diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2012-10-28 16:20:45 +0100 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2012-10-28 16:36:45 +0100 |
commit | f6e936c2b9197689afd2b347d381a80612e0b545 (patch) | |
tree | a89715b14cf0178240295612b49167d3d94ca68e | |
parent | c1e3aaece33f8d603ece5709d5191fe780dd26cc (diff) | |
download | org-mode-f6e936c2b9197689afd2b347d381a80612e0b545.tar.gz |
Export back-ends: Update timestamp export
* contrib/lisp/org-e-ascii.el (org-e-ascii-timestamp): Update
timestamp export.
* contrib/lisp/org-e-groff.el (org-e-groff-timestamp): Update
timestamp export.
* contrib/lisp/org-e-html.el (org-e-html-timestamp): Update timestamp
export.
* contrib/lisp/org-e-latex.el (org-e-latex-timestamp): Update
timestamp export.
* contrib/lisp/org-e-odt.el (org-e-odt-timestamp): Update timestamp
export.
* contrib/lisp/org-e-texinfo.el (org-e-texinfo-timestamp): Update
timestamp export.
-rw-r--r-- | contrib/lisp/org-e-ascii.el | 10 | ||||
-rw-r--r-- | contrib/lisp/org-e-groff.el | 15 | ||||
-rw-r--r-- | contrib/lisp/org-e-html.el | 8 | ||||
-rw-r--r-- | contrib/lisp/org-e-latex.el | 22 | ||||
-rw-r--r-- | contrib/lisp/org-e-odt.el | 23 | ||||
-rw-r--r-- | contrib/lisp/org-e-texinfo.el | 15 |
6 files changed, 49 insertions, 44 deletions
diff --git a/contrib/lisp/org-e-ascii.el b/contrib/lisp/org-e-ascii.el index 85968a6..819a0c3 100644 --- a/contrib/lisp/org-e-ascii.el +++ b/contrib/lisp/org-e-ascii.el @@ -1724,12 +1724,10 @@ a communication channel." (defun org-e-ascii-timestamp (timestamp contents info) "Transcode a TIMESTAMP object from Org to ASCII. CONTENTS is nil. INFO is a plist holding contextual information." - (let ((value (org-translate-time (org-element-property :value timestamp))) - (range-end - (org-translate-time (org-element-property :range-end timestamp))) - (utf8p (eq (plist-get info :ascii-charset) 'utf-8))) - (concat value - (when range-end (concat (if utf8p "–" "--") range-end))))) + (let ((value (org-translate-time + (org-element-property :raw-value timestamp)))) + (if (not (eq (plist-get info :ascii-charset) 'utf-8)) value + (replace-regexp-in-string "--" "–" value)))) ;;;; Underline diff --git a/contrib/lisp/org-e-groff.el b/contrib/lisp/org-e-groff.el index f1538b4..7fe9eb7 100644 --- a/contrib/lisp/org-e-groff.el +++ b/contrib/lisp/org-e-groff.el @@ -1851,13 +1851,14 @@ information." "Transcode a TIMESTAMP object from Org to Groff. CONTENTS is nil. INFO is a plist holding contextual information." - (let ((value (org-translate-time (org-element-property :value timestamp))) - (type (org-element-property :type timestamp))) - (cond ((memq type '(active active-range)) - (format org-e-groff-active-timestamp-format value)) - ((memq type '(inactive inactive-range)) - (format org-e-groff-inactive-timestamp-format value)) - (t (format org-e-groff-diary-timestamp-format value))))) + (let ((value (org-translate-time + (org-element-property :raw-value timestamp)))) + (case (org-element-property :type timestamp) + ((active active-range) + (format org-e-groff-active-timestamp-format value)) + ((inactive inactive-range) + (format org-e-groff-inactive-timestamp-format value)) + (t (format org-e-groff-diary-timestamp-format value))))) ;;; Underline diff --git a/contrib/lisp/org-e-html.el b/contrib/lisp/org-e-html.el index fbfb0ab..0f3ed7d 100644 --- a/contrib/lisp/org-e-html.el +++ b/contrib/lisp/org-e-html.el @@ -2702,12 +2702,10 @@ information." "Transcode a TIMESTAMP object from Org to HTML. CONTENTS is nil. INFO is a plist holding contextual information." - (let* ((f (if (eq (org-element-property :type timestamp) 'inactive) "[%s]" "<%s>")) - (value (org-translate-time (format f (org-element-property :value timestamp)))) - (range-end (org-element-property :range-end timestamp))) + (let ((value (org-translate-time + (org-element-property :raw-value timestamp)))) (format "<span class=\"timestamp-wrapper\"><span class=\"timestamp\">%s</span></span>" - (if (not range-end) value - (concat value "–" (org-translate-time (format f range-end))))))) + (replace-regexp-in-string "--" "–" value)))) ;;;; Underline diff --git a/contrib/lisp/org-e-latex.el b/contrib/lisp/org-e-latex.el index 58664a1..fdb9e31 100644 --- a/contrib/lisp/org-e-latex.el +++ b/contrib/lisp/org-e-latex.el @@ -2452,21 +2452,23 @@ information." "Transcode a TIMESTAMP object from Org to LaTeX. CONTENTS is nil. INFO is a plist holding contextual information." - (let ((value (org-translate-time (org-element-property :value timestamp))) - (range-end (org-element-property :range-end timestamp))) + (let ((value (org-translate-time + (org-element-property :raw-value timestamp)))) (case (org-element-property :type timestamp) (active (format org-e-latex-active-timestamp-format value)) (active-range - (concat (format org-e-latex-active-timestamp-format value) - "--" - (format org-e-latex-active-timestamp-format - (org-translate-time range-end)))) + (let ((timestamps (org-split-string value "--"))) + (concat + (format org-e-latex-active-timestamp-format (car timestamps)) + "--" + (format org-e-latex-active-timestamp-format (cdr timestamps))))) (inactive (format org-e-latex-inactive-timestamp-format value)) (inactive-range - (concat (format org-e-latex-inactive-timestamp-format value) - "--" - (format org-e-latex-inactive-timestamp-format - (org-translate-time range-end)))) + (let ((timestamps (org-split-string value "--"))) + (concat + (format org-e-latex-inactive-timestamp-format (car timestamps)) + "--" + (format org-e-latex-inactive-timestamp-format (cdr timestamps))))) (otherwise (format org-e-latex-diary-timestamp-format value))))) diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el index 2798b21..3478cc5 100644 --- a/contrib/lisp/org-e-odt.el +++ b/contrib/lisp/org-e-odt.el @@ -3305,17 +3305,22 @@ information." "Transcode a TIMESTAMP object from Org to ODT. CONTENTS is nil. INFO is a plist used as a communication channel." - (let ((timestamp-1 (org-element-property :value timestamp)) - (timestamp-2 (org-element-property :range-end timestamp))) + (let ((value (org-translate-time + (org-element-property :raw-value timestamp)))) (format "<text:span text:style-name=\"%s\">%s</text:span>" "OrgTimestampWrapper" - (concat - (format "<text:span text:style-name=\"%s\">%s</text:span>" - "OrgTimestamp" (org-translate-time timestamp-1)) - (and timestamp-2 - "–" - (format "<text:span text:style-name=\"%s\">%s</text:span>" - "OrgTimestamp" (org-translate-time timestamp-2))))))) + (if (not (memq (org-element-property :type timestamp) + '(active-range inactive-range))) + value + (let ((timestamps (org-split-string value "--"))) + (concat + (format "<text:span text:style-name=\"%s\">%s</text:span>" + "OrgTimestamp" + (car timestamps)) + "–" + (format "<text:span text:style-name=\"%s\">%s</text:span>" + "OrgTimestamp" + (cdr timestamps)))))))) ;;;; Underline diff --git a/contrib/lisp/org-e-texinfo.el b/contrib/lisp/org-e-texinfo.el index e754560..79fa2ed 100644 --- a/contrib/lisp/org-e-texinfo.el +++ b/contrib/lisp/org-e-texinfo.el @@ -1570,13 +1570,14 @@ information." "Transcode a TIMESTAMP object from Org to Texinfo. CONTENTS is nil. INFO is a plist holding contextual information." - (let ((value (org-translate-time (org-element-property :value timestamp))) - (type (org-element-property :type timestamp))) - (cond ((memq type '(active active-range)) - (format org-e-texinfo-active-timestamp-format value)) - ((memq type '(inactive inactive-range)) - (format org-e-texinfo-inactive-timestamp-format value)) - (t (format org-e-texinfo-diary-timestamp-format value))))) + (let ((value (org-translate-time + (org-element-property :raw-value timestamp)))) + (case (org-element-property :type timestamp) + ((active active-range) + (format org-e-texinfo-active-timestamp-format value)) + ((inactive inactive-range) + (format org-e-texinfo-inactive-timestamp-format value)) + (t (format org-e-texinfo-diary-timestamp-format value))))) ;;; Verbatim |