mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-27 07:37:25 +00:00
Code
25,885 Commits 3 Branches 439 Tags 112 MiB
92a40cf7a1
Commit Graph

86 Commits

Author SHA1 Message Date
Nicolas Goaziou
2e370ed537 Merge branch 'maint' 2014-05-21 21:30:38 +02:00
Nicolas Goaziou
bc456879ff ox-org: Tiny refactoring 
* lisp/ox-org.el (org-org-section): Tiny refactoring.  Use appropriate
  property.
 2014-05-21 21:29:16 +02:00
Nicolas Goaziou
c40833436c Merge branch 'maint' 2014-05-21 18:38:11 +02:00
Nicolas Goaziou
844a6494c3 ox-org: Fix missing footnote definitions 
* lisp/ox-org.el (org-org-headline): Ignore footnote sections.
(org-org-section): New function.

Some footnote definitions may be outside of the scope of the export
and, therefore, do not appear in the generated output.  This patch
ensures that all footnote definitions appear at the end of the section
they belong to.

Thanks to Leonard Randall for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/86558
 2014-05-21 18:37:13 +02:00
Nicolas Goaziou
81f2f5a6e8 Export back-ends: Remove quote section translators 
* lisp/ox-ascii.el (org-ascii--current-text-width): Remove
  `quote-section' reference.
  (org-ascii-quote-section): Remove function.
* lisp/ox-html.el (org-html-quote-section): Remove function.
* lisp/ox-man.el (org-man-quote-section): Remove function.
* lisp/ox-md.el (org-md-quote-section): Remove function.
* lisp/ox-odt.el (org-odt-quote-section): Remove function.
* lisp/ox-org.el (org-org-quote-section): Remove function.
* lisp/ox-texinfo.el (org-texinfo-quote-section): Remove function.
 2014-01-27 21:14:44 +01:00
Bastien Guerry
f8e1745440 Merge branch 'maint' 
Conflicts:
	contrib/lisp/org-favtable.el
 2014-01-07 14:19:03 +01:00
Bastien Guerry
7d9a883b50 Update copyright years again. 
Hint: copyright years are all updated in Emacs.
 2014-01-07 14:18:17 +01:00
Bastien Guerry
c41f5075ac Merge branch 'maint' 
Conflicts:
	contrib/lisp/org-favtable.el
 2014-01-05 06:36:11 +01:00
Bastien Guerry
0beda99171 Revert "Update copyright years." 
This reverts commit 21105594fc.
 2014-01-05 06:28:07 +01:00
Bastien Guerry
096ff7e078 Merge branch 'maint' 
Conflicts:
	contrib/lisp/org-favtable.el
 2014-01-04 18:58:12 +01:00
Bastien Guerry
21105594fc Update copyright years. 2014-01-04 18:56:11 +01:00
Nicolas Goaziou
d55f0632b5 Merge branch 'maint' 2013-12-15 16:18:31 +01:00
Nicolas Goaziou
29c02c3810 ox-org: Remove attr_backend keywords 
* lisp/ox-org.el (org-org-identity): Since back-end specific keywords
  are stripped from output, also remove attr_backend keywords.
 2013-12-15 15:17:24 +01:00
Nicolas Goaziou
4e02e48fa3 Merge branch 'maint' 
Conflicts:
	doc/org.texi
 2013-12-15 14:59:33 +01:00
Nicolas Goaziou
18d3057e62 org.texi: Document `org' back-end 
* doc/org.texi (Org export): New section.
* lisp/ox-org.el: Remove initial code comments since this is now in
  manual.
 2013-12-15 14:52:46 +01:00
Nicolas Goaziou
9676c59547 ox-org: Add "body-only" export 
* lisp/ox-org.el (org-org-export-to-org): Add body-only export.
 2013-11-16 09:19:22 +01:00
Nicolas Goaziou
38a2bd3783 ox-org: Improve keyword handling 
* lisp/ox-org.el (org-org-template): New function.
(org-org-keyword): Handle document keywords specially.
 2013-11-16 00:20:13 +01:00
Bastien Guerry
f95641c443 Backport changes from Emacs revs 115081 and 115082 
2013-11-12  Stefan Monnier  <monnier@iro.umontreal.ca>

	Address some byte-compiler warnings.
	* ob-abc.el (org-babel-expand-body:abc): Use dolist.
	(org-babel-execute:abc): Fix regexp quoting.
	* ob-calc.el (org--var-syms): Rename from `var-syms'.
	* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
	* ob-table.el (sbe): Move debug declaration.
	* org-clock.el (org--msg-extra): Rename from `msg-extra'.
	* org.el (org-version): Avoid var name starting with _.
	(org-inhibit-startup, org-called-with-limited-levels)
	(org-link-search-inhibit-query, org-time-was-given)
	(org-end-time-was-given, org-def, org-defdecode, org-with-time):
	* org-colview.el (org-agenda-overriding-columns-format):
	* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
	(org-agenda-show-log-scoped):
	* ob-python.el (py-which-bufname, python-shell-buffer-name):
	* ob-haskell.el (org-export-copy-to-kill-ring):
	* ob-exp.el (org-link-search-inhibit-query):
	* ob-R.el (ess-eval-visibly-p):
	* ob-core.el (org-src-window-setup): Declare before use.
	(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
	* ox-odt.el (org-odt-hfy-face-to-css):
	* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
	* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
	(org-bibtex-check):
	* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
	(org-babel-tangle-single-block, org-babel-tangle-comment-links):
	* ob-table.el (sbe):
	* ob-sqlite.el (org-babel-sqlite-expand-vars):
	* ob-sql.el (org-babel-sql-expand-vars):
	* ob-shen.el (org-babel-execute:shen):
	* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
	* ob-scala.el (org-babel-scala-evaluate):
	* ob-ruby.el (org-babel-ruby-table-or-string)
	(org-babel-ruby-evaluate):
	* ob-python.el (org-babel-python-table-or-string)
	(org-babel-python-evaluate-external-process)
	(org-babel-python-evaluate-session):
	* ob-picolisp.el (org-babel-execute:picolisp):
	* ob-perl.el (org-babel-perl-evaluate):
	* ob-maxima.el (org-babel-execute:maxima):
	* ob-lisp.el (org-babel-execute:lisp):
	* ob-java.el (org-babel-execute:java):
	* ob-io.el (org-babel-io-evaluate):
	* ob-haskell.el (org-babel-execute:haskell):
	* ob-fortran.el (org-babel-execute:fortran):
	* ob-exp.el (org-babel-exp-code):
	* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
	* ob-ditaa.el (org-babel-execute:ditaa):
	* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
	(org-babel-parse-header-arguments, org-babel-reassemble-table)
	(org-babel-goto-src-block-head, org-babel-mark-block)
	(org-babel-expand-noweb-references, org-babel-script-escape)
	(org-babel-process-file-name):
	* ob-clojure.el (org-babel-execute:clojure):
	* ob-calc.el (org-babel-execute:calc):
	* ob-awk.el (org-babel-execute:awk):
	* ob-abc.el (org-babel-execute:abc):
	* ob-R.el (org-babel-expand-body:R):
	* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).

2013-11-12  Glenn Morris  <rgm@gnu.org>

	* ox-html.el (org-html-scripts): Add 2013 to copyright years.
	(org-html-infojs-template): Copyright holder to FSF.
 2013-11-12 20:57:31 +01:00
Nicolas Goaziou
92f89eedba ox-org: Fix headline level during subtree export 
* lisp/org-element.el (org-element-headline-interpreter): Take into
  consideration `org-odd-levels-only' when building a headline.
* lisp/ox-org.el (org-org-headline): Correctly set transcoded headline
  level during subtree export.
 2013-11-06 19:14:14 +01:00
Bastien Guerry
c1ea2c3df9 ox-org.el: Show all headings and all blocks before fontifying when htmlizing sources 
* ox-org.el (org-org-publish-to-org): When htmlizing an .org
file, ensure to show all headings and all blocks before
fontifying.
 2013-10-14 10:05:30 +02:00
Nicolas Goaziou
c2fa90248c ox-org: Fix arguments mismatch in `org-export-as-org' 
* lisp/ox-org.el (org-export-as-org): Add missing BODY-ONLY argument,
which is always nil in this back-end.

Reported-by: Nicolas Girard <girard.nicolas@gmail.com>
 2013-08-23 09:32:35 +02:00
Nicolas Goaziou
9154c70a04 Export back-ends: Apply changes to export functions 
* contrib/lisp/ox-confluence.el (org-confluence-export-as-confluence):
* contrib/lisp/ox-deck.el (org-deck-export-as-html,
  org-deck-export-to-html):
* contrib/lisp/ox-freemind.el (org-freemind-export-to-freemind):
* contrib/lisp/ox-groff.el (org-groff-export-to-groff,
  org-groff-export-to-pdf):
* contrib/lisp/ox-koma-letter.el (org-koma-letter-export-as-latex,
  org-koma-letter-export-to-latex, org-koma-letter-export-to-pdf):
* contrib/lisp/ox-rss.el (org-rss-export-as-rss,
  org-rss-export-to-rss):
* contrib/lisp/ox-s5.el (org-s5-export-as-html,
  org-s5-export-to-html):
* contrib/lisp/ox-taskjuggler.el (org-taskjuggler-export):
* lisp/ob-haskell.el:
* lisp/ox-ascii.el (org-ascii-export-as-ascii,
  org-ascii-export-to-ascii):
* lisp/ox-beamer.el (org-beamer-export-as-latex,
  org-beamer-export-to-latex, org-beamer-export-to-pdf):
* lisp/ox-html.el (org-html-export-as-html, org-html-export-to-html):
* lisp/ox-icalendar.el (org-icalendar-export-to-ics):
* lisp/ox-latex.el (org-latex-export-as-latex,
  org-latex-export-to-pdf):
* lisp/ox-man.el (org-man-export-to-man, org-man-export-to-pdf):
* lisp/ox-md.el (org-md-export-as-markdown,
  org-md-export-to-markdown):
* lisp/ox-odt.el (org-odt-export-to-odt):
* lisp/ox-org.el (org-org-export-as-org, org-org-export-to-org):
* lisp/ox-publish.el (org-publish-org-to):
* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo,
  org-texinfo-export-to-info):
* testing/lisp/test-ob-exp.el (test-ob-exp/org-babel-exp-src-blocks/w-no-file):
 2013-08-07 16:11:42 +02:00
Nicolas Goaziou
eba04bfb3c ox-org: Preserve affiliated keywords 
* lisp/ox.el (org-export-expand): Optionally add affiliated keywords
  to results.
* lisp/ox-org.el (org-org-identity): Use new argument for
  `org-export-expand'.
 2013-04-26 15:53:05 +02:00
Nicolas Goaziou
58f7e43821 ox-org.el: Fix some docstrings 
* lisp/ox-org.el (org-org-identity): Fix docstring.  Tiny refactoring.
(org-org-headline, org-org-keyword): Fix docstring.
 2013-04-17 22:45:07 +02:00
Nicolas Goaziou
3d65b46c0c ox-org: Add interactive functions to back-end 
* lisp/ox-org.el (org): Add a menu entry for the back-end.
(org-org-export-as-org, org-org-export-to-org): New functions.
* lisp/org.el (org-export-backends): Accept `org' as a loadable
  back-end.
 2013-04-04 15:09:22 +02:00
Bastien Guerry
a597a8b622 ox-html.el and ox-org.el: Use the custom HTML extension. 
* ox-org.el (org-org-publish-to-org):
* ox-html.el (org-html-publish-to-html): Use the custom
extension.

Thanks to Ian Barton for reporting this.
 2013-04-03 13:25:11 +02:00
Bastien Guerry
a13b19e384 ox.el (org-export-define-backend, org-export-define-derived-backend): Use defuns 
* ox.el (org-export-define-backend)
(org-export-define-derived-backend): Make defuns and update
docstrings.

* ox-texinfo.el (texinfo):
* ox-org.el (org):
* ox-odt.el (odt):
* ox-md.el (md):
* ox-man.el (man):
* ox-latex.el (latex):
* ox-icalendar.el (icalendar):
* ox-html.el (html):
* ox-beamer.el (beamer):
* ox-ascii.el (ascii): Use the defuns.
 2013-03-19 19:39:34 +01:00
Bastien Guerry
f5bf08c92c ox-org.el (org-org-publish-to-org): Kill buffers not visited at publication time 
* ox-org.el (org-org-publish-to-org): Kill buffers not visited
at publication time.
 2013-03-19 19:38:52 +01:00
Bastien Guerry
952100a8a1 Fix typo 2013-03-04 07:36:54 +01:00
Nicolas Goaziou
25f2ae88f5 ox-org: Silence byte-compiler 2013-03-02 19:31:12 +01:00
Bastien Guerry
4351dda5ab ox-org.el: Handle :htmlized-source in publishing projects 
* ox-org.el (org-org-htmlized-css-url): Rename from
`org-html-htmlized-org-css-url' and moved here from
ox-html.el.
(org-org-publish-to-org): Handle :htmlized-source in
publishing projects.
 2013-03-02 18:46:07 +01:00
Bastien Guerry
e9e32173cc Update headers. 2013-02-23 09:56:24 +01:00
Bastien Guerry
e4a8f7b8c1 ox-org.el (org-org-publish-to-org): Autoload 
* ox-org.el (org-org-publish-to-org): Autoload.
 2013-02-22 13:42:02 +01:00
Nicolas Goaziou
61bf4a5c3f export back-ends: Preserve subsequent blank lines when ignoring comments 
* lisp/ox-latex.el (org-latex-property-drawer): Remove function.
* contrib/lisp/ox-groff.el (org-groff-property-drawer): Remove
  function.

This changes ensures that:

  paragraph
  # comment

  another paragraph

will be exported as:

  paragraph

  another paragraph

and not as:

  paragraph
  another paragraph

It only applies on back-end where empty lines are meaningful (e.g. not
html).
 2013-02-22 11:43:38 +01:00
Bastien Guerry
bfa648be7d ox-org.el (org-org-publish-to-org): New defun 
* ox-org.el (org-org-publish-to-org): New defun.
 2013-02-19 19:17:20 +01:00
Nicolas Goaziou
8dd2bfc291 Move new export framework files into core 
* contrib/README: Remove references to new export framework.
* contrib/lisp/org-e-ascii.el: Removed file.
* contrib/lisp/org-e-beamer.el: Removed file.
* contrib/lisp/org-e-confluence.el: Removed file.
* contrib/lisp/org-e-groff.el: Removed file.
* contrib/lisp/org-e-html.el: Removed file.
* contrib/lisp/org-e-icalendar.el: Removed file.
* contrib/lisp/org-e-latex.el: Removed file.
* contrib/lisp/org-e-man.el: Removed file.
* contrib/lisp/org-e-odt.el: Removed file.
* contrib/lisp/org-e-publish.el: Removed file.
* contrib/lisp/org-e-texinfo.el: Removed file.
* contrib/lisp/org-export.el: Removed file.
* contrib/lisp/org-koma-letter.el: Removed file.
* contrib/lisp/org-md.el: Removed file.
* contrib/lisp/ox-confluence.el: New file.
* contrib/lisp/ox-groff.el: New file.
* contrib/lisp/ox-koma-letter.el: New file.
* lisp/ox-ascii.el: New file.
* lisp/ox-beamer.el: New file.
* lisp/ox-html.el: New file.
* lisp/ox-icalendar.el: New file.
* lisp/ox-jsinfo.el: New file.
* lisp/ox-latex.el: New file.
* lisp/ox-man.el: New file.
* lisp/ox-md.el: New file.
* lisp/ox-odt.el: New file.
* lisp/ox-publish.el: New file.
* lisp/ox-texinfo.el: New file.
* lisp/ox.el: New file.
* mk/org-fixup.el (org-make-org-loaddefs): Install new export
  framework and back-end files.
* testing/lisp/test-org-export.el: Removed file.
* testing/lisp/test-ox.el: New file.
 2013-02-06 23:06:30 +01:00