Rename org-export-convert-* to org-lparse-convert-*

The org-export-* prefix is confusing here, as these functions
seem to be part of org-exp.el.  Let's name them by the library
they are in (and rely on) for now -- maybe this will change
when we move the ODT exporter to the core.
This commit is contained in:
Bastien Guerry 2011-07-08 12:39:05 +02:00
parent 227bd77874
commit e6f45face6
3 changed files with 14 additions and 14 deletions

View File

@ -43,7 +43,7 @@
;; `org-export-as-html-and-open', `org-export-as-html-to-buffer',
;; `org-replace-region-by-html' and `org-export-region-as-html'.
;; The all new interactive command `org-export-convert' can be used to
;; The new interactive command `org-lparse-convert' can be used to
;; convert documents between various formats. Use this to command,
;; for example, to convert odt file to doc or pdf format.
@ -428,7 +428,7 @@ PUB-DIR specifies the publishing directory."
(run-hooks 'org-export-first-hook)
(org-do-lparse arg hidden ext-plist to-buffer body-only pub-dir)))
(defcustom org-export-convert-process
(defcustom org-lparse-convert-process
'("soffice" "-norestore" "-invisible" "-headless" "\"macro:///BasicODConverter.Main.Convert(%I,%f,%O)\"")
"Command to covert a Org exported format to other formats.
The variable is an list of the form (PROCESS ARG1 ARG2 ARG3
@ -440,14 +440,14 @@ The variable is an list of the form (PROCESS ARG1 ARG2 ARG3
%O output file name as a URL
%d output dir in full
%D output dir as a URL"
:group 'org-export)
:group 'org-lparse)
(defcustom org-lparse-use-flashy-warning t
"Use flashy warnings when exporting to ODT."
:type 'boolean
:group 'org-export)
(defun org-export-convert (&optional in-file fmt)
(defun org-lparse-convert (&optional in-file fmt)
"Convert file from one format to another using a converter.
IN-FILE is the file to be converted. If unspecified, it defaults
to variable `buffer-file-name'. FMT is the desired output format. If the
@ -473,7 +473,7 @@ then that converter is used. Otherwise
(backend (when (boundp 'org-lparse-backend) org-lparse-backend))
(convert-process
(or (ignore-errors (org-lparse-backend-get backend 'CONVERT-METHOD))
org-export-convert-process))
org-lparse-convert-process))
program arglist)
(setq program (and convert-process (consp convert-process)
@ -1114,9 +1114,9 @@ version."
(or (when (and (boundp 'org-lparse-other-backend)
org-lparse-other-backend
(not (equal org-lparse-backend org-lparse-other-backend)))
(let ((org-export-convert-process (org-lparse-get 'CONVERT-METHOD)))
(when org-export-convert-process
(org-export-convert buffer-file-name
(let ((org-lparse-convert-process (org-lparse-get 'CONVERT-METHOD)))
(when org-lparse-convert-process
(org-lparse-convert buffer-file-name
(symbol-name org-lparse-other-backend)))))
(current-buffer)))
((eq to-buffer 'string)
@ -1582,9 +1582,9 @@ the alist of previous items."
(defvar org-lparse-output-buffer)
(defcustom org-lparse-debug nil
"."
:group 'org-lparse
:type 'boolean)
"Turn on/off debugging for `org-lparse'."
:type 'boolean
:group 'org-lparse)
(defun org-lparse-begin (entity &rest args)
"Begin ENTITY in current buffer. ARGS is entity specific.

View File

@ -1654,7 +1654,7 @@ lang=\"%s\" xml:lang=\"%s\">
(OTHER-BACKENDS
'("etext" "html" "html10" "mediawiki" "pdf" "sdw" "sdw3" "sdw4"
"text" "text10" "odt" "vor" "vor4"))
(CONVERT-METHOD org-export-convert-process)
(CONVERT-METHOD org-lparse-convert-process)
(EXPORT-DIR (org-export-directory :html opt-plist))
(FILE-NAME-EXTENSION (plist-get opt-plist :html-extension))
(EXPORT-BUFFER-NAME "*Org HTML Export*")

View File

@ -10721,12 +10721,12 @@ following methods:
Export the outline first to one of the native formats (like OpenDocumentText)
and immediately post-process it to other formats using an external converter.
@item M-x org-export-convert
@item M-x org-lparse-convert
Export an existing document to other formats using an external converter.
@end table
You can choose the converter used for conversion by customizing the variable
@code{org-export-convert-process}.
@code{org-lparse-convert-process}.
@node Links in OpenDocumentText export, Tables in OpenDocumentText export, Converting to Other formats, OpenDocumentText export
@subsection Links in OpenDocumentText export