Commit Graph

260 Commits

Author SHA1 Message Date
Manuel Giraud 2f50b1380b * org-html.el (org-html-handle-links): add an alternate for inline images 2011-04-19 11:22:20 +02:00
Manuel Giraud c56bf33812 HTML export: correct a bug in coderef link.
* org-html.el (org-html-make-link): correct a bug in coderef link.
2011-04-15 13:58:29 +02:00
Ethan Ligon 49e6bc8997 Fix for html & docbook export of description list items
The problem is illustrated by the following example:

* Illustration of bug in html export
  - This has a space after the colons :: so will work in latex and html
  - This doesn't have a space after the colons ::so is an invalid
    description item according to the org manual.  Won't work in html
    or docbook.  Will nevertheless work in latex, provided /first/
    description item is valid.
  - Has a terminating space ::
    - So it works in both html and latex export!
    - Even though it's difficult to distinguish from the next example.
  - Lacks a terminating space ::
    - At present, *doesn't* work in html or docbook export, does in
      latex.  This is the case that the following patch fixes.
2011-04-09 18:40:45 +02:00
Lawrence Mitchell 5259210cfb org-html: Fix logic for export of section numbers
* lisp/org-html.el (org-export-as-html) (org-html-level-start): Fix
logic for section number printing when NUM is an integer.

Fixes a bug introduced in 9f57b8e which considered all non-integer
values of the num option to be nil.
2011-04-06 10:35:55 +02:00
Carsten Dominik b71413947c Remove spurious letter 2011-03-30 05:35:00 +02:00
Carsten Dominik 57c379bb26 Clean up the new options to remove tasks on export 2011-03-30 05:27:43 +02:00
Carsten Dominik b4e2ef4cb9 Allow to exclude tasks from being exported
* doc/org.texi (Selective export): Document exclusion of any tasks from
export.
* lisp/org-exp.el (org-export-with-tasks): New option.
(org-export-plist-vars): Add :tasks property.
2011-03-30 00:48:29 +02:00
Carsten Dominik 6d40eb3809 Implement export without DONE tasks
* doc/org.texi (Selective export): Document how to exclude DONE tasks
from export.
(Publishing options): Document the properties to be used to turn off
export of DONE tasks.
* lisp/org-ascii.el (org-export-as-ascii):
* lisp/org-docbook.el (org-export-as-docbook):
* lisp/org-html.el (org-export-as-html):
* lisp/org-latex.el (org-export-as-latex): Pass the :done-tasks property
to the export preprocessor.
* lisp/org-exp.el (org-export-with-done-tasks): New option.
(org-export-plist-vars): Add entry for :done-tasks.
(org-export-preprocess-string): Call `org-export-remove-done-tasks'.
(org-export-remove-done-tasks): New function.
2011-03-29 17:29:24 +02:00
Bastien Guerry c4dbff58be Whitespaces clean up. 2011-03-23 15:08:49 +01:00
Puneeth Chaganti a201b11286 Fix HTML export of footnotes with lists, tables, quotes, etc.
* org-html.el (org-export-as-html): Fix export of footnotes
containing lists, tables, quotes, etc.
2011-03-23 15:07:07 +01:00
Lawrence Mitchell 9f57b8e85d Allow mixed export of numbered and unnumbered sections in HTML
* lisp/org-html.el (org-export-as-html): Get local value of
org-export-with-section-numbers from the buffer's plist.  Deal
specially with the case the resulting value is an integer.
(org-html-level-start): New optional argument of the option plist used
instead of `org-export-with-section-numbers'.  Also deal specially
with the case that the value is an integer.

When `org-export-with-section-numbers' (or the buffer-local
:section-numbers option) is an integer, we now export the first NUM
levels of headings with numbers and lower-level headings without.
2011-03-23 15:04:59 +01:00
David Maus 38c6b17822 Protected linebreak element after timestamp markup
* org-html.el (org-html-handle-time-stamps): Protected linebreak
element after timestamp markup.

Follow up of 1fb33b595d.
2011-03-21 06:45:10 +01:00
David Maus 1fb33b595d Don't protect img tag in link description
* org-html.el (org-html-handle-links): Don't protect img tag in link
description.

Follow up of 7b74ef1c13.
2011-03-20 12:14:36 +01:00
Nicolas Goaziou 1bd87fb09f Fix export of empty items in HTML and DocBook 2011-03-18 18:36:22 +01:00
Bastien Guerry 7b74ef1c13 org-html.el: Fix problems with special chars in links.
* org-html.el (org-export-as-html): Handle links with
`org-html-handle-links' after we handle special characters
conversions.
(org-html-make-link, org-export-html-format-image): Don't
protect html with @ anymore, as links are now handled after
special characters conversions.
2011-03-17 09:07:14 +01:00
Nicolas Goaziou 87c427981f Open a new paragraph when closing a list in HTML and DocBook 2011-03-15 21:51:19 +01:00
David Maus c295c09fb2 Protect <p> element of image caption.
* org-html.el (org-export-html-format-image): Protect <p> element of
image caption.

Follow up of 1052f07ecf, forgot a <p>
element.
2011-03-15 21:18:40 +01:00
Bastien Guerry 76a8c2bb17 * org-html.el (org-export-as-html): fix export of email. 2011-03-15 18:36:10 +01:00
Bastien Guerry b6b7057467 Tiny docstring fix. 2011-03-15 16:18:38 +01:00
Bastien Guerry 1b02fe8c6e org-html.el: let `org-export-time-stamp-file' control the postamble date.
* org-html.el (org-export-as-html): the default postamble now
only export a date paragraph if `org-export-time-stamp-file'
is non-nil.
2011-03-15 15:53:36 +01:00
Bastien Guerry a786464ae8 Various fixes for org-export-html-preamble/postamble.
* org-html.el (org-export-html-insert-plist-item): Remove.
(org-export-html-preamble): Default to `t'.  Accept functions.
(org-export-html-postamble): Default to `auto'.  Accept
functions and distinguish between 'auto (no formatting string)
and `t' (default formatting string).
(org-export-as-html): Handle org-export-html-preamble and
org-export-html-postamble new defaults/allowed values.
Define email and creator-info before using them.
2011-03-15 15:36:25 +01:00
Bastien Guerry 2ff34a5fac * org-html.el (org-export-html-protect-char-alist): Fix typo in custom type definition. 2011-03-15 14:13:25 +01:00
David Maus 1052f07ecf Protect image elements
* org-html.el (org-export-html-format-image): Protect image elements.

Follow up of 6a369c26d3.
2011-03-14 20:38:04 +01:00
David Maus 6a369c26d3 Expand char entities after creating markup for links and timestamps
* org-html.el (org-html-make-link, org-html-handle-links): Protect
generated XHTML elements.
(org-export-as-html): Expand character entities after creating markup
for links and timestamps.

This fixes a problem with exporting active timestamps, reported by
Daniel Clemente <n142857@gmail.com>.
2011-03-13 20:27:12 +01:00
David Maus c6f5bf72e9 Revert "Fix bug when exporing inactive timestamps."
This reverts commit ca69b55624.
2011-03-13 20:08:10 +01:00
Bastien Guerry 70de130bba * org-html.el (org-export-as-html): bugfix: insert email correctly.
Thanks to Bernt Hansen for spotting this.
2011-03-12 05:22:41 +01:00
Kim Rutherford 3bf379aee9 Fix for infinite loop in org-html-protect
When I export the following as HTML, emacs hangs in org-html-protect:

#+begin_src org
&
#+end_src

The attached patch fixes the problem for me.

Thanks,
Kim.
>From cfb1ccb6f9cfd84530c73b7f72d686a2062b3c3b Mon Sep 17 00:00:00 2001
From: Kim Rutherford <kmr44@cam.ac.uk>
Date: Fri, 11 Mar 2011 16:44:09 +0000
Subject: [PATCH] Fix infinite loop in org-html-protect
2011-03-11 18:38:18 +01:00
Bastien Guerry ed8a9616a2 Revert "* org-html.el: Bugfix: prevent infinite matching of the `&' character."
This reverts commit f6752c805e.
2011-03-11 18:37:22 +01:00
Bastien Guerry f6752c805e * org-html.el: Bugfix: prevent infinite matching of the `&' character.
* org-html.el (org-html-protect): Bugfix: prevent infinite
matching of the `&' character.

This bug was spotted by Rehan Iftikhar.
2011-03-11 18:30:36 +01:00
Manuel Giraud 72011fc407 org-html.el: correct HTML export of dedicated target.
* org-html.el (org-format-org-table-html): fix anchors in HTML
export (thanks to <aankhen@gmail.com>)
(org-html-protect): fix a  bug that prevents some target to be
rendered correctly.

* org-exp.el (org-solidify-link-text): a single "-" to avoid a
"&ndash" rewrite in HTML export later.
2011-03-09 16:37:32 +01:00
Manuel Giraud 44684a9977 org-html.el: Bugfix: don't insert closing HTML tags when exporting body only.
* org-html.el (org-export-as-html): Bugfix: don't insert
closing HTML tags when exporting body only.
2011-03-09 11:28:38 +01:00
emacs 11a10bdfe7 Update website to show 7.5 as current release 2011-03-07 14:27:39 +00:00
Bastien Guerry 5953798522 Clean handling :html-pre/postamble options wrt author/email/creator-info.
* org-html.el (org-export-html-preamble)
(org-export-html-postamble): now default to `nil'.
(org-export-as-html): when :html-pre/postamble is nil, fall
back on the default pre/postamble, which depends on the
:author-info, :email-info, :creator-info options.

* org-exp.el (org-export-plist-vars): reorder the alist.

* org.texi (Export options): better document :html-preamble
and :html-postamble: setting these options will override any
:author-info, :email-info and :creator-info options for the
HTML export.
2011-03-04 16:32:10 +01:00
Bastien Guerry fe67a66e2f Docfix: explain how to escape the in *-html-(pre|post)amble-format.
* org-html.el (org-export-html-postamble-format)
(org-export-html-preamble-format): explain how to escape the
`%' character.
2011-03-02 18:30:06 +01:00
Nicolas Goaziou 83b782c916 Change internal list end marker to avoid confusing special blocks
* lisp/org-exp.el (org-export-mark-list-end): change end marker
* lisp/org-docbook.el (org-export-docbook-list-line): use new marker.
* lisp/org-html.el (org-html-export-list-line): use new marker
* lisp/org-latex.el (org-export-latex-lists): use new marker
2011-02-28 11:20:06 +01:00
Nicolas Goaziou de3d3652bb org-html: use non breaking space for empty checkboxes 2011-02-18 13:43:48 +01:00
Nicolas Goaziou 1ac0ac16ac org-html: remove unused local variable 2011-02-18 13:43:48 +01:00
Nicolas Goaziou 3d34dd47dd org-html: remove unneeded newline characters in list export 2011-02-18 13:43:48 +01:00
Nicolas Goaziou 4fd61d8021 org-html: unchecked boxes should not appear checked without CSS 2011-02-18 13:43:48 +01:00
Nicolas Goaziou b43ad47ad1 Insert a newline character before <\li> when exporting lists
* lisp/org-html.el (org-html-export-list-line): insert a newline
  character before ending an item, as anchor could be on a line
  going to be deleted, like a drawer ending string.
* lisp/org-list.el (org-list-to-html): same.
2011-02-18 12:45:13 +01:00
Nicolas Goaziou 4636453e93 Do not enforce type of ordered lists upon exporting
* lisp/org-docbook.el (org-export-docbook-list-line): even with
  alphabetical lists, Org shouldn't enforce a particular list type to
  exporters. This is a job for style files.
* lisp/org-html.el (org-html-export-list-line): ib idem.
2011-02-18 12:45:11 +01:00
Nicolas Goaziou cddea8c542 org-list: new accessor returning type of list
* lisp/org-list.el (org-list-get-list-type): new function.
(org-list-parse-list): use new function.
* lisp/org-html.el (org-html-export-list-line): use new function.
* lisp/org-docbook.el (org-export-docbook-list-line): use new function.
2011-02-18 12:45:10 +01:00
Nicolas Goaziou 781228183a org-list: implement alphabetical lists
* lisp/org-list.el (org-alphabetical-lists): new variable
(org-item-re, org-list-full-item, org-cycle-list-bullet,
org-list-struct-fix-bul, org-list-inc-bullet-maybe): reflect
introduction of the new variable.
(org-item-beginning-re): changed into a function, so any modification
of `org-alphabetical-lists' will not require reloading Org.
(org-at-item-p, org-toggle-checkbox, org-update-checkbox-count,
org-list-parse-list, org-list-send-list): reflect changes to
`org-item-beginning-re'.
(org-list-use-alpha-bul-p): new function.
* lisp/org.el (org-check-for-hidden): reflect changes to
`org-item-beginning-re'.
* lisp/org-capture.el (org-capture-place-item): reflect changes to
`org-item-beginning-re'.
* lisp/org-docbook.el (org-export-docbook-list-line): handle new type
of items.
* lisp/org-exp.el (org-export-mark-list-end,
org-export-mark-list-properties): reflect changes to
`org-item-beginning-re'.
* lisp/org-html.el (org-html-export-list-line): handle new type of
items.
* lisp/org-latex.el (org-export-latex-lists): handle new type of items
and reflect changes to `org-item-beginning-re'.
* lisp/org-ascii.el (org-export-ascii-preprocess): handle new counters.

Modified from a patch by Nathaniel Flath.
2011-02-18 12:45:10 +01:00
Nicolas Goaziou 2621fe0461 Do not remove empty list items in HTML and DocBook export 2011-02-18 12:45:09 +01:00
Nicolas Goaziou 69e02a73de Modified export engines for lists
* lisp/org-exp.el (org-export-mark-lists): new function, replacing
  org-export-mark-list-ending. It adds information as text properties
  to every list, before changes done by exporter destruct them.

* lisp/org-html.el (org-export-as-html): delegate list handling to
  external function org-html-export-list-line.
(org-html-export-list-line): new function.

* lisp/org-latex.el (org-export-latex-lists): small modification.
2011-02-18 12:45:09 +01:00
Bastien Guerry c7700d7bbe * org-html.el (org-export-as-html): expand the HTML title.
This fix is a modified version of a patch submitted by Pierre Téchoueyres.
2011-02-16 11:53:28 +01:00
Bastien Guerry e51aa0eaa5 Bugix: keep backward-compatible with the old default of `org-export-html-validation-link'.
* org-html.el (org-export-as-html): handle the case when
`org-export-html-validation-link' is nil to keep backward
compatible with the old default value of this variable.

Thanks to Sébastien Vauban for spotting this.
2011-02-15 15:57:20 +01:00
Bastien Guerry ed6d676026 Code cleanup: use a generic :for-backend parameter. 2011-02-15 11:07:46 +01:00
Bastien Guerry 3a04522ef1 New variable org-export-html-protect-char-alist.
* org-html.el (org-export-html-protect-char-alist): New custom
variable to define characters to be HTML protected.
(org-html-protect): Use the new variable.
2011-02-12 12:49:50 +01:00
Bastien Guerry da8dc7bba7 Rewrite the handling of HTML preamble/postamble.
* org-html.el (org-export-html-auto-preamble)
(org-export-html-auto-postamble): Remove.
(org-export-html-preamble, org-export-html-postamble): Turn
into custom variables.  Update the docstrings.
(org-export-html-preamble-format)
(org-export-html-postamble-format): New custom variables.
(org-export-as-html): Use org-export-html-postamble-format and
org-export-html-preamble-format.
(org-export-html-title-format): delete.

* org-exp.el (org-export-plist-vars): Remove
:auto-preamble and :auto-postamble.  Rename :preamble and
:postamble to :html-preamble and :html-postamble.

* org-publish.el (org-publish-project-alist): Remove
:auto-preamble and :auto-postamble.  Rename :preamble and
:postamble to :html-preamble and :html-postamble.

* org.texi (Publishing options): replace :preamble and
:auto-preamble by :html-preamble (same for postamble.)
2011-02-11 01:27:15 +01:00