diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2009-01-26 07:36:01 +0100 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2009-01-26 07:36:01 +0100 |
| commit | d438d616b7bf99e64e729d3a06243a2f2a0eb2d4 (patch) | |
| tree | bac1f0ab11632821be0b56d5a9e798bdecea726e | |
| parent | 2ccea84c9694274c0658aa70ee376ee1bdc7f19b (diff) | |
Export: Fix timestamp processing
There were two bugs:
1. Timestamp processing did not honor the setting of
`org-export-with-timestamps' in the text before the first
headline.
2. When `org-export-with-timestamps' was nil, time stamps were removed
even in tables. I think this is incorrect, so in tables, time
stamps are now never removed.
| -rwxr-xr-x | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/org-exp.el | 12 | ||||
| -rw-r--r-- | lisp/org-export-latex.el | 4 |
3 files changed, 19 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f1c4b39a..46c956cef 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2009-01-26 Carsten Dominik <carsten.dominik@gmail.com> + + * org-exp.el (org-export-remove-timestamps): Never remove + timestamps from tables. + + * org-export-latex.el (org-export-latex-first-lines): Add more + options to the preprocessing of the text before the first + headline. + 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com> * org-faces.el (org-clock-overlay): Make face compatible with diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 0a888746c..14abae405 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1,6 +1,7 @@ ;;; org-exp.el --- ASCII, HTML, XOXO and iCalendar export for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +;; 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 @@ -1863,10 +1864,11 @@ from the buffer." (while (re-search-forward org-maybe-keyword-time-regexp nil t) (backward-char 1) (org-if-unprotected - (replace-match "") - (beginning-of-line 1) - (if (looking-at "[- \t]*\\(=>[- \t0-9:]*\\)?[ \t]*\n") - (replace-match ""))))) + (unless (save-match-data (org-at-table-p)) + (replace-match "") + (beginning-of-line 1) + (if (looking-at "[- \t]*\\(=>[- \t0-9:]*\\)?[ \t]*\n") + (replace-match "")))))) (defun org-export-remove-clock-lines () "Remove timestamps and keywords for export." diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el index 2da064853..a4e627498 100644 --- a/lisp/org-export-latex.el +++ b/lisp/org-export-latex.el @@ -790,7 +790,9 @@ If BEG is non-nil, the is the beginning of he region." :add-text nil :comments nil :skip-before-1st-heading nil - :LaTeX-fragments nil)) + :LaTeX-fragments nil + :timestamps (plist-get opt-plist :timestamps) + :footnotes (plist-get opt-plist :footnotes))) (add-text-properties pt (max pt (1- end)) '(:org-license-to-kill t)))))) |