mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-27 07:37:25 +00:00
Code

Simplify definition of `org-export-odt-convert-processes'

Browse Source 
* lisp/org-odt.el (org-export-odt-convert-processes): Re-define
(org-export-odt-convert-capabilities): Fix an accidental
regression.

* lisp/org-lparse.el (org-lparse-do-convert): Related change.
This commit is contained in:
Jambunathan K 2012-02-12 16:39:07 +05:30
parent c04b68a73c
commit 21ccc6def6
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lisp/org-lparse.el
View File

@ -484,24 +484,17 @@ This is a helper routine for interactive use."
(error "Cannot convert from %s format to %s format?"
in-fmt out-fmt)))
(convert-process (car how))
(program (car convert-process))
(dummy (and (or program (error "Converter not configured"))
(or (executable-find program)
(error "Cannot find converter %s" program))))
(out-file (concat (file-name-sans-extension in-file) "."
(nth 1 (or (cdr how) out-fmt))))
(out-dir (file-name-directory in-file))
(arglist (mapcar (lambda (arg)
(format-spec
arg `((?i . ,(shell-quote-argument in-file))
(?I . ,(browse-url-file-url in-file))
(?f . ,out-fmt)
(?o . ,out-file)
(?O . ,(browse-url-file-url out-file))
(?d . , (shell-quote-argument out-dir))
(?D . ,(browse-url-file-url out-dir)))))
convert-process))
(cmd (mapconcat 'identity arglist " ")))
(cmd (format-spec convert-process
`((?i . ,(shell-quote-argument in-file))
(?I . ,(browse-url-file-url in-file))
(?f . ,out-fmt)
(?o . ,out-file)
(?O . ,(browse-url-file-url out-file))
(?d . , (shell-quote-argument out-dir))
(?D . ,(browse-url-file-url out-dir))))))
(when (file-exists-p out-file)
(delete-file out-file))
@ -511,7 +504,7 @@ This is a helper routine for interactive use."
(cond
((file-exists-p out-file)
(message "Exported to %s using %s" out-file program)
(message "Exported to %s" out-file)
(when prefix-arg
(message "Opening %s..." out-file)
(org-open-file out-file))

27
lisp/org-odt.el
View File

@ -2413,24 +2413,20 @@ visually."
(defcustom org-export-odt-convert-processes
'(("LibreOffice"
("soffice" "--headless" "--convert-to %f" "--outdir %d" "%i"))
"soffice --headless --convert-to %f --outdir %d %i")
("BasicODConverter"
("soffice" "--headless"
"\"macro:///BasicODConverter.Main.Convert(%I,%f,%O)\""))
"soffice --headless \"macro:///BasicODConverter.Main.Convert(%I,%f,%O)\"")
("unoconv"
("unoconv" "-f" "%f" "-o" "%d" "%i")))
"unoconv -f %f -o %d %i"))
"Specify a list of document converters and their usage.
The converters in this list are offered as choices while
customizing `org-export-odt-convert-process'.
This variable is an alist where each element is of the
form (CONVERTER-NAME CONVERTER-PROCESS). CONVERTER-NAME is name
of the converter. CONVERTER-PROCESS specifies the command-line
syntax of the converter and is of the form (CONVERTER-PROGRAM
ARG1 ARG2 ...). CONVERTER-PROGRAM is the name of the executable.
ARG1, ARG2 etc are command line options that are passed to
CONVERTER-PROGRAM. Format specifiers can be used in the ARGs and
they are interpreted as below:
This variable is a list where each element is of the
form (CONVERTER-NAME CONVERTER-CMD). CONVERTER-NAME is the name
of the converter. CONVERTER-CMD is the shell command for the
converter and can contain format specifiers. These format
specifiers are interpreted as below:
%i input file name in full
%I input file name as a URL
@ -2446,8 +2442,7 @@ they are interpreted as below:
(const :tag "None" nil)
(alist :tag "Converters"
:key-type (string :tag "Converter Name")
:value-type (group (cons (string :tag "Executable")
(repeat (string :tag "Command line args")))))))
:value-type (group (string :tag "Command line")))))
(defcustom org-export-odt-convert-process "LibreOffice"
"Use this converter to convert from \"odt\" format to other formats.
@ -2470,6 +2465,7 @@ from `org-export-odt-convert-processes'."
(("pdf" "pdf") ("odt" "odt") ("rtf" "rtf") ("ott" "ott") ("doc" "doc")
("docx" "docx") ("html" "html")))
("Web"
("html")
(("pdf" "pdf") ("odt" "odt") ("html" "html")))
("Spreadsheet"
("ods" "ots" "xls" "csv" "xlsx")
@ -2517,7 +2513,8 @@ configuration."
:type
'(choice
(const :tag "None" nil)
(alist :key-type (string :tag "Document Class")
(alist :tag "Capabilities"
:key-type (string :tag "Document Class")
:value-type
(group (repeat :tag "Input formats" (string :tag "Input format"))
(alist :tag "Output formats"