2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-create-formula-image): Remove the -E option for
dvipng.
* org-exp.el (org-default-export-plist): Respect #+BIND.
(org-export-confirm-letbind): New function.
* org.el (org-paste-subtree): Test the kill ring entry if it is
going to be used.
(org-copy-subtree): Use `org-forward-same-level'.
(org-forward-same-level): Respect the `invisibe-ok' arg for
back-to-heading.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-table-map-tables): Make sure cursor is back at table
beginning after funcall.
* org-agenda.el (org-agenda-bulk-action): Make sure parents are
handled before children, and do not error if an entry is not
found, probably because it hase been remove when the parent was
archived or refiled.
* org.el (org-ido-completing-read): Accept straight lists for
completion as well as alists.
* org-timer.el (org-timer-cancel-timers): Renamed from
`org-timer-cancel-timers'.
* org.el (org-cycle-internal-local): Fix problem with finding next
invisible line.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-list-send-list): Call
`org-list-goto-true-beginning' instead of
`org-list-find-true-beginning', which does not exist.
* org-timer.el (org-timer-reset-timers): Use `mapc'.
(org-timer-set-timer): Do not assign to heading.
* org-id.el (org-id-open): Quote function name.
* org-macs.el (org-unmodified): Turn off recording undo
information while running inside the macro.
* org-table.el (org-table-export): Also work in file-less
buffers.
* org.el (org-startup-indented): New option.
(org-startup-options): Add new options indent and noindent.
(org-unfontify-region): Remove line-prefix and wrap-prefix
properties.
(org-after-demote-entry-hook, org-after-promote-entry-hook): New
hooks.
(org-promote, org-demote): Run the new hooks.
* org-table.el (org-table-align): Replace leading \n as well.
* org-exp.el (org-export-push-to-kill-ring): Remove `line-prefix'
and `line-wrap' text properties.
* org-compat.el (org-kill-new): New function.
* org-agenda.el (org-format-agenda-item): Remove `line-prefix' and
`line-wrap' text properties.
* org-indent.el: New file.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-provide-todo-statistics): Tweak docstring.
* org-id.el (org-id-open): Honor `org-link-frame-setup'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-as-org): Insert the "-source" string
before the extension.
* org.el (org-read-date): Make sure the calendar is in the current
frame.
(org-set-emph-re): Remove the ? from the post-match.
(org-emphasis-regexp-components): Add backslash to the
postmatch class.
(org-set-font-lock-defaults): Write \n instead of \xa, and make it
optional so that also lines at the end of the buffers will still
be matched as headlines.
* org-table.el (org-table-error-on-row-ref-crossing-hline):
Variable made obsolete.
(org-table-relative-ref-may-cross-hline): New option.
(org-table-find-row-type): Honow the new option
`org-table-relative-ref-may-cross-hline'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-cut-region, org-table-copy-region): Work
on single field if no active region.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Only insert title
if one is defined.
* org.el (org-make-options-regexp): Allow empty values.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-cycle-internal-local): Improved version of finding
next visible line.
(org-cycle-hide-drawers): Only hide drawers if this is really
necessary.
(outline-end-of-subtree): Make `outline-end-of-subtree' use the
org-version of this function in Org-mode. We use advice to
implement this change, so that future changes to this function in
outline.el wil be handled properly.
(org-forward-same-level, org-backward-same-level): New commands.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-remove-empty-overlays-at)
(org-clean-visibility-after-subtree-move): New functons.
(org-move-subtree-down): Simplify cleanup of display.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-mac-message.el (org-mac-message-get-links): Improve
docstring. Make argument SELECT-OR-FLAGGED optional, default to
"s". Fix the return value.
(org-mac-message-insert-flagged): Simplify.
* org.el (org-refile-get-location): Tamper with refile history o
that history contains compete matches instead of the entered
string.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-store-link): Never store a link to an inline task.
* org-footnote.el (org-footnote-goto-local-insertion-point): Skip
inline tasks when positioning footnotes.
* org.el (org-refile): Remove the END line when archiving an
inline task that does have an END line.
* org-archive.el (org-archive-subtree): Remove the END line when
archiving an inline task that does have an END line.
* org-macs.el (org-with-limited-levels): New macro.
(org-get-limited-outline-regexp): New function.
* org-exp.el (org-export-format-source-code-or-example): Fix bug
that did not enumerate first line.
(org-export-mark-radio-links): Skip matches in links.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-activate-plain-links): Make single-match.
(org-adapt-indentation): Fix docstring.
* org-macs.el (org-unmodified): Turn of modification hooks while
running this macro.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-adapt-indentation): Slightly improve the docstring.
(org-occur): Sends an error when the user inputs an empty string.
(org-priority): Bugfix: the tag alignement should happen within
save-excursion.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-make-link-regexps): Don't exclude parentheses from
`org-plain-link-re'
(org-cycle-internal-local): When locally cycling, switch directly
from CHILDREN to FOLDED if there is no subtree
(org-cycle): Update the docstring to document the new behavior of
`org-cycle-internal-local'.
2009-08-06 Nicolas Goaziou <n.goaziou@neuf.fr> (tiny change)
* org-clock.el (org-clock-in): Bugfix: recognize timestamps with
an abbreviated format for days.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-protocol.el (org-protocol-default-template-key): New
option.
* org.el (org-refile): Bugfix: save-excursion before reading the
refile target, otherwise cursor moves might confuse `org-refile'.
* org.el (org-toggle-heading): Bugfix: correctly convert list
items before the first headline.
* org.el (org-provide-todo-statistics): Allow a list of TODO
keywords to compute statistics against headlines containing a
keyword from this list.
(org-update-parent-todo-statistics): Possibly use the new allowed
value of `org-provide-todo-statistics'.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-timer.el: Add autoload cookie.
* org.el (org-occur-link-in-agenda-files): New function.
* org-timer.el (org-timer-last-timer): New variable.
* org-agenda.el (org-agenda-mode-map): New key for
org-timer-set-timer called from the agenda.
* org.el (org-mode-map): New key for org-timer-set-timer.
* org-timer.el (org-timer-reset-timers)
(org-timer-show-remaining-time, org-timer-set-timer): New
functions.
* org-clock.el (org-show-notification): Update the docstring.
* org.el (org-provide-todo-statistics): Allow new value
'all-headlines for this option, which includes entries with no
TODO keywords in the todo statistics.
(org-update-parent-todo-statistics): Possibly use the new
'all-headline value from `org-provide-todo-statistics'.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-clock.el (org-dblock-write:clocktable): Add a new option
:timestamp which allows display of timestamps in clock reports.
* org.el (org-mode-map): Define new key `C-c C-*': convert a plain
list to a subtree, preserving the structure of the list.
(org-set-emph-re): Make the last element optional in the regexp.
This regexp now matches an emphasized string at the end of a line.
* org-list.el (org-list-goto-true-beginning)
(org-list-make-subtree, org-list-make-subtrees): New functions.
* org.el (org-eval-in-calendar): Select the right frame.
(org-save-frame-excursion): Remove this macro.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-list.el (org-list-beginning-re): Bugfix: don't use * when
trying to find the beginning of a list.
* org-exp.el (org-get-file-contents): Use a new argument: markup.
When present, tell org-get-file-contents not to protect org-like
lines.
* org-id.el (org-id-uuid-program): New option to set the name of
the uuidgen program.
(org-id-method): Use `org-id-uuid-program'.
(org-id-new): Use `org-id-uuid-program'.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-exp.el (org-export-number-lines): Allow whitespace in code
references. Allow the -r switch to remove the references in the
source code even when the lines are not numbered: the labels can
be explicit enough.
* org.el (org-fontify-whole-heading-line): New option.
(org-set-font-lock-defaults): Use the new option.
* org-clock.el (org-show-notification-handler): New option.
(org-show-notification): Use the new option.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-eval-in-calendar): Fix a bug about calendar
navigation when `calendar-setup' value is 'calendar-only.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (orgstruct++-mode): Fix typo in docstring.
(org-insert-link): Clean up: (or (...)) => (...)
(org-insert-link): Use TAB for stored links completion.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-get-refile-targets): Fix bug: don't ignore case when
building the list of targets.
* org-remember.el (org-remember-delete-empty-lines-at-end): New
option.
(org-remember-handler): Use the new option.
2009-08-06 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-tags-sort-function): New option for sorting tags.
(org-set-tags): Use the new option to sort tags.
* org-plot.el (org-plot/gnuplot): Run with an idle timer to avoid
premature deletion of the data when using org-plot in a script.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-clock.el (org-clock-in-prepare-hook): New hook.
(org-clock-in): Use this new hook.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-special-ctrl-a/e): Explicitely bind the value
'reversed for this option to the "true line boundary first"
behavior.
(org-tags-match-list-sublevels): Document the 'indented value for
this variable.
* org-latex.el (org-export-latex-first-lines): Fix problem with
publishing the region.
* org-exp.el (org-export-format-source-code-or-example): Fix
bad line numbering when exporting examples in HTML.
2009-08-06 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-format-time-period): Formats a time in
fractional days as days, hours, mins, seconds.
(org-columns-display-here): Add special handling for SINCE and
SINCE_IA to format for display.
* org.el (org-time-since): Add a function to get the time since an
org timestamp.
(org-entry-properties): Add two new special properties: SINCE and
SINCE_IA. These give the time since any active or inactive
timestamp in an entry.
(org-special-properties): Add SINCE, SINCE_IA.
(org-tags-sort-function): Add custom declaration for tags
sorting function.
(org-set-tags): Sort tags if org-tags-sort-function is set
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-goto): Find hidden headlines as well.
* org.el (org-narrow-to-subtree): Find hidden headlines as well.
* org-plot.el (org-plot/add-options-to-plist): Add timeind
option.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-remove-all-timestamps): New function.
(org-publish-all): Remove all timestamp files if `org-publish-all'
is called with a prefix argument.
* org-list.el (org-indent-item): Fix typo.
(org-item-indent-positions): Normalize ordered bullet.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-macs.el (org-set-local): Make a local variable, do not make
the variable buffer-local!
* org-latex.el (org-export-as-latex): Call `org-install-letbind'.
* org-exp.el (org-infile-export-plist): Read BIND lines.
(org-install-letbind): New function.
(org-export-as-org, org-export-preprocess-string): Call
`org-install-letbind'.
* org-list.el (org-list-demote-modify-bullet): New option.
(org-first-list-item-p): Save point.
(org-fix-bullet-type): New optional argument FORCE-BULLET.
(org-indent-item): Honor `org-list-demote-modify-bullet'.
(org-item-indent-positions): Return bullet types along with
indentation.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-show-entry): Hide drawers.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-auto-adjust): New option.
(org-footnote-auto-adjust-maybe): New function.
(org-footnote-new, org-footnote-delete): Call
`org-footnote-auto-adjust-maybe'.
* org.el (org-startup-options): Add new footnote-related
keywords.
* org-publish.el (org-publish-timestamp-filename): Additional
arguments PUB-DIR and PUB-FUNC, which are included in the hash.
(org-publish-needed-p): Additional arguments PUB-DIR PUB-FUNC
TRUE-PUB-DIR. Pass them through to
`org-publish-timestamp-filename'.
(org-publish-update-timestamp): Additional arguments PUB-DIR and
PUB-FUNC, which are included in the hash.
(org-publish-file): Delay timestamp test until the publishing
function is known.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-bulk-action): Add scheduling and
setting the deadline.
* org.el (org-read-date-final-answer): New variable.
(org-read-date): Store the final answer string, including the date
from the calendar, for reuse by agenda bulk commands.
* org-publish.el (org-publish-attachment): Fix publishing of
attachments.
* org-latex.el (org-export-latex-quotation-marks): Fix export of
quotation makrs in parenthesis.
(org-remove-initial-hash): New function.
(org-export-latex-preprocess): Fix bug with infinite loop if
environment is not properly closed.
* org-table.el (org-table-get-remote-range): Find #+TBLNAME also
when indented.
* org.el (org-fontify-meta-lines-and-blocks): Make #+TBLNAME
highlight also when indented.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-renumber-fn:N): New command.
(org-footnote-action): Offer renumbering.
* org.el (org-cycle): Honor the `integrate' value of
org-cycle-include-plain-lists'.
* org-list.el (org-cycle-include-plain-lists): New allowed value
`internal'. Improve the docstring.
* org.el (org-set-autofill-regexps): Improve the paragraph-start
regexp to work better with LaTeX commands.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-inline-image-extensions): Add ps
and eps extensions.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-write-agenda): Make sure org-icalendar is
loaded.
* org.el (org-map-entries): No longer force
`org-tags-match-list-sublevels' to t during a todo-only tags
search.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-low-levels): Allow user-defined
environment.
(org-export-latex-subcontent): Handle user-defined environment.
* org-agenda.el (org-agenda-view-mode-dispatch): Add more keys to
the View dispatcher.
* org.el (org-hide-block-toggle): Use `org-make-overlay' instead of
`make-overlay'.
* org-latex.el (org-export-as-pdf): Protect match data during call
to shell-quote-argument.
* org-agenda.el (org-agenda-mode-map): Modify bulk action keys.
(org-agenda-view-mode-dispatch): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-mode): Reset list of marks.
(org-agenda-mode-map): Define new keys for refile and bulk action.
(org-agenda-menu): Add menu itesm for refile and bulk action.
(org-agenda-refile): New function.
(org-agenda-set-tags): Optional arguments TAG and ONOFF.
(org-agenda-marked-entries): New variable.
(org-agenda-bulk-select, org-agenda-remove-bulk-action-overlays)
(org-agenda-remove-all-bulk-action-marks)
(org-agenda-bulk-action): New functions/commands.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-get-file-contents): Protect org-like lines in
included files.
(org-export-format-source-code-or-example): Remove newlines.
* org-latex.el (org-export-latex-links): Check for no-description
marking.
* org-exp.el (org-export-preprocess-apply-macros): Switch macro
argument separator back to comma.
(org-export-normalize-links): Mark links without description.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-infile-export-plist): Fix bug in macro
processing.
* org-agenda.el (org-agenda-clock-out): Update line after clocking
out.
(org-agenda-highlight-todo): Fix bug with highlighting.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-font-lock-defaults): Adapt formatting to capture
new alignment strings.
* org-table.el (orgtbl-self-insert-command): Add yas/expand to
command list.
(org-table-align): Check for forced align type.
* org.el (org-self-insert-command): Add yas/expand to command
list.
* org-clock.el (org-clock-in-hook): New hook.
(org-clock-in): Run `org-clock-in-hook.
(org-clock-out-hook): New hook.
(org-clock-out): Run `org-clock-out-hook.
(org-clock-cancel-hook): New hook.
(org-clock-cancel): Run `org-clock-cancel-hook.
(org-clock-goto-hook): New hook.
(org-clock-goto): Run `org-clock-goto-hook.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-store-link): Better default description for link to
Org-mode headline.
* org-exp.el (org-export-generic): Autoload the generic exporter
function.
(org-export): Implement the `g' key for the generic exporter.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (orgtbl-setup): Add a binding for `S-iso-lefttab',
and for zbacktab'.
* org-exp.el (org-infile-export-plist): Get macros also from
#+SETUPFILE.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-colview.el (org-columns-capture-view): Protect vertical bars
in column values.
(org-columns-capture-view): Exclude comment and archived trees.
* org-colview-xemacs.el (org-columns-capture-view): Protect
vertical bars in column values.
(org-columns-capture-view): Exclude comment and archived trees.
* org.el (org-quote-vert): New function.
* org-latex.el (org-export-latex-verbatim-wrap): New option.
* org-exp.el (org-export-format-source-code-or-example): Use
`org-export-latex-verbatim-wrap'.
* org.el (org-clone-subtree-with-time-shift): Also shift inactive
time stamps.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp-blocks.el: New file.
* org-remember.el (org-remember-templates): Allow the headline
element to be a function.
(org-remember-apply-template): If the headline is a function, call
it to get the true function.
* org-clock.el (org-clock-menu): New function.
(org-clock-update-mode-line): Update help string.
(org-clock-modify-effort-estimate): New function.
(org-clock-mark-default-task): New function.
* org.el (org-hh:mm-string-to-minutes): Also take just a number of
minutes as input.
(org-org-menu): Add new clocking stuff.
(org-clock-is-active): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-non-existing-files): Improve docstring.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-icalendar-include-bbdb-anniversaries): New
option.
(org-export-icalendar): Call `org-bbdb-anniv-export-ical'.
* org-bbdb.el (org-bbdb-anniv-export-ical): New function.
* org-list.el (org-get-checkbox-statistics-face): Use the new
faces.
* org-faces.el (org-checkbox-statistics-todo)
(org-checkbox-statistics-done): New faces.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-use-verb): New variable.
(org-export-latex-emph-format): Prefer \texttt over \verb when
org-export-latex-use-verb is set.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-handler): Abort remember if the
buffer is empty.
* org-exp.el (org-export-format-source-code-or-example): Run
`org-src-mode-hook'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-indent-line-function): Fix indentation of +#end lines.
2009-08-06 Tassilo Horn <tassilo@member.fsf.org>
* org-gnus.el (org-gnus-store-link): Require message.el in
org-gnus-store-link.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el: New file, split out of org.el
* org-macs.el (org-replace-match-keep-properties): New function.
* org-exp.el (org-export-mark-blockquote-verse-center): Better
preprocessing of center and quote and verse blocks.
* org-list.el (org-list-end): Respect the stored "original"
indentation when determining the end of the list.
* org-exp.el (org-export-replace-src-segments-and-examples):
Remember indentation correctly.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-update-mode-line): Apply face
org-mode-line-clock.
* org-faces.el (org-mode-line-clock): New face.
2009-08-06 Tassilo Horn <tassilo@member.fsf.org>
* org-gnus.el (org-gnus-store-link): Fix bug where
`org-gnus-store-link' used wrong subject when called in an article
buffer. Patch provided by fengli AT gmail DOT com.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Remember
the original indentation of source code snippets and examples.
* org-latex.el (org-export-as-latex): Relocate the table of
contents.
* org.el (org-ctrl-c-ctrl-c): Update clock lines.
* org-agenda.el (org-run-agenda-series): Scope global options also
when creating the agenda buffer.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-adapt-indentation): Improve documentation.
(org-insert-property-drawer): Respect org-adapt-indentation when
inserting the drawer.
(org-remove-flyspell-overlays-in): New function.
(org-do-emphasis-faces, org-activate-plain-links)
(org-activate-code, org-fontify-meta-lines-and-blocks)
(org-activate-angle-links, org-activate-footnote-links)
(org-activate-bracket-links, org-activate-dates)
(org-activate-target-links, org-activate-tags): Remove flyspell
overlays.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-edit-src-save): New function.
* org-clock.el (org-clock-out-switch-to-state): New option.
(org-clock-out): Honor `org-clock-out-switch-to-state'.
* org-compat.el (org-compatible-face): Improve macro.
* org.el (org-global-properties-fixed): Add default for
CLOCK_MODELINE_TOTAL.
* org-clock.el (org-clock-sum): Accept lists and strigs as tstart
andd tend.
(org-clock-sum-current-item): Optional argument TSTART, pass it to
org-clock-sum.
(org-clock-get-sum-start): New function.
* org.el (org-startup-options): New keywords blockhide and
blockshow.
(org-mode): Add new invisibility spec.
(org-set-startup-visibility): Hide block on startup if so
desired.
(org-hide-block-startup): New option.
(org-block-regexp): New constant.
(org-hide-block-overlays): New variable.
(org-block-map, org-hide-block-toggle-all, org-hide-block-all)
(org-show-block-all, org-hide-block-toggle-maybe)
(org-hide-block-toggle): New functions.
(org-edit-src-exit): Do not quote lines starting with # and no +
behind it.
(org-auto-repeat-maybe): Add LAST_REPEAT properter for a repeating
entry.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-buffer-property-keys): Add Effort property for
completion.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-sum-current-item): Fix positioning bug
when retrieving total clocked time in the subtree.
* org.el (org-quoting-blocks): New variable.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-store-formulas)
(org-table-get-stored-formulas, org-table-fix-formulas)
(org-table-edit-formulas, orgtbl-ctrl-c-ctrl-c)
(orgtbl-gather-send-defs): Allow indented #+TBLFM line.
* org.el (org-fontify-meta-lines, org-ctrl-c-ctrl-c): Allow
indented #+TBLFM line.
* org-footnote.el (org-footnote-goto-local-insertion-point): Allow
indented #+TBLFM line.
* org-colview.el (org-dblock-write:columnview): Allow indented
#+TBLFM line.
* org-colview-xemacs.el (org-dblock-write:columnview): Allow
indented #+TBLFM line.
* org-clock.el (org-dblock-write:clocktable): Allow indented
#+TBLFM line.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Make
editing indented blocks work correctly.
* org.el (org-edit-src-nindent): New variable.
(org-edit-src-code, org-edit-fixed-width-region)
(org-edit-src-find-region-and-lang, org-edit-src-exit): Make
editing indented blocks work correctly.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-replace-src-segments-and-examples): FInd
indented blocks.
(org-export-format-source-code-or-example): Fix indentation of
blocks.
(org-export-remove-indentation): New function.
(org-export-select-backend-specific-text): Allow backend-specific
code to be indented.
(org-export-mark-blockquote-verse-center): Allow markers to be
indented.
* org.el (org-fontify-meta-lines): New function.
(org-set-font-lock-defaults): Call the new fontification
function.
* org-faces.el (org-meta-line): New face
(org-block): New face.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-treat-insert-todo-heading-as-state-change)
(org-treat-S-cursor-todo-selection-as-state-change): New
variables.
(org-insert-todo-heading): Honor
`org-treat-insert-todo-heading-as-state-change'.
(org-shiftright, org-shiftleft): Honor
`org-treat-S-cursor-todo-selection-as-state-change'.
(org-inhibit-logging): New variable.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-remove-subtree-entries-from-agenda): Reduce
range for marker position checking.
* org-latex.el (org-export-latex-first-lines): Fix bug when
exporting a region.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-push-to-kill-ring): Protect using
x-set-selection, because that does not always work.
* org-agenda.el (org-agenda-list): Apply the new face
`org-agenda-date-today'.
* org-faces.el (org-agenda-date-today): New face.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-to-appt): Turn off restriction when
creating appointments.
* org-latex.el (org-export-latex-low-levels): Fix customization
type.
* org.el (org-priority, org-shiftup, org-shiftdown): Disable
priority commands.
* org-agenda.el (org-agenda-priority): Disable priority commands.
* org.el (org-enable-priority-commands): New option.
* org-colview-xemacs.el (org-columns-compute)
(org-columns-number-to-string): Fix problems with empty fields.
* org-colview.el (org-columns-compute)
(org-columns-number-to-string): Fix problems with empty fields.
* org-exp.el (org-export-push-to-kill-ring): New function.
(org-export-copy-to-kill-ring): New option.
* org-latex.el (org-export-as-latex): Call
`org-export-push-to-kill-ring'.
* org-exp.el (org-export-show-temporary-export-buffer): New
option.
* org-latex.el (org-export-as-latex): Use
`org-export-show-temporary-export-buffer'.
* org-exp.el (org-export-show-temporary-export-buffer): New
option.
(org-export-push-to-kill-ring): New function.
* org-colview.el (org-columns-compile-map): New variable.
(org-columns-new, org-columns-compute)
(org-columns-number-to-string, org-columns-uncompile-format)
(org-columns-compile-format): Implement new operators.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-plist-vars): Add :xml-declaration.
* org-list.el (org-update-checkbox-count): Make property
dependent.
* org.el (org-hierarchical-todo-statistics): New option.
(org-update-parent-todo-statistics): Modified to handle recursive
statistics.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish): Make this function behave
correctly in interactive use when called with a prefix argument.
* org.el (org-todo-statistics-hook): New hook.
(org-update-parent-todo-statistics): Use new hook.
(org-log-into-drawer): New function.
(org-add-log-setup): Use the new `org-log-into-drawer' function to
determine if we should be logging into a drawer.
(org-log-into-drawer): Update docstring.
(org-default-properties): Add LOG_INTO_DRAWER as a property.
* org-list.el (org-checkbox-statistics-hook): New hook.
(org-update-checkbox-count-maybe): Use new hook.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-edit-src-code, org-edit-fixed-width-region): Use a
better bufer-generating mechanism.
(org-edit-src-find-buffer): New function.
* org-icalendar.el (org-print-icalendar-entries): Don't check for
archive tag, this is already done by `org-agenda-skip'.
data while constructing lost of tags.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-apply-macros): Use semicolon
as argument separator in macros.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-after-sorting-entries-or-items-hook): New hook.
(org-sort-entries-or-items): Run the new hook.
(org-after-refile-insert-hook): New hook.
(org-refile): Run `org-after-refile-insert-hook'.
* org-agenda.el (org-agenda-get-progress): Never take time of day
from headline when displaying progress.
* org-latex.el (org-export-latex-complex-heading-re): New variable.
(org-export-as-latex): Force the correct regexp in the
preprocessor buffer.
(org-export-latex-set-initial-vars): Set
`org-export-latex-complex-heading-re'.
* org-agenda.el (org-agenda-start-with-log-mode): New option.
(org-agenda-mode): Use `org-agenda-start-with-log-mode'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-tables-centered): New option.
(org-export-latex-tables): Use `org-export-latex-tables-centered'.
* org-exp.el (org-export-as-org): New command.
(org-export-as-org): New command.
* org-publish.el (org-publish-org-to-org): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-yank): Just call `org-yank-generic'.
(org-yank-generic): New function, containing the formaer
functionality of `org-yank'.
* org-latex.el (org-export-latex-not-done-keywords)
(org-export-latex-done-keywords): New variables.
(org-export-latex-todo-keyword-markup): New option.
(org-export-latex-set-initial-vars): Remember the TODO keywords.
(org-export-latex-keywords-maybe): Apply the TODO markup.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-infile-export-plist): Add more default macros.
(org-export-preprocess-apply-macros): Process macro arguments.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-icalendar-include-todo): New allowedvalue
`unblocked'.
(org-print-icalendar-entries): Respect the new value of
`org-icalendar-include-todo'.
* org.el (org-link-try-special-completion)
(org-file-complete-link): New functions.
(org-insert-link): Add special completion support for some link
types.
* org-bbdb.el (org-bbdb-complete-link): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-update-checkbox-count): Allow recursive
statistics.
(org-hierarchical-checkbox-statistics): New option.
* org.el (org-cycle): Remove erraneous space character.
* org-icalendar.el (org-icalendar-timezone): Initialize from
environment.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-autoload): Fix autoloading of ascii export
functions.
(org-modules): Add org-special-blocks.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-start-icalendar-file): Use the new option.
(org-ical-timezone): New option.
* org-exp.el (org-export-get-coderef-format): Use the description
is present.
* org.el (org-sort-entries-or-items): Improve docstring, and make
better implementation for time sorting.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-edit-src-persistent-message): New option.
(org-edit-src-code, org-edit-fixed-width-region): Use the new
option.
* org-clock.el (org-clock-insert-selection-line): Fix prefious
patch.
* org.el (org-edit-src-code, org-edit-fixed-width-region): Use
separate buffer instead of indirect buffer to edit source code.
(org-edit-src-exit): Make this function work with the new setup.
* org-clock.el (org-clock-insert-selection-line): Make sure tasks
are properly fontified before shown in the selection menu.
* org.el (org-fontify-like-in-org-mode): New function.
* org-latex.el (org-export-latex-links): Use the property list to
retrieve the default image attributes.
* org-exp.el (org-export-plist-vars): Add a new option.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export, org-export-visible): Support ASCII
export to buffer
(org-export-normalize-links): Do not protect the description if it
is explicitly given.
* org-list.el (org-reset-checkbox-state-subtree): Moved here from
org-checklist.el.
(org-reset-checkbox-state-subtree): Call
`org-reset-checkbox-state-subtree'.
* org-remember.el (org-select-remember-template): For the
selection of a valid template.
* org-latex.el (org-export-region-as-latex): Supply the
force-no-subtree argument.
(org-export-as-latex): Provide better limits when exporting the
first line. When exporting to string, we still want the first
lines.
(org-export-latex-first-lines): New argument END, to force the end
of the region.
(org-export-region-as-latex): Use the property list.
(org-export-as-latex):
* org-colview-xemacs.el (org-columns-remove-overlays)
(org-columns): Fix call to `local-variable-p'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-after-blockquotes-hook): New hook.
(org-export-latex-preprocess): Run the new hook.
* org-exp.el (org-export-preprocess-after-blockquote-hook): New hook.
(org-export-preprocess-string): Run the new hook.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-macs.el (org-check-external-command): New defsubst.
* org.el (org-mode-map): New key for reload.
(org-format-latex): Better error message when external programs
are not available.
* org-agenda.el (org-agenda-mode-map): Bind `org-reload'.
* org.el (org-sort-entries-or-items): Explicit sorting function
for priorities, needed for XEmacs compatibility.
* org-remember.el (org-remember-apply-template): Improve auto-save
behavior.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Also protect
environments ending in a star.
* org-list.el (org-at-item-p): Fix regular expression.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-end-of-subtree): Improve speed.
* org-agenda.el (org-agenda-get-timestamps)
(org-agenda-get-progress, org-agenda-get-deadlines)
(org-agenda-get-scheduled, org-agenda-get-blocks): Optimizations,
in particular, wait as long as possible to collect the tags.
(org-stuck-projects): Improve docstring.
* org.el (org-store-link): No errors when getting custom id before
first headline.
(org-get-tags-at): Use `org-up-heading-safe' when getting tags.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-prepare-agenda-buffers): Catch a throw to nextfile.
* org-protocol.el: Remove dependency on url.el.
(org-protocol-unhex-compound, org-protocol-open-source): Remove
dependency on url.el.
* org-latex.el (org-export-as-pdf): Use
`org-latex-to-pdf-process'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-latex-to-pdf-process): New option.
* org-agenda.el (org-agenda-skip-additional-timestamps-same-entry):
New option.
(org-agenda-get-timestamps): Honor
`org-agenda-skip-additional-timestamps-same-entry'.
* org-clock.el (org-clock-goto-may-find-recent-task): New option.
(org-clock-goto): Find recent task only if
`org-clock-goto-may-find-recent-task' allows it.
* org-exp.el (org-export-remove-or-extract-drawers): Handle empty
drawers, and drawers that are missing the :END: line.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-goto): Go to recently clocked task if no
clock is running.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-update-parent-todo-statistics): Check for
STATISTICS_FROM property.
* org-list.el (org-update-checkbox-count): Check for
STATISTICS_FROM property.
* org.el (org-tab-first-hook)
(org-tab-after-check-for-table-hook)
(org-tab-after-check-for-cycling-hook): New hooks.
(org-cycle-internal-global, org-cycle-internal-local): New
functions, split out from `org-cycle'.
(org-cycle): Call the new hooks.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-string): Reset the list of
preferred targets for each run of the preprocessor.
* org.el (org-refile-target-verify-function): Improve
documentation.
(org-get-refile-targets): Respect point being moved by the
verification function.
* org-latex.el (org-export-latex-timestamp-keyword-markup): New
option.
(org-export-latex-keywords): Use new option.
* org.el (org-rear-nonsticky-at): New defsubst.
(org-activate-plain-links, org-activate-angle-links)
(org-activate-footnote-links, org-activate-bracket-links)
(org-activate-dates, org-activate-target-links)
(org-activate-tags): Place the rear-nonsticky properties at the
correct location.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-protocol.el (server-edit): Declare `server-edit'.
(org-protocol-unhex-string, org-protocol-unhex-compound): New
functions.
(org-protocol-check-filename-for-protocol): Call `server-edit'.
* org.el (org-default-properties): New default properteis for
completion.
* org-exp.el (org-export-add-subtree-options): Add new properties
for subtree export.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-id.el (org-id-get-with-outline-path-completion): Turn off
org-refile-target-verify-function for the duration of the command.
* org.el (org-link-to-org-use-id): New possible value
`create-if-interactive-and-no-custom-id'.
(org-store-link): Use custom IDs.
(org-link-search): Find custom ID properties from #link.
(org-default-properties): Add CUSTOM_ID for property completion.
(org-refile-target-verify-function): New option.
(org-goto): Turn off org-refile-target-verify-function
for the duration of the command.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preferred-target-alist): New variable.
(org-export-define-heading-targets): Find the new CUSTOM_ID
property.
(org-export-target-internal-links): Target the custom ids when
possible.
* org-latex.el (org-export-latex-preprocess): Better regexp for
matching latex macros with arguments.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-handler): Allow filing to non-org
files.
2009-08-06 Magnus Henoch <magnus.henoch@gmail.com>
* org-table.el (org-table-fix-formulas): Do not change references
to remote tables.
(org-table-get-remote-range): Convert standard coordinates to RC
format.
* org-latex.el (org-export-latex-keywords): Fix regexp bug.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-compat.el (org-sha1-string): Function removed.
* org.el (org-refile-allow-creating-parent-nodes): New option.
(org-refile-get-location): New argument NEW-NODES.
(org-refile): Call `org-refile-get-location' with the new
argument.
(org-refile-get-location): Arrange for adding a new child.
(org-refile-new-child): New function.
* org-clock.el: Fix a number of docstrings.
(org-clock-find-position): New argument
FIND-UNCLOSED to make the function find an unclosed clock in the
entry.
(org-clock-in): Call `org-clock-find-position' with the new
argument if we might be resuming a clock.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-display-custom-times): New variable.
(org-export-latex-timestamp-markup): New option.
(org-export-latex-set-initial-vars): Remember the local value of
`org-display-custom-times'.
(org-export-latex-content): Process time stamps.
(org-export-latex-time-stamps): New function.
* org-macs.el (org-maybe-intangible): Add intangible property
again to invisible text.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-default-export-plist): Handle undefined
variables.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-sort-entries-or-items): Match TODO keywrds
case-sensitively, when sorting.
(org-priority): Do not match TODO keywords with wrong case.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-todo): Honor the NOBLOCKING property.
* org-agenda.el (org-agenda-dim-blocked-tasks): Honor the
NOBLOCKING property.
* org.el (org-scan-tags): Fix bug in tag scanner
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-modules): Mark obsolete packages.
* org-html.el: New file, split out from org-exp.el.
* org-icalendar.el: New file, split out from org-exp.el.
* org-xoxo.el: New file, split out from org-exp.el.
* org-ascii.el: New file, split out from org-exp.el.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-compat.el (org-find-library-name): New function.
* org.el (org-pre-cycle-hook): New hook.
(org-cycle): Call the new hook in appropriate places.
(org-reload): Only reload files that have been loaded before.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-font-lock-defaults): Enforxe space or line end
after todo keyword.
(org-todo): When changing TODO state, do matching
case-sensitively.
(org-map-continue-from): New variable.
(org-scan-tags): Respect values in `org-map-continue-from'.
(org-reload): Make XEmacs compatible.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-protocol.el (org-protocol-flatten-greedy): New function.
(org-protocol-flatten): New function.
* org.el (org-open-link-from-string): Pass reference buffer to
`org-open-at-point'.
(org-open-at-point): New optional argument `reference-buffer'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-scan-tags): Make tag scan find headline in first
line, 2nd attempt.
(org-get-refile-targets): Add the naked file name.
(org-refile): Store as top-level entry when only file name was
given.
* org-agenda.el (org-agenda-get-progress): Fix regexp bug.
* org.el (org-block-todo-from-children-or-siblings-or-parent):
Renamed from org-block-todo-from-children-or-siblings, and
enhanced to look for the parent's status as well.
* org-agenda.el (org-agenda-log-mode-add-notes): New option.
(org-agenda-get-progress): Add first notes line to log entry if so
desired.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-cleanup-fancy-diary-hook): New hook.
(org-agenda-cleanup-fancy-diary): Call the new hook.
* org-remember.el (org-remember-apply-template): Take the default
for the annotation from the :annotation property.
* org-mac-message.el (org-mac-message-get-link): Remove the
quotes.
(org-mac-message-get-link): Return the result.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-refile-get-location): Add file name only if not
already included in outline path.
* org-faces.el (org-n-level-faces): Fix customization type from
number to integer.
* org-exp.el (org-export-headline-levels): Fix customization type
from number to integer.
* org-agenda.el (org-agenda-confirm-kill)
(org-agenda-custom-commands-local-options)
(org-timeline-show-empty-dates, org-agenda-ndays)
(org-agenda-start-on-weekday, org-scheduled-past-days): Fix
customization type from number to integer.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-protocol.el: Declare some functions.
* org-agenda.el (org-agenda-compare-effort): Honor
`org-sort-agenda-noeffort-is-high'.
(org-agenda-filter-by-tag, org-agenda-filter-make-matcher)
(org-agenda-compare-effort): Implement the "?" operator for
finding entries without effort setting.
* org.el (org-extract-attributes-from-string): New function.
* org-exp.el (org-export-splice-attributes): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-mouse.el: XEmacs compatibility fixes
* org.el (org-modules): Add org-inlinetasks.el
(org-cycle): Implement limiting level on cycling.
(org-move-subtree-down): Fix bug with swapping subtrees at end of
buffer.
* org-inlinetask.el: New file.
* org-protocol.el: New file.
* org.el (org-emphasis-regexp-components): Allow braces in
emphasis pre and post match.
* org-footnote.el (org-footnote-normalize): When only dorting, do
not insert inline notes at the end.
* org.el (org-require-autoloaded-modules): Add org-docbook.el.
* org-docbook.el: New file.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-reftex-citation): New command.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-cmp-user-defined): New option.
(org-sorting-choice, org-agenda-sorting-strategy): Add the new
sorting options.
(org-entries-lessp): Apply the new sorting option.
* org.el (org-block-todo-from-children-or-siblings): Fix bug in
blocker code, when an older sibling has children.
* org-mac-message.el (org-mac-message-get-link): Improve getting
links from multiple selected messages.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-finalize): Do not set buffer file
name to nil.
(org-remember-handler): Mark buffer as unmodified.
(org-remember-handler): Delete backup file and show message about
remaining backup files.
(org-remember-auto-remove-backup-files): New option.
* org.el (org-store-link): Use buffer name as link description in
w3-mode buffers.
(org-ido-switchb): Fix argument bug for completion.
* org-remember.el (org-remember-apply-template): Set local
variable `auto-save-visited-file-name' instead of global one.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-get-todos): Fix bug with match-data.
(org-agenda-get-todos): Mark file tags as inherited.
(org-agenda-list): Always search diary lines for a time.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-feed.el: New file.
* org-exp.el (org-export-as-html): Close local lists depending on
indentation, also when starting a table.
* org-remember.el (org-remember-backup-directory)
(org-remember-backup-name): New internal variable.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-out-if-current): Make buffer detection
work in indirect buffers as well.
* org.el (org-emphasis-regexp-components): Add the exxclamation
mark to the post-emphasis characters.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-read-date-minibiffer-septup-hook): New hook.
(org-read-date): Run the new hook.
* org-mac-message.el (org-mac-flagged-mail): New group.
(org-mac-mail-account): New variable.
(org-mac-create-flagged-mail, org-mac-insert-flagged-mail): New
commands.
* org-remember.el (org-remember-backup-directory): New variable.
(org-remember-apply-template): Write file to backup directory.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-mouse.el (org-mouse-todo-menu): New function.
(org-mouse-todo-keywords): Function removed.
(org-mouse-context-menu): Use `org-mouse-todo-menu'.
* org-table.el (org-table-beginning-of-field)
(org-table-end-of-field): New commands
(org-table-previous-field, org-table-beginning-of-field): Better
error messages.
(orgtbl-setup): Include `M-a' and `M-e'.
* org.el (org-backward-sentence, org-forward-sentence): New
commands.
* org-colview.el (org-colview-initial-truncate-line-value): New
variable.
(org-columns-remove-overlays): Restore the value of `truncate-lines'.
(org-columns): Remember the value of `truncate-lines'.
* org-colview-xemacs.el (org-colview-initial-truncate-line-value):
New variable.
(org-columns-remove-overlays): Restore the value of
`truncate-lines'.
(org-columns): Remember the value of `truncate-lines'.
* org.el (org-columns-skip-arrchived-trees): New option.
* org-agenda.el (org-agenda-export-html-style): Define color for
org-agenda-done face.
(org-search-view, org-agenda-get-todos, org-agenda-get-progress)
(org-agenda-get-deadlines, org-agenda-get-scheduled): Use new face.
* org.el (org-scan-tags): Use the new face.
* org-faces.el (org-agenda-done): New face.
* org.el (org-scan-tags): Test the value org
`org-tags-match-list-sublevels'.
(org-tags-match-list-sublevels): New allowed value: indented.
* org-latex.el (org-export-latex-make-header): Apply macros
in header.
* org-exp.el (org-export-apply-macros-in-string): New function.
* org-latex.el (org-export-latex-list-parameters): Fix bug
with the definition of a checked box.
* org-clock.el (org-clock-find-position): Fix drawer indentations.
* org-latex.el (org-export-latex-low-levels): More options
for how to process lower levels in LaTeX.
(org-export-latex-subcontent): Better treatment for lists as a
means of publishing lower levels.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-font-lock-defaults): Use new checkbox face.
* org-faces.el (org-checkbox): New face.
* org-exp.el (org-export-html-preprocess): Only create LaTeX
fragement images if there is an export file.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-stuck-projects): Document that the subtree of
projects that are not stuck will now be searched for stuck
sub-projects.
(org-agenda-skip-entry-when-regexp-matches)
(org-agenda-skip-entry-when-regexp-matches-in-subtree): New functions.
(org-agenda-list-stuck-projects): Use
`org-agenda-skip-entry-when-regexp-matches-in-subtree'.
* org-latex.el (org-export-latex-preprocess): Improve
export of verses.
* org-exp.el (org-export-as-html): Implement centering as a div
rather than a paragraph. Do a better job with line-end in verse
environments.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-at-point): Fix tags searches by mouse click.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Implement the
centering markup.
* org-exp.el (org-export-mark-blockquote-verse-center): Renamed
from `org-export-mark-blockquote-and-verse'.
(org-export-as-html): Implement the centering markup.
* org-latex.el (org-export-latex-tables): Fix vertical
lines in tables.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-read-date-history): New variable.
(org-read-date): Use new history variable.
(org-toggle-heading): Fix bug when used before first headline.
(org-store-log-note): Remove drawer if empty while note is
aborted.
(org-remove-empty-drawer-at): New function.
(org-check-after-date): New command.
(org-sparse-tree): New sparse tree command "a".
* org-exp.el (org-export-as-ascii): Improve export of plain lists.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-toggle-fixed-width-section): Bug fix: insert a
column and a space, not only a column.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-emphasis-alist): Better
defaults for verbose emphasis.
(org-export-latex-emph-format): New function.
(org-export-latex-fontify): Call `org-export-latex-emph-format'.
* org-agenda.el (org-agenda-menu): Add new commands to menu.
(org-agenda-do-date-later, org-agenda-do-date-earlier)
(org-agenda-date-later-minutes, org-agenda-date-earlier-minutes)
(org-agenda-date-later-hours, org-agenda-date-earlier-hours): New
commands.
* org.el (org-timestamp-change): Move end-time along with start
time.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-target-internal-links)
(org-export-as-html): Protect links specified as #name.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-clone-subtree-with-time-shift): New command.
* org-latex.el (org-export-latex-special-chars)
(org-export-latex-treat-sub-super-char): Fix subscript export.
* org-exp.el (org-create-multibrace-regexp): Do not add
backslashes to the class.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-colview.el (org-columns-map): Better functions for moving up
and down a row, even if `truncate-line' is nil.
* org.el (org-insert-todo-heading): Make sure the keyword is
inserted at the correct position.
* org-publish.el (org-publish-project-alist)
(org-publish-projects, org-publish-org-index): Change default anme
for the index of file names to "sitemap.org".
* org-latex.el (org-export-latex-tables): Use
`org-split-string', for Emacs 21 compatibility.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-log-mode-items): Improve docstring.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-page-description)
(org-export-page-keywords): New variables.
(org-export-plist-vars): Add entries for :keywords and
:description.
(org-infile-export-plist): Parse for new keywords.
(org-get-current-options): Add new keywords
(org-export-as-html): Publish description and keywords.
* org-agenda.el (org-agenda-add-entry-text-descriptive-links): New
option.
(org-agenda-add-entry-text): Honor
`org-agenda-add-entry-text-descriptive-links'.
* org-latex.el (org-export-latex-preprocess): Make all
external preprocess functions use a PARAMETER arg.
* org-exp.el (org-export-preprocess-string)
(org-export-select-backend-specific-text)
(org-export-format-source-code-or-example)
(org-format-org-table-html): Support docbook export.
(org-export-preprocess-string): Make all external preprocess
functions use a PARAMETER arg.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-html-style-include-scripts): New option.
(org-export-plist-vars): Add new option
`org-export-html-style-include-scripts'.
(org-export-as-html): Honor new option
`org-export-html-style-include-scripts'.
(org-export-html-scripts, org-export-html-style-default): Fix
xml issues with the Safari browser.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-attachment): Only copy file when the
directories differ.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clocktable-steps): Use inactive time stamps
for clocktable steps.
* org.el (org-additional-option-like-keywords): Add two more
keywords.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Mark
temporary buffer unmodified, so that it will be killed even if
mode like message mode has decided to assign a file name.
* org.el (org-scan-tags): Improve tag inheritance.
(org-scan-tags, org-make-tags-matcher): Make tag comparison
case-sensitive.
(org-scan-tags): Use the internal tags list instead of creating it
from scratch.
(org-trust-scanner-tags, org-scanner-tags): New variables.
(org-scan-tags): Set `org-scanner-tags'.
(org-get-tags-at): Take advantage of `org-trust-scanner-tags'.
(org-map-entries): Document the possible speedup using scanner
tags.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-add-planning-info): Fix bug with looking for keyword
only at column 0.
* org-agenda.el (org-agenda-custom-commands-local-options): Add
option for tags filter preset.
(org-prepare-agenda): Store filter preset as a property on the
filter variable.
(org-finalize-agenda): Call the filter, if there is a preset.
(org-agenda-filter-by-tag): Filter again after clearing the
filter, when there still is a preset.
(org-agenda-filter-make-matcher, org-agenda-set-mode-name):
Include the preset filter.
(org-agenda-redo): Apply the filter again, also the preset filter.
* org-exp.el (org-export-as-html): Use IDs in the correct way.
* org.el (org-uuidgen-p): New funtion.
* org-agenda.el (org-agenda-fontify-priorities): New default value
`cookies'.
(org-agenda-fontify-priorities): Renamed from
org-fontify-priorities.
* org.el (org-set-font-lock-defaults): Call
`org-font-lock-add-priority-faces'.
(org-font-lock-add-priority-faces): New function.
* org-faces.el: (org-set-tag-faces): New option.
(org-priority-faces): New variable.
* org-exp.el (org-export-as-html): Add a "content" div around the
entire content of the body tag.
(org-export-html-get-bibliography): New function.
(org-export-html-validation-link): New variable.
(org-export-as-html): Add validation link to exported page.
* org.el (org-match-sparse-tree): Renamed from
`org-tags-sparse-tree'.
(org-tags-sparse-tree): New alias.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-get-valid-level): Catch the case where the level
change is nil.
* org-clock.el (org-clock-find-position): Better indentation of
new clock drawers.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-quit): Delete window only when the
frame-setup was not `current-window'.
* org.el (org-tag-persistent-alist): New option.
(org-startup-options): Add keyword `noptag'.
(org-fast-todo-selection): Handle :newline correctly.
(org-set-tags): Handle :newline correctly.
(org-fast-tag-selection): Handle :newline correctly.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-as-ascii): Reverse link buffer before
outputting it.
(org-export-ascii-push-links): Fix bug with pussing links into the
export buffer.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-archive.el (org-archive-subtree): Do not add 1 to level if
pasting at top level.
* org-bbdb.el: Improve documentation.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-insert-item): Only consider insert empty lines
is `org-empty-line-terminates-plain-lists' is not nil.
* org.el (org-blank-before-new-entry): Mention the dependence on
`org-empty-line-terminates-plain-lists' in the docstring.
* org-publish.el (org-publish-get-project-from-filename): New
optional argument UP. Only find the top project if UP is set.
(org-publish-current-project): Find the top encloding project.
* org-agenda.el (org-agenda-before-write-hook)
(org-agenda-add-entry-text-maxlines): New options.
(org-write-agenda): Run the new hook in the temporary buffer.
(org-agenda-add-entry-text): New function.
(org-write-agenda): Implement PDF export, using ps2pdf.
* org.el (org-global-properties-fixed, org-global-properties):
Improve documentation string.
* org-exp.el (org-export-ascii-links-to-notes): New option.
(org-export-as-ascii): Handle links better.
(org-export-ascii-wrap, org-export-ascii-push-links): New
functions.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda): Make prefix arg optional.
(org-agenda-search-headline-for-time): New option.
(org-format-agenda-item): Honor
`org-agenda-search-headline-for-time'.
* org-table.el (orgtbl-self-insert-command): Cluster undo for 20
characters.
* org.el (org-self-insert-cluster-for-undo): New option.
(org-self-insert-command): Cluster undo for 20 characters.
(org-self-insert-command-undo-counter): New variable.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-as-html): Fix problem with closing colone
example.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-as-latex)
(org-export-latex-first-lines): Avoid modification flag when
adding or removing text properties.
(org-export-latex-fontify): Catch error when org-emph-alist has
entries that are not defined for LaTeX export.
* org-export-latex.el: renamed to org-latex.el
* org-latex.el: renamed from org-export-latex.el
* org.el (orgstruct++-mode): New function.
(turn-on-orgstruct++): Call `orgstruct++-mode'.
(org-context-p): Allow detecting item context after the first line
of an item.
(orgstruct-make-binding): Detect if item-body context should be
seen.
(orgstruct-is-++): New variable.
(org-add-planning-info): Catch the case when there is no planning
info yet and the call does not want to add anything, only maybe
tries to remove something.
(org-special-ctrl-a/e): All value to be a cons cell with separate
settings for `C-a. and `C-e'.
(org-beginning-of-line, org-end-of-line): Honor separate values
for `C-a' and `C-e'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-reload): New command.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Publishing action): Improve documentation of file
names when publishing to the source directory.
(Clean view): Document `org-indent-mode'.
(Clocking work time): Add documentation for the
new :timetamp option when creating a clock report.
(Paragraphs): Fix many typos.
(Plain lists): Remove duplicate explanation about the
`C-c *' command.
(Literal examples): Update to reflect the new behavior
of the -n -r -k switches when exporting source code examples.
(Structure editing): Add information about `C-c *',
converting a plain list into a list of Org items.
(Remember): Small rephrasing of the paragraph
describing remember.el. Also mentioned that remember.el is part
of Emacs 23, not Emacs 22.
(Clocking work time): Add documentation about
displaying the current clocking time against the effort estimate.
Also add a footnote about using `org-clock-in-prepare-hook' to add
an effort estimate on the fly, just before clocking it.
(Footnotes): Document automatic renumbering and
sorting.
(Agenda commands): Document new bulk commands.
(Plain lists): Document new behavior of
`org-cycle-include-plain-lists'.
Hyphenation only in TeX.
(Clocking work time): Document the key to update effort
estimates.
(Clocking work time): Document the clock time display.
(Structure editing, TODO basics): Document new
variables.
(Column attributes): Document new colciew operators.
(Publishing options): Document :xml-declaration.
(Tracking TODO state changes): Document the
LOG_INTO_DRAWER property.
(Literal examples): Document the new implementation for
editing source code.
(Publishing action): Mention the new publishing
function, to publish an Org source file.
(Publishing links): Mention how to link to an Org source file.
(Macro replacement): Document new macros.
(Handling links): Document type-specific completion
when inserting links.
(Structure editing, Plain lists): Improve documentation
on sorting.
(Internal links): Document custom ids for links.
(Handling links): Document custom ids for links.
(CSS support): Document new class.
(Refiling notes): Document the possibility to create new nodes
during refiling.
(Agenda commands): Document the "?" operator to find
tasks without effort setting.
(Exporting agenda information): Section moved.
(RSS Feeds): New section.
(Built-in table editor): Document M-e and M-a navigate
inside table field.
(Stuck projects): Docment that projects identified as
un-stuck will still be searchd for stuck sub-projects.
(Paragraphs): Document centering.
(Creating timestamps, Agenda commands): Document new
behavior when changing time stamps.
(Structure editing): Document the new command
`org-clone-subtree-with-time-shift'.
(Publishing): Refresh this chapter.
(Export options, Export options, In-buffer settings):
Document the new keywords.
(Matching tags and properties): Collect all
documentation about tags/property matches here.
(Setting tags): Document `org-tag-persistent-alist'.
(Weekly/daily agenda): New section.
(Orgstruct mode): Describe `orgstruct++-mode'.
(Drawers): Mention the LOGBOOK drawer.
(Export options, Sectioning structure): Document the
#+LEATEX_HEADER in-buffer setting.
(Bugs): Section removed.
(Hooks): New section.
(Add-on packages): Moved here from old location.
(Context-sensitive commands): New section.
(Setting tags): Document newline option.
(Global TODO list, Matching tags and properties):
Mention more variables.
(Checkboxes): Update to changed command behavior.
2009-08-06 09:14:10 +00:00
|
|
|
;;; org-html.el --- HTML export for Org-mode
|
|
|
|
|
|
|
|
|
|
;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
|
|
|
|
|
;; Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
;; Version: 6.29c
|
|
|
|
|
;;
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
;;
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
(require 'org-exp)
|
|
|
|
|
|
|
|
|
|
(declare-function org-id-find-id-file "org-id" (id))
|
|
|
|
|
(declare-function htmlize-region "ext:htmlize" (beg end))
|
|
|
|
|
|
|
|
|
|
(defgroup org-export-html nil
|
|
|
|
|
"Options specific for HTML export of Org-mode files."
|
|
|
|
|
:tag "Org Export HTML"
|
|
|
|
|
:group 'org-export)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-footnotes-section "<div id=\"footnotes\">
|
|
|
|
|
<h2 class=\"footnotes\">%s: </h2>
|
|
|
|
|
<div id=\"text-footnotes\">
|
|
|
|
|
%s
|
|
|
|
|
</div>
|
|
|
|
|
</div>"
|
|
|
|
|
"Format for the footnotes section.
|
|
|
|
|
Should contain a two instances of %s. The first will be replaced with the
|
|
|
|
|
language-specific word for \"Footnotes\", the second one will be replaced
|
|
|
|
|
by the footnotes themselves."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-footnote-format "<sup>%s</sup>"
|
|
|
|
|
"The format for the footnote reference.
|
|
|
|
|
%s will be replaced by the footnote reference itself."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-coding-system nil
|
|
|
|
|
"Coding system for HTML export, defaults to buffer-file-coding-system."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'coding-system)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-extension "html"
|
|
|
|
|
"The extension for exported HTML files."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-xml-declaration
|
|
|
|
|
'(("html" . "<?xml version=\"1.0\" encoding=\"%s\"?>")
|
|
|
|
|
("php" . "<?php echo \"<?xml version=\\\"1.0\\\" encoding=\\\"%s\\\" ?>\"; ?>"))
|
|
|
|
|
"The extension for exported HTML files.
|
|
|
|
|
%s will be replaced with the charset of the exported file.
|
|
|
|
|
This may be a string, or an alist with export extensions
|
|
|
|
|
and corresponding declarations."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type '(choice
|
|
|
|
|
(string :tag "Single declaration")
|
|
|
|
|
(repeat :tag "Dependent on extension"
|
|
|
|
|
(cons (string :tag "Extension")
|
|
|
|
|
(string :tag "Declaration")))))
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-style-include-scripts t
|
|
|
|
|
"Non-nil means, include the javascript snippets in exported HTML files.
|
|
|
|
|
The actual script is defined in `org-export-html-scripts' and should
|
|
|
|
|
not be modified."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
|
|
(defconst org-export-html-scripts
|
|
|
|
|
"<script type=\"text/javascript\">
|
|
|
|
|
<!--/*--><![CDATA[/*><!--*/
|
|
|
|
|
function CodeHighlightOn(elem, id)
|
|
|
|
|
{
|
|
|
|
|
var target = document.getElementById(id);
|
|
|
|
|
if(null != target) {
|
|
|
|
|
elem.cacheClassElem = elem.className;
|
|
|
|
|
elem.cacheClassTarget = target.className;
|
|
|
|
|
target.className = \"code-highlighted\";
|
|
|
|
|
elem.className = \"code-highlighted\";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
function CodeHighlightOff(elem, id)
|
|
|
|
|
{
|
|
|
|
|
var target = document.getElementById(id);
|
|
|
|
|
if(elem.cacheClassElem)
|
|
|
|
|
elem.className = elem.cacheClassElem;
|
|
|
|
|
if(elem.cacheClassTarget)
|
|
|
|
|
target.className = elem.cacheClassTarget;
|
|
|
|
|
}
|
|
|
|
|
/*]]>*///-->
|
|
|
|
|
</script>"
|
|
|
|
|
"Basic javascript that is needed by HTML files produced by Org-mode.")
|
|
|
|
|
|
|
|
|
|
(defconst org-export-html-style-default
|
|
|
|
|
"<style type=\"text/css\">
|
|
|
|
|
<!--/*--><![CDATA[/*><!--*/
|
|
|
|
|
html { font-family: Times, serif; font-size: 12pt; }
|
|
|
|
|
.title { text-align: center; }
|
|
|
|
|
.todo { color: red; }
|
|
|
|
|
.done { color: green; }
|
|
|
|
|
.tag { background-color: #add8e6; font-weight:normal }
|
|
|
|
|
.target { }
|
|
|
|
|
.timestamp { color: #bebebe; }
|
|
|
|
|
.timestamp-kwd { color: #5f9ea0; }
|
|
|
|
|
p.verse { margin-left: 3% }
|
|
|
|
|
pre {
|
|
|
|
|
border: 1pt solid #AEBDCC;
|
|
|
|
|
background-color: #F3F5F7;
|
|
|
|
|
padding: 5pt;
|
|
|
|
|
font-family: courier, monospace;
|
|
|
|
|
font-size: 90%;
|
|
|
|
|
overflow:auto;
|
|
|
|
|
}
|
|
|
|
|
table { border-collapse: collapse; }
|
|
|
|
|
td, th { vertical-align: top; }
|
|
|
|
|
dt { font-weight: bold; }
|
|
|
|
|
div.figure { padding: 0.5em; }
|
|
|
|
|
div.figure p { text-align: center; }
|
|
|
|
|
.linenr { font-size:smaller }
|
|
|
|
|
.code-highlighted {background-color:#ffff00;}
|
|
|
|
|
.org-info-js_info-navigation { border-style:none; }
|
|
|
|
|
#org-info-js_console-label { font-size:10px; font-weight:bold;
|
|
|
|
|
white-space:nowrap; }
|
|
|
|
|
.org-info-js_search-highlight {background-color:#ffff00; color:#000000;
|
|
|
|
|
font-weight:bold; }
|
|
|
|
|
/*]]>*/-->
|
|
|
|
|
</style>"
|
|
|
|
|
"The default style specification for exported HTML files.
|
|
|
|
|
Please use the variables `org-export-html-style' and
|
|
|
|
|
`org-export-html-style-extra' to add to this style. If you wish to not
|
|
|
|
|
have the default style included, customize the variable
|
|
|
|
|
`org-export-html-style-include-default'.")
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-style-include-default t
|
|
|
|
|
"Non-nil means, include the default style in exported HTML files.
|
|
|
|
|
The actual style is defined in `org-export-html-style-default' and should
|
|
|
|
|
not be modified. Use the variables `org-export-html-style' to add
|
|
|
|
|
your own style information."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(put 'org-export-html-style 'safe-local-variable 'booleanp)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-style ""
|
|
|
|
|
"Org-wide style definitions for exported HTML files.
|
|
|
|
|
|
|
|
|
|
This variable needs to contain the full HTML structure to provide a style,
|
|
|
|
|
including the surrounding HTML tags. If you set the value of this variable,
|
|
|
|
|
you should consider to include definitions for the following classes:
|
|
|
|
|
title, todo, done, timestamp, timestamp-kwd, tag, target.
|
|
|
|
|
|
|
|
|
|
For example, a valid value would be:
|
|
|
|
|
|
|
|
|
|
<style type=\"text/css\">
|
|
|
|
|
<![CDATA[
|
|
|
|
|
p { font-weight: normal; color: gray; }
|
|
|
|
|
h1 { color: black; }
|
|
|
|
|
.title { text-align: center; }
|
|
|
|
|
.todo, .timestamp-kwd { color: red; }
|
|
|
|
|
.done { color: green; }
|
|
|
|
|
]]>
|
|
|
|
|
</style>
|
|
|
|
|
|
|
|
|
|
If you'd like to refer to en external style file, use something like
|
|
|
|
|
|
|
|
|
|
<link rel=\"stylesheet\" type=\"text/css\" href=\"mystyles.css\">
|
|
|
|
|
|
|
|
|
|
As the value of this option simply gets inserted into the HTML <head> header,
|
|
|
|
|
you can \"misuse\" it to add arbitrary text to the header.
|
|
|
|
|
See also the variable `org-export-html-style-extra'."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(put 'org-export-html-style 'safe-local-variable 'stringp)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-style-extra ""
|
|
|
|
|
"Additional style information for HTML export.
|
|
|
|
|
The value of this variable is inserted into the HTML buffer right after
|
|
|
|
|
the value of `org-export-html-style'. Use this variable for per-file
|
|
|
|
|
settings of style information, and do not forget to surround the style
|
|
|
|
|
settings with <style>...</style> tags."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(put 'org-export-html-style-extra 'safe-local-variable 'stringp)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-tag-class-prefix ""
|
|
|
|
|
"Prefix to clas names for TODO keywords.
|
|
|
|
|
Each tag gets a class given by the tag itself, with this prefix.
|
|
|
|
|
The default prefix is empty because it is nice to just use the keyword
|
|
|
|
|
as a class name. But if you get into conflicts with other, existing
|
|
|
|
|
CSS classes, then this prefic can be very useful."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-todo-kwd-class-prefix ""
|
|
|
|
|
"Prefix to clas names for TODO keywords.
|
|
|
|
|
Each TODO keyword gets a class given by the keyword itself, with this prefix.
|
|
|
|
|
The default prefix is empty because it is nice to just use the keyword
|
|
|
|
|
as a class name. But if you get into conflicts with other, existing
|
|
|
|
|
CSS classes, then this prefic can be very useful."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-title-format "<h1 class=\"title\">%s</h1>\n"
|
|
|
|
|
"Format for typesetting the document title in HTML export."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-home/up-format
|
|
|
|
|
"<div style=\"text-align:right;font-size:70%%;white-space:nowrap;\">
|
|
|
|
|
<a accesskey=\"h\" href=\"%s\"> UP </a>
|
|
|
|
|
|
|
|
|
|
|
<a accesskey=\"H\" href=\"%s\"> HOME </a>
|
|
|
|
|
</div>"
|
|
|
|
|
"Snippet used to insert the HOME and UP links. This is a format,
|
|
|
|
|
the first %s will receive the UP link, the second the HOME link.
|
|
|
|
|
If both `org-export-html-link-up' and `org-export-html-link-home' are
|
|
|
|
|
empty, the entire snippet will be ignored."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-toplevel-hlevel 2
|
|
|
|
|
"The <H> level for level 1 headings in HTML export.
|
|
|
|
|
This is also important for the classes that will be wrapped around headlines
|
|
|
|
|
and outline structure. If this variable is 1, the top-level headlines will
|
|
|
|
|
be <h1>, and the corresponding classes will be outline-1, section-number-1,
|
|
|
|
|
and outline-text-1. If this is 2, all of these will get a 2 instead.
|
|
|
|
|
The default for this variable is 2, because we use <h1> for formatting the
|
|
|
|
|
document title."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-link-org-files-as-html t
|
|
|
|
|
"Non-nil means, make file links to `file.org' point to `file.html'.
|
|
|
|
|
When org-mode is exporting an org-mode file to HTML, links to
|
|
|
|
|
non-html files are directly put into a href tag in HTML.
|
|
|
|
|
However, links to other Org-mode files (recognized by the
|
|
|
|
|
extension `.org.) should become links to the corresponding html
|
|
|
|
|
file, assuming that the linked org-mode file will also be
|
|
|
|
|
converted to HTML.
|
|
|
|
|
When nil, the links still point to the plain `.org' file."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-inline-images 'maybe
|
|
|
|
|
"Non-nil means, inline images into exported HTML pages.
|
|
|
|
|
This is done using an <img> tag. When nil, an anchor with href is used to
|
|
|
|
|
link to the image. If this option is `maybe', then images in links with
|
|
|
|
|
an empty description will be inlined, while images with a description will
|
|
|
|
|
be linked only."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type '(choice (const :tag "Never" nil)
|
|
|
|
|
(const :tag "Always" t)
|
|
|
|
|
(const :tag "When there is no description" maybe)))
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-inline-image-extensions
|
|
|
|
|
'("png" "jpeg" "jpg" "gif")
|
|
|
|
|
"Extensions of image files that can be inlined into HTML."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type '(repeat (string :tag "Extension")))
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-table-tag
|
|
|
|
|
"<table border=\"2\" cellspacing=\"0\" cellpadding=\"6\" rules=\"groups\" frame=\"hsides\">"
|
|
|
|
|
"The HTML tag that is used to start a table.
|
|
|
|
|
This must be a <table> tag, but you may change the options like
|
|
|
|
|
borders and spacing."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-table-header-tags '("<th scope=\"%s\">" . "</th>")
|
|
|
|
|
"The opening tag for table header fields.
|
|
|
|
|
This is customizable so that alignment options can be specified.
|
|
|
|
|
%s will be filled with the scope of the field, either row or col.
|
|
|
|
|
See also the variable `org-export-html-table-use-header-tags-for-first-column'."
|
|
|
|
|
:group 'org-export-tables
|
|
|
|
|
:type '(cons (string :tag "Opening tag") (string :tag "Closing tag")))
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-table-data-tags '("<td>" . "</td>")
|
|
|
|
|
"The opening tag for table data fields.
|
|
|
|
|
This is customizable so that alignment options can be specified."
|
|
|
|
|
:group 'org-export-tables
|
|
|
|
|
:type '(cons (string :tag "Opening tag") (string :tag "Closing tag")))
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-table-row-tags '("<tr>" . "</tr>")
|
|
|
|
|
"The opening tag for table data fields.
|
|
|
|
|
This is customizable so that alignment options can be specified.
|
|
|
|
|
Instead of strings, these can be Lisp forms that will be evaluated
|
|
|
|
|
for each row in order to construct the table row tags. During evaluation,
|
|
|
|
|
the variable `head' will be true when this is a header line, nil when this
|
|
|
|
|
is a body line. And the variable `nline' will contain the line number,
|
|
|
|
|
starting from 1 in the first header line. For example
|
|
|
|
|
|
|
|
|
|
(setq org-export-table-row-tags
|
|
|
|
|
(cons '(if head
|
|
|
|
|
\"<tr>\"
|
|
|
|
|
(if (= (mod nline 2) 1)
|
|
|
|
|
\"<tr class=\\\"tr-odd\\\">\"
|
|
|
|
|
\"<tr class=\\\"tr-even\\\">\"))
|
|
|
|
|
\"</tr>\"))
|
|
|
|
|
|
|
|
|
|
will give even lines the class \"tr-even\" and odd lines the class \"tr-odd\"."
|
|
|
|
|
:group 'org-export-tables
|
|
|
|
|
:type '(cons
|
|
|
|
|
(choice :tag "Opening tag"
|
|
|
|
|
(string :tag "Specify")
|
|
|
|
|
(sexp))
|
|
|
|
|
(choice :tag "Closing tag"
|
|
|
|
|
(string :tag "Specify")
|
|
|
|
|
(sexp))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-table-use-header-tags-for-first-column nil
|
|
|
|
|
"Non-nil means, format column one in tables with header tags.
|
|
|
|
|
When nil, also column one will use data tags."
|
|
|
|
|
:group 'org-export-tables
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-validation-link nil
|
|
|
|
|
"Non-nil means, add validationlink to postamble of HTML exported files."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "Nothing" nil)
|
|
|
|
|
(const :tag "XHTML 1.0" "<p class=\"xhtml-validation\"><a href=\"http://validator.w3.org/check?uri=referer\">Validate XHTML 1.0</a></p>")
|
|
|
|
|
(string :tag "Specify full HTML")))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-with-timestamp nil
|
|
|
|
|
"If non-nil, write `org-export-html-html-helper-timestamp'
|
|
|
|
|
into the exported HTML text. Otherwise, the buffer will just be saved
|
|
|
|
|
to a file."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-html-html-helper-timestamp
|
|
|
|
|
"<br/><br/><hr><p><!-- hhmts start --> <!-- hhmts end --></p>\n"
|
|
|
|
|
"The HTML tag used as timestamp delimiter for HTML-helper-mode."
|
|
|
|
|
:group 'org-export-html
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defgroup org-export-htmlize nil
|
|
|
|
|
"Options for processing examples with htmlize.el."
|
|
|
|
|
:tag "Org Export Htmlize"
|
|
|
|
|
:group 'org-export-html)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-htmlize-output-type 'inline-css
|
|
|
|
|
"Output type to be used by htmlize when formatting code snippets.
|
|
|
|
|
We use as default `inline-css', in order to make the resulting
|
|
|
|
|
HTML self-containing.
|
|
|
|
|
However, this will fail when using Emacs in batch mode for export, because
|
|
|
|
|
then no rich font definitions are in place. It will also not be good if
|
|
|
|
|
people with different Emacs setup contribute HTML files to a website,
|
|
|
|
|
because the fonts will represent the individual setups. In these cases,
|
|
|
|
|
it is much better to let Org/Htmlize assign classes only, and to use
|
|
|
|
|
a style file to define the look of these classes.
|
|
|
|
|
To get a start for your css file, start Emacs session and make sure that
|
|
|
|
|
all the faces you are interested in are defined, for example by loading files
|
|
|
|
|
in all modes you want. Then, use the command
|
|
|
|
|
\\[org-export-htmlize-generate-css] to extract class definitions."
|
|
|
|
|
:group 'org-export-htmlize
|
|
|
|
|
:type '(choice (const css) (const inline-css)))
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-htmlize-css-font-prefix "org-"
|
|
|
|
|
"The prefix for CSS class names for htmlize font specifications."
|
|
|
|
|
:group 'org-export-htmlize
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-export-htmlized-org-css-url nil
|
|
|
|
|
"URL pointing to a CSS file defining text colors for htmlized Emacs buffers.
|
|
|
|
|
Normally when creating an htmlized version of an Org buffer, htmlize will
|
|
|
|
|
create CSS to define the font colors. However, this does not work when
|
|
|
|
|
converting in batch mode, and it also can look bad if different people
|
|
|
|
|
with different fontification setup work on the same website.
|
|
|
|
|
When this variable is non-nil, creating an htmlized version of an Org buffer
|
|
|
|
|
using `org-export-as-org' will remove the internal CSS section and replace it
|
|
|
|
|
with a link to this URL."
|
|
|
|
|
:group 'org-export-htmlize
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "Keep internal css" nil)
|
|
|
|
|
(string :tag "URL or local href")))
|
|
|
|
|
|
|
|
|
|
;;; Variables, constants, and parameter plists
|
|
|
|
|
|
|
|
|
|
(defvar org-export-html-preamble nil
|
|
|
|
|
"Preamble, to be inserted just before <body>. Set by publishing functions.
|
|
|
|
|
This may also be a function, building and inserting the preamble.")
|
|
|
|
|
(defvar org-export-html-postamble nil
|
|
|
|
|
"Preamble, to be inserted just after </body>. Set by publishing functions.
|
|
|
|
|
This may also be a function, building and inserting the postamble.")
|
|
|
|
|
(defvar org-export-html-auto-preamble t
|
|
|
|
|
"Should default preamble be inserted? Set by publishing functions.")
|
|
|
|
|
(defvar org-export-html-auto-postamble t
|
|
|
|
|
"Should default postamble be inserted? Set by publishing functions.")
|
|
|
|
|
|
|
|
|
|
;;; Hooks
|
|
|
|
|
|
|
|
|
|
(defvar org-export-html-after-blockquotes-hook nil
|
|
|
|
|
"Hook run during HTML export, after blockquote, verse, center are done.")
|
|
|
|
|
|
|
|
|
|
;;; HTML export
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-preprocess (parameters)
|
|
|
|
|
;; Convert LaTeX fragments to images
|
|
|
|
|
(when (and org-current-export-file
|
|
|
|
|
(plist-get parameters :LaTeX-fragments))
|
|
|
|
|
(org-format-latex
|
|
|
|
|
(concat "ltxpng/" (file-name-sans-extension
|
|
|
|
|
(file-name-nondirectory
|
|
|
|
|
org-current-export-file)))
|
|
|
|
|
org-current-export-dir nil "Creating LaTeX image %s"))
|
|
|
|
|
(message "Exporting..."))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-export-as-html-and-open (arg)
|
|
|
|
|
"Export the outline as HTML and immediately open it with a browser.
|
|
|
|
|
If there is an active region, export only the region.
|
|
|
|
|
The prefix ARG specifies how many levels of the outline should become
|
|
|
|
|
headlines. The default is 3. Lower levels will become bulleted lists."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(org-export-as-html arg 'hidden)
|
|
|
|
|
(org-open-file buffer-file-name))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-export-as-html-batch ()
|
|
|
|
|
"Call `org-export-as-html', may be used in batch processing as
|
|
|
|
|
emacs --batch
|
|
|
|
|
--load=$HOME/lib/emacs/org.el
|
|
|
|
|
--eval \"(setq org-export-headline-levels 2)\"
|
|
|
|
|
--visit=MyFile --funcall org-export-as-html-batch"
|
|
|
|
|
(org-export-as-html org-export-headline-levels 'hidden))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-export-as-html-to-buffer (arg)
|
|
|
|
|
"Call `org-export-as-html` with output to a temporary buffer.
|
|
|
|
|
No file is created. The prefix ARG is passed through to `org-export-as-html'."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(org-export-as-html arg nil nil "*Org HTML Export*")
|
|
|
|
|
(when org-export-show-temporary-export-buffer
|
|
|
|
|
(switch-to-buffer-other-window "*Org HTML Export*")))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-replace-region-by-html (beg end)
|
|
|
|
|
"Assume the current region has org-mode syntax, and convert it to HTML.
|
|
|
|
|
This can be used in any buffer. For example, you could write an
|
|
|
|
|
itemized list in org-mode syntax in an HTML buffer and then use this
|
|
|
|
|
command to convert it."
|
|
|
|
|
(interactive "r")
|
|
|
|
|
(let (reg html buf pop-up-frames)
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
(if (org-mode-p)
|
|
|
|
|
(setq html (org-export-region-as-html
|
|
|
|
|
beg end t 'string))
|
|
|
|
|
(setq reg (buffer-substring beg end)
|
|
|
|
|
buf (get-buffer-create "*Org tmp*"))
|
|
|
|
|
(with-current-buffer buf
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert reg)
|
|
|
|
|
(org-mode)
|
|
|
|
|
(setq html (org-export-region-as-html
|
|
|
|
|
(point-min) (point-max) t 'string)))
|
|
|
|
|
(kill-buffer buf)))
|
|
|
|
|
(delete-region beg end)
|
|
|
|
|
(insert html)))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-export-region-as-html (beg end &optional body-only buffer)
|
|
|
|
|
"Convert region from BEG to END in org-mode buffer to HTML.
|
|
|
|
|
If prefix arg BODY-ONLY is set, omit file header, footer, and table of
|
|
|
|
|
contents, and only produce the region of converted text, useful for
|
|
|
|
|
cut-and-paste operations.
|
|
|
|
|
If BUFFER is a buffer or a string, use/create that buffer as a target
|
|
|
|
|
of the converted HTML. If BUFFER is the symbol `string', return the
|
|
|
|
|
produced HTML as a string and leave not buffer behind. For example,
|
|
|
|
|
a Lisp program could call this function in the following way:
|
|
|
|
|
|
|
|
|
|
(setq html (org-export-region-as-html beg end t 'string))
|
|
|
|
|
|
|
|
|
|
When called interactively, the output buffer is selected, and shown
|
|
|
|
|
in a window. A non-interactive call will only return the buffer."
|
|
|
|
|
(interactive "r\nP")
|
|
|
|
|
(when (interactive-p)
|
|
|
|
|
(setq buffer "*Org HTML Export*"))
|
|
|
|
|
(let ((transient-mark-mode t) (zmacs-regions t)
|
|
|
|
|
ext-plist rtn)
|
|
|
|
|
(setq ext-plist (plist-put ext-plist :ignore-subree-p t))
|
|
|
|
|
(goto-char end)
|
|
|
|
|
(set-mark (point)) ;; to activate the region
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(setq rtn (org-export-as-html
|
|
|
|
|
nil nil ext-plist
|
|
|
|
|
buffer body-only))
|
|
|
|
|
(if (fboundp 'deactivate-mark) (deactivate-mark))
|
|
|
|
|
(if (and (interactive-p) (bufferp rtn))
|
|
|
|
|
(switch-to-buffer-other-window rtn)
|
|
|
|
|
rtn)))
|
|
|
|
|
|
|
|
|
|
(defvar html-table-tag nil) ; dynamically scoped into this.
|
|
|
|
|
(defvar org-par-open nil)
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-export-as-html (arg &optional hidden ext-plist
|
|
|
|
|
to-buffer body-only pub-dir)
|
|
|
|
|
"Export the outline as a pretty HTML file.
|
|
|
|
|
If there is an active region, export only the region. The prefix
|
|
|
|
|
ARG specifies how many levels of the outline should become
|
|
|
|
|
headlines. The default is 3. Lower levels will become bulleted
|
|
|
|
|
lists. HIDDEN is obsolete and does nothing.
|
|
|
|
|
EXT-PLIST is a property list with external parameters overriding
|
|
|
|
|
org-mode's default settings, but still inferior to file-local
|
|
|
|
|
settings. When TO-BUFFER is non-nil, create a buffer with that
|
|
|
|
|
name and export to that buffer. If TO-BUFFER is the symbol
|
|
|
|
|
`string', don't leave any buffer behind but just return the
|
|
|
|
|
resulting HTML as a string. When BODY-ONLY is set, don't produce
|
|
|
|
|
the file header and footer, simply return the content of
|
|
|
|
|
<body>...</body>, without even the body tags themselves. When
|
|
|
|
|
PUB-DIR is set, use this as the publishing directory."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
|
|
|
|
|
;; Make sure we have a file name when we need it.
|
|
|
|
|
(when (and (not (or to-buffer body-only))
|
|
|
|
|
(not buffer-file-name))
|
|
|
|
|
(if (buffer-base-buffer)
|
|
|
|
|
(org-set-local 'buffer-file-name
|
|
|
|
|
(with-current-buffer (buffer-base-buffer)
|
|
|
|
|
buffer-file-name))
|
|
|
|
|
(error "Need a file name to be able to export.")))
|
|
|
|
|
|
|
|
|
|
(message "Exporting...")
|
|
|
|
|
(setq-default org-todo-line-regexp org-todo-line-regexp)
|
|
|
|
|
(setq-default org-deadline-line-regexp org-deadline-line-regexp)
|
|
|
|
|
(setq-default org-done-keywords org-done-keywords)
|
|
|
|
|
(setq-default org-maybe-keyword-time-regexp org-maybe-keyword-time-regexp)
|
|
|
|
|
(let* ((opt-plist
|
|
|
|
|
(org-export-process-option-filters
|
|
|
|
|
(org-combine-plists (org-default-export-plist)
|
|
|
|
|
ext-plist
|
|
|
|
|
(org-infile-export-plist))))
|
|
|
|
|
(body-only (or body-only (plist-get opt-plist :body-only)))
|
|
|
|
|
(style (concat (if (plist-get opt-plist :style-include-default)
|
|
|
|
|
org-export-html-style-default)
|
|
|
|
|
(plist-get opt-plist :style)
|
|
|
|
|
(plist-get opt-plist :style-extra)
|
|
|
|
|
"\n"
|
|
|
|
|
(if (plist-get opt-plist :style-include-scripts)
|
|
|
|
|
org-export-html-scripts)))
|
|
|
|
|
(html-extension (plist-get opt-plist :html-extension))
|
|
|
|
|
(link-validate (plist-get opt-plist :link-validation-function))
|
|
|
|
|
valid thetoc have-headings first-heading-pos
|
|
|
|
|
(odd org-odd-levels-only)
|
|
|
|
|
(region-p (org-region-active-p))
|
|
|
|
|
(rbeg (and region-p (region-beginning)))
|
|
|
|
|
(rend (and region-p (region-end)))
|
|
|
|
|
(subtree-p
|
|
|
|
|
(if (plist-get opt-plist :ignore-subree-p)
|
|
|
|
|
nil
|
|
|
|
|
(when region-p
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char rbeg)
|
|
|
|
|
(and (org-at-heading-p)
|
|
|
|
|
(>= (org-end-of-subtree t t) rend))))))
|
|
|
|
|
(level-offset (if subtree-p
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char rbeg)
|
|
|
|
|
(+ (funcall outline-level)
|
|
|
|
|
(if org-odd-levels-only 1 0)))
|
|
|
|
|
0))
|
|
|
|
|
(opt-plist (setq org-export-opt-plist
|
|
|
|
|
(if subtree-p
|
|
|
|
|
(org-export-add-subtree-options opt-plist rbeg)
|
|
|
|
|
opt-plist)))
|
|
|
|
|
;; The following two are dynamically scoped into other
|
|
|
|
|
;; routines below.
|
|
|
|
|
(org-current-export-dir
|
|
|
|
|
(or pub-dir (org-export-directory :html opt-plist)))
|
|
|
|
|
(org-current-export-file buffer-file-name)
|
|
|
|
|
(level 0) (line "") (origline "") txt todo
|
|
|
|
|
(umax nil)
|
|
|
|
|
(umax-toc nil)
|
|
|
|
|
(filename (if to-buffer nil
|
|
|
|
|
(expand-file-name
|
|
|
|
|
(concat
|
|
|
|
|
(file-name-sans-extension
|
|
|
|
|
(or (and subtree-p
|
|
|
|
|
(org-entry-get (region-beginning)
|
|
|
|
|
"EXPORT_FILE_NAME" t))
|
|
|
|
|
(file-name-nondirectory buffer-file-name)))
|
|
|
|
|
"." html-extension)
|
|
|
|
|
(file-name-as-directory
|
|
|
|
|
(or pub-dir (org-export-directory :html opt-plist))))))
|
|
|
|
|
(current-dir (if buffer-file-name
|
|
|
|
|
(file-name-directory buffer-file-name)
|
|
|
|
|
default-directory))
|
|
|
|
|
(buffer (if to-buffer
|
|
|
|
|
(cond
|
|
|
|
|
((eq to-buffer 'string) (get-buffer-create "*Org HTML Export*"))
|
|
|
|
|
(t (get-buffer-create to-buffer)))
|
|
|
|
|
(find-file-noselect filename)))
|
|
|
|
|
(org-levels-open (make-vector org-level-max nil))
|
|
|
|
|
(date (plist-get opt-plist :date))
|
|
|
|
|
(author (plist-get opt-plist :author))
|
|
|
|
|
(title (or (and subtree-p (org-export-get-title-from-subtree))
|
|
|
|
|
(plist-get opt-plist :title)
|
|
|
|
|
(and (not
|
|
|
|
|
(plist-get opt-plist :skip-before-1st-heading))
|
|
|
|
|
(org-export-grab-title-from-buffer))
|
|
|
|
|
(and buffer-file-name
|
|
|
|
|
(file-name-sans-extension
|
|
|
|
|
(file-name-nondirectory buffer-file-name)))
|
|
|
|
|
"UNTITLED"))
|
|
|
|
|
(link-up (and (plist-get opt-plist :link-up)
|
|
|
|
|
(string-match "\\S-" (plist-get opt-plist :link-up))
|
|
|
|
|
(plist-get opt-plist :link-up)))
|
|
|
|
|
(link-home (and (plist-get opt-plist :link-home)
|
|
|
|
|
(string-match "\\S-" (plist-get opt-plist :link-home))
|
|
|
|
|
(plist-get opt-plist :link-home)))
|
|
|
|
|
(dummy (setq opt-plist (plist-put opt-plist :title title)))
|
|
|
|
|
(html-table-tag (plist-get opt-plist :html-table-tag))
|
|
|
|
|
(quote-re0 (concat "^[ \t]*" org-quote-string "\\>"))
|
|
|
|
|
(quote-re (concat "^\\(\\*+\\)\\([ \t]+" org-quote-string "\\>\\)"))
|
|
|
|
|
(inquote nil)
|
|
|
|
|
(infixed nil)
|
|
|
|
|
(inverse nil)
|
|
|
|
|
(in-local-list nil)
|
|
|
|
|
(local-list-type nil)
|
|
|
|
|
(local-list-indent nil)
|
|
|
|
|
(llt org-plain-list-ordered-item-terminator)
|
|
|
|
|
(email (plist-get opt-plist :email))
|
|
|
|
|
(language (plist-get opt-plist :language))
|
|
|
|
|
(keywords (plist-get opt-plist :keywords))
|
|
|
|
|
(description (plist-get opt-plist :description))
|
|
|
|
|
(lang-words nil)
|
|
|
|
|
(head-count 0) cnt
|
|
|
|
|
(start 0)
|
|
|
|
|
(coding-system (and (boundp 'buffer-file-coding-system)
|
|
|
|
|
buffer-file-coding-system))
|
|
|
|
|
(coding-system-for-write (or org-export-html-coding-system
|
|
|
|
|
coding-system))
|
|
|
|
|
(save-buffer-coding-system (or org-export-html-coding-system
|
|
|
|
|
coding-system))
|
|
|
|
|
(charset (and coding-system-for-write
|
|
|
|
|
(fboundp 'coding-system-get)
|
|
|
|
|
(coding-system-get coding-system-for-write
|
|
|
|
|
'mime-charset)))
|
|
|
|
|
(region
|
|
|
|
|
(buffer-substring
|
|
|
|
|
(if region-p (region-beginning) (point-min))
|
|
|
|
|
(if region-p (region-end) (point-max))))
|
|
|
|
|
(lines
|
|
|
|
|
(org-split-string
|
|
|
|
|
(org-export-preprocess-string
|
|
|
|
|
region
|
|
|
|
|
:emph-multiline t
|
|
|
|
|
:for-html t
|
|
|
|
|
:skip-before-1st-heading
|
|
|
|
|
(plist-get opt-plist :skip-before-1st-heading)
|
|
|
|
|
:drawers (plist-get opt-plist :drawers)
|
|
|
|
|
:todo-keywords (plist-get opt-plist :todo-keywords)
|
|
|
|
|
:tags (plist-get opt-plist :tags)
|
|
|
|
|
:priority (plist-get opt-plist :priority)
|
|
|
|
|
:footnotes (plist-get opt-plist :footnotes)
|
|
|
|
|
:timestamps (plist-get opt-plist :timestamps)
|
|
|
|
|
:archived-trees
|
|
|
|
|
(plist-get opt-plist :archived-trees)
|
|
|
|
|
:select-tags (plist-get opt-plist :select-tags)
|
|
|
|
|
:exclude-tags (plist-get opt-plist :exclude-tags)
|
|
|
|
|
:add-text
|
|
|
|
|
(plist-get opt-plist :text)
|
|
|
|
|
:LaTeX-fragments
|
|
|
|
|
(plist-get opt-plist :LaTeX-fragments))
|
|
|
|
|
"[\r\n]"))
|
|
|
|
|
table-open type
|
|
|
|
|
table-buffer table-orig-buffer
|
|
|
|
|
ind item-type starter didclose
|
|
|
|
|
rpl path attr desc descp desc1 desc2 link
|
|
|
|
|
snumber fnc item-tag
|
|
|
|
|
footnotes footref-seen
|
|
|
|
|
id-file href
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(org-unmodified
|
|
|
|
|
(remove-text-properties (point-min) (point-max)
|
|
|
|
|
'(:org-license-to-kill t))))
|
|
|
|
|
|
|
|
|
|
(message "Exporting...")
|
|
|
|
|
|
|
|
|
|
(setq org-min-level (org-get-min-level lines level-offset))
|
|
|
|
|
(setq org-last-level org-min-level)
|
|
|
|
|
(org-init-section-numbers)
|
|
|
|
|
|
|
|
|
|
(cond
|
|
|
|
|
((and date (string-match "%" date))
|
|
|
|
|
(setq date (format-time-string date)))
|
|
|
|
|
(date)
|
|
|
|
|
(t (setq date (format-time-string "%Y-%m-%d %T %Z"))))
|
|
|
|
|
|
|
|
|
|
;; Get the language-dependent settings
|
|
|
|
|
(setq lang-words (or (assoc language org-export-language-setup)
|
|
|
|
|
(assoc "en" org-export-language-setup)))
|
|
|
|
|
|
|
|
|
|
;; Switch to the output buffer
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(let ((inhibit-read-only t)) (erase-buffer))
|
|
|
|
|
(fundamental-mode)
|
|
|
|
|
(org-install-letbind)
|
|
|
|
|
|
|
|
|
|
(and (fboundp 'set-buffer-file-coding-system)
|
|
|
|
|
(set-buffer-file-coding-system coding-system-for-write))
|
|
|
|
|
|
|
|
|
|
(let ((case-fold-search nil)
|
|
|
|
|
(org-odd-levels-only odd))
|
|
|
|
|
;; create local variables for all options, to make sure all called
|
|
|
|
|
;; functions get the correct information
|
|
|
|
|
(mapc (lambda (x)
|
|
|
|
|
(set (make-local-variable (nth 2 x))
|
|
|
|
|
(plist-get opt-plist (car x))))
|
|
|
|
|
org-export-plist-vars)
|
|
|
|
|
(setq umax (if arg (prefix-numeric-value arg)
|
|
|
|
|
org-export-headline-levels))
|
|
|
|
|
(setq umax-toc (if (integerp org-export-with-toc)
|
|
|
|
|
(min org-export-with-toc umax)
|
|
|
|
|
umax))
|
|
|
|
|
(unless body-only
|
|
|
|
|
;; File header
|
|
|
|
|
(insert (format
|
|
|
|
|
"%s
|
|
|
|
|
<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"
|
|
|
|
|
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">
|
|
|
|
|
<html xmlns=\"http://www.w3.org/1999/xhtml\"
|
|
|
|
|
lang=\"%s\" xml:lang=\"%s\">
|
|
|
|
|
<head>
|
|
|
|
|
%s
|
|
|
|
|
<title>%s</title>
|
|
|
|
|
<meta http-equiv=\"Content-Type\" content=\"text/html;charset=%s\"/>
|
|
|
|
|
<meta name=\"generator\" content=\"Org-mode\"/>
|
|
|
|
|
<meta name=\"generated\" content=\"%s\"/>
|
|
|
|
|
<meta name=\"author\" content=\"%s\"/>
|
|
|
|
|
<meta name=\"description\" content=\"%s\"/>
|
|
|
|
|
<meta name=\"keywords\" content=\"%s\"/>
|
|
|
|
|
%s
|
|
|
|
|
</head>
|
|
|
|
|
<body>
|
|
|
|
|
<div id=\"content\">
|
|
|
|
|
"
|
|
|
|
|
(format
|
|
|
|
|
(or (and (stringp org-export-html-xml-declaration)
|
|
|
|
|
org-export-html-xml-declaration)
|
|
|
|
|
(cdr (assoc html-extension org-export-html-xml-declaration))
|
|
|
|
|
(cdr (assoc "html" org-export-html-xml-declaration))
|
|
|
|
|
|
|
|
|
|
"")
|
|
|
|
|
(or charset "iso-8859-1"))
|
|
|
|
|
language language
|
|
|
|
|
(if (or link-up link-home)
|
|
|
|
|
(concat
|
|
|
|
|
(format org-export-html-home/up-format
|
|
|
|
|
(or link-up link-home)
|
|
|
|
|
(or link-home link-up))
|
|
|
|
|
"\n")
|
|
|
|
|
"")
|
|
|
|
|
(org-html-expand title)
|
|
|
|
|
(or charset "iso-8859-1")
|
|
|
|
|
date author description keywords
|
|
|
|
|
style))
|
|
|
|
|
|
|
|
|
|
(org-export-html-insert-plist-item opt-plist :preamble opt-plist)
|
|
|
|
|
|
|
|
|
|
(when (plist-get opt-plist :auto-preamble)
|
|
|
|
|
(if title (insert (format org-export-html-title-format
|
|
|
|
|
(org-html-expand title))))))
|
|
|
|
|
|
|
|
|
|
(if (and org-export-with-toc (not body-only))
|
|
|
|
|
(progn
|
|
|
|
|
(push (format "<h%d>%s</h%d>\n"
|
|
|
|
|
org-export-html-toplevel-hlevel
|
|
|
|
|
(nth 3 lang-words)
|
|
|
|
|
org-export-html-toplevel-hlevel)
|
|
|
|
|
thetoc)
|
|
|
|
|
(push "<div id=\"text-table-of-contents\">\n" thetoc)
|
|
|
|
|
(push "<ul>\n<li>" thetoc)
|
|
|
|
|
(setq lines
|
|
|
|
|
(mapcar '(lambda (line)
|
|
|
|
|
(if (string-match org-todo-line-regexp line)
|
|
|
|
|
;; This is a headline
|
|
|
|
|
(progn
|
|
|
|
|
(setq have-headings t)
|
|
|
|
|
(setq level (- (match-end 1) (match-beginning 1)
|
|
|
|
|
level-offset)
|
|
|
|
|
level (org-tr-level level)
|
|
|
|
|
txt (save-match-data
|
|
|
|
|
(org-html-expand
|
|
|
|
|
(org-export-cleanup-toc-line
|
|
|
|
|
(match-string 3 line))))
|
|
|
|
|
todo
|
|
|
|
|
(or (and org-export-mark-todo-in-toc
|
|
|
|
|
(match-beginning 2)
|
|
|
|
|
(not (member (match-string 2 line)
|
|
|
|
|
org-done-keywords)))
|
|
|
|
|
; TODO, not DONE
|
|
|
|
|
(and org-export-mark-todo-in-toc
|
|
|
|
|
(= level umax-toc)
|
|
|
|
|
(org-search-todo-below
|
|
|
|
|
line lines level))))
|
|
|
|
|
(if (string-match
|
|
|
|
|
(org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$") txt)
|
|
|
|
|
(setq txt (replace-match " <span class=\"tag\"> \\1</span>" t nil txt)))
|
|
|
|
|
(if (string-match quote-re0 txt)
|
|
|
|
|
(setq txt (replace-match "" t t txt)))
|
|
|
|
|
(setq snumber (org-section-number level))
|
|
|
|
|
(if org-export-with-section-numbers
|
|
|
|
|
(setq txt (concat snumber " " txt)))
|
|
|
|
|
(if (<= level (max umax umax-toc))
|
|
|
|
|
(setq head-count (+ head-count 1)))
|
|
|
|
|
(if (<= level umax-toc)
|
|
|
|
|
(progn
|
|
|
|
|
(if (> level org-last-level)
|
|
|
|
|
(progn
|
|
|
|
|
(setq cnt (- level org-last-level))
|
|
|
|
|
(while (>= (setq cnt (1- cnt)) 0)
|
|
|
|
|
(push "\n<ul>\n<li>" thetoc))
|
|
|
|
|
(push "\n" thetoc)))
|
|
|
|
|
(if (< level org-last-level)
|
|
|
|
|
(progn
|
|
|
|
|
(setq cnt (- org-last-level level))
|
|
|
|
|
(while (>= (setq cnt (1- cnt)) 0)
|
|
|
|
|
(push "</li>\n</ul>" thetoc))
|
|
|
|
|
(push "\n" thetoc)))
|
|
|
|
|
;; Check for targets
|
|
|
|
|
(while (string-match org-any-target-regexp line)
|
|
|
|
|
(setq line (replace-match
|
|
|
|
|
(concat "@<span class=\"target\">" (match-string 1 line) "@</span> ")
|
|
|
|
|
t t line)))
|
|
|
|
|
(while (string-match "<\\(<\\)+\\|>\\(>\\)+" txt)
|
|
|
|
|
(setq txt (replace-match "" t t txt)))
|
|
|
|
|
(setq href (format "sec-%s" snumber))
|
|
|
|
|
(setq href (or (cdr (assoc href org-export-preferred-target-alist)) href))
|
|
|
|
|
(push
|
|
|
|
|
(format
|
|
|
|
|
(if todo
|
|
|
|
|
"</li>\n<li><a href=\"#%s\"><span class=\"todo\">%s</span></a>"
|
|
|
|
|
"</li>\n<li><a href=\"#%s\">%s</a>")
|
|
|
|
|
href txt) thetoc)
|
|
|
|
|
|
|
|
|
|
(setq org-last-level level))
|
|
|
|
|
)))
|
|
|
|
|
line)
|
|
|
|
|
lines))
|
|
|
|
|
(while (> org-last-level (1- org-min-level))
|
|
|
|
|
(setq org-last-level (1- org-last-level))
|
|
|
|
|
(push "</li>\n</ul>\n" thetoc))
|
|
|
|
|
(push "</div>\n" thetoc)
|
|
|
|
|
(setq thetoc (if have-headings (nreverse thetoc) nil))))
|
|
|
|
|
|
|
|
|
|
(setq head-count 0)
|
|
|
|
|
(org-init-section-numbers)
|
|
|
|
|
|
|
|
|
|
(org-open-par)
|
|
|
|
|
|
|
|
|
|
(while (setq line (pop lines) origline line)
|
|
|
|
|
(catch 'nextline
|
|
|
|
|
|
|
|
|
|
;; end of quote section?
|
|
|
|
|
(when (and inquote (string-match "^\\*+ " line))
|
|
|
|
|
(insert "</pre>\n")
|
|
|
|
|
(org-open-par)
|
|
|
|
|
(setq inquote nil))
|
|
|
|
|
;; inside a quote section?
|
|
|
|
|
(when inquote
|
|
|
|
|
(insert (org-html-protect line) "\n")
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
|
|
|
|
|
;; Fixed-width, verbatim lines (examples)
|
|
|
|
|
(when (and org-export-with-fixed-width
|
|
|
|
|
(string-match "^[ \t]*:\\(\\([ \t]\\|$\\)\\(.*\\)\\)" line))
|
|
|
|
|
(when (not infixed)
|
|
|
|
|
(setq infixed t)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
|
|
|
|
|
(insert "<pre class=\"example\">\n"))
|
|
|
|
|
(insert (org-html-protect (match-string 3 line)) "\n")
|
|
|
|
|
(when (or (not lines)
|
|
|
|
|
(not (string-match "^[ \t]*:\\(\\([ \t]\\|$\\)\\(.*\\)\\)"
|
|
|
|
|
(car lines))))
|
|
|
|
|
(setq infixed nil)
|
|
|
|
|
(insert "</pre>\n")
|
|
|
|
|
(org-open-par))
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
|
|
|
|
|
(org-export-html-close-lists-maybe line)
|
|
|
|
|
|
|
|
|
|
;; Protected HTML
|
|
|
|
|
(when (get-text-property 0 'org-protected line)
|
|
|
|
|
(let (par (ind (get-text-property 0 'original-indentation line)))
|
|
|
|
|
(when (re-search-backward
|
|
|
|
|
"\\(<p>\\)\\([ \t\r\n]*\\)\\=" (- (point) 100) t)
|
|
|
|
|
(setq par (match-string 1))
|
|
|
|
|
(replace-match "\\2\n"))
|
|
|
|
|
(insert line "\n")
|
|
|
|
|
(while (and lines
|
|
|
|
|
(or (= (length (car lines)) 0)
|
|
|
|
|
(not ind)
|
|
|
|
|
(equal ind (get-text-property 0 'original-indentation (car lines))))
|
|
|
|
|
(or (= (length (car lines)) 0)
|
|
|
|
|
(get-text-property 0 'org-protected (car lines))))
|
|
|
|
|
(insert (pop lines) "\n"))
|
|
|
|
|
(and par (insert "<p>\n")))
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
|
|
|
|
|
;; Blockquotes, verse, and center
|
|
|
|
|
(when (equal "ORG-BLOCKQUOTE-START" line)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert "<blockquote>\n")
|
|
|
|
|
(org-open-par)
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
(when (equal "ORG-BLOCKQUOTE-END" line)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert "\n</blockquote>\n")
|
|
|
|
|
(org-open-par)
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
(when (equal "ORG-VERSE-START" line)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert "\n<p class=\"verse\">\n")
|
|
|
|
|
(setq inverse t)
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
(when (equal "ORG-VERSE-END" line)
|
|
|
|
|
(insert "</p>\n")
|
|
|
|
|
(org-open-par)
|
|
|
|
|
(setq inverse nil)
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
(when (equal "ORG-CENTER-START" line)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert "\n<div style=\"text-align: center\">")
|
|
|
|
|
(org-open-par)
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
(when (equal "ORG-CENTER-END" line)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert "\n</div>")
|
|
|
|
|
(org-open-par)
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
(run-hooks 'org-export-html-after-blockquotes-hook)
|
|
|
|
|
(when inverse
|
|
|
|
|
(let ((i (org-get-string-indentation line)))
|
|
|
|
|
(if (> i 0)
|
|
|
|
|
(setq line (concat (mapconcat 'identity
|
|
|
|
|
(make-list (* 2 i) "\\nbsp") "")
|
|
|
|
|
" " (org-trim line))))
|
|
|
|
|
(unless (string-match "\\\\\\\\[ \t]*$" line)
|
|
|
|
|
(setq line (concat line "\\\\")))))
|
|
|
|
|
|
|
|
|
|
;; make targets to anchors
|
|
|
|
|
(while (string-match
|
|
|
|
|
"<<<?\\([^<>]*\\)>>>?\\((INVISIBLE)\\)?[ \t]*\n?" line)
|
|
|
|
|
(cond
|
|
|
|
|
((match-end 2)
|
|
|
|
|
(setq line (replace-match
|
|
|
|
|
(format
|
|
|
|
|
"@<a name=\"%s\" id=\"%s\">@</a>"
|
|
|
|
|
(org-solidify-link-text (match-string 1 line))
|
|
|
|
|
(org-solidify-link-text (match-string 1 line)))
|
|
|
|
|
t t line)))
|
|
|
|
|
((and org-export-with-toc (equal (string-to-char line) ?*))
|
|
|
|
|
;; FIXME: NOT DEPENDENT on TOC?????????????????????
|
|
|
|
|
(setq line (replace-match
|
|
|
|
|
(concat "@<span class=\"target\">" (match-string 1 line) "@</span> ")
|
|
|
|
|
; (concat "@<i>" (match-string 1 line) "@</i> ")
|
|
|
|
|
t t line)))
|
|
|
|
|
(t
|
|
|
|
|
(setq line (replace-match
|
|
|
|
|
(concat "@<a name=\""
|
|
|
|
|
(org-solidify-link-text (match-string 1 line))
|
|
|
|
|
"\" class=\"target\">" (match-string 1 line) "@</a> ")
|
|
|
|
|
t t line)))))
|
|
|
|
|
|
|
|
|
|
(setq line (org-html-handle-time-stamps line))
|
|
|
|
|
|
|
|
|
|
;; replace "&" by "&", "<" and ">" by "<" and ">"
|
|
|
|
|
;; handle @<..> HTML tags (replace "@>..<" by "<..>")
|
|
|
|
|
;; Also handle sub_superscripts and checkboxes
|
|
|
|
|
(or (string-match org-table-hline-regexp line)
|
|
|
|
|
(setq line (org-html-expand line)))
|
|
|
|
|
|
|
|
|
|
;; Format the links
|
|
|
|
|
(setq start 0)
|
|
|
|
|
(while (string-match org-bracket-link-analytic-regexp++ line start)
|
|
|
|
|
(setq start (match-beginning 0))
|
|
|
|
|
(setq path (save-match-data (org-link-unescape
|
|
|
|
|
(match-string 3 line))))
|
|
|
|
|
(setq type (cond
|
|
|
|
|
((match-end 2) (match-string 2 line))
|
|
|
|
|
((save-match-data
|
|
|
|
|
(or (file-name-absolute-p path)
|
|
|
|
|
(string-match "^\\.\\.?/" path)))
|
|
|
|
|
"file")
|
|
|
|
|
(t "internal")))
|
|
|
|
|
(setq path (org-extract-attributes (org-link-unescape path)))
|
|
|
|
|
(setq attr (get-text-property 0 'org-attributes path))
|
|
|
|
|
(setq desc1 (if (match-end 5) (match-string 5 line))
|
|
|
|
|
desc2 (if (match-end 2) (concat type ":" path) path)
|
|
|
|
|
descp (and desc1 (not (equal desc1 desc2)))
|
|
|
|
|
desc (or desc1 desc2))
|
|
|
|
|
;; Make an image out of the description if that is so wanted
|
|
|
|
|
(when (and descp (org-file-image-p
|
|
|
|
|
desc org-export-html-inline-image-extensions))
|
|
|
|
|
(save-match-data
|
|
|
|
|
(if (string-match "^file:" desc)
|
|
|
|
|
(setq desc (substring desc (match-end 0)))))
|
|
|
|
|
(setq desc (org-add-props
|
|
|
|
|
(concat "<img src=\"" desc "\"/>")
|
|
|
|
|
'(org-protected t))))
|
|
|
|
|
;; FIXME: do we need to unescape here somewhere?
|
|
|
|
|
(cond
|
|
|
|
|
((equal type "internal")
|
|
|
|
|
(setq rpl
|
|
|
|
|
(concat
|
|
|
|
|
"<a href=\""
|
|
|
|
|
(if (= (string-to-char path) ?#) "" "#")
|
|
|
|
|
(org-solidify-link-text
|
|
|
|
|
(save-match-data (org-link-unescape path)) nil)
|
|
|
|
|
"\"" attr ">"
|
|
|
|
|
(org-export-html-format-desc desc)
|
|
|
|
|
"</a>")))
|
|
|
|
|
((and (equal type "id")
|
|
|
|
|
(setq id-file (org-id-find-id-file path)))
|
|
|
|
|
;; This is an id: link to another file (if it was the same file,
|
|
|
|
|
;; it would have become an internal link...)
|
|
|
|
|
(save-match-data
|
|
|
|
|
(setq id-file (file-relative-name
|
|
|
|
|
id-file (file-name-directory org-current-export-file)))
|
|
|
|
|
(setq id-file (concat (file-name-sans-extension id-file)
|
|
|
|
|
"." html-extension))
|
|
|
|
|
(setq rpl (concat "<a href=\"" id-file "#"
|
|
|
|
|
(if (org-uuidgen-p path) "ID-")
|
|
|
|
|
path "\""
|
|
|
|
|
attr ">"
|
|
|
|
|
(org-export-html-format-desc desc)
|
|
|
|
|
"</a>"))))
|
|
|
|
|
((member type '("http" "https"))
|
|
|
|
|
;; standard URL, just check if we need to inline an image
|
|
|
|
|
(if (and (or (eq t org-export-html-inline-images)
|
|
|
|
|
(and org-export-html-inline-images (not descp)))
|
|
|
|
|
(org-file-image-p
|
|
|
|
|
path org-export-html-inline-image-extensions))
|
|
|
|
|
(setq rpl (org-export-html-format-image
|
|
|
|
|
(concat type ":" path) org-par-open))
|
|
|
|
|
(setq link (concat type ":" path))
|
|
|
|
|
(setq rpl (concat "<a href=\""
|
|
|
|
|
(org-export-html-format-href link)
|
|
|
|
|
"\"" attr ">"
|
|
|
|
|
(org-export-html-format-desc desc)
|
|
|
|
|
"</a>"))))
|
|
|
|
|
((member type '("ftp" "mailto" "news"))
|
|
|
|
|
;; standard URL
|
|
|
|
|
(setq link (concat type ":" path))
|
|
|
|
|
(setq rpl (concat "<a href=\""
|
|
|
|
|
(org-export-html-format-href link)
|
|
|
|
|
"\"" attr ">"
|
|
|
|
|
(org-export-html-format-desc desc)
|
|
|
|
|
"</a>")))
|
|
|
|
|
|
|
|
|
|
((string= type "coderef")
|
|
|
|
|
(setq rpl (format "<a href=\"#coderef-%s\" class=\"coderef\" onmouseover=\"CodeHighlightOn(this, 'coderef-%s');\" onmouseout=\"CodeHighlightOff(this, 'coderef-%s');\">%s</a>"
|
|
|
|
|
path path path
|
|
|
|
|
(format (org-export-get-coderef-format path (and descp desc))
|
|
|
|
|
(cdr (assoc path org-export-code-refs))))))
|
|
|
|
|
|
|
|
|
|
((functionp (setq fnc (nth 2 (assoc type org-link-protocols))))
|
|
|
|
|
;; The link protocol has a function for format the link
|
|
|
|
|
(setq rpl
|
|
|
|
|
(save-match-data
|
|
|
|
|
(funcall fnc (org-link-unescape path) desc1 'html))))
|
|
|
|
|
|
|
|
|
|
((string= type "file")
|
|
|
|
|
;; FILE link
|
|
|
|
|
(let* ((filename path)
|
|
|
|
|
(abs-p (file-name-absolute-p filename))
|
|
|
|
|
thefile file-is-image-p search)
|
|
|
|
|
(save-match-data
|
|
|
|
|
(if (string-match "::\\(.*\\)" filename)
|
|
|
|
|
(setq search (match-string 1 filename)
|
|
|
|
|
filename (replace-match "" t nil filename)))
|
|
|
|
|
(setq valid
|
|
|
|
|
(if (functionp link-validate)
|
|
|
|
|
(funcall link-validate filename current-dir)
|
|
|
|
|
t))
|
|
|
|
|
(setq file-is-image-p
|
|
|
|
|
(org-file-image-p
|
|
|
|
|
filename org-export-html-inline-image-extensions))
|
|
|
|
|
(setq thefile (if abs-p (expand-file-name filename) filename))
|
|
|
|
|
(when (and org-export-html-link-org-files-as-html
|
|
|
|
|
(string-match "\\.org$" thefile))
|
|
|
|
|
(setq thefile (concat (substring thefile 0
|
|
|
|
|
(match-beginning 0))
|
|
|
|
|
"." html-extension))
|
|
|
|
|
(if (and search
|
|
|
|
|
;; make sure this is can be used as target search
|
|
|
|
|
(not (string-match "^[0-9]*$" search))
|
|
|
|
|
(not (string-match "^\\*" search))
|
|
|
|
|
(not (string-match "^/.*/$" search)))
|
|
|
|
|
(setq thefile (concat thefile "#"
|
|
|
|
|
(org-solidify-link-text
|
|
|
|
|
(org-link-unescape search)))))
|
|
|
|
|
(when (string-match "^file:" desc)
|
|
|
|
|
(setq desc (replace-match "" t t desc))
|
|
|
|
|
(if (string-match "\\.org$" desc)
|
|
|
|
|
(setq desc (replace-match "" t t desc))))))
|
|
|
|
|
(setq rpl (if (and file-is-image-p
|
|
|
|
|
(or (eq t org-export-html-inline-images)
|
|
|
|
|
(and org-export-html-inline-images
|
|
|
|
|
(not descp))))
|
|
|
|
|
(progn
|
|
|
|
|
(message "image %s %s" thefile org-par-open)
|
|
|
|
|
(org-export-html-format-image thefile org-par-open))
|
|
|
|
|
(concat "<a href=\"" thefile "\"" attr ">"
|
|
|
|
|
(org-export-html-format-desc desc)
|
|
|
|
|
"</a>")))
|
|
|
|
|
(if (not valid) (setq rpl desc))))
|
|
|
|
|
|
|
|
|
|
(t
|
|
|
|
|
;; just publish the path, as default
|
|
|
|
|
(setq rpl (concat "<i><" type ":"
|
|
|
|
|
(save-match-data (org-link-unescape path))
|
|
|
|
|
"></i>"))))
|
|
|
|
|
(setq line (replace-match rpl t t line)
|
|
|
|
|
start (+ start (length rpl))))
|
|
|
|
|
|
|
|
|
|
;; TODO items
|
|
|
|
|
(if (and (string-match org-todo-line-regexp line)
|
|
|
|
|
(match-beginning 2))
|
|
|
|
|
|
|
|
|
|
(setq line
|
|
|
|
|
(concat (substring line 0 (match-beginning 2))
|
|
|
|
|
"<span class=\""
|
|
|
|
|
(if (member (match-string 2 line)
|
|
|
|
|
org-done-keywords)
|
|
|
|
|
"done" "todo")
|
|
|
|
|
" " (match-string 2 line)
|
|
|
|
|
"\"> " (org-export-html-get-todo-kwd-class-name
|
|
|
|
|
(match-string 2 line))
|
|
|
|
|
"</span>" (substring line (match-end 2)))))
|
|
|
|
|
|
|
|
|
|
;; Does this contain a reference to a footnote?
|
|
|
|
|
(when org-export-with-footnotes
|
|
|
|
|
(setq start 0)
|
|
|
|
|
(while (string-match "\\([^* \t].*\\)?\\[\\([0-9]+\\)\\]" line start)
|
|
|
|
|
(if (get-text-property (match-beginning 2) 'org-protected line)
|
|
|
|
|
(setq start (match-end 2))
|
|
|
|
|
(let ((n (match-string 2 line)) extra a)
|
|
|
|
|
(if (setq a (assoc n footref-seen))
|
|
|
|
|
(progn
|
|
|
|
|
(setcdr a (1+ (cdr a)))
|
|
|
|
|
(setq extra (format ".%d" (cdr a))))
|
|
|
|
|
(setq extra "")
|
|
|
|
|
(push (cons n 1) footref-seen))
|
|
|
|
|
(setq line
|
|
|
|
|
(replace-match
|
|
|
|
|
(format
|
|
|
|
|
(concat (if (match-string 1 line) "%s" "")
|
|
|
|
|
(format org-export-html-footnote-format
|
|
|
|
|
"<a class=\"footref\" name=\"fnr.%s%s\" href=\"#fn.%s\">%s</a>"))
|
|
|
|
|
(match-string 1 line) n extra n n)
|
|
|
|
|
t t line))))))
|
|
|
|
|
|
|
|
|
|
(cond
|
|
|
|
|
((string-match "^\\(\\*+\\)[ \t]+\\(.*\\)" line)
|
|
|
|
|
;; This is a headline
|
|
|
|
|
(setq level (org-tr-level (- (match-end 1) (match-beginning 1)
|
|
|
|
|
level-offset))
|
|
|
|
|
txt (match-string 2 line))
|
|
|
|
|
(if (string-match quote-re0 txt)
|
|
|
|
|
(setq txt (replace-match "" t t txt)))
|
|
|
|
|
(if (<= level (max umax umax-toc))
|
|
|
|
|
(setq head-count (+ head-count 1)))
|
|
|
|
|
(when in-local-list
|
|
|
|
|
;; Close any local lists before inserting a new header line
|
|
|
|
|
(while local-list-type
|
|
|
|
|
(org-close-li (car local-list-type))
|
|
|
|
|
(insert (format "</%sl>\n" (car local-list-type)))
|
|
|
|
|
(pop local-list-type))
|
|
|
|
|
(setq local-list-indent nil
|
|
|
|
|
in-local-list nil))
|
|
|
|
|
(setq first-heading-pos (or first-heading-pos (point)))
|
|
|
|
|
(org-html-level-start level txt umax
|
|
|
|
|
(and org-export-with-toc (<= level umax))
|
|
|
|
|
head-count)
|
|
|
|
|
|
|
|
|
|
;; QUOTES
|
|
|
|
|
(when (string-match quote-re line)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert "<pre>")
|
|
|
|
|
(setq inquote t)))
|
|
|
|
|
|
|
|
|
|
((string-match "^[ \t]*- __+[ \t]*$" line)
|
|
|
|
|
;; Explicit list closure
|
|
|
|
|
(when local-list-type
|
|
|
|
|
(let ((ind (org-get-indentation line)))
|
|
|
|
|
(while (and local-list-indent
|
|
|
|
|
(<= ind (car local-list-indent)))
|
|
|
|
|
(org-close-li (car local-list-type))
|
|
|
|
|
(insert (format "</%sl>\n" (car local-list-type)))
|
|
|
|
|
(pop local-list-type)
|
|
|
|
|
(pop local-list-indent))
|
|
|
|
|
(or local-list-indent (setq in-local-list nil))))
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
|
|
|
|
|
((and org-export-with-tables
|
|
|
|
|
(string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)" line))
|
|
|
|
|
(when (not table-open)
|
|
|
|
|
;; New table starts
|
|
|
|
|
(setq table-open t table-buffer nil table-orig-buffer nil))
|
|
|
|
|
|
|
|
|
|
;; Accumulate lines
|
|
|
|
|
(setq table-buffer (cons line table-buffer)
|
|
|
|
|
table-orig-buffer (cons origline table-orig-buffer))
|
|
|
|
|
(when (or (not lines)
|
|
|
|
|
(not (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)"
|
|
|
|
|
(car lines))))
|
|
|
|
|
(setq table-open nil
|
|
|
|
|
table-buffer (nreverse table-buffer)
|
|
|
|
|
table-orig-buffer (nreverse table-orig-buffer))
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert (org-format-table-html table-buffer table-orig-buffer))))
|
|
|
|
|
(t
|
|
|
|
|
;; Normal lines
|
|
|
|
|
(when (string-match
|
|
|
|
|
(cond
|
|
|
|
|
((eq llt t) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+[.)]\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
|
|
|
|
|
((= llt ?.) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+\\.\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
|
|
|
|
|
((= llt ?\)) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+)\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
|
|
|
|
|
(t (error "Invalid value of `org-plain-list-ordered-item-terminator'")))
|
|
|
|
|
line)
|
|
|
|
|
(setq ind (or (get-text-property 0 'original-indentation line)
|
|
|
|
|
(org-get-string-indentation line))
|
|
|
|
|
item-type (if (match-beginning 4) "o" "u")
|
|
|
|
|
starter (if (match-beginning 2)
|
|
|
|
|
(substring (match-string 2 line) 0 -1))
|
|
|
|
|
line (substring line (match-beginning 5))
|
|
|
|
|
item-tag nil)
|
|
|
|
|
(if (and starter (string-match "\\(.*?\\) ::[ \t]*" line))
|
|
|
|
|
(setq item-type "d"
|
|
|
|
|
item-tag (match-string 1 line)
|
|
|
|
|
line (substring line (match-end 0))))
|
|
|
|
|
(when (and (not (equal item-type "d"))
|
|
|
|
|
(not (string-match "[^ \t]" line)))
|
|
|
|
|
;; empty line. Pretend indentation is large.
|
|
|
|
|
(setq ind (if org-empty-line-terminates-plain-lists
|
|
|
|
|
0
|
|
|
|
|
(1+ (or (car local-list-indent) 1)))))
|
|
|
|
|
(setq didclose nil)
|
|
|
|
|
(while (and in-local-list
|
|
|
|
|
(or (and (= ind (car local-list-indent))
|
|
|
|
|
(not starter))
|
|
|
|
|
(< ind (car local-list-indent))))
|
|
|
|
|
(setq didclose t)
|
|
|
|
|
(org-close-li (car local-list-type))
|
|
|
|
|
(insert (format "</%sl>\n" (car local-list-type)))
|
|
|
|
|
(pop local-list-type) (pop local-list-indent)
|
|
|
|
|
(setq in-local-list local-list-indent))
|
|
|
|
|
(cond
|
|
|
|
|
((and starter
|
|
|
|
|
(or (not in-local-list)
|
|
|
|
|
(> ind (car local-list-indent))))
|
|
|
|
|
;; Start new (level of) list
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert (cond
|
|
|
|
|
((equal item-type "u") "<ul>\n<li>\n")
|
|
|
|
|
((equal item-type "o") "<ol>\n<li>\n")
|
|
|
|
|
((equal item-type "d")
|
|
|
|
|
(format "<dl>\n<dt>%s</dt><dd>\n" item-tag))))
|
|
|
|
|
(push item-type local-list-type)
|
|
|
|
|
(push ind local-list-indent)
|
|
|
|
|
(setq in-local-list t))
|
|
|
|
|
(starter
|
|
|
|
|
;; continue current list
|
|
|
|
|
(org-close-li (car local-list-type))
|
|
|
|
|
(insert (cond
|
|
|
|
|
((equal (car local-list-type) "d")
|
|
|
|
|
(format "<dt>%s</dt><dd>\n" (or item-tag "???")))
|
|
|
|
|
(t "<li>\n"))))
|
|
|
|
|
(didclose
|
|
|
|
|
;; we did close a list, normal text follows: need <p>
|
|
|
|
|
(org-open-par)))
|
|
|
|
|
(if (string-match "^[ \t]*\\[\\([X ]\\)\\]" line)
|
|
|
|
|
(setq line
|
|
|
|
|
(replace-match
|
|
|
|
|
(if (equal (match-string 1 line) "X")
|
|
|
|
|
"<b>[X]</b>"
|
|
|
|
|
"<b>[<span style=\"visibility:hidden;\">X</span>]</b>")
|
|
|
|
|
t t line))))
|
|
|
|
|
|
|
|
|
|
;; Horizontal line
|
|
|
|
|
(when (string-match "^[ \t]*-\\{5,\\}[ \t]*$" line)
|
|
|
|
|
(if org-par-open
|
|
|
|
|
(insert "\n</p>\n<hr/>\n<p>\n")
|
|
|
|
|
(insert "\n<hr/>\n"))
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
|
|
|
|
|
;; Empty lines start a new paragraph. If hand-formatted lists
|
|
|
|
|
;; are not fully interpreted, lines starting with "-", "+", "*"
|
|
|
|
|
;; also start a new paragraph.
|
|
|
|
|
(if (string-match "^ [-+*]-\\|^[ \t]*$" line) (org-open-par))
|
|
|
|
|
|
|
|
|
|
;; Is this the start of a footnote?
|
|
|
|
|
(when org-export-with-footnotes
|
|
|
|
|
(when (and (boundp 'footnote-section-tag-regexp)
|
|
|
|
|
(string-match (concat "^" footnote-section-tag-regexp)
|
|
|
|
|
line))
|
|
|
|
|
;; ignore this line
|
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
(when (string-match "^[ \t]*\\[\\([0-9]+\\)\\]" line)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(let ((n (match-string 1 line)))
|
|
|
|
|
(setq org-par-open t
|
|
|
|
|
line (replace-match
|
|
|
|
|
(concat "<p class=\"footnote\">"
|
|
|
|
|
(format org-export-html-footnote-format
|
|
|
|
|
"<a class=\"footnum\" name=\"fn.%s\" href=\"#fnr.%s\">%s</a>"
|
|
|
|
|
n n n) t t line))))))
|
|
|
|
|
;; Check if the line break needs to be conserved
|
|
|
|
|
(cond
|
|
|
|
|
((string-match "\\\\\\\\[ \t]*$" line)
|
|
|
|
|
(setq line (replace-match "<br/>" t t line)))
|
|
|
|
|
(org-export-preserve-breaks
|
|
|
|
|
(setq line (concat line "<br/>"))))
|
|
|
|
|
|
|
|
|
|
;; Check if a paragraph should be started
|
|
|
|
|
(let ((start 0))
|
|
|
|
|
(while (and org-par-open
|
|
|
|
|
(string-match "\\\\par\\>" line start))
|
|
|
|
|
;; Leave a space in the </p> so that the footnote matcher
|
|
|
|
|
;; does not see this.
|
|
|
|
|
(if (not (get-text-property (match-beginning 0)
|
|
|
|
|
'org-protected line))
|
|
|
|
|
(setq line (replace-match "</p ><p >" t t line)))
|
|
|
|
|
(setq start (match-end 0))))
|
|
|
|
|
|
|
|
|
|
(insert line "\n")))))
|
|
|
|
|
|
|
|
|
|
;; Properly close all local lists and other lists
|
|
|
|
|
(when inquote
|
|
|
|
|
(insert "</pre>\n")
|
|
|
|
|
(org-open-par))
|
|
|
|
|
(when in-local-list
|
|
|
|
|
;; Close any local lists before inserting a new header line
|
|
|
|
|
(while local-list-type
|
|
|
|
|
(org-close-li (car local-list-type))
|
|
|
|
|
(insert (format "</%sl>\n" (car local-list-type)))
|
|
|
|
|
(pop local-list-type))
|
|
|
|
|
(setq local-list-indent nil
|
|
|
|
|
in-local-list nil))
|
|
|
|
|
(org-html-level-start 1 nil umax
|
|
|
|
|
(and org-export-with-toc (<= level umax))
|
|
|
|
|
head-count)
|
|
|
|
|
;; the </div> to close the last text-... div.
|
|
|
|
|
(when (and (> umax 0) first-heading-pos) (insert "</div>\n"))
|
|
|
|
|
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward "<p class=\"footnote\">[^\000]*?\\(</p>\\|\\'\\)" nil t)
|
|
|
|
|
(push (match-string 0) footnotes)
|
|
|
|
|
(replace-match "" t t)))
|
|
|
|
|
(when footnotes
|
|
|
|
|
(insert (format org-export-html-footnotes-section
|
|
|
|
|
(nth 4 lang-words)
|
|
|
|
|
(mapconcat 'identity (nreverse footnotes) "\n"))
|
|
|
|
|
"\n"))
|
|
|
|
|
(let ((bib (org-export-html-get-bibliography)))
|
|
|
|
|
(when bib
|
|
|
|
|
(insert "\n" bib "\n")))
|
|
|
|
|
(unless body-only
|
|
|
|
|
(when (plist-get opt-plist :auto-postamble)
|
|
|
|
|
(insert "<div id=\"postamble\">\n")
|
|
|
|
|
(when (and org-export-author-info author)
|
|
|
|
|
(insert "<p class=\"author\"> "
|
|
|
|
|
(nth 1 lang-words) ": " author "\n")
|
|
|
|
|
(when email
|
|
|
|
|
(if (listp (split-string email ",+ *"))
|
|
|
|
|
(mapc (lambda(e)
|
|
|
|
|
(insert "<a href=\"mailto:" e "\"><"
|
|
|
|
|
e "></a>\n"))
|
|
|
|
|
(split-string email ",+ *"))
|
|
|
|
|
(insert "<a href=\"mailto:" email "\"><"
|
|
|
|
|
email "></a>\n")))
|
|
|
|
|
(insert "</p>\n"))
|
|
|
|
|
(when (and date org-export-time-stamp-file)
|
|
|
|
|
(insert "<p class=\"date\"> "
|
|
|
|
|
(nth 2 lang-words) ": "
|
|
|
|
|
date "</p>\n"))
|
|
|
|
|
(when org-export-creator-info
|
|
|
|
|
(insert (format "<p class=\"creator\">HTML generated by org-mode %s in emacs %s</p>\n"
|
|
|
|
|
org-version emacs-major-version)))
|
|
|
|
|
(when org-export-html-validation-link
|
|
|
|
|
(insert org-export-html-validation-link "\n"))
|
|
|
|
|
(insert "</div>"))
|
|
|
|
|
|
|
|
|
|
(if org-export-html-with-timestamp
|
|
|
|
|
(insert org-export-html-html-helper-timestamp))
|
|
|
|
|
(org-export-html-insert-plist-item opt-plist :postamble opt-plist)
|
|
|
|
|
(insert "\n</div>\n</body>\n</html>\n"))
|
|
|
|
|
|
|
|
|
|
(unless (plist-get opt-plist :buffer-will-be-killed)
|
|
|
|
|
(normal-mode)
|
2009-08-28 17:02:53 +00:00
|
|
|
(if (eq major-mode (default-value 'major-mode)) (html-mode)))
|
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-create-formula-image): Remove the -E option for
dvipng.
* org-exp.el (org-default-export-plist): Respect #+BIND.
(org-export-confirm-letbind): New function.
* org.el (org-paste-subtree): Test the kill ring entry if it is
going to be used.
(org-copy-subtree): Use `org-forward-same-level'.
(org-forward-same-level): Respect the `invisibe-ok' arg for
back-to-heading.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-table-map-tables): Make sure cursor is back at table
beginning after funcall.
* org-agenda.el (org-agenda-bulk-action): Make sure parents are
handled before children, and do not error if an entry is not
found, probably because it hase been remove when the parent was
archived or refiled.
* org.el (org-ido-completing-read): Accept straight lists for
completion as well as alists.
* org-timer.el (org-timer-cancel-timers): Renamed from
`org-timer-cancel-timers'.
* org.el (org-cycle-internal-local): Fix problem with finding next
invisible line.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-list-send-list): Call
`org-list-goto-true-beginning' instead of
`org-list-find-true-beginning', which does not exist.
* org-timer.el (org-timer-reset-timers): Use `mapc'.
(org-timer-set-timer): Do not assign to heading.
* org-id.el (org-id-open): Quote function name.
* org-macs.el (org-unmodified): Turn off recording undo
information while running inside the macro.
* org-table.el (org-table-export): Also work in file-less
buffers.
* org.el (org-startup-indented): New option.
(org-startup-options): Add new options indent and noindent.
(org-unfontify-region): Remove line-prefix and wrap-prefix
properties.
(org-after-demote-entry-hook, org-after-promote-entry-hook): New
hooks.
(org-promote, org-demote): Run the new hooks.
* org-table.el (org-table-align): Replace leading \n as well.
* org-exp.el (org-export-push-to-kill-ring): Remove `line-prefix'
and `line-wrap' text properties.
* org-compat.el (org-kill-new): New function.
* org-agenda.el (org-format-agenda-item): Remove `line-prefix' and
`line-wrap' text properties.
* org-indent.el: New file.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-provide-todo-statistics): Tweak docstring.
* org-id.el (org-id-open): Honor `org-link-frame-setup'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-as-org): Insert the "-source" string
before the extension.
* org.el (org-read-date): Make sure the calendar is in the current
frame.
(org-set-emph-re): Remove the ? from the post-match.
(org-emphasis-regexp-components): Add backslash to the
postmatch class.
(org-set-font-lock-defaults): Write \n instead of \xa, and make it
optional so that also lines at the end of the buffers will still
be matched as headlines.
* org-table.el (org-table-error-on-row-ref-crossing-hline):
Variable made obsolete.
(org-table-relative-ref-may-cross-hline): New option.
(org-table-find-row-type): Honow the new option
`org-table-relative-ref-may-cross-hline'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-cut-region, org-table-copy-region): Work
on single field if no active region.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Only insert title
if one is defined.
* org.el (org-make-options-regexp): Allow empty values.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-cycle-internal-local): Improved version of finding
next visible line.
(org-cycle-hide-drawers): Only hide drawers if this is really
necessary.
(outline-end-of-subtree): Make `outline-end-of-subtree' use the
org-version of this function in Org-mode. We use advice to
implement this change, so that future changes to this function in
outline.el wil be handled properly.
(org-forward-same-level, org-backward-same-level): New commands.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-remove-empty-overlays-at)
(org-clean-visibility-after-subtree-move): New functons.
(org-move-subtree-down): Simplify cleanup of display.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-mac-message.el (org-mac-message-get-links): Improve
docstring. Make argument SELECT-OR-FLAGGED optional, default to
"s". Fix the return value.
(org-mac-message-insert-flagged): Simplify.
* org.el (org-refile-get-location): Tamper with refile history o
that history contains compete matches instead of the entered
string.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-store-link): Never store a link to an inline task.
* org-footnote.el (org-footnote-goto-local-insertion-point): Skip
inline tasks when positioning footnotes.
* org.el (org-refile): Remove the END line when archiving an
inline task that does have an END line.
* org-archive.el (org-archive-subtree): Remove the END line when
archiving an inline task that does have an END line.
* org-macs.el (org-with-limited-levels): New macro.
(org-get-limited-outline-regexp): New function.
* org-exp.el (org-export-format-source-code-or-example): Fix bug
that did not enumerate first line.
(org-export-mark-radio-links): Skip matches in links.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-activate-plain-links): Make single-match.
(org-adapt-indentation): Fix docstring.
* org-macs.el (org-unmodified): Turn of modification hooks while
running this macro.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-adapt-indentation): Slightly improve the docstring.
(org-occur): Sends an error when the user inputs an empty string.
(org-priority): Bugfix: the tag alignement should happen within
save-excursion.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-make-link-regexps): Don't exclude parentheses from
`org-plain-link-re'
(org-cycle-internal-local): When locally cycling, switch directly
from CHILDREN to FOLDED if there is no subtree
(org-cycle): Update the docstring to document the new behavior of
`org-cycle-internal-local'.
2009-08-06 Nicolas Goaziou <n.goaziou@neuf.fr> (tiny change)
* org-clock.el (org-clock-in): Bugfix: recognize timestamps with
an abbreviated format for days.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-protocol.el (org-protocol-default-template-key): New
option.
* org.el (org-refile): Bugfix: save-excursion before reading the
refile target, otherwise cursor moves might confuse `org-refile'.
* org.el (org-toggle-heading): Bugfix: correctly convert list
items before the first headline.
* org.el (org-provide-todo-statistics): Allow a list of TODO
keywords to compute statistics against headlines containing a
keyword from this list.
(org-update-parent-todo-statistics): Possibly use the new allowed
value of `org-provide-todo-statistics'.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-timer.el: Add autoload cookie.
* org.el (org-occur-link-in-agenda-files): New function.
* org-timer.el (org-timer-last-timer): New variable.
* org-agenda.el (org-agenda-mode-map): New key for
org-timer-set-timer called from the agenda.
* org.el (org-mode-map): New key for org-timer-set-timer.
* org-timer.el (org-timer-reset-timers)
(org-timer-show-remaining-time, org-timer-set-timer): New
functions.
* org-clock.el (org-show-notification): Update the docstring.
* org.el (org-provide-todo-statistics): Allow new value
'all-headlines for this option, which includes entries with no
TODO keywords in the todo statistics.
(org-update-parent-todo-statistics): Possibly use the new
'all-headline value from `org-provide-todo-statistics'.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-clock.el (org-dblock-write:clocktable): Add a new option
:timestamp which allows display of timestamps in clock reports.
* org.el (org-mode-map): Define new key `C-c C-*': convert a plain
list to a subtree, preserving the structure of the list.
(org-set-emph-re): Make the last element optional in the regexp.
This regexp now matches an emphasized string at the end of a line.
* org-list.el (org-list-goto-true-beginning)
(org-list-make-subtree, org-list-make-subtrees): New functions.
* org.el (org-eval-in-calendar): Select the right frame.
(org-save-frame-excursion): Remove this macro.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-list.el (org-list-beginning-re): Bugfix: don't use * when
trying to find the beginning of a list.
* org-exp.el (org-get-file-contents): Use a new argument: markup.
When present, tell org-get-file-contents not to protect org-like
lines.
* org-id.el (org-id-uuid-program): New option to set the name of
the uuidgen program.
(org-id-method): Use `org-id-uuid-program'.
(org-id-new): Use `org-id-uuid-program'.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-exp.el (org-export-number-lines): Allow whitespace in code
references. Allow the -r switch to remove the references in the
source code even when the lines are not numbered: the labels can
be explicit enough.
* org.el (org-fontify-whole-heading-line): New option.
(org-set-font-lock-defaults): Use the new option.
* org-clock.el (org-show-notification-handler): New option.
(org-show-notification): Use the new option.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-eval-in-calendar): Fix a bug about calendar
navigation when `calendar-setup' value is 'calendar-only.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (orgstruct++-mode): Fix typo in docstring.
(org-insert-link): Clean up: (or (...)) => (...)
(org-insert-link): Use TAB for stored links completion.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-get-refile-targets): Fix bug: don't ignore case when
building the list of targets.
* org-remember.el (org-remember-delete-empty-lines-at-end): New
option.
(org-remember-handler): Use the new option.
2009-08-06 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-tags-sort-function): New option for sorting tags.
(org-set-tags): Use the new option to sort tags.
* org-plot.el (org-plot/gnuplot): Run with an idle timer to avoid
premature deletion of the data when using org-plot in a script.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org-clock.el (org-clock-in-prepare-hook): New hook.
(org-clock-in): Use this new hook.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-special-ctrl-a/e): Explicitely bind the value
'reversed for this option to the "true line boundary first"
behavior.
(org-tags-match-list-sublevels): Document the 'indented value for
this variable.
* org-latex.el (org-export-latex-first-lines): Fix problem with
publishing the region.
* org-exp.el (org-export-format-source-code-or-example): Fix
bad line numbering when exporting examples in HTML.
2009-08-06 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-format-time-period): Formats a time in
fractional days as days, hours, mins, seconds.
(org-columns-display-here): Add special handling for SINCE and
SINCE_IA to format for display.
* org.el (org-time-since): Add a function to get the time since an
org timestamp.
(org-entry-properties): Add two new special properties: SINCE and
SINCE_IA. These give the time since any active or inactive
timestamp in an entry.
(org-special-properties): Add SINCE, SINCE_IA.
(org-tags-sort-function): Add custom declaration for tags
sorting function.
(org-set-tags): Sort tags if org-tags-sort-function is set
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-goto): Find hidden headlines as well.
* org.el (org-narrow-to-subtree): Find hidden headlines as well.
* org-plot.el (org-plot/add-options-to-plist): Add timeind
option.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-remove-all-timestamps): New function.
(org-publish-all): Remove all timestamp files if `org-publish-all'
is called with a prefix argument.
* org-list.el (org-indent-item): Fix typo.
(org-item-indent-positions): Normalize ordered bullet.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-macs.el (org-set-local): Make a local variable, do not make
the variable buffer-local!
* org-latex.el (org-export-as-latex): Call `org-install-letbind'.
* org-exp.el (org-infile-export-plist): Read BIND lines.
(org-install-letbind): New function.
(org-export-as-org, org-export-preprocess-string): Call
`org-install-letbind'.
* org-list.el (org-list-demote-modify-bullet): New option.
(org-first-list-item-p): Save point.
(org-fix-bullet-type): New optional argument FORCE-BULLET.
(org-indent-item): Honor `org-list-demote-modify-bullet'.
(org-item-indent-positions): Return bullet types along with
indentation.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-show-entry): Hide drawers.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-auto-adjust): New option.
(org-footnote-auto-adjust-maybe): New function.
(org-footnote-new, org-footnote-delete): Call
`org-footnote-auto-adjust-maybe'.
* org.el (org-startup-options): Add new footnote-related
keywords.
* org-publish.el (org-publish-timestamp-filename): Additional
arguments PUB-DIR and PUB-FUNC, which are included in the hash.
(org-publish-needed-p): Additional arguments PUB-DIR PUB-FUNC
TRUE-PUB-DIR. Pass them through to
`org-publish-timestamp-filename'.
(org-publish-update-timestamp): Additional arguments PUB-DIR and
PUB-FUNC, which are included in the hash.
(org-publish-file): Delay timestamp test until the publishing
function is known.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-bulk-action): Add scheduling and
setting the deadline.
* org.el (org-read-date-final-answer): New variable.
(org-read-date): Store the final answer string, including the date
from the calendar, for reuse by agenda bulk commands.
* org-publish.el (org-publish-attachment): Fix publishing of
attachments.
* org-latex.el (org-export-latex-quotation-marks): Fix export of
quotation makrs in parenthesis.
(org-remove-initial-hash): New function.
(org-export-latex-preprocess): Fix bug with infinite loop if
environment is not properly closed.
* org-table.el (org-table-get-remote-range): Find #+TBLNAME also
when indented.
* org.el (org-fontify-meta-lines-and-blocks): Make #+TBLNAME
highlight also when indented.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-renumber-fn:N): New command.
(org-footnote-action): Offer renumbering.
* org.el (org-cycle): Honor the `integrate' value of
org-cycle-include-plain-lists'.
* org-list.el (org-cycle-include-plain-lists): New allowed value
`internal'. Improve the docstring.
* org.el (org-set-autofill-regexps): Improve the paragraph-start
regexp to work better with LaTeX commands.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-inline-image-extensions): Add ps
and eps extensions.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-write-agenda): Make sure org-icalendar is
loaded.
* org.el (org-map-entries): No longer force
`org-tags-match-list-sublevels' to t during a todo-only tags
search.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-low-levels): Allow user-defined
environment.
(org-export-latex-subcontent): Handle user-defined environment.
* org-agenda.el (org-agenda-view-mode-dispatch): Add more keys to
the View dispatcher.
* org.el (org-hide-block-toggle): Use `org-make-overlay' instead of
`make-overlay'.
* org-latex.el (org-export-as-pdf): Protect match data during call
to shell-quote-argument.
* org-agenda.el (org-agenda-mode-map): Modify bulk action keys.
(org-agenda-view-mode-dispatch): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-mode): Reset list of marks.
(org-agenda-mode-map): Define new keys for refile and bulk action.
(org-agenda-menu): Add menu itesm for refile and bulk action.
(org-agenda-refile): New function.
(org-agenda-set-tags): Optional arguments TAG and ONOFF.
(org-agenda-marked-entries): New variable.
(org-agenda-bulk-select, org-agenda-remove-bulk-action-overlays)
(org-agenda-remove-all-bulk-action-marks)
(org-agenda-bulk-action): New functions/commands.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-get-file-contents): Protect org-like lines in
included files.
(org-export-format-source-code-or-example): Remove newlines.
* org-latex.el (org-export-latex-links): Check for no-description
marking.
* org-exp.el (org-export-preprocess-apply-macros): Switch macro
argument separator back to comma.
(org-export-normalize-links): Mark links without description.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-infile-export-plist): Fix bug in macro
processing.
* org-agenda.el (org-agenda-clock-out): Update line after clocking
out.
(org-agenda-highlight-todo): Fix bug with highlighting.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-font-lock-defaults): Adapt formatting to capture
new alignment strings.
* org-table.el (orgtbl-self-insert-command): Add yas/expand to
command list.
(org-table-align): Check for forced align type.
* org.el (org-self-insert-command): Add yas/expand to command
list.
* org-clock.el (org-clock-in-hook): New hook.
(org-clock-in): Run `org-clock-in-hook.
(org-clock-out-hook): New hook.
(org-clock-out): Run `org-clock-out-hook.
(org-clock-cancel-hook): New hook.
(org-clock-cancel): Run `org-clock-cancel-hook.
(org-clock-goto-hook): New hook.
(org-clock-goto): Run `org-clock-goto-hook.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-store-link): Better default description for link to
Org-mode headline.
* org-exp.el (org-export-generic): Autoload the generic exporter
function.
(org-export): Implement the `g' key for the generic exporter.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (orgtbl-setup): Add a binding for `S-iso-lefttab',
and for zbacktab'.
* org-exp.el (org-infile-export-plist): Get macros also from
#+SETUPFILE.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-colview.el (org-columns-capture-view): Protect vertical bars
in column values.
(org-columns-capture-view): Exclude comment and archived trees.
* org-colview-xemacs.el (org-columns-capture-view): Protect
vertical bars in column values.
(org-columns-capture-view): Exclude comment and archived trees.
* org.el (org-quote-vert): New function.
* org-latex.el (org-export-latex-verbatim-wrap): New option.
* org-exp.el (org-export-format-source-code-or-example): Use
`org-export-latex-verbatim-wrap'.
* org.el (org-clone-subtree-with-time-shift): Also shift inactive
time stamps.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp-blocks.el: New file.
* org-remember.el (org-remember-templates): Allow the headline
element to be a function.
(org-remember-apply-template): If the headline is a function, call
it to get the true function.
* org-clock.el (org-clock-menu): New function.
(org-clock-update-mode-line): Update help string.
(org-clock-modify-effort-estimate): New function.
(org-clock-mark-default-task): New function.
* org.el (org-hh:mm-string-to-minutes): Also take just a number of
minutes as input.
(org-org-menu): Add new clocking stuff.
(org-clock-is-active): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-non-existing-files): Improve docstring.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-icalendar-include-bbdb-anniversaries): New
option.
(org-export-icalendar): Call `org-bbdb-anniv-export-ical'.
* org-bbdb.el (org-bbdb-anniv-export-ical): New function.
* org-list.el (org-get-checkbox-statistics-face): Use the new
faces.
* org-faces.el (org-checkbox-statistics-todo)
(org-checkbox-statistics-done): New faces.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-use-verb): New variable.
(org-export-latex-emph-format): Prefer \texttt over \verb when
org-export-latex-use-verb is set.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-handler): Abort remember if the
buffer is empty.
* org-exp.el (org-export-format-source-code-or-example): Run
`org-src-mode-hook'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-indent-line-function): Fix indentation of +#end lines.
2009-08-06 Tassilo Horn <tassilo@member.fsf.org>
* org-gnus.el (org-gnus-store-link): Require message.el in
org-gnus-store-link.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el: New file, split out of org.el
* org-macs.el (org-replace-match-keep-properties): New function.
* org-exp.el (org-export-mark-blockquote-verse-center): Better
preprocessing of center and quote and verse blocks.
* org-list.el (org-list-end): Respect the stored "original"
indentation when determining the end of the list.
* org-exp.el (org-export-replace-src-segments-and-examples):
Remember indentation correctly.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-update-mode-line): Apply face
org-mode-line-clock.
* org-faces.el (org-mode-line-clock): New face.
2009-08-06 Tassilo Horn <tassilo@member.fsf.org>
* org-gnus.el (org-gnus-store-link): Fix bug where
`org-gnus-store-link' used wrong subject when called in an article
buffer. Patch provided by fengli AT gmail DOT com.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Remember
the original indentation of source code snippets and examples.
* org-latex.el (org-export-as-latex): Relocate the table of
contents.
* org.el (org-ctrl-c-ctrl-c): Update clock lines.
* org-agenda.el (org-run-agenda-series): Scope global options also
when creating the agenda buffer.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-adapt-indentation): Improve documentation.
(org-insert-property-drawer): Respect org-adapt-indentation when
inserting the drawer.
(org-remove-flyspell-overlays-in): New function.
(org-do-emphasis-faces, org-activate-plain-links)
(org-activate-code, org-fontify-meta-lines-and-blocks)
(org-activate-angle-links, org-activate-footnote-links)
(org-activate-bracket-links, org-activate-dates)
(org-activate-target-links, org-activate-tags): Remove flyspell
overlays.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-edit-src-save): New function.
* org-clock.el (org-clock-out-switch-to-state): New option.
(org-clock-out): Honor `org-clock-out-switch-to-state'.
* org-compat.el (org-compatible-face): Improve macro.
* org.el (org-global-properties-fixed): Add default for
CLOCK_MODELINE_TOTAL.
* org-clock.el (org-clock-sum): Accept lists and strigs as tstart
andd tend.
(org-clock-sum-current-item): Optional argument TSTART, pass it to
org-clock-sum.
(org-clock-get-sum-start): New function.
* org.el (org-startup-options): New keywords blockhide and
blockshow.
(org-mode): Add new invisibility spec.
(org-set-startup-visibility): Hide block on startup if so
desired.
(org-hide-block-startup): New option.
(org-block-regexp): New constant.
(org-hide-block-overlays): New variable.
(org-block-map, org-hide-block-toggle-all, org-hide-block-all)
(org-show-block-all, org-hide-block-toggle-maybe)
(org-hide-block-toggle): New functions.
(org-edit-src-exit): Do not quote lines starting with # and no +
behind it.
(org-auto-repeat-maybe): Add LAST_REPEAT properter for a repeating
entry.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-buffer-property-keys): Add Effort property for
completion.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-sum-current-item): Fix positioning bug
when retrieving total clocked time in the subtree.
* org.el (org-quoting-blocks): New variable.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-store-formulas)
(org-table-get-stored-formulas, org-table-fix-formulas)
(org-table-edit-formulas, orgtbl-ctrl-c-ctrl-c)
(orgtbl-gather-send-defs): Allow indented #+TBLFM line.
* org.el (org-fontify-meta-lines, org-ctrl-c-ctrl-c): Allow
indented #+TBLFM line.
* org-footnote.el (org-footnote-goto-local-insertion-point): Allow
indented #+TBLFM line.
* org-colview.el (org-dblock-write:columnview): Allow indented
#+TBLFM line.
* org-colview-xemacs.el (org-dblock-write:columnview): Allow
indented #+TBLFM line.
* org-clock.el (org-dblock-write:clocktable): Allow indented
#+TBLFM line.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Make
editing indented blocks work correctly.
* org.el (org-edit-src-nindent): New variable.
(org-edit-src-code, org-edit-fixed-width-region)
(org-edit-src-find-region-and-lang, org-edit-src-exit): Make
editing indented blocks work correctly.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-replace-src-segments-and-examples): FInd
indented blocks.
(org-export-format-source-code-or-example): Fix indentation of
blocks.
(org-export-remove-indentation): New function.
(org-export-select-backend-specific-text): Allow backend-specific
code to be indented.
(org-export-mark-blockquote-verse-center): Allow markers to be
indented.
* org.el (org-fontify-meta-lines): New function.
(org-set-font-lock-defaults): Call the new fontification
function.
* org-faces.el (org-meta-line): New face
(org-block): New face.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-treat-insert-todo-heading-as-state-change)
(org-treat-S-cursor-todo-selection-as-state-change): New
variables.
(org-insert-todo-heading): Honor
`org-treat-insert-todo-heading-as-state-change'.
(org-shiftright, org-shiftleft): Honor
`org-treat-S-cursor-todo-selection-as-state-change'.
(org-inhibit-logging): New variable.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-remove-subtree-entries-from-agenda): Reduce
range for marker position checking.
* org-latex.el (org-export-latex-first-lines): Fix bug when
exporting a region.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-push-to-kill-ring): Protect using
x-set-selection, because that does not always work.
* org-agenda.el (org-agenda-list): Apply the new face
`org-agenda-date-today'.
* org-faces.el (org-agenda-date-today): New face.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-to-appt): Turn off restriction when
creating appointments.
* org-latex.el (org-export-latex-low-levels): Fix customization
type.
* org.el (org-priority, org-shiftup, org-shiftdown): Disable
priority commands.
* org-agenda.el (org-agenda-priority): Disable priority commands.
* org.el (org-enable-priority-commands): New option.
* org-colview-xemacs.el (org-columns-compute)
(org-columns-number-to-string): Fix problems with empty fields.
* org-colview.el (org-columns-compute)
(org-columns-number-to-string): Fix problems with empty fields.
* org-exp.el (org-export-push-to-kill-ring): New function.
(org-export-copy-to-kill-ring): New option.
* org-latex.el (org-export-as-latex): Call
`org-export-push-to-kill-ring'.
* org-exp.el (org-export-show-temporary-export-buffer): New
option.
* org-latex.el (org-export-as-latex): Use
`org-export-show-temporary-export-buffer'.
* org-exp.el (org-export-show-temporary-export-buffer): New
option.
(org-export-push-to-kill-ring): New function.
* org-colview.el (org-columns-compile-map): New variable.
(org-columns-new, org-columns-compute)
(org-columns-number-to-string, org-columns-uncompile-format)
(org-columns-compile-format): Implement new operators.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-plist-vars): Add :xml-declaration.
* org-list.el (org-update-checkbox-count): Make property
dependent.
* org.el (org-hierarchical-todo-statistics): New option.
(org-update-parent-todo-statistics): Modified to handle recursive
statistics.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish): Make this function behave
correctly in interactive use when called with a prefix argument.
* org.el (org-todo-statistics-hook): New hook.
(org-update-parent-todo-statistics): Use new hook.
(org-log-into-drawer): New function.
(org-add-log-setup): Use the new `org-log-into-drawer' function to
determine if we should be logging into a drawer.
(org-log-into-drawer): Update docstring.
(org-default-properties): Add LOG_INTO_DRAWER as a property.
* org-list.el (org-checkbox-statistics-hook): New hook.
(org-update-checkbox-count-maybe): Use new hook.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-edit-src-code, org-edit-fixed-width-region): Use a
better bufer-generating mechanism.
(org-edit-src-find-buffer): New function.
* org-icalendar.el (org-print-icalendar-entries): Don't check for
archive tag, this is already done by `org-agenda-skip'.
data while constructing lost of tags.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-apply-macros): Use semicolon
as argument separator in macros.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-after-sorting-entries-or-items-hook): New hook.
(org-sort-entries-or-items): Run the new hook.
(org-after-refile-insert-hook): New hook.
(org-refile): Run `org-after-refile-insert-hook'.
* org-agenda.el (org-agenda-get-progress): Never take time of day
from headline when displaying progress.
* org-latex.el (org-export-latex-complex-heading-re): New variable.
(org-export-as-latex): Force the correct regexp in the
preprocessor buffer.
(org-export-latex-set-initial-vars): Set
`org-export-latex-complex-heading-re'.
* org-agenda.el (org-agenda-start-with-log-mode): New option.
(org-agenda-mode): Use `org-agenda-start-with-log-mode'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-tables-centered): New option.
(org-export-latex-tables): Use `org-export-latex-tables-centered'.
* org-exp.el (org-export-as-org): New command.
(org-export-as-org): New command.
* org-publish.el (org-publish-org-to-org): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-yank): Just call `org-yank-generic'.
(org-yank-generic): New function, containing the formaer
functionality of `org-yank'.
* org-latex.el (org-export-latex-not-done-keywords)
(org-export-latex-done-keywords): New variables.
(org-export-latex-todo-keyword-markup): New option.
(org-export-latex-set-initial-vars): Remember the TODO keywords.
(org-export-latex-keywords-maybe): Apply the TODO markup.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-infile-export-plist): Add more default macros.
(org-export-preprocess-apply-macros): Process macro arguments.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-icalendar-include-todo): New allowedvalue
`unblocked'.
(org-print-icalendar-entries): Respect the new value of
`org-icalendar-include-todo'.
* org.el (org-link-try-special-completion)
(org-file-complete-link): New functions.
(org-insert-link): Add special completion support for some link
types.
* org-bbdb.el (org-bbdb-complete-link): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-update-checkbox-count): Allow recursive
statistics.
(org-hierarchical-checkbox-statistics): New option.
* org.el (org-cycle): Remove erraneous space character.
* org-icalendar.el (org-icalendar-timezone): Initialize from
environment.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-autoload): Fix autoloading of ascii export
functions.
(org-modules): Add org-special-blocks.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-start-icalendar-file): Use the new option.
(org-ical-timezone): New option.
* org-exp.el (org-export-get-coderef-format): Use the description
is present.
* org.el (org-sort-entries-or-items): Improve docstring, and make
better implementation for time sorting.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-edit-src-persistent-message): New option.
(org-edit-src-code, org-edit-fixed-width-region): Use the new
option.
* org-clock.el (org-clock-insert-selection-line): Fix prefious
patch.
* org.el (org-edit-src-code, org-edit-fixed-width-region): Use
separate buffer instead of indirect buffer to edit source code.
(org-edit-src-exit): Make this function work with the new setup.
* org-clock.el (org-clock-insert-selection-line): Make sure tasks
are properly fontified before shown in the selection menu.
* org.el (org-fontify-like-in-org-mode): New function.
* org-latex.el (org-export-latex-links): Use the property list to
retrieve the default image attributes.
* org-exp.el (org-export-plist-vars): Add a new option.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export, org-export-visible): Support ASCII
export to buffer
(org-export-normalize-links): Do not protect the description if it
is explicitly given.
* org-list.el (org-reset-checkbox-state-subtree): Moved here from
org-checklist.el.
(org-reset-checkbox-state-subtree): Call
`org-reset-checkbox-state-subtree'.
* org-remember.el (org-select-remember-template): For the
selection of a valid template.
* org-latex.el (org-export-region-as-latex): Supply the
force-no-subtree argument.
(org-export-as-latex): Provide better limits when exporting the
first line. When exporting to string, we still want the first
lines.
(org-export-latex-first-lines): New argument END, to force the end
of the region.
(org-export-region-as-latex): Use the property list.
(org-export-as-latex):
* org-colview-xemacs.el (org-columns-remove-overlays)
(org-columns): Fix call to `local-variable-p'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-after-blockquotes-hook): New hook.
(org-export-latex-preprocess): Run the new hook.
* org-exp.el (org-export-preprocess-after-blockquote-hook): New hook.
(org-export-preprocess-string): Run the new hook.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-macs.el (org-check-external-command): New defsubst.
* org.el (org-mode-map): New key for reload.
(org-format-latex): Better error message when external programs
are not available.
* org-agenda.el (org-agenda-mode-map): Bind `org-reload'.
* org.el (org-sort-entries-or-items): Explicit sorting function
for priorities, needed for XEmacs compatibility.
* org-remember.el (org-remember-apply-template): Improve auto-save
behavior.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Also protect
environments ending in a star.
* org-list.el (org-at-item-p): Fix regular expression.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-end-of-subtree): Improve speed.
* org-agenda.el (org-agenda-get-timestamps)
(org-agenda-get-progress, org-agenda-get-deadlines)
(org-agenda-get-scheduled, org-agenda-get-blocks): Optimizations,
in particular, wait as long as possible to collect the tags.
(org-stuck-projects): Improve docstring.
* org.el (org-store-link): No errors when getting custom id before
first headline.
(org-get-tags-at): Use `org-up-heading-safe' when getting tags.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-prepare-agenda-buffers): Catch a throw to nextfile.
* org-protocol.el: Remove dependency on url.el.
(org-protocol-unhex-compound, org-protocol-open-source): Remove
dependency on url.el.
* org-latex.el (org-export-as-pdf): Use
`org-latex-to-pdf-process'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-latex-to-pdf-process): New option.
* org-agenda.el (org-agenda-skip-additional-timestamps-same-entry):
New option.
(org-agenda-get-timestamps): Honor
`org-agenda-skip-additional-timestamps-same-entry'.
* org-clock.el (org-clock-goto-may-find-recent-task): New option.
(org-clock-goto): Find recent task only if
`org-clock-goto-may-find-recent-task' allows it.
* org-exp.el (org-export-remove-or-extract-drawers): Handle empty
drawers, and drawers that are missing the :END: line.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-goto): Go to recently clocked task if no
clock is running.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-update-parent-todo-statistics): Check for
STATISTICS_FROM property.
* org-list.el (org-update-checkbox-count): Check for
STATISTICS_FROM property.
* org.el (org-tab-first-hook)
(org-tab-after-check-for-table-hook)
(org-tab-after-check-for-cycling-hook): New hooks.
(org-cycle-internal-global, org-cycle-internal-local): New
functions, split out from `org-cycle'.
(org-cycle): Call the new hooks.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-string): Reset the list of
preferred targets for each run of the preprocessor.
* org.el (org-refile-target-verify-function): Improve
documentation.
(org-get-refile-targets): Respect point being moved by the
verification function.
* org-latex.el (org-export-latex-timestamp-keyword-markup): New
option.
(org-export-latex-keywords): Use new option.
* org.el (org-rear-nonsticky-at): New defsubst.
(org-activate-plain-links, org-activate-angle-links)
(org-activate-footnote-links, org-activate-bracket-links)
(org-activate-dates, org-activate-target-links)
(org-activate-tags): Place the rear-nonsticky properties at the
correct location.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-protocol.el (server-edit): Declare `server-edit'.
(org-protocol-unhex-string, org-protocol-unhex-compound): New
functions.
(org-protocol-check-filename-for-protocol): Call `server-edit'.
* org.el (org-default-properties): New default properteis for
completion.
* org-exp.el (org-export-add-subtree-options): Add new properties
for subtree export.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-id.el (org-id-get-with-outline-path-completion): Turn off
org-refile-target-verify-function for the duration of the command.
* org.el (org-link-to-org-use-id): New possible value
`create-if-interactive-and-no-custom-id'.
(org-store-link): Use custom IDs.
(org-link-search): Find custom ID properties from #link.
(org-default-properties): Add CUSTOM_ID for property completion.
(org-refile-target-verify-function): New option.
(org-goto): Turn off org-refile-target-verify-function
for the duration of the command.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preferred-target-alist): New variable.
(org-export-define-heading-targets): Find the new CUSTOM_ID
property.
(org-export-target-internal-links): Target the custom ids when
possible.
* org-latex.el (org-export-latex-preprocess): Better regexp for
matching latex macros with arguments.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-handler): Allow filing to non-org
files.
2009-08-06 Magnus Henoch <magnus.henoch@gmail.com>
* org-table.el (org-table-fix-formulas): Do not change references
to remote tables.
(org-table-get-remote-range): Convert standard coordinates to RC
format.
* org-latex.el (org-export-latex-keywords): Fix regexp bug.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-compat.el (org-sha1-string): Function removed.
* org.el (org-refile-allow-creating-parent-nodes): New option.
(org-refile-get-location): New argument NEW-NODES.
(org-refile): Call `org-refile-get-location' with the new
argument.
(org-refile-get-location): Arrange for adding a new child.
(org-refile-new-child): New function.
* org-clock.el: Fix a number of docstrings.
(org-clock-find-position): New argument
FIND-UNCLOSED to make the function find an unclosed clock in the
entry.
(org-clock-in): Call `org-clock-find-position' with the new
argument if we might be resuming a clock.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-display-custom-times): New variable.
(org-export-latex-timestamp-markup): New option.
(org-export-latex-set-initial-vars): Remember the local value of
`org-display-custom-times'.
(org-export-latex-content): Process time stamps.
(org-export-latex-time-stamps): New function.
* org-macs.el (org-maybe-intangible): Add intangible property
again to invisible text.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-default-export-plist): Handle undefined
variables.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-sort-entries-or-items): Match TODO keywrds
case-sensitively, when sorting.
(org-priority): Do not match TODO keywords with wrong case.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-todo): Honor the NOBLOCKING property.
* org-agenda.el (org-agenda-dim-blocked-tasks): Honor the
NOBLOCKING property.
* org.el (org-scan-tags): Fix bug in tag scanner
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-modules): Mark obsolete packages.
* org-html.el: New file, split out from org-exp.el.
* org-icalendar.el: New file, split out from org-exp.el.
* org-xoxo.el: New file, split out from org-exp.el.
* org-ascii.el: New file, split out from org-exp.el.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-compat.el (org-find-library-name): New function.
* org.el (org-pre-cycle-hook): New hook.
(org-cycle): Call the new hook in appropriate places.
(org-reload): Only reload files that have been loaded before.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-font-lock-defaults): Enforxe space or line end
after todo keyword.
(org-todo): When changing TODO state, do matching
case-sensitively.
(org-map-continue-from): New variable.
(org-scan-tags): Respect values in `org-map-continue-from'.
(org-reload): Make XEmacs compatible.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-protocol.el (org-protocol-flatten-greedy): New function.
(org-protocol-flatten): New function.
* org.el (org-open-link-from-string): Pass reference buffer to
`org-open-at-point'.
(org-open-at-point): New optional argument `reference-buffer'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-scan-tags): Make tag scan find headline in first
line, 2nd attempt.
(org-get-refile-targets): Add the naked file name.
(org-refile): Store as top-level entry when only file name was
given.
* org-agenda.el (org-agenda-get-progress): Fix regexp bug.
* org.el (org-block-todo-from-children-or-siblings-or-parent):
Renamed from org-block-todo-from-children-or-siblings, and
enhanced to look for the parent's status as well.
* org-agenda.el (org-agenda-log-mode-add-notes): New option.
(org-agenda-get-progress): Add first notes line to log entry if so
desired.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-cleanup-fancy-diary-hook): New hook.
(org-agenda-cleanup-fancy-diary): Call the new hook.
* org-remember.el (org-remember-apply-template): Take the default
for the annotation from the :annotation property.
* org-mac-message.el (org-mac-message-get-link): Remove the
quotes.
(org-mac-message-get-link): Return the result.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-refile-get-location): Add file name only if not
already included in outline path.
* org-faces.el (org-n-level-faces): Fix customization type from
number to integer.
* org-exp.el (org-export-headline-levels): Fix customization type
from number to integer.
* org-agenda.el (org-agenda-confirm-kill)
(org-agenda-custom-commands-local-options)
(org-timeline-show-empty-dates, org-agenda-ndays)
(org-agenda-start-on-weekday, org-scheduled-past-days): Fix
customization type from number to integer.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-protocol.el: Declare some functions.
* org-agenda.el (org-agenda-compare-effort): Honor
`org-sort-agenda-noeffort-is-high'.
(org-agenda-filter-by-tag, org-agenda-filter-make-matcher)
(org-agenda-compare-effort): Implement the "?" operator for
finding entries without effort setting.
* org.el (org-extract-attributes-from-string): New function.
* org-exp.el (org-export-splice-attributes): New function.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-mouse.el: XEmacs compatibility fixes
* org.el (org-modules): Add org-inlinetasks.el
(org-cycle): Implement limiting level on cycling.
(org-move-subtree-down): Fix bug with swapping subtrees at end of
buffer.
* org-inlinetask.el: New file.
* org-protocol.el: New file.
* org.el (org-emphasis-regexp-components): Allow braces in
emphasis pre and post match.
* org-footnote.el (org-footnote-normalize): When only dorting, do
not insert inline notes at the end.
* org.el (org-require-autoloaded-modules): Add org-docbook.el.
* org-docbook.el: New file.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-reftex-citation): New command.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-cmp-user-defined): New option.
(org-sorting-choice, org-agenda-sorting-strategy): Add the new
sorting options.
(org-entries-lessp): Apply the new sorting option.
* org.el (org-block-todo-from-children-or-siblings): Fix bug in
blocker code, when an older sibling has children.
* org-mac-message.el (org-mac-message-get-link): Improve getting
links from multiple selected messages.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-finalize): Do not set buffer file
name to nil.
(org-remember-handler): Mark buffer as unmodified.
(org-remember-handler): Delete backup file and show message about
remaining backup files.
(org-remember-auto-remove-backup-files): New option.
* org.el (org-store-link): Use buffer name as link description in
w3-mode buffers.
(org-ido-switchb): Fix argument bug for completion.
* org-remember.el (org-remember-apply-template): Set local
variable `auto-save-visited-file-name' instead of global one.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-get-todos): Fix bug with match-data.
(org-agenda-get-todos): Mark file tags as inherited.
(org-agenda-list): Always search diary lines for a time.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-feed.el: New file.
* org-exp.el (org-export-as-html): Close local lists depending on
indentation, also when starting a table.
* org-remember.el (org-remember-backup-directory)
(org-remember-backup-name): New internal variable.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-out-if-current): Make buffer detection
work in indirect buffers as well.
* org.el (org-emphasis-regexp-components): Add the exxclamation
mark to the post-emphasis characters.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-read-date-minibiffer-septup-hook): New hook.
(org-read-date): Run the new hook.
* org-mac-message.el (org-mac-flagged-mail): New group.
(org-mac-mail-account): New variable.
(org-mac-create-flagged-mail, org-mac-insert-flagged-mail): New
commands.
* org-remember.el (org-remember-backup-directory): New variable.
(org-remember-apply-template): Write file to backup directory.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-mouse.el (org-mouse-todo-menu): New function.
(org-mouse-todo-keywords): Function removed.
(org-mouse-context-menu): Use `org-mouse-todo-menu'.
* org-table.el (org-table-beginning-of-field)
(org-table-end-of-field): New commands
(org-table-previous-field, org-table-beginning-of-field): Better
error messages.
(orgtbl-setup): Include `M-a' and `M-e'.
* org.el (org-backward-sentence, org-forward-sentence): New
commands.
* org-colview.el (org-colview-initial-truncate-line-value): New
variable.
(org-columns-remove-overlays): Restore the value of `truncate-lines'.
(org-columns): Remember the value of `truncate-lines'.
* org-colview-xemacs.el (org-colview-initial-truncate-line-value):
New variable.
(org-columns-remove-overlays): Restore the value of
`truncate-lines'.
(org-columns): Remember the value of `truncate-lines'.
* org.el (org-columns-skip-arrchived-trees): New option.
* org-agenda.el (org-agenda-export-html-style): Define color for
org-agenda-done face.
(org-search-view, org-agenda-get-todos, org-agenda-get-progress)
(org-agenda-get-deadlines, org-agenda-get-scheduled): Use new face.
* org.el (org-scan-tags): Use the new face.
* org-faces.el (org-agenda-done): New face.
* org.el (org-scan-tags): Test the value org
`org-tags-match-list-sublevels'.
(org-tags-match-list-sublevels): New allowed value: indented.
* org-latex.el (org-export-latex-make-header): Apply macros
in header.
* org-exp.el (org-export-apply-macros-in-string): New function.
* org-latex.el (org-export-latex-list-parameters): Fix bug
with the definition of a checked box.
* org-clock.el (org-clock-find-position): Fix drawer indentations.
* org-latex.el (org-export-latex-low-levels): More options
for how to process lower levels in LaTeX.
(org-export-latex-subcontent): Better treatment for lists as a
means of publishing lower levels.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-font-lock-defaults): Use new checkbox face.
* org-faces.el (org-checkbox): New face.
* org-exp.el (org-export-html-preprocess): Only create LaTeX
fragement images if there is an export file.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-stuck-projects): Document that the subtree of
projects that are not stuck will now be searched for stuck
sub-projects.
(org-agenda-skip-entry-when-regexp-matches)
(org-agenda-skip-entry-when-regexp-matches-in-subtree): New functions.
(org-agenda-list-stuck-projects): Use
`org-agenda-skip-entry-when-regexp-matches-in-subtree'.
* org-latex.el (org-export-latex-preprocess): Improve
export of verses.
* org-exp.el (org-export-as-html): Implement centering as a div
rather than a paragraph. Do a better job with line-end in verse
environments.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-at-point): Fix tags searches by mouse click.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Implement the
centering markup.
* org-exp.el (org-export-mark-blockquote-verse-center): Renamed
from `org-export-mark-blockquote-and-verse'.
(org-export-as-html): Implement the centering markup.
* org-latex.el (org-export-latex-tables): Fix vertical
lines in tables.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-read-date-history): New variable.
(org-read-date): Use new history variable.
(org-toggle-heading): Fix bug when used before first headline.
(org-store-log-note): Remove drawer if empty while note is
aborted.
(org-remove-empty-drawer-at): New function.
(org-check-after-date): New command.
(org-sparse-tree): New sparse tree command "a".
* org-exp.el (org-export-as-ascii): Improve export of plain lists.
2009-08-06 Bastien Guerry <bzg@altern.org>
* org.el (org-toggle-fixed-width-section): Bug fix: insert a
column and a space, not only a column.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-emphasis-alist): Better
defaults for verbose emphasis.
(org-export-latex-emph-format): New function.
(org-export-latex-fontify): Call `org-export-latex-emph-format'.
* org-agenda.el (org-agenda-menu): Add new commands to menu.
(org-agenda-do-date-later, org-agenda-do-date-earlier)
(org-agenda-date-later-minutes, org-agenda-date-earlier-minutes)
(org-agenda-date-later-hours, org-agenda-date-earlier-hours): New
commands.
* org.el (org-timestamp-change): Move end-time along with start
time.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-target-internal-links)
(org-export-as-html): Protect links specified as #name.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-clone-subtree-with-time-shift): New command.
* org-latex.el (org-export-latex-special-chars)
(org-export-latex-treat-sub-super-char): Fix subscript export.
* org-exp.el (org-create-multibrace-regexp): Do not add
backslashes to the class.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-colview.el (org-columns-map): Better functions for moving up
and down a row, even if `truncate-line' is nil.
* org.el (org-insert-todo-heading): Make sure the keyword is
inserted at the correct position.
* org-publish.el (org-publish-project-alist)
(org-publish-projects, org-publish-org-index): Change default anme
for the index of file names to "sitemap.org".
* org-latex.el (org-export-latex-tables): Use
`org-split-string', for Emacs 21 compatibility.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-log-mode-items): Improve docstring.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-page-description)
(org-export-page-keywords): New variables.
(org-export-plist-vars): Add entries for :keywords and
:description.
(org-infile-export-plist): Parse for new keywords.
(org-get-current-options): Add new keywords
(org-export-as-html): Publish description and keywords.
* org-agenda.el (org-agenda-add-entry-text-descriptive-links): New
option.
(org-agenda-add-entry-text): Honor
`org-agenda-add-entry-text-descriptive-links'.
* org-latex.el (org-export-latex-preprocess): Make all
external preprocess functions use a PARAMETER arg.
* org-exp.el (org-export-preprocess-string)
(org-export-select-backend-specific-text)
(org-export-format-source-code-or-example)
(org-format-org-table-html): Support docbook export.
(org-export-preprocess-string): Make all external preprocess
functions use a PARAMETER arg.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-html-style-include-scripts): New option.
(org-export-plist-vars): Add new option
`org-export-html-style-include-scripts'.
(org-export-as-html): Honor new option
`org-export-html-style-include-scripts'.
(org-export-html-scripts, org-export-html-style-default): Fix
xml issues with the Safari browser.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-attachment): Only copy file when the
directories differ.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clocktable-steps): Use inactive time stamps
for clocktable steps.
* org.el (org-additional-option-like-keywords): Add two more
keywords.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Mark
temporary buffer unmodified, so that it will be killed even if
mode like message mode has decided to assign a file name.
* org.el (org-scan-tags): Improve tag inheritance.
(org-scan-tags, org-make-tags-matcher): Make tag comparison
case-sensitive.
(org-scan-tags): Use the internal tags list instead of creating it
from scratch.
(org-trust-scanner-tags, org-scanner-tags): New variables.
(org-scan-tags): Set `org-scanner-tags'.
(org-get-tags-at): Take advantage of `org-trust-scanner-tags'.
(org-map-entries): Document the possible speedup using scanner
tags.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-add-planning-info): Fix bug with looking for keyword
only at column 0.
* org-agenda.el (org-agenda-custom-commands-local-options): Add
option for tags filter preset.
(org-prepare-agenda): Store filter preset as a property on the
filter variable.
(org-finalize-agenda): Call the filter, if there is a preset.
(org-agenda-filter-by-tag): Filter again after clearing the
filter, when there still is a preset.
(org-agenda-filter-make-matcher, org-agenda-set-mode-name):
Include the preset filter.
(org-agenda-redo): Apply the filter again, also the preset filter.
* org-exp.el (org-export-as-html): Use IDs in the correct way.
* org.el (org-uuidgen-p): New funtion.
* org-agenda.el (org-agenda-fontify-priorities): New default value
`cookies'.
(org-agenda-fontify-priorities): Renamed from
org-fontify-priorities.
* org.el (org-set-font-lock-defaults): Call
`org-font-lock-add-priority-faces'.
(org-font-lock-add-priority-faces): New function.
* org-faces.el: (org-set-tag-faces): New option.
(org-priority-faces): New variable.
* org-exp.el (org-export-as-html): Add a "content" div around the
entire content of the body tag.
(org-export-html-get-bibliography): New function.
(org-export-html-validation-link): New variable.
(org-export-as-html): Add validation link to exported page.
* org.el (org-match-sparse-tree): Renamed from
`org-tags-sparse-tree'.
(org-tags-sparse-tree): New alias.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-get-valid-level): Catch the case where the level
change is nil.
* org-clock.el (org-clock-find-position): Better indentation of
new clock drawers.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-quit): Delete window only when the
frame-setup was not `current-window'.
* org.el (org-tag-persistent-alist): New option.
(org-startup-options): Add keyword `noptag'.
(org-fast-todo-selection): Handle :newline correctly.
(org-set-tags): Handle :newline correctly.
(org-fast-tag-selection): Handle :newline correctly.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-as-ascii): Reverse link buffer before
outputting it.
(org-export-ascii-push-links): Fix bug with pussing links into the
export buffer.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-archive.el (org-archive-subtree): Do not add 1 to level if
pasting at top level.
* org-bbdb.el: Improve documentation.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-insert-item): Only consider insert empty lines
is `org-empty-line-terminates-plain-lists' is not nil.
* org.el (org-blank-before-new-entry): Mention the dependence on
`org-empty-line-terminates-plain-lists' in the docstring.
* org-publish.el (org-publish-get-project-from-filename): New
optional argument UP. Only find the top project if UP is set.
(org-publish-current-project): Find the top encloding project.
* org-agenda.el (org-agenda-before-write-hook)
(org-agenda-add-entry-text-maxlines): New options.
(org-write-agenda): Run the new hook in the temporary buffer.
(org-agenda-add-entry-text): New function.
(org-write-agenda): Implement PDF export, using ps2pdf.
* org.el (org-global-properties-fixed, org-global-properties):
Improve documentation string.
* org-exp.el (org-export-ascii-links-to-notes): New option.
(org-export-as-ascii): Handle links better.
(org-export-ascii-wrap, org-export-ascii-push-links): New
functions.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda): Make prefix arg optional.
(org-agenda-search-headline-for-time): New option.
(org-format-agenda-item): Honor
`org-agenda-search-headline-for-time'.
* org-table.el (orgtbl-self-insert-command): Cluster undo for 20
characters.
* org.el (org-self-insert-cluster-for-undo): New option.
(org-self-insert-command): Cluster undo for 20 characters.
(org-self-insert-command-undo-counter): New variable.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-as-html): Fix problem with closing colone
example.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-as-latex)
(org-export-latex-first-lines): Avoid modification flag when
adding or removing text properties.
(org-export-latex-fontify): Catch error when org-emph-alist has
entries that are not defined for LaTeX export.
* org-export-latex.el: renamed to org-latex.el
* org-latex.el: renamed from org-export-latex.el
* org.el (orgstruct++-mode): New function.
(turn-on-orgstruct++): Call `orgstruct++-mode'.
(org-context-p): Allow detecting item context after the first line
of an item.
(orgstruct-make-binding): Detect if item-body context should be
seen.
(orgstruct-is-++): New variable.
(org-add-planning-info): Catch the case when there is no planning
info yet and the call does not want to add anything, only maybe
tries to remove something.
(org-special-ctrl-a/e): All value to be a cons cell with separate
settings for `C-a. and `C-e'.
(org-beginning-of-line, org-end-of-line): Honor separate values
for `C-a' and `C-e'.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-reload): New command.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Publishing action): Improve documentation of file
names when publishing to the source directory.
(Clean view): Document `org-indent-mode'.
(Clocking work time): Add documentation for the
new :timetamp option when creating a clock report.
(Paragraphs): Fix many typos.
(Plain lists): Remove duplicate explanation about the
`C-c *' command.
(Literal examples): Update to reflect the new behavior
of the -n -r -k switches when exporting source code examples.
(Structure editing): Add information about `C-c *',
converting a plain list into a list of Org items.
(Remember): Small rephrasing of the paragraph
describing remember.el. Also mentioned that remember.el is part
of Emacs 23, not Emacs 22.
(Clocking work time): Add documentation about
displaying the current clocking time against the effort estimate.
Also add a footnote about using `org-clock-in-prepare-hook' to add
an effort estimate on the fly, just before clocking it.
(Footnotes): Document automatic renumbering and
sorting.
(Agenda commands): Document new bulk commands.
(Plain lists): Document new behavior of
`org-cycle-include-plain-lists'.
Hyphenation only in TeX.
(Clocking work time): Document the key to update effort
estimates.
(Clocking work time): Document the clock time display.
(Structure editing, TODO basics): Document new
variables.
(Column attributes): Document new colciew operators.
(Publishing options): Document :xml-declaration.
(Tracking TODO state changes): Document the
LOG_INTO_DRAWER property.
(Literal examples): Document the new implementation for
editing source code.
(Publishing action): Mention the new publishing
function, to publish an Org source file.
(Publishing links): Mention how to link to an Org source file.
(Macro replacement): Document new macros.
(Handling links): Document type-specific completion
when inserting links.
(Structure editing, Plain lists): Improve documentation
on sorting.
(Internal links): Document custom ids for links.
(Handling links): Document custom ids for links.
(CSS support): Document new class.
(Refiling notes): Document the possibility to create new nodes
during refiling.
(Agenda commands): Document the "?" operator to find
tasks without effort setting.
(Exporting agenda information): Section moved.
(RSS Feeds): New section.
(Built-in table editor): Document M-e and M-a navigate
inside table field.
(Stuck projects): Docment that projects identified as
un-stuck will still be searchd for stuck sub-projects.
(Paragraphs): Document centering.
(Creating timestamps, Agenda commands): Document new
behavior when changing time stamps.
(Structure editing): Document the new command
`org-clone-subtree-with-time-shift'.
(Publishing): Refresh this chapter.
(Export options, Export options, In-buffer settings):
Document the new keywords.
(Matching tags and properties): Collect all
documentation about tags/property matches here.
(Setting tags): Document `org-tag-persistent-alist'.
(Weekly/daily agenda): New section.
(Orgstruct mode): Describe `orgstruct++-mode'.
(Drawers): Mention the LOGBOOK drawer.
(Export options, Sectioning structure): Document the
#+LEATEX_HEADER in-buffer setting.
(Bugs): Section removed.
(Hooks): New section.
(Add-on packages): Moved here from old location.
(Context-sensitive commands): New section.
(Setting tags): Document newline option.
(Global TODO list, Matching tags and properties):
Mention more variables.
(Checkboxes): Update to changed command behavior.
2009-08-06 09:14:10 +00:00
|
|
|
|
|
|
|
|
;; insert the table of contents
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(when thetoc
|
|
|
|
|
(if (or (re-search-forward
|
|
|
|
|
"<p>\\s-*\\[TABLE-OF-CONTENTS\\]\\s-*</p>" nil t)
|
|
|
|
|
(re-search-forward
|
|
|
|
|
"\\[TABLE-OF-CONTENTS\\]" nil t))
|
|
|
|
|
(progn
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
(replace-match ""))
|
|
|
|
|
(goto-char first-heading-pos)
|
|
|
|
|
(when (looking-at "\\s-*</p>")
|
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
|
(insert "\n")))
|
|
|
|
|
(insert "<div id=\"table-of-contents\">\n")
|
|
|
|
|
(mapc 'insert thetoc)
|
|
|
|
|
(insert "</div>\n"))
|
|
|
|
|
;; remove empty paragraphs and lists
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward "<p>[ \r\n\t]*</p>" nil t)
|
|
|
|
|
(replace-match ""))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward "<li>[ \r\n\t]*</li>\n?" nil t)
|
|
|
|
|
(replace-match ""))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward "</ul>\\s-*<ul>\n?" nil t)
|
|
|
|
|
(replace-match ""))
|
|
|
|
|
;; Convert whitespace place holders
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let (beg end n)
|
|
|
|
|
(while (setq beg (next-single-property-change (point) 'org-whitespace))
|
|
|
|
|
(setq n (get-text-property beg 'org-whitespace)
|
|
|
|
|
end (next-single-property-change beg 'org-whitespace))
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(delete-region beg end)
|
|
|
|
|
(insert (format "<span style=\"visibility:hidden;\">%s</span>"
|
|
|
|
|
(make-string n ?x)))))
|
|
|
|
|
(or to-buffer (save-buffer))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(or (org-export-push-to-kill-ring "HTML")
|
|
|
|
|
(message "Exporting... done"))
|
|
|
|
|
(if (eq to-buffer 'string)
|
|
|
|
|
(prog1 (buffer-substring (point-min) (point-max))
|
|
|
|
|
(kill-buffer (current-buffer)))
|
|
|
|
|
(current-buffer)))))
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-insert-plist-item (plist key &rest args)
|
|
|
|
|
(let ((item (plist-get plist key)))
|
|
|
|
|
(cond ((functionp item)
|
|
|
|
|
(apply item args))
|
|
|
|
|
(item
|
|
|
|
|
(insert item)))))
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-format-href (s)
|
|
|
|
|
"Make sure the S is valid as a href reference in an XHTML document."
|
|
|
|
|
(save-match-data
|
|
|
|
|
(let ((start 0))
|
|
|
|
|
(while (string-match "&" s start)
|
|
|
|
|
(setq start (+ (match-beginning 0) 3)
|
|
|
|
|
s (replace-match "&" t t s)))))
|
|
|
|
|
s)
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-format-desc (s)
|
|
|
|
|
"Make sure the S is valid as a description in a link."
|
|
|
|
|
(if (and s (not (get-text-property 1 'org-protected s)))
|
|
|
|
|
(save-match-data
|
|
|
|
|
(org-html-do-expand s))
|
|
|
|
|
s))
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-format-image (src par-open)
|
|
|
|
|
"Create image tag with source and attributes."
|
|
|
|
|
(save-match-data
|
|
|
|
|
(if (string-match "^ltxpng/" src)
|
|
|
|
|
(format "<img src=\"%s\"/>" src)
|
|
|
|
|
(let* ((caption (org-find-text-property-in-string 'org-caption src))
|
|
|
|
|
(attr (org-find-text-property-in-string 'org-attributes src))
|
|
|
|
|
(label (org-find-text-property-in-string 'org-label src)))
|
|
|
|
|
(format "%s<div %sclass=\"figure\">
|
|
|
|
|
<p><img src=\"%s\"%s /></p>%s
|
|
|
|
|
</div>%s"
|
|
|
|
|
(if org-par-open "</p>\n" "")
|
|
|
|
|
(if label (format "id=\"%s\" " label) "")
|
|
|
|
|
src
|
|
|
|
|
(if (string-match "\\<alt=" (or attr ""))
|
|
|
|
|
(concat " " attr )
|
|
|
|
|
(concat " " attr " alt=\"" src "\""))
|
|
|
|
|
(if caption (concat "\n<p>" caption "</p>") "")
|
|
|
|
|
(if org-par-open "\n<p>" ""))))))
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-get-bibliography ()
|
|
|
|
|
"Find bibliography, cut it out and return it."
|
|
|
|
|
(catch 'exit
|
|
|
|
|
(let (beg end (cnt 1) bib)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(when (re-search-forward "^[ \t]*<div \\(id\\|class\\)=\"bibliography\"" nil t)
|
|
|
|
|
(setq beg (match-beginning 0))
|
|
|
|
|
(while (re-search-forward "</?div\\>" nil t)
|
|
|
|
|
(setq cnt (+ cnt (if (string= (match-string 0) "<div") +1 -1)))
|
|
|
|
|
(when (= cnt 0)
|
|
|
|
|
(and (looking-at ">") (forward-char 1))
|
|
|
|
|
(setq bib (buffer-substring beg (point)))
|
|
|
|
|
(delete-region beg (point))
|
|
|
|
|
(throw 'exit bib))))
|
|
|
|
|
nil))))
|
|
|
|
|
|
|
|
|
|
(defvar org-table-number-regexp) ; defined in org-table.el
|
|
|
|
|
(defun org-format-table-html (lines olines)
|
|
|
|
|
"Find out which HTML converter to use and return the HTML code."
|
|
|
|
|
(if (stringp lines)
|
|
|
|
|
(setq lines (org-split-string lines "\n")))
|
|
|
|
|
(if (string-match "^[ \t]*|" (car lines))
|
|
|
|
|
;; A normal org table
|
|
|
|
|
(org-format-org-table-html lines)
|
|
|
|
|
;; Table made by table.el - test for spanning
|
|
|
|
|
(let* ((hlines (delq nil (mapcar
|
|
|
|
|
(lambda (x)
|
|
|
|
|
(if (string-match "^[ \t]*\\+-" x) x
|
|
|
|
|
nil))
|
|
|
|
|
lines)))
|
|
|
|
|
(first (car hlines))
|
|
|
|
|
(ll (and (string-match "\\S-+" first)
|
|
|
|
|
(match-string 0 first)))
|
|
|
|
|
(re (concat "^[ \t]*" (regexp-quote ll)))
|
|
|
|
|
(spanning (delq nil (mapcar (lambda (x) (not (string-match re x)))
|
|
|
|
|
hlines))))
|
|
|
|
|
(if (and (not spanning)
|
|
|
|
|
(not org-export-prefer-native-exporter-for-tables))
|
|
|
|
|
;; We can use my own converter with HTML conversions
|
|
|
|
|
(org-format-table-table-html lines)
|
|
|
|
|
;; Need to use the code generator in table.el, with the original text.
|
|
|
|
|
(org-format-table-table-html-using-table-generate-source olines)))))
|
|
|
|
|
|
|
|
|
|
(defvar org-table-number-fraction) ; defined in org-table.el
|
|
|
|
|
(defun org-format-org-table-html (lines &optional splice)
|
|
|
|
|
"Format a table into HTML."
|
|
|
|
|
(require 'org-table)
|
|
|
|
|
;; Get rid of hlines at beginning and end
|
|
|
|
|
(if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
|
|
|
|
|
(setq lines (nreverse lines))
|
|
|
|
|
(if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
|
|
|
|
|
(setq lines (nreverse lines))
|
|
|
|
|
(when org-export-table-remove-special-lines
|
|
|
|
|
;; Check if the table has a marking column. If yes remove the
|
|
|
|
|
;; column and the special lines
|
|
|
|
|
(setq lines (org-table-clean-before-export lines)))
|
|
|
|
|
|
|
|
|
|
(let* ((caption (or (get-text-property 0 'org-caption (car lines))
|
|
|
|
|
(get-text-property (or (next-single-property-change
|
|
|
|
|
0 'org-caption (car lines))
|
|
|
|
|
0)
|
|
|
|
|
'org-caption (car lines))))
|
|
|
|
|
(attributes (or (get-text-property 0 'org-attributes (car lines))
|
|
|
|
|
(get-text-property (or (next-single-property-change
|
|
|
|
|
0 'org-attributes (car lines))
|
|
|
|
|
0)
|
|
|
|
|
'org-attributes (car lines))))
|
|
|
|
|
(html-table-tag (org-export-splice-attributes
|
|
|
|
|
html-table-tag attributes))
|
|
|
|
|
(head (and org-export-highlight-first-table-line
|
|
|
|
|
(delq nil (mapcar
|
|
|
|
|
(lambda (x) (string-match "^[ \t]*|-" x))
|
|
|
|
|
(cdr lines)))))
|
|
|
|
|
|
|
|
|
|
(nline 0) fnum i
|
|
|
|
|
tbopen line fields html gr colgropen rowstart rowend)
|
|
|
|
|
(if splice (setq head nil))
|
|
|
|
|
(unless splice (push (if head "<thead>" "<tbody>") html))
|
|
|
|
|
(setq tbopen t)
|
|
|
|
|
(while (setq line (pop lines))
|
|
|
|
|
(catch 'next-line
|
|
|
|
|
(if (string-match "^[ \t]*|-" line)
|
|
|
|
|
(progn
|
|
|
|
|
(unless splice
|
|
|
|
|
(push (if head "</thead>" "</tbody>") html)
|
|
|
|
|
(if lines (push "<tbody>" html) (setq tbopen nil)))
|
|
|
|
|
(setq head nil) ;; head ends here, first time around
|
|
|
|
|
;; ignore this line
|
|
|
|
|
(throw 'next-line t)))
|
|
|
|
|
;; Break the line into fields
|
|
|
|
|
(setq fields (org-split-string line "[ \t]*|[ \t]*"))
|
|
|
|
|
(unless fnum (setq fnum (make-vector (length fields) 0)))
|
|
|
|
|
(setq nline (1+ nline) i -1
|
|
|
|
|
rowstart (eval (car org-export-table-row-tags))
|
|
|
|
|
rowend (eval (cdr org-export-table-row-tags)))
|
|
|
|
|
(push (concat rowstart
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (x)
|
|
|
|
|
(setq i (1+ i))
|
|
|
|
|
(if (and (< i nline)
|
|
|
|
|
(string-match org-table-number-regexp x))
|
|
|
|
|
(incf (aref fnum i)))
|
|
|
|
|
(cond
|
|
|
|
|
(head
|
|
|
|
|
(concat
|
|
|
|
|
(format (car org-export-table-header-tags) "col")
|
|
|
|
|
x
|
|
|
|
|
(cdr org-export-table-header-tags)))
|
|
|
|
|
((and (= i 0) org-export-html-table-use-header-tags-for-first-column)
|
|
|
|
|
(concat
|
|
|
|
|
(format (car org-export-table-header-tags) "row")
|
|
|
|
|
x
|
|
|
|
|
(cdr org-export-table-header-tags)))
|
|
|
|
|
(t
|
|
|
|
|
(concat (car org-export-table-data-tags) x
|
|
|
|
|
(cdr org-export-table-data-tags)))))
|
|
|
|
|
fields "")
|
|
|
|
|
rowend)
|
|
|
|
|
html)))
|
|
|
|
|
(unless splice (if tbopen (push "</tbody>" html)))
|
|
|
|
|
(unless splice (push "</table>\n" html))
|
|
|
|
|
(setq html (nreverse html))
|
|
|
|
|
(unless splice
|
|
|
|
|
;; Put in col tags with the alignment (unfortuntely often ignored...)
|
|
|
|
|
(unless (car org-table-colgroup-info)
|
|
|
|
|
(setq org-table-colgroup-info
|
|
|
|
|
(cons :start (cdr org-table-colgroup-info))))
|
|
|
|
|
(push (mapconcat
|
|
|
|
|
(lambda (x)
|
|
|
|
|
(setq gr (pop org-table-colgroup-info))
|
|
|
|
|
(format "%s<col align=\"%s\"></col>%s"
|
|
|
|
|
(if (memq gr '(:start :startend))
|
|
|
|
|
(prog1
|
|
|
|
|
(if colgropen "</colgroup>\n<colgroup>" "<colgroup>")
|
|
|
|
|
(setq colgropen t))
|
|
|
|
|
"")
|
|
|
|
|
(if (> (/ (float x) nline) org-table-number-fraction)
|
|
|
|
|
"right" "left")
|
|
|
|
|
(if (memq gr '(:end :startend))
|
|
|
|
|
(progn (setq colgropen nil) "</colgroup>")
|
|
|
|
|
"")))
|
|
|
|
|
fnum "")
|
|
|
|
|
html)
|
|
|
|
|
(if colgropen (setq html (cons (car html) (cons "</colgroup>" (cdr html)))))
|
|
|
|
|
;; Since the output of HTML table formatter can also be used in
|
|
|
|
|
;; DocBook document, we want to always include the caption to make
|
|
|
|
|
;; DocBook XML file valid.
|
|
|
|
|
(push (format "<caption>%s</caption>" (or caption "")) html)
|
|
|
|
|
(push html-table-tag html))
|
|
|
|
|
(concat (mapconcat 'identity html "\n") "\n")))
|
|
|
|
|
|
|
|
|
|
(defun org-export-splice-attributes (tag attributes)
|
|
|
|
|
"Read attributes in string ATTRIBUTES, add and replace in HTML tag TAG."
|
|
|
|
|
(if (not attributes)
|
|
|
|
|
tag
|
|
|
|
|
(let (oldatt newatt)
|
|
|
|
|
(setq oldatt (org-extract-attributes-from-string tag)
|
|
|
|
|
tag (pop oldatt)
|
|
|
|
|
newatt (cdr (org-extract-attributes-from-string attributes)))
|
|
|
|
|
(while newatt
|
|
|
|
|
(setq oldatt (plist-put oldatt (pop newatt) (pop newatt))))
|
|
|
|
|
(if (string-match ">" tag)
|
|
|
|
|
(setq tag
|
|
|
|
|
(replace-match (concat (org-attributes-to-string oldatt) ">")
|
|
|
|
|
t t tag)))
|
|
|
|
|
tag)))
|
|
|
|
|
|
|
|
|
|
(defun org-format-table-table-html (lines)
|
|
|
|
|
"Format a table generated by table.el into HTML.
|
|
|
|
|
This conversion does *not* use `table-generate-source' from table.el.
|
|
|
|
|
This has the advantage that Org-mode's HTML conversions can be used.
|
|
|
|
|
But it has the disadvantage, that no cell- or row-spanning is allowed."
|
|
|
|
|
(let (line field-buffer
|
|
|
|
|
(head org-export-highlight-first-table-line)
|
|
|
|
|
fields html empty i)
|
|
|
|
|
(setq html (concat html-table-tag "\n"))
|
|
|
|
|
(while (setq line (pop lines))
|
|
|
|
|
(setq empty " ")
|
|
|
|
|
(catch 'next-line
|
|
|
|
|
(if (string-match "^[ \t]*\\+-" line)
|
|
|
|
|
(progn
|
|
|
|
|
(if field-buffer
|
|
|
|
|
(progn
|
|
|
|
|
(setq
|
|
|
|
|
html
|
|
|
|
|
(concat
|
|
|
|
|
html
|
|
|
|
|
"<tr>"
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (x)
|
|
|
|
|
(if (equal x "") (setq x empty))
|
|
|
|
|
(if head
|
|
|
|
|
(concat
|
|
|
|
|
(format (car org-export-table-header-tags) "col")
|
|
|
|
|
x
|
|
|
|
|
(cdr org-export-table-header-tags))
|
|
|
|
|
(concat (car org-export-table-data-tags) x
|
|
|
|
|
(cdr org-export-table-data-tags))))
|
|
|
|
|
field-buffer "\n")
|
|
|
|
|
"</tr>\n"))
|
|
|
|
|
(setq head nil)
|
|
|
|
|
(setq field-buffer nil)))
|
|
|
|
|
;; Ignore this line
|
|
|
|
|
(throw 'next-line t)))
|
|
|
|
|
;; Break the line into fields and store the fields
|
|
|
|
|
(setq fields (org-split-string line "[ \t]*|[ \t]*"))
|
|
|
|
|
(if field-buffer
|
|
|
|
|
(setq field-buffer (mapcar
|
|
|
|
|
(lambda (x)
|
|
|
|
|
(concat x "<br/>" (pop fields)))
|
|
|
|
|
field-buffer))
|
|
|
|
|
(setq field-buffer fields))))
|
|
|
|
|
(setq html (concat html "</table>\n"))
|
|
|
|
|
html))
|
|
|
|
|
|
|
|
|
|
(defun org-format-table-table-html-using-table-generate-source (lines)
|
|
|
|
|
"Format a table into html, using `table-generate-source' from table.el.
|
|
|
|
|
This has the advantage that cell- or row-spanning is allowed.
|
|
|
|
|
But it has the disadvantage, that Org-mode's HTML conversions cannot be used."
|
|
|
|
|
(require 'table)
|
|
|
|
|
(with-current-buffer (get-buffer-create " org-tmp1 ")
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert (mapconcat 'identity lines "\n"))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (not (re-search-forward "|[^+]" nil t))
|
|
|
|
|
(error "Error processing table"))
|
|
|
|
|
(table-recognize-table)
|
|
|
|
|
(with-current-buffer (get-buffer-create " org-tmp2 ") (erase-buffer))
|
|
|
|
|
(table-generate-source 'html " org-tmp2 ")
|
|
|
|
|
(set-buffer " org-tmp2 ")
|
|
|
|
|
(buffer-substring (point-min) (point-max))))
|
|
|
|
|
|
|
|
|
|
(defun org-export-splice-style (style extra)
|
|
|
|
|
"Splice EXTRA into STYLE, just before \"</style>\"."
|
|
|
|
|
(if (and (stringp extra)
|
|
|
|
|
(string-match "\\S-" extra)
|
|
|
|
|
(string-match "</style>" style))
|
|
|
|
|
(concat (substring style 0 (match-beginning 0))
|
|
|
|
|
"\n" extra "\n"
|
|
|
|
|
(substring style (match-beginning 0)))
|
|
|
|
|
style))
|
|
|
|
|
|
|
|
|
|
(defun org-html-handle-time-stamps (s)
|
|
|
|
|
"Format time stamps in string S, or remove them."
|
|
|
|
|
(catch 'exit
|
|
|
|
|
(let (r b)
|
|
|
|
|
(while (string-match org-maybe-keyword-time-regexp s)
|
|
|
|
|
(or b (setq b (substring s 0 (match-beginning 0))))
|
|
|
|
|
(setq r (concat
|
|
|
|
|
r (substring s 0 (match-beginning 0))
|
|
|
|
|
" @<span class=\"timestamp-wrapper\">"
|
|
|
|
|
(if (match-end 1)
|
|
|
|
|
(format "@<span class=\"timestamp-kwd\">%s @</span>"
|
|
|
|
|
(match-string 1 s)))
|
|
|
|
|
(format " @<span class=\"timestamp\">%s@</span>"
|
|
|
|
|
(substring
|
|
|
|
|
(org-translate-time (match-string 3 s)) 1 -1))
|
|
|
|
|
"@</span>")
|
|
|
|
|
s (substring s (match-end 0))))
|
|
|
|
|
;; Line break if line started and ended with time stamp stuff
|
|
|
|
|
(if (not r)
|
|
|
|
|
s
|
|
|
|
|
(setq r (concat r s))
|
|
|
|
|
(unless (string-match "\\S-" (concat b s))
|
|
|
|
|
(setq r (concat r "@<br/>")))
|
|
|
|
|
r))))
|
|
|
|
|
|
|
|
|
|
(defvar htmlize-buffer-places) ; from htmlize.el
|
|
|
|
|
(defun org-export-htmlize-region-for-paste (beg end)
|
|
|
|
|
"Convert the region to HTML, using htmlize.el.
|
|
|
|
|
This is much like `htmlize-region-for-paste', only that it uses
|
|
|
|
|
the settings define in the org-... variables."
|
|
|
|
|
(let* ((htmlize-output-type org-export-htmlize-output-type)
|
|
|
|
|
(htmlize-css-name-prefix org-export-htmlize-css-font-prefix)
|
|
|
|
|
(htmlbuf (htmlize-region beg end)))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(with-current-buffer htmlbuf
|
|
|
|
|
(buffer-substring (plist-get htmlize-buffer-places 'content-start)
|
|
|
|
|
(plist-get htmlize-buffer-places 'content-end)))
|
|
|
|
|
(kill-buffer htmlbuf))))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-export-htmlize-generate-css ()
|
|
|
|
|
"Create the CSS for all font definitions in the current Emacs session.
|
|
|
|
|
Use this to create face definitions in your CSS style file that can then
|
|
|
|
|
be used by code snippets transformed by htmlize.
|
|
|
|
|
This command just produces a buffer that contains class definitions for all
|
|
|
|
|
faces used in the current Emacs session. You can copy and paste the ones you
|
|
|
|
|
need into your CSS file.
|
|
|
|
|
|
|
|
|
|
If you then set `org-export-htmlize-output-type' to `css', calls to
|
|
|
|
|
the function `org-export-htmlize-region-for-paste' will produce code
|
|
|
|
|
that uses these same face definitions."
|
|
|
|
|
(interactive)
|
|
|
|
|
(require 'htmlize)
|
|
|
|
|
(and (get-buffer "*html*") (kill-buffer "*html*"))
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((fl (face-list))
|
|
|
|
|
(htmlize-css-name-prefix "org-")
|
|
|
|
|
(htmlize-output-type 'css)
|
|
|
|
|
f i)
|
|
|
|
|
(while (setq f (pop fl)
|
|
|
|
|
i (and f (face-attribute f :inherit)))
|
|
|
|
|
(when (and (symbolp f) (or (not i) (not (listp i))))
|
|
|
|
|
(insert (org-add-props (copy-sequence "1") nil 'face f))))
|
|
|
|
|
(htmlize-region (point-min) (point-max))))
|
|
|
|
|
(switch-to-buffer "*html*")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (re-search-forward "<style" nil t)
|
|
|
|
|
(delete-region (point-min) (match-beginning 0)))
|
|
|
|
|
(if (re-search-forward "</style>" nil t)
|
|
|
|
|
(delete-region (1+ (match-end 0)) (point-max)))
|
|
|
|
|
(beginning-of-line 1)
|
|
|
|
|
(if (looking-at " +") (replace-match ""))
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
|
|
|
|
|
(defun org-html-protect (s)
|
|
|
|
|
;; convert & to &, < to < and > to >
|
|
|
|
|
(let ((start 0))
|
|
|
|
|
(while (string-match "&" s start)
|
|
|
|
|
(setq s (replace-match "&" t t s)
|
|
|
|
|
start (1+ (match-beginning 0))))
|
|
|
|
|
(while (string-match "<" s)
|
|
|
|
|
(setq s (replace-match "<" t t s)))
|
|
|
|
|
(while (string-match ">" s)
|
|
|
|
|
(setq s (replace-match ">" t t s)))
|
|
|
|
|
; (while (string-match "\"" s)
|
|
|
|
|
; (setq s (replace-match """ t t s)))
|
|
|
|
|
)
|
|
|
|
|
s)
|
|
|
|
|
|
|
|
|
|
(defun org-html-expand (string)
|
|
|
|
|
"Prepare STRING for HTML export. Applies all active conversions.
|
|
|
|
|
If there are links in the string, don't modify these."
|
|
|
|
|
(let* ((re (concat org-bracket-link-regexp "\\|"
|
|
|
|
|
(org-re "[ \t]+\\(:[[:alnum:]_@:]+:\\)[ \t]*$")))
|
|
|
|
|
m s l res)
|
|
|
|
|
(while (setq m (string-match re string))
|
|
|
|
|
(setq s (substring string 0 m)
|
|
|
|
|
l (match-string 0 string)
|
|
|
|
|
string (substring string (match-end 0)))
|
|
|
|
|
(push (org-html-do-expand s) res)
|
|
|
|
|
(push l res))
|
|
|
|
|
(push (org-html-do-expand string) res)
|
|
|
|
|
(apply 'concat (nreverse res))))
|
|
|
|
|
|
|
|
|
|
(defun org-html-do-expand (s)
|
|
|
|
|
"Apply all active conversions to translate special ASCII to HTML."
|
|
|
|
|
(setq s (org-html-protect s))
|
|
|
|
|
(if org-export-html-expand
|
|
|
|
|
(while (string-match "@<\\([^&]*\\)>" s)
|
|
|
|
|
(setq s (replace-match "<\\1>" t nil s))))
|
|
|
|
|
(if org-export-with-emphasize
|
|
|
|
|
(setq s (org-export-html-convert-emphasize s)))
|
|
|
|
|
(if org-export-with-special-strings
|
|
|
|
|
(setq s (org-export-html-convert-special-strings s)))
|
|
|
|
|
(if org-export-with-sub-superscripts
|
|
|
|
|
(setq s (org-export-html-convert-sub-super s)))
|
|
|
|
|
(if org-export-with-TeX-macros
|
|
|
|
|
(let ((start 0) wd ass)
|
|
|
|
|
(while (setq start (string-match "\\\\\\([a-zA-Z]+\\)\\({}\\)?"
|
|
|
|
|
s start))
|
|
|
|
|
(if (get-text-property (match-beginning 0) 'org-protected s)
|
|
|
|
|
(setq start (match-end 0))
|
|
|
|
|
(setq wd (match-string 1 s))
|
|
|
|
|
(if (setq ass (assoc wd org-html-entities))
|
|
|
|
|
(setq s (replace-match (or (cdr ass)
|
|
|
|
|
(concat "&" (car ass) ";"))
|
|
|
|
|
t t s))
|
|
|
|
|
(setq start (+ start (length wd))))))))
|
|
|
|
|
s)
|
|
|
|
|
|
|
|
|
|
(defconst org-export-html-special-string-regexps
|
|
|
|
|
'(("\\\\-" . "­")
|
|
|
|
|
("---\\([^-]\\)" . "—\\1")
|
|
|
|
|
("--\\([^-]\\)" . "–\\1")
|
|
|
|
|
("\\.\\.\\." . "…"))
|
|
|
|
|
"Regular expressions for special string conversion.")
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-convert-special-strings (string)
|
|
|
|
|
"Convert special characters in STRING to HTML."
|
|
|
|
|
(let ((all org-export-html-special-string-regexps)
|
|
|
|
|
e a re rpl start)
|
|
|
|
|
(while (setq a (pop all))
|
|
|
|
|
(setq re (car a) rpl (cdr a) start 0)
|
|
|
|
|
(while (string-match re string start)
|
|
|
|
|
(if (get-text-property (match-beginning 0) 'org-protected string)
|
|
|
|
|
(setq start (match-end 0))
|
|
|
|
|
(setq string (replace-match rpl t nil string)))))
|
|
|
|
|
string))
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-convert-sub-super (string)
|
|
|
|
|
"Convert sub- and superscripts in STRING to HTML."
|
|
|
|
|
(let (key c (s 0) (requireb (eq org-export-with-sub-superscripts '{})))
|
|
|
|
|
(while (string-match org-match-substring-regexp string s)
|
|
|
|
|
(cond
|
|
|
|
|
((and requireb (match-end 8)) (setq s (match-end 2)))
|
|
|
|
|
((get-text-property (match-beginning 2) 'org-protected string)
|
|
|
|
|
(setq s (match-end 2)))
|
|
|
|
|
(t
|
|
|
|
|
(setq s (match-end 1)
|
|
|
|
|
key (if (string= (match-string 2 string) "_") "sub" "sup")
|
|
|
|
|
c (or (match-string 8 string)
|
|
|
|
|
(match-string 6 string)
|
|
|
|
|
(match-string 5 string))
|
|
|
|
|
string (replace-match
|
|
|
|
|
(concat (match-string 1 string)
|
|
|
|
|
"<" key ">" c "</" key ">")
|
|
|
|
|
t t string)))))
|
|
|
|
|
(while (string-match "\\\\\\([_^]\\)" string)
|
|
|
|
|
(setq string (replace-match (match-string 1 string) t t string)))
|
|
|
|
|
string))
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-convert-emphasize (string)
|
|
|
|
|
"Apply emphasis."
|
|
|
|
|
(let ((s 0) rpl)
|
|
|
|
|
(while (string-match org-emph-re string s)
|
|
|
|
|
(if (not (equal
|
|
|
|
|
(substring string (match-beginning 3) (1+ (match-beginning 3)))
|
|
|
|
|
(substring string (match-beginning 4) (1+ (match-beginning 4)))))
|
|
|
|
|
(setq s (match-beginning 0)
|
|
|
|
|
rpl
|
|
|
|
|
(concat
|
|
|
|
|
(match-string 1 string)
|
|
|
|
|
(nth 2 (assoc (match-string 3 string) org-emphasis-alist))
|
|
|
|
|
(match-string 4 string)
|
|
|
|
|
(nth 3 (assoc (match-string 3 string)
|
|
|
|
|
org-emphasis-alist))
|
|
|
|
|
(match-string 5 string))
|
|
|
|
|
string (replace-match rpl t t string)
|
|
|
|
|
s (+ s (- (length rpl) 2)))
|
|
|
|
|
(setq s (1+ s))))
|
|
|
|
|
string))
|
|
|
|
|
|
|
|
|
|
(defun org-open-par ()
|
|
|
|
|
"Insert <p>, but first close previous paragraph if any."
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert "\n<p>")
|
|
|
|
|
(setq org-par-open t))
|
|
|
|
|
(defun org-close-par-maybe ()
|
|
|
|
|
"Close paragraph if there is one open."
|
|
|
|
|
(when org-par-open
|
|
|
|
|
(insert "</p>")
|
|
|
|
|
(setq org-par-open nil)))
|
|
|
|
|
(defun org-close-li (&optional type)
|
|
|
|
|
"Close <li> if necessary."
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(insert (if (equal type "d") "</dd>\n" "</li>\n")))
|
|
|
|
|
|
|
|
|
|
(defvar in-local-list)
|
|
|
|
|
(defvar local-list-indent)
|
|
|
|
|
(defvar local-list-type)
|
|
|
|
|
(defun org-export-html-close-lists-maybe (line)
|
|
|
|
|
(let ((ind (or (get-text-property 0 'original-indentation line)))
|
|
|
|
|
; (and (string-match "\\S-" line)
|
|
|
|
|
; (org-get-indentation line))))
|
|
|
|
|
didclose)
|
|
|
|
|
(when ind
|
|
|
|
|
(while (and in-local-list
|
|
|
|
|
(<= ind (car local-list-indent)))
|
|
|
|
|
(setq didclose t)
|
|
|
|
|
(org-close-li (car local-list-type))
|
|
|
|
|
(insert (format "</%sl>\n" (car local-list-type)))
|
|
|
|
|
(pop local-list-type) (pop local-list-indent)
|
|
|
|
|
(setq in-local-list local-list-indent))
|
|
|
|
|
(and didclose (org-open-par)))))
|
|
|
|
|
|
|
|
|
|
(defvar body-only) ; dynamically scoped into this.
|
|
|
|
|
(defun org-html-level-start (level title umax with-toc head-count)
|
|
|
|
|
"Insert a new level in HTML export.
|
|
|
|
|
When TITLE is nil, just close all open levels."
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(let* ((target (and title (org-get-text-property-any 0 'target title)))
|
|
|
|
|
(extra-targets (assoc target org-export-target-aliases))
|
|
|
|
|
(preferred (cdr (assoc target org-export-preferred-target-alist)))
|
|
|
|
|
(remove (or preferred target))
|
|
|
|
|
(l org-level-max)
|
|
|
|
|
snumber href suffix)
|
|
|
|
|
(setq extra-targets (remove remove extra-targets))
|
|
|
|
|
(setq extra-targets
|
|
|
|
|
(mapconcat (lambda (x)
|
|
|
|
|
(if (org-uuidgen-p x) (setq x (concat "ID-" x)))
|
|
|
|
|
(format "<a name=\"%s\" id=\"%s\"></a>"
|
|
|
|
|
x x))
|
|
|
|
|
extra-targets
|
|
|
|
|
""))
|
|
|
|
|
(while (>= l level)
|
|
|
|
|
(if (aref org-levels-open (1- l))
|
|
|
|
|
(progn
|
|
|
|
|
(org-html-level-close l umax)
|
|
|
|
|
(aset org-levels-open (1- l) nil)))
|
|
|
|
|
(setq l (1- l)))
|
|
|
|
|
(when title
|
|
|
|
|
;; If title is nil, this means this function is called to close
|
|
|
|
|
;; all levels, so the rest is done only if title is given
|
|
|
|
|
(when (string-match (org-re "\\(:[[:alnum:]_@:]+:\\)[ \t]*$") title)
|
|
|
|
|
(setq title (replace-match
|
|
|
|
|
(if org-export-with-tags
|
|
|
|
|
(save-match-data
|
|
|
|
|
(concat
|
|
|
|
|
" <span class=\"tag\">"
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (x)
|
|
|
|
|
(format "<span class=\"%s\">%s</span>"
|
|
|
|
|
(org-export-html-get-tag-class-name x)
|
|
|
|
|
x))
|
|
|
|
|
(org-split-string (match-string 1 title) ":")
|
|
|
|
|
" ")
|
|
|
|
|
"</span>"))
|
|
|
|
|
"")
|
|
|
|
|
t t title)))
|
|
|
|
|
(if (> level umax)
|
|
|
|
|
(progn
|
|
|
|
|
(if (aref org-levels-open (1- level))
|
|
|
|
|
(progn
|
|
|
|
|
(org-close-li)
|
|
|
|
|
(if target
|
|
|
|
|
(insert (format "<li id=\"%s\">" target) extra-targets title "<br/>\n")
|
|
|
|
|
(insert "<li>" title "<br/>\n")))
|
|
|
|
|
(aset org-levels-open (1- level) t)
|
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
(if target
|
|
|
|
|
(insert (format "<ul>\n<li id=\"%s\">" target)
|
|
|
|
|
extra-targets title "<br/>\n")
|
|
|
|
|
(insert "<ul>\n<li>" title "<br/>\n"))))
|
|
|
|
|
(aset org-levels-open (1- level) t)
|
|
|
|
|
(setq snumber (org-section-number level))
|
|
|
|
|
(setq level (+ level org-export-html-toplevel-hlevel -1))
|
|
|
|
|
(if (and org-export-with-section-numbers (not body-only))
|
|
|
|
|
(setq title (concat
|
|
|
|
|
(format "<span class=\"section-number-%d\">%s</span>"
|
|
|
|
|
level snumber)
|
|
|
|
|
" " title)))
|
|
|
|
|
(unless (= head-count 1) (insert "\n</div>\n"))
|
|
|
|
|
(setq href (cdr (assoc (concat "sec-" snumber) org-export-preferred-target-alist)))
|
|
|
|
|
(setq suffix (or href snumber))
|
|
|
|
|
(setq href (or href (concat "sec-" snumber)))
|
|
|
|
|
(insert (format "\n<div id=\"outline-container-%s\" class=\"outline-%d\">\n<h%d id=\"%s\">%s%s</h%d>\n<div class=\"outline-text-%d\" id=\"text-%s\">\n"
|
|
|
|
|
suffix level level href
|
|
|
|
|
extra-targets
|
|
|
|
|
title level level suffix))
|
|
|
|
|
(org-open-par)))))
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-get-tag-class-name (tag)
|
|
|
|
|
"Turn tag into a valid class name.
|
|
|
|
|
Replaces invalid characters with \"_\" and then prepends a prefix."
|
|
|
|
|
(save-match-data
|
|
|
|
|
(while (string-match "[^a-zA-Z0-9_]" tag)
|
|
|
|
|
(setq tag (replace-match "_" t t tag))))
|
|
|
|
|
(concat org-export-html-tag-class-prefix tag))
|
|
|
|
|
|
|
|
|
|
(defun org-export-html-get-todo-kwd-class-name (kwd)
|
|
|
|
|
"Turn todo keyword into a valid class name.
|
|
|
|
|
Replaces invalid characters with \"_\" and then prepends a prefix."
|
|
|
|
|
(save-match-data
|
|
|
|
|
(while (string-match "[^a-zA-Z0-9_]" kwd)
|
|
|
|
|
(setq kwd (replace-match "_" t t kwd))))
|
|
|
|
|
(concat org-export-html-todo-kwd-class-prefix kwd))
|
|
|
|
|
|
|
|
|
|
(defun org-html-level-close (level max-outline-level)
|
|
|
|
|
"Terminate one level in HTML export."
|
|
|
|
|
(if (<= level max-outline-level)
|
|
|
|
|
(insert "</div>\n")
|
|
|
|
|
(org-close-li)
|
|
|
|
|
(insert "</ul>\n")))
|
|
|
|
|
|
|
|
|
|
(provide 'org-html)
|
|
|
|
|
|
|
|
|
|
;; arch-tag: 8109d84d-eb8f-460b-b1a8-f45f3a6c7ea1
|
|
|
|
|
;;; org-html.el ends here
|