summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-05-13 20:17:28 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-05-13 20:17:28 +0200
commitb7793bd54a1d79e16b9b3297c620715157b00d0f (patch)
treeffc3fd658165fec888a778976a6c724496c46d10
parent797fa7ffeea4eb2f23ac101b17f2e4328c0b302a (diff)
downloadorg-mode-b7793bd54a1d79e16b9b3297c620715157b00d0f.tar.gz
Docbook export: Improve formatting of xslt command
Patch by Dale Smith.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/org-docbook.el13
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a82725..5700d9d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-13 Carsten Dominik <carsten.dominik@gmail.com>
+
+ * org-docbook.el (org-export-as-docbook-pdf): Improve
+ formatting of the xslt command.
+
2010-05-13 Sebastian Rose <sebastian_rose@gmx.de>
* org-publish.el (org-publish-cache): Use one big hashmap for
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el
index 7f76989..768702f 100644
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@@ -76,6 +76,7 @@
(require 'org)
(require 'org-exp)
(require 'org-html)
+(require 'format-spec)
;;; Variables:
@@ -333,10 +334,10 @@ in a window. A non-interactive call will only return the buffer."
"Export as DocBook XML file, and generate PDF file."
(interactive "P")
(if (or (not org-export-docbook-xslt-proc-command)
- (not (string-match "%s.+%s" org-export-docbook-xslt-proc-command)))
+ (not (string-match "%[io].+%[io]" org-export-docbook-xslt-proc-command)))
(error "XSLT processor command is not set correctly"))
(if (or (not org-export-docbook-xsl-fo-proc-command)
- (not (string-match "%s.+%s" org-export-docbook-xsl-fo-proc-command)))
+ (not (string-match "%[io].+%[io]" org-export-docbook-xsl-fo-proc-command)))
(error "XSL-FO processor command is not set correctly"))
(message "Exporting to PDF...")
(let* ((wconfig (current-window-configuration))
@@ -348,10 +349,10 @@ in a window. A non-interactive call will only return the buffer."
(pdffile (concat base ".pdf")))
(and (file-exists-p pdffile) (delete-file pdffile))
(message "Processing DocBook XML file...")
- (shell-command (format org-export-docbook-xslt-proc-command
- fofile (shell-quote-argument filename)))
- (shell-command (format org-export-docbook-xsl-fo-proc-command
- fofile pdffile))
+ (shell-command (format-spec org-export-docbook-xslt-proc-command
+ (format-spec-make ?o fofile ?i (shell-quote-argument filename))))
+ (shell-command (format-spec org-export-docbook-xsl-fo-proc-command
+ (format-spec-make ?i fofile ?o pdffile)))
(message "Processing DocBook file...done")
(if (not (file-exists-p pdffile))
(error "PDF file was not produced")