diff options
author | Jambunathan K <kjambunathan@gmail.com> | 2011-07-27 11:27:23 +0530 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-07-27 14:43:07 +0200 |
commit | 76297448c9ebbf3d4a487b52b34e5435652fcd64 (patch) | |
tree | 25113d8e23c3dbebdb0ea0af1d65099fcf8d3dde | |
parent | 5aae06d9f4c18429ecddb41efc103a67b2a4292d (diff) | |
download | org-mode-76297448c9ebbf3d4a487b52b34e5435652fcd64.tar.gz |
org-odt: Emit OD compatible date string in the default case
* contrib/lisp/org-odt.el (org-odt-format-date): New
(org-odt-update-meta-file): Use the above routine
Knocks off an error reported by
http://tools.services.openoffice.org/odfvalidator/
-rw-r--r-- | contrib/lisp/org-odt.el | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/contrib/lisp/org-odt.el b/contrib/lisp/org-odt.el index bab7590..fbbf638 100644 --- a/contrib/lisp/org-odt.el +++ b/contrib/lisp/org-odt.el @@ -1351,10 +1351,36 @@ MAY-INLINE-P allows inlining it as an image." (message "Created %s" target) (set-buffer (find-file-noselect target t))) +(defun org-odt-format-date (date) + (let ((warning-msg + "OpenDocument files require that dates be in ISO-8601 format. Please review your DATE options for compatibility.")) + ;; If the user is not careful with the date specification, an + ;; invalid meta.xml will be emitted. + + ;; For now honor user's diktat and let him off with a warning + ;; message. This is OK as LibreOffice (and possibly other + ;; apps) doesn't deem this deviation as critical and continue + ;; to load the file. + + ;; FIXME: Surely there a better way to handle this. Revisit this + ;; later. + (cond + ((and date (string-match "%" date)) + ;; Honor user's diktat. See comments above + (org-lparse-warn warning-msg) + (format-time-string date)) + (date + ;; Honor user's diktat. See comments above + (org-lparse-warn warning-msg) + date) + (t + ;; ISO 8601 format + (format-time-string "%Y-%m-%dT%T%:z"))))) + (defun org-odt-update-meta-file (opt-plist) (with-current-buffer (find-file-noselect (expand-file-name "meta.xml") t) - (let ((date (or (plist-get opt-plist :effective-date) "")) + (let ((date (org-odt-format-date (plist-get opt-plist :date))) (author (or (plist-get opt-plist :author) "")) (email (plist-get opt-plist :email)) (keywords (plist-get opt-plist :keywords)) |