* [PATCH] org-odt: Include mimetype in the exported odt file
@ 2011-07-26 21:24 Jambunathan K
2011-07-27 12:42 ` Bastien
0 siblings, 1 reply; 2+ messages in thread
From: Jambunathan K @ 2011-07-26 21:24 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: 0001-org-odt-Include-mimetype-in-the-exported-odt-file.patch --]
[-- Type: text/plain, Size: 3188 bytes --]
From 3530d2b3bd5b903e9b568a6412573faa79862d36 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Wed, 27 Jul 2011 02:50:48 +0530
Subject: [PATCH] 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/.
---
contrib/lisp/org-odt.el | 32 ++++++++++++++++----------------
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)
--
1.7.2.3
[-- Attachment #2: Type: text/plain, Size: 6 bytes --]
--
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] org-odt: Include mimetype in the exported odt file
2011-07-26 21:24 [PATCH] org-odt: Include mimetype in the exported odt file Jambunathan K
@ 2011-07-27 12:42 ` Bastien
0 siblings, 0 replies; 2+ messages in thread
From: Bastien @ 2011-07-27 12:42 UTC (permalink / raw)
To: Jambunathan K; +Cc: emacs-orgmode
Hi Jambunathan,
Jambunathan K <kjambunathan@gmail.com> writes:
>From 3530d2b3bd5b903e9b568a6412573faa79862d36 Mon Sep 17 00:00:00 2001
> From: Jambunathan K <kjambunathan@gmail.com>
> Date: Wed, 27 Jul 2011 02:50:48 +0530
> Subject: [PATCH] org-odt: Include mimetype in the exported odt file
Applied, thanks.
--
Bastien
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-27 14:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-26 21:24 [PATCH] org-odt: Include mimetype in the exported odt file Jambunathan K
2011-07-27 12:42 ` Bastien
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).