0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 12:10:44 +00:00
Commit graph

62 commits

Author SHA1 Message Date
Nicolas Goaziou 0c14ad963c ox-html: Allow multiple #+LATEX_HEAD and #+LATEX_HEAD_EXTRA again
* lisp/ox-html.el (html): Allow multiple #+LATEX_HEAD and
  #+LATEX_HEAD_EXTRA again.
2013-03-04 16:23:13 +01:00
Nicolas Goaziou 51ab145e36 ox-html: Exclude contents div and title from body-only export
* lisp/ox-html.el (org-html-inner-template): Remove contents div and
  title.
(org-html-template): Add contents div and title.
2013-03-04 12:33:04 +01:00
Nicolas Goaziou f3ef3eb549 ox-html: Can't activate jsinfo script during a body-only export
* lisp/ox-html.el (org-html-infojs-install-script): Can't activate
  jsinfo script during a body-only export.
2013-03-04 12:33:03 +01:00
Bastien Guerry 8b637b54a9 Complete fix for 128e14b 2013-03-03 22:26:09 +01:00
Bastien Guerry f3fa14ef5d Fix commit 128e14b 2013-03-03 22:21:53 +01:00
Jambunathan K 510f5a9ba9 ox-html.el (org-html-code, org-html-verbatim): Transcode value
* lisp/ox-html.el (org-html-code, org-html-verbatim):
Transcode value.
2013-03-03 21:58:09 +01:00
Bastien Guerry 128e14b7f5 ox-html.el: Reintroduce #+HTML_HEAD_EXTRA, previously known as HTML_STYLE_EXTRA
* ox-html.el (html): Reintroduce #+HTML_HEAD_EXTRA, previously
known as HTML_STYLE_EXTRA.
(org-html-head): Enhance docstring.
(org-html-head-extra): Reintroduce.  Was `org-html-style-extra'.
(org-html--build-head): Rename from `org-html--build-head'.
Add information from `org-html-head-extra'.
(org-html-template): Use `org-html--build-head'.

Having an option for adding extra stuff is useful when publishing
projects.
2013-03-03 18:58:40 +01:00
Bastien Guerry 633cfc9dac ox-html.el (org-html-display-buffer-mode): Delete
* ox-html.el (org-html-display-buffer-mode): Delete.
(org-html-export-as-html): Use `set-auto-mode' instead of
`org-html-display-buffer-mode'.

Thanks to Jambunathan for suggesting this.
2013-03-03 18:29:00 +01:00
Bastien Guerry 0e42e7a7e3 ox-html.el: Rename a property (complete commit 2752ef1c4b)
Thanks to Sébastien Vauban for reporting this.
2013-03-03 06:34:35 +01:00
Bastien Guerry b9e1648860 ox-html.el (html): Remove :html-htmlized-css-url :options-alist
* ox-html.el (html): Remove :html-htmlized-css-url
:options-alist.
2013-03-03 06:30:43 +01:00
Jambunathan K f2b2c8318f Add Freemind Mindmap Back-End for Org Export Engine
* contrib/lisp/ox-freemind.el: New file.

* lisp/ox-html.el (org-html--tags, org-html-format-headline)
(org-html--format-toc-headline, org-html-checkbox)
(org-html-table-cell, org-html-timestamp)
(org-html-verse-block, org-html-special-string-regexps):
Replace named HTML entities with their numeric counterparts.
This keeps Freemind backend happy.
2013-03-02 22:33:03 +01:00
Bastien Guerry 71e9b321ec Merge branch 'master-wip3' 2013-03-02 18:59:55 +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 2752ef1c4b ox-html.el: Use HTML_HEAD instead of HTML_STYLE and fix some variable names
* ox-html.el (org-html-style-default): Update docstring.
(org-html-infojs-install-script, org-html--build-style):
Update property names.
(org-html-head-include-scripts)
(org-html-head-include-default-style, org-html-head):
Respectively rename from `org-html-style-include-scripts',
`org-html-style-include-default' and `org-html-style', now
obsolete.
(org-html-style-extra): Delete.

Thanks to those who pointed at this problem on the mailing list.
2013-03-02 18:05:16 +01:00
Nicolas Goaziou 82246f8196 ox-html: Fix infloop
* lisp/ox-html.el (org-html--format-toc-headline): Fix infloop
  introduced in c299c109bb.
2013-03-02 18:02:57 +01:00
Bastien Guerry ff97a0ee9d Revert "Add (provide ...) forms."
This reverts commit 8decdbcd23.
2013-03-02 16:20:59 +01:00
Bastien Guerry 66d6a6c450 Merge branch 'master-fixes-8' 2013-03-02 12:10:44 +01:00
Bastien Guerry 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
Nicolas Goaziou 2c797c41d9 ox-html: Silence byte-compiler
* lisp/ox-html.el (org-html-link): Silence byte-compiler.
2013-03-02 09:45:26 +01:00
Nicolas Goaziou 3049f1c75f ox-html: Fix infojs integration
* lisp/ox-html.el (html): Add infojs installation script in options
  filter.
(org-html-infojs-install-script): Remove check for back-end as we can
safely assume the function will be called from `html' back-end or one
of its derivative.

`org-export-filter-*-functions' are user oriented. Developer filters
should be installed in back-end definition.
2013-03-01 23:14:30 +01:00
Bastien Guerry c299c109bb ox-html.el (org-html-headline): Add comment
* ox-html.el (org-html-headline): Add comment.

The comment explains why commit
http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=1f591b
is needed.
2013-03-01 19:06:53 +01:00
Bastien Guerry 1dfdbe331a ox-html.el: Fix setting of attributes for inline images
* ox-html.el (org-html-link--inline-image): Always retrieve
attributes for inline images.
(org-html-link): Fix trailing whitespace at the end of the
opening <a ...> HTML tag.

Thanks to John Hendy for forcing me to focus on this :)
2013-03-01 17:08:27 +01:00
Bastien Guerry 1f591bcc30 ox-html.el: Bugfix wrt org-info.js
* ox-html.el (org-html-headline): For headlines whose first
element is a headline and not a section, pretend there is an
empty section (as "") for the correct HTML div to be inserted.

This fixes a bug wrt org-info.js.  Thanks to Nicolas for
guiding me through this patch.
2013-03-01 16:16:53 +01:00
Bastien Guerry 1dfc45554a Merge ox-infojs.el into ox-html.el
* org-pcomplete.el
(pcomplete/org-mode/file-option/infojs_opt): Use
`org-html-infojs-opts-table'.

* ox-html.el (org-html-infojs-opts-table):
(org-html-use-infojs, org-html-infojs-options)
(org-html-infojs-template): Move from ox-jsinfo.el.
Rename using the org-html- prefix.
(org-html-infojs-install-script): Move from ox-infojs.el.

* ox-infojs.el: Delete.

* org.texi (JavaScript support): Update variable names.
2013-03-01 14:26:55 +01:00
Bastien Guerry 136781b6a1 ox-html.el (org-html-section): Fix indentation
* ox-html.el (org-html-section): Fix indentation.
2013-03-01 14:22:09 +01:00
Bastien Guerry cfe1d9a9fc ox-html.el: Fix document structure for org-info.js compatibility.
* ox-html.el (org-html-inner-template): Add the document title
here, within the "content" class, as the org-info.js needs it.
(org-html-template): Don't include the document's title here.
(org-html-format-inlinetask-function): Remove wrong example.

Although counter-intuitive and certainly weird, the
<h1 class="title"> string needs to be within the "content"
div, not before it.  We would need the developer of org-info.js
to update org-info.js to put the title outside of "content".
2013-03-01 13:57:54 +01:00
Nicolas Goaziou cbba811a73 ox-html: Do not display title in body-only export
* lisp/ox-html.el (org-html-inner-template): Remove title.
(org-html-template): Add title.
2013-02-28 08:48:43 +01:00
Nicolas Goaziou 86563e0119 org-element: OPTIONAL_TITLE becomes ALT_TITLE property
* lisp/org-element.el (org-element-headline-parser):
  Rename :optional-title into :alt-title.
* lisp/ox.el (org-export-get-alt-title): Renamed from
  `org-export-get-optional-title'.
* lisp/ox-ascii.el (org-ascii--build-title): Apply name change.
* lisp/ox-html.el (org-html--format-toc-headline): Apply name change.
* lisp/ox-latex.el (org-latex-headline): Apply name change.
* lisp/ox-texinfo.el (org-texinfo--get-node,
  org-texinfo--generate-menu-items): Apply name change.
* testing/lisp/test-ox.el: Update tests.
* doc/org.texi (Table of contents): Update documentation.
2013-02-27 00:03:59 +01:00
Bastien Guerry 295b0ba5d1 Bump :version to "24.4" and add :package-version.
The options updated are those who won't be in Emacs 24.3.
2013-02-26 18:21:28 +01:00
Nicolas Goaziou 36f5aa316f ox-html: Fix stack overflow in regexp matching
* lisp/ox-html.el (org-html-fontify-code): Do not use [^\000] in
  regexps that may match large strings.

Thanks to Kyle Machulis for reporting it.
2013-02-26 00:29:04 +01:00
Nicolas Goaziou 3049f72f34 ox-html: Attributes specified to a paragraph only apply to first link within
* lisp/ox-html.el (org-html-link, org-html-link--inline-image):
  Attributes specified to a paragraph only apply to first link within.
2013-02-25 14:28:55 +01:00
Rick Frankel 35e914c1d7 Make html exporter respect css-url configuration variable
* lisp/ox-html.el:
  (org-export-define-backend): Add css url option.
  (org-export-htmlized-org-css-url):  Modify docstring and options.
  (org-html--build-style): Include css-url if specified.
2013-02-25 13:00:16 +01:00
Bastien Guerry 3a0e559ad9 ox-html.el (org-html-headline): Fix typo
* ox-html.el (org-html-headline): Fix typo.

Thanks to Rick Frankel for reporting this.
2013-02-24 19:42:12 +01:00
Bastien Guerry 082023f833 ox-html.el (org-html-format-headline--wrap): Cosmetic change
* ox-html.el (org-html-format-headline--wrap): Cosmetic
change.
2013-02-24 19:25:58 +01:00
Nicolas Goaziou 9e7c30ea3d ox-html: Fix code typo in 1fd83e0487
* lisp/ox-html.el (org-html--format-toc-headline): Fix function name.
2013-02-24 16:03:58 +01:00
Nicolas Goaziou 1fd83e0487 ox-html: Add list of listings and list of tables
* lisp/ox-html.el (org-html-toc, org-html--toc-text): Change to
  docstring.
(org-html-list-of-listings, org-html-list-of-tables): New functions.
(org-html-keyword): Use new functions.
(org-html-src-block): Add an ID attribute when a name is given.
2013-02-24 15:58:47 +01:00
Bastien Guerry 398e8af56e Merge branch 'master' of orgmode.org:org-mode 2013-02-24 11:33:34 +01:00
Bastien Guerry 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
Nicolas Goaziou 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
Nicolas Goaziou 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
Bastien Guerry 8ee6c13c7f Fix typo: an headline -> a headline. 2013-02-23 13:47:44 +01:00
Bastien Guerry e9e32173cc Update headers. 2013-02-23 09:56:24 +01:00
Nicolas Goaziou 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
Nicolas Goaziou 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
Bastien Guerry 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
Bastien Guerry da717614ac Remove some FIXME issues in the final list. 2013-02-22 09:58:58 +01:00
Bastien Guerry 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
Nicolas Goaziou 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
Nicolas Goaziou 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
Bastien Guerry 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