398e8af56e
Merge branch 'master' of orgmode.org:org-mode
2013-02-24 11:33:34 +01:00
d242be2c89
ox-html.el (org-html-format-headline-function): Fix docstring
...
* ox-html.el (org-html-format-headline-function): Fix docstring.
2013-02-24 10:01:39 +01:00
a15a657bfb
ox: Better return value for `org-export-get-optional-title'
...
* lisp/ox.el (org-export-get-optional-title): Return regular title
when no optional title is found.
* lisp/ox-ascii.el (org-ascii--build-title): Apply change to
`org-export-get-optional-title'.
* lisp/ox-html.el (org-html--format-toc-headline): Apply change to
`org-export-get-optional-title'.
* lisp/ox-latex.el (org-latex-headline): Apply change to
`org-export-get-optional-title'.
* testing/lisp/test-ox.el: Add tests.
2013-02-24 09:20:35 +01:00
d790fbd489
ox-ascii/ox-latex/ox-html: Make use of optional title in toc
...
* lisp/ox-ascii.el (org-ascii--build-title): Add an argument. Use
optional title when building a toc line.
(org-ascii--build-toc): Call `org-ascii--build-title' with appropriate
arguments.
* lisp/ox-latex.el (org-latex-headline): Use optional title for table
of contents.
* lisp/ox-html.el (org-html--toc-text): Renamed from
`org-html-toc-text'. Add docstring.
(org-html--format-toc-headline): Renamed from
`org-html-format-toc-headline'. Add docstring. Use optional title if
possible.
(org-html-toc): Add docstring.
2013-02-23 23:58:23 +01:00
8ee6c13c7f
Fix typo: an headline -> a headline.
2013-02-23 13:47:44 +01:00
e9e32173cc
Update headers.
2013-02-23 09:56:24 +01:00
3e95e859cd
ox-html: Handle external fuzzy links
...
* lisp/ox-html.el (org-html-link): Resolve external links with search
options like [[file.org::#custom-id]] or
[[file.org::*headline-search]].
In particular, this allows to resolve completely links produced by
index generation during publishing.
2013-02-23 00:05:10 +01:00
b10e2bde13
export back-ends: Fix leftover downcase :custom-id properties
...
* lisp/ox-html.el (org-html-format-headline--wrap, org-html-headline):
Use :CUSTOM_ID, not :custom-id.
* contrib/lisp/ox-deck.el (org-deck-toc): Use :CUSTOM_ID,
not :custom-id.
2013-02-22 14:51:58 +01:00
db0143f70e
ox-html.el: Fix a few FIXMEs
...
* ox-html.el (org-html-table-header-tags)
(org-html-table-data-tags, org-html-table-row-tags)
(org-html-table-align-individual-fields): Use the
org-export-html group.
(org-html-inline-src-block, org-html-link): Fix error
messages.
(org-html-begin-plain-list): Fix formatting, better FIXME
comment.
2013-02-22 10:28:25 +01:00
da717614ac
Remove some FIXME issues in the final list.
2013-02-22 09:58:58 +01:00
8134e80bdf
org-html.el: Rename org-export-htmlize-* options to org-html-htmlize-*
...
* ox-html.el (org-export-htmlize): Delete group.
(org-html-htmlize-output-type)
(org-html-htmlized-org-css-url)
(org-html-htmlize-region-for-paste): Rename from
org-export-htmlize-*.
(org-html-htmlize-generate-css, org-html-fontify-code): Use
the correct names.
2013-02-19 19:03:59 +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
8858e1ffef
ox-publish: Fix index generation
...
* lisp/ox.el (org-export-install-filters): Properly install filters
send through ext-plist mechanism.
* lisp/ox-publish.el (org-publish-org-to): Small refactoring.
* lisp/ox-html.el (org-html-keyword): Remove INDEX keyword handling.
ox-publish.el takes care of it already.
2013-02-16 18:44:22 +01:00
451e8be770
ox-html.el (org-html--build-meta-info): Add a newline before the title meta information
...
* ox-html.el (org-html--build-meta-info): Add a newline before
the title meta information.
2013-02-15 21:50:35 +01:00
4d7f4d87fb
Fix last commit
2013-02-15 16:42:04 +01:00
94dbeedd4a
ox-html.el (org-html--build-mathjax-config): Do not always include MathJax configuration
...
* ox-html.el (org-html--build-mathjax-config): Only include
MathJax configuration if the resulting HTML contains LaTeX
fragments.
2013-02-15 15:50:38 +01:00
131d70ab48
ox-html.el (org-html-table): Append #+attr_html attributes
...
* ox-html.el (org-html-table): Append #+attr_html attributes.
Thanks to Дядов Васил Стоянов for reporting this and for a preliminary
patch.
2013-02-14 11:07:18 +01:00
9d85946992
ox-html.el (org-html-link): Don't throw an error if the value of the :ID: property has not been generated by uuidgen
...
* ox-html.el (org-html-link): Don't throw an error if the
value of the :ID: property has not been generated by uuidgen.
Thanks to Florian Beck for requesting this.
2013-02-13 15:55:26 +01:00
cf1ba8cb05
ox-html.el (org-html-display-buffer-mode): New option
...
* ox-html.el (org-html-display-buffer-mode): New option.
(org-html-export-as-html): Use it.
2013-02-12 22:21:20 +01:00
8071d67cdd
Fix commit 25a4f5 (again)
2013-02-12 08:38:31 +01:00
1f8c8dc6d6
ox: Implement `inner-template' transcoder
...
* lisp/ox.el (org-export-as): Call `inner-template' function, if
available.
* lisp/ox-html.el (org-html-inner-template): New function.
(org-html-template): Move all parts that should be inserted even in
a body-only export into `org-html-inner-template'.
* testing/lisp/test-ox.el: Add tests.
2013-02-11 22:26:52 +01:00
cc61ad218d
ox-html.el (org-html-format-latex): Fix commit 25a4f5
...
* ox-html.el (org-html-format-latex): Don't set
`cache-relpath' and `cache-dir' when `processing-type' is
'mathjax.
2013-02-11 16:11:05 +01:00
302c2850fa
org-latex/org-html: Small changes to menu entries
2013-02-08 22:19:37 +01:00
25a4f513a7
ox-html.el (org-html-format-latex): Fix conversion in non-file buffers
...
* ox-html.el (org-html-format-latex): Fix conversion in
non-file buffers.
Thanks to Vincent Beffara for spotting this and proposing a patch.
2013-02-08 19:49:25 +01:00
c857077351
ox-html.el (org-html-link): Fix bug.
...
Thanks to Chuck Berry for reporting it.
2013-02-07 09:59:08 +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
Bastien Guerry
Nicolas Goaziou