mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-27 10:55:04 +00:00
Code
13,106 Commits 3 Branches 441 Tags 120 MiB
1f591bcc30
Commit Graph

40 Commits

Author SHA1 Message Date
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
Bastien Guerry
4d7f4d87fb Fix last commit 2013-02-15 16:42:04 +01:00
Bastien Guerry
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
Bastien Guerry
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
Bastien Guerry
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
Bastien Guerry
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
Bastien Guerry
8071d67cdd Fix commit 25a4f5 (again) 2013-02-12 08:38:31 +01:00
Nicolas Goaziou
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
Bastien Guerry
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
Nicolas Goaziou
302c2850fa org-latex/org-html: Small changes to menu entries 2013-02-08 22:19:37 +01:00
Bastien Guerry
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
Bastien Guerry
c857077351 ox-html.el (org-html-link): Fix bug. 
Thanks to Chuck Berry for reporting it.
 2013-02-07 09:59:08 +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