aff4f10d79
Merge branch 'maint'
2013-10-23 19:04:49 +02:00
a535d291fd
ox-odt: Stop adding leading space after line break
...
* lisp/ox-odt.el (org-odt-line-break, org-odt-plain-text): Remove
newline after line-break tag.
The exporter was pretty-printing the ODT XML with newlines after
forced line breaks, but LibreOffice would interpret those as
spaces. This led to a leading space after every manual line break.
2013-10-23 19:04:09 +02:00
e09ffe2a67
ox: Add a defcustom to export properties drawers
...
* lisp/ox.el (org-export-with-drawers): Improve docstring.
(org-export-with-properties): New variable
(org-export--skip-p): Handle new variable.
(org-export-options-alist): Install new variable.
* lisp/ox-ascii.el (org-ascii-node-property,
org-ascii-property-drawer): New functions.
* lisp/ox-html.el (org-html-node-property): New function.
(org-html-property-drawer): Export property drawers as "pre" blocks.
* lisp/ox-latex.el (org-latex-property-drawer,
org-latex-node-property): New functions.
* lisp/ox-man.el (org-man-node-property, org-man-property-drawer): New
functions.
* lisp/ox-md.el (org-md-node-property, org-md-property-drawer): New
functions.
* lisp/ox-odt.el (org-odt-node-property): New function.
(org-odt-property-drawer): Export property drawers as fixed width
blocks.
* lisp/ox-texinfo.el (org-texinfo-node-property): New function.
(org-texinfo-property-drawer): Export property drawers as verbatim
blocks.
* doc/org.texi: Update manual.
* testing/lisp/test-ox.el: Add tests.
2013-09-26 13:46:31 +02:00
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
2a94fca6ca
Fix generating LaTeX formula images
...
* lisp/ox-odt.el (org-odt--translate-latex-fragments): Fix imagemagick support.
* lisp/ox-html.el (org-html-latex-environment)
(org-html-latex-fragment): Fix imagemagick support.
* org.el (org-create-formula-image-with-imagemagick): Generate correct
size formula image.
(org-format-latex-header): Change pagestyle command position.
* doc/org.texi (@LaTeX{} fragments)
(Previewing @LaTeX{} fragments)
(Math formatting in HTML export)
(Working with @LaTeX{} math snippets): Add document about creating
formula image with imagemagick.
2013-07-15 15:31:38 +02:00
044c8c5ebb
Merge branch 'maint'
2013-07-10 12:13:09 +02:00
681bd0cfd9
ox-odt.el (org-odt-pixels-per-inch): Use 96.0 as the default
...
* ox-odt.el (org-odt-pixels-per-inch): Use 96.0 as the default.
Thanks to Vincent Liard for this patch.
2013-07-10 12:12:59 +02:00
758a545fb6
Export back-ends: Apply changes to back-end structure
...
* lisp/ox-html.el (org-html--format-toc-headline): Make use of
anonymous back-ends.
* lisp/ox-odt.el (org-odt-footnote-reference): Make use of anonymous
back-ends.
(org-odt-format-label, org-odt-toc, org-odt-format-headline--wrap):
Use `org-export-with-backend' instead of
`org-export-with-translations'.
* contrib/lisp/ox-freemind.el (org-freemind--build-node-contents): Use
`org-export-with-backend' instead of `org-export-with-translations'.
2013-07-04 14:17:49 +02:00
116a66c5be
Merge branch 'maint'
2013-07-01 23:13:03 +02:00
c419d1134e
Fix compiler warnings.
2013-07-01 23:12:54 +02:00
f7f874006e
ox-odt: Fix internationalization of some labels
...
* lisp/ox-odt.el (org-odt-label-styles, org-odt-category-map-alist):
Fix docstring.
(org-odt-format-label): Add docstring. Internationalize prefix.
* lisp/ox.el (org-export-dictionary): Add entry for colons.
2013-06-29 15:29:24 +02:00
4309062580
ox-odt: Remove unused function
...
* lisp/ox-odt.el (org-odt--suppress-some-translators): Remove
function.
2013-06-29 15:23:34 +02:00
b7710ddcbd
Merge branch 'maint'
2013-06-26 09:45:10 +02:00
d7f9f9da56
Revert "ox-odt: Fix internationalization of "Table" and "Listing""
...
This reverts commit 95b16b1aa5
2013-06-26 09:44:36 +02:00
ec8f3f987e
Merge branch 'maint'
2013-06-25 09:33:39 +02:00
95b16b1aa5
ox-odt: Fix internationalization of "Table" and "Listing"
...
* lisp/ox-odt.el (org-odt-category-map-alist): Fix
internationalization of "Table" and "Listing".
Bug reported by Georg Lehner.
2013-06-25 09:30:18 +02:00
41a0f2fa9e
ox-odt: Links to headlines are more consistent with other back-ends
...
* lisp/ox-odt.el (org-odt-link): Fuzzy links to an headline with
a description always use that description, even if the description
is the same as the headline title.
Reported by Georg Lehner.
2013-06-25 09:05:46 +02:00
b4f90c687d
ox-odt: Allow to turn smart quotes off
...
* lisp/ox-odt.el (org-odt-plain-text): Allow to turn smart quotes off.
Patch suggested by Georg Lehner.
2013-06-25 08:35:25 +02:00
d36a933c65
Compatibility: fix XEmacs compilation failures
...
* lisp/ob-eval.el, lisp/ob.el, lisp/org-macro.el, lisp/org-mhe.el:
Require org-macs and org-compat as necessary.
* lisp/ob-tangle.el: Declare function `org-store-link' and
`org-open-link-from-string'.
* lisp/org-compat.el: Extend eval-and-compile clause and add advices
for functions that have different parameter lists in XEmacs. Add
variable definitions that XEmacs lacks .
* lisp/org-macs.el (declare-function): Define macro to use autoload
instead for XEmacs.
* lisp/ox-html.el, lisp/ox-odt.el: XEmacs does not have table.el, so
use 'noerror on the require form.
* lisp/ox-texinfo.el (org-texinfo-table-column-widths): Fix spliced
argument list that XEmacs complains about by adding parenthesis.
This fixes all compilation failures on XEmacs and warnings related to
Org that indicate that XEmacs has compiled things wrongly (for
instance it might have interpreted a function as a variable symbol).
There are still many warnings that probably indicate serious problems.
2013-06-01 11:31:07 +02:00
a84c01642b
Fix customization types of variables
...
* contrib/lisp/org-wl.el (org-wl-namazu-default-index): Fix custom type.
* lisp/ob-lob.el (org-babel-lob-files): Fix custom type.
* lisp/org-agenda.el (org-agenda-export-html-style):
(org-agenda-ndays):
(org-agenda-inactive-leader):
(org-agenda-day-face-function):
(org-agenda-auto-exclude-function): Fix custom type.
* lisp/org-bibtex.el (org-bibtex-prefix): Fix custom type.
* lisp/org-clock.el (org-clock-heading-function):
(org-show-notification-handler): Fix custom type.
* lisp/org-footnote.el (org-footnote-auto-adjust): Fix custom type.
* lisp/org-protocol.el (org-protocol-default-template-key): Fix custom type.
* lisp/org.el (org-make-link-description-function):
(org-link-translation-function):
(org-link-frame-setup):
(org-refile-target-verify-function):
(org-get-priority-function):
(org-use-fast-tag-selection):
(org-columns-modify-value-for-display-function):
(org-sparse-tree-default-date-type): Fix custom type.
* lisp/ox-html.el (org-html-postamble):
(org-html-postamble-format):
(org-html-preamble-format): Fix custom type.
* lisp/ox-odt.el (org-odt-content-template-file): Fix custom type.
* lisp/ox.el (org-export-with-archived-trees):
(org-export-initial-scope): Fix custom type.
Thanks to Glenn Moris for reporting these. He used cus-test.el
to find them.
2013-05-09 15:19:02 +02:00
1144903cfa
ox-odt.el (org-odt-link): Fix bug: convert & to & in links
...
* ox-odt.el (org-odt-link): Fix bug: convert & to & in
links.
2013-04-08 21:25:09 +02:00
133afe8915
Cosmetic change in messages.
2013-04-06 16:49:10 +02:00
735bb251b1
Remove TARGET handling from export back-ends
...
* contrib/lisp/ox-groff.el (org-groff-link): Remove TARGET handling.
* lisp/ox-ascii.el (org-ascii-link): Remove TARGET handling.
* lisp/ox-html.el (org-html-keyword): Remove TARGET handling.
* lisp/ox-latex.el (org-latex-keyword, org-latex-link): Remove TARGET
handling.
* lisp/ox-man.el (org-man-keyword): Remove TARGET handling.
* lisp/ox-md.el (org-md-link): Remove TARGET handling.
* lisp/ox-odt.el (org-odt-keyword): Remove TARGET handling.
2013-04-04 20:38:36 +02:00
9c854372ff
ox-odt: Fix export of footnotes outside subtree during subtree export
...
* etc/styles/OrgOdtStyles.xml: Define "OrgFootnoteCenter" and
"OrgFootnoteQuotations" styles.
* lisp/ox-odt.el (org-odt--format-paragraph): New function.
(org-odt-paragraph): Use new function to limit code duplication.
(org-odt-footnote-reference): Change default style for paragraphs when
transcoding a footnote definition.
2013-04-01 17:23:32 +02:00
8aeea9b02c
Revert "ox-odt.el: Fix annotation insertion."
...
This reverts commit 9eb384fe4f
2013-03-25 22:45:17 +01:00
57aaaa9330
Revert "Fix previous commit again"
...
This reverts commit a3e8a1d604
2013-03-25 22:45:06 +01:00
a3e8a1d604
Fix previous commit again
...
Now off.
2013-03-25 18:28:50 +01:00
9eb384fe4f
ox-odt.el: Fix annotation insertion.
...
* ox-odt.el (org-odt-special-block): Don't wrap annotations
into <text:p>...</text:p> at all.
(org-odt--fix-annotations): New defun.
(org-odt--export-wrap): Use the new defun to fix annotations
insertion in content.xml.
Please don't insult me because of the uglyness of this fix.
Send me a proper fix instead!
2013-03-25 18:05:06 +01:00
f09471e5d9
ox-odt.el (org-odt-special-block): Don't insert annotations using style "Text_20_body"
...
* ox-odt.el (org-odt-special-block): Don't insert annotations
using style "Text_20_body".
Thanks to Christian Moe for reporting this bug.
2013-03-25 16:12:24 +01:00
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
ce0473532d
ox.el (org-export-copy-to-kill-ring): Default back to 'if-interactive
...
* ox.el (org-export--copy-to-kill-ring-p): New function.
(org-export-copy-to-kill-ring): Use 'if-interactive as the
default.
(org-export-to-buffer, org-export-to-file): Use
`org-export--copy-to-kill-ring-p' and fix docstrings.
* ox-odt.el (org-odt-export-as-odf): Use
`org-export--copy-to-kill-ring-p'.
2013-03-15 13:39:45 +01:00
80724ea2a6
ox-odt.el (org-odt-code, org-odt-verbatim): Use `org-odt--encode-plain-text'
...
* ox-odt.el (org-odt-code, org-odt-verbatim): Use
`org-odt--encode-plain-text'.
Thanks to Bernd Haug for reporting this.
2013-03-13 17:02:34 +01:00
59cb22d638
ox: Simplify syntax for attributes
...
* lisp/ox.el (org-export-read-attribute): Do not use `read' to read
attributes. Instead, extract keywords and values from it, which
means each value will be a string when non-nil.
* contrib/lisp/ox-groff.el (org-groff-link--inline-image): Use new
attribute syntax. Small refactoring.
* lisp/ox-ascii.el (org-ascii-horizontal-rule): Use new attribute
syntax.
* lisp/ox-beamer.el (org-beamer-plain-list): Use new attribute syntax.
* lisp/ox-html.el (org-html--textarea-block): Use new attribute
syntax.
* lisp/ox-latex.el (org-latex--inline-image, org-latex--org-table,
org-latex--math-table): Use new attribute syntax.
* lisp/ox-man.el (org-man-table--org-table): Use new attribute syntax.
Small refactoring.
* lisp/ox-odt.el (org-odt-link--inline-image, org-odt-table-cell): Use
new attribute syntax.
* testing/lisp/test-ox.el: Add tests.
This patch introduces two changes. To begin with, it removes the need
for quoting and escaping characters. Also, all non-nil values are
stored as strings. As an exception "nil" is stored as nil.
2013-03-11 08:33:10 +01:00
2ad8369015
org.el: Update `customize-package-emacs-version-alist' and fix :version/:package-version keywords
...
* org.el (customize-package-emacs-version-alist): Update
`customize-package-emacs-version-alist'.
* ox-texinfo.el (org-export-texinfo)
(org-texinfo-filename, org-texinfo-classes)
(org-texinfo-format-headline-function)
(org-texinfo-node-description-column)
(org-texinfo-active-timestamp-format)
(org-texinfo-link-with-unknown-path-format)
(org-texinfo-tables-verbatim)
(org-texinfo-table-scientific-notation)
(org-texinfo-text-markup-alist)
(org-texinfo-format-drawer-function)
(org-texinfo-format-inlinetask-function)
(org-texinfo-info-process):
* ox-odt.el (org-odt-format-drawer-function)
(org-odt-format-headline-function)
(org-odt-format-inlinetask-function):
* ox-md.el (org-export-md, org-md-headline-style): Fix :version
and :package-version keywords.
2013-03-06 17:31:28 +01:00
e109a37ede
Export framework: Add :version and :package-version informations to defcustoms
...
* lisp/ox-beamer.el (org-beamer-column-view-format, org-beamer-theme,
org-beamer-environments-extra): Add :version and :package-version.
* lisp/ox-html.el (org-html-with-latex, org-html-inline-image-rules):
Add :version and :package-version.
* lisp/ox-latex.el (org-latex-inline-image-rules,
org-latex-default-table-environment, org-latex-default-table-mode,
org-latex-tables-booktabs, org-latex-table-scientific-notation,
org-latex-known-errors): Add :version and :package-version.
* lisp/ox-md.el (org-md-headline-style): Add :version
and :package-version.
* lisp/ox-odt.el (org-odt-with-latex): Add :version
and :package-version.
* lisp/ox.el (org-export-with-drawers, org-export-with-latex,
org-export-with-inlinetasks, org-export-with-planning,
org-export-with-smart-quotes, org-export-with-statistics-cookies,
org-export-allow-bind-keywords, org-export-async-init-file):
Add :version and :package-version.
2013-03-06 17:14:27 +01:00
e1befff7ad
ox-odt.el (org-odt-keyword): Fix typo
...
* ox-odt.el (org-odt-keyword): Fix typo.
2013-03-04 20:31:08 +01:00
ff97a0ee9d
Revert "Add (provide ...) forms."
...
This reverts commit 8decdbcd23
2013-03-02 16:20:59 +01:00
8decdbcd23
Add (provide ...) forms.
...
E.g., if a user requires the 'org-icalendar feature,
he really wants to load 'ox-icalendar if it's in her
load-path.
2013-03-02 10:25:10 +01:00
8ee6c13c7f
Fix typo: an headline -> a headline.
2013-02-23 13:47:44 +01:00
ceeee88f49
Update header information.
...
Those three files will be part of Emacs when Org 8.0
will be merged with Emacs trunk.
Thanks to Nick Dokos for pointing this.
2013-02-23 08:59:23 +01:00
324a2cb3f9
export-back-ends: Apply changes from b692064e621acbc93876670585f8a4b0fd6a7ffa
...
* lisp/ox-beamer.el (org-beamer--get-label, org-beamer--frame-level,
org-beamer--format-section, org-beamer--format-frame,
org-beamer--format-block, org-beamer-headline): Apply changes to
properties.
* lisp/ox-html.el (org-html-headline, org-html-link,
org-html-section): Apply changes to properties.
* lisp/ox-icalendar.el (org-icalendar-create-uid,
org-icalendar-blocked-headline-p, org-icalendar-entry,
org-icalendar--valarm): Apply changes to properties.
* lisp/ox-odt.el (org-odt-headline): Apply changes
* lisp/ox-publish.el (org-publish-collect-index): Apply changes to
properties.
* lisp/ox-texinfo.el (org-texinfo--generate-menu-list,
org-texinfo--generate-menu-items, org-texinfo-template,
org-texinfo-headline, org-texinfo-link): Apply changes to
properties.
* lisp/ox.el (org-export-resolve-id-link, org-export-get-category):
Apply changes to properties.
(org-export-get-node-property): Update docstring.
* testing/lisp/test-ox.el: Update tests.
2013-02-18 00:12:57 +01:00
e5322d77f2
ox-odt.el (org-odt-convert-read-params): Fix typo in prompt
...
* ox-odt.el (org-odt-convert-read-params): Fix typo in prompt.
2013-02-12 22:26:39 +01:00
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
Nicolas Goaziou
Christian Moe
Feng Shu
Bastien Guerry
Achim Gratz
Carsten Dominik