summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJambunathan K <kjambunathan@gmail.com>2011-07-27 02:50:48 +0530
committerBastien Guerry <bzg@altern.org>2011-07-27 14:41:52 +0200
commit5aae06d9f4c18429ecddb41efc103a67b2a4292d (patch)
tree51180a8a2683e97c8139fa61ef472929e6d01a1a
parent2610bfd05241f6adacf2c9143e6fd12ce9062b28 (diff)
downloadorg-mode-5aae06d9f4c18429ecddb41efc103a67b2a4292d.tar.gz
org-odt: Include mimetype in the exported odt file
* contrib/lisp/org-odt.el (org-export-odt-save-list): Add the file "mimetype". (org-odt-init-outfile): Write contents of "mimetype". (org-odt-save-as-outfile): Include "mimetype" file in the exported file. (org-export-odt-mimetype-lines): Removed. This change knocks of an error while validating against http://tools.services.openoffice.org/odfvalidator/.
-rw-r--r--contrib/lisp/org-odt.el32
1 files changed, 16 insertions, 16 deletions
diff --git a/contrib/lisp/org-odt.el b/contrib/lisp/org-odt.el
index b7e5a70..bab7590 100644
--- a/contrib/lisp/org-odt.el
+++ b/contrib/lisp/org-odt.el
@@ -1091,7 +1091,7 @@ MAY-INLINE-P allows inlining it as an image."
;; xml files generated on-the-fly
(defconst org-export-odt-save-list
- '("META-INF/manifest.xml" "content.xml" "meta.xml" "styles.xml"))
+ '("mimetype" "META-INF/manifest.xml" "content.xml" "meta.xml" "styles.xml"))
;; xml files that are copied
(defconst org-export-odt-nosave-list '())
@@ -1262,6 +1262,10 @@ MAY-INLINE-P allows inlining it as an image."
(save-excursion
(insert (mapconcat 'identity (cdr org-export-odt-meta-lines) "\n"))))
+ ;; mimetype
+ (with-current-buffer (find-file-noselect mimetype-file t)
+ (insert "application/vnd.oasis.opendocument.text"))
+
;; styles file
;; (copy-file org-export-odt-styles-file styles-file t)
@@ -1273,9 +1277,6 @@ MAY-INLINE-P allows inlining it as an image."
(append org-export-odt-save-list org-export-odt-nosave-list)))
content-file))
-(defconst org-export-odt-mimetype-lines
- '("application/vnd.oasis.opendocument.text"))
-
(defconst org-odt-manifest-file-entry-tag
"<manifest:file-entry manifest:media-type=\"%s\" manifest:full-path=\"%s\"/>")
@@ -1319,23 +1320,22 @@ MAY-INLINE-P allows inlining it as an image."
(let* ((target-name (file-name-nondirectory target))
(target-dir (file-name-directory target))
- (cmd (format "zip -rmTq %s %s" target-name ".")))
+ (cmds `(("zip" "-mX0" ,target-name "mimetype")
+ ("zip" "-rmTq" ,target-name "."))))
(when (file-exists-p target)
;; FIXME: If the file is locked this throws a cryptic error
(delete-file target))
(let ((coding-system-for-write 'no-conversion) exitcode)
- (message "Creating odt file using \"%s\"" cmd)
- (setq exitcode
- (apply 'call-process
- "zip"
- nil
- nil
- nil
- (append (list "-rmTq") (list target-name "."))))
-
- (or (zerop exitcode)
- (error "Unable to create odt file (%S)" exitcode)))
+ (message "Creating odt file...")
+ (mapc
+ (lambda (cmd)
+ (message "Running %s" (mapconcat 'identity cmd " "))
+ (setq exitcode
+ (apply 'call-process (car cmd) nil nil nil (cdr cmd)))
+ (or (zerop exitcode)
+ (error "Unable to create odt file (%S)" exitcode)))
+ cmds))
;; move the file from outdir to target-dir
(rename-file target-name target-dir)