summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2012-11-29 20:52:43 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2012-11-29 20:52:43 (GMT)
commit496ed832d8d16dcede4078832b77638744f4a42c (patch)
tree36e1b9e43ab1ae9339ce9ccec43db5ccdc68472b
parent07f4d867e547736bb823812414022096676e9993 (diff)
downloadorg-mode-496ed832d8d16dcede4078832b77638744f4a42c.zip
org-mode-496ed832d8d16dcede4078832b77638744f4a42c.tar.gz
export back-ends: Remove useless pub-dir argument from export commands
* contrib/lisp/org-e-ascii.el (org-e-ascii-export-to-ascii): Remove pub-dir argument. * contrib/lisp/org-e-beamer.el (org-e-beamer-export-to-latex, org-e-beamer-export-to-pdf): Remove pub-dir argument. * contrib/lisp/org-e-groff.el (org-e-groff-export-to-groff, org-e-groff-export-to-pdf): Remove pub-dir argument. * contrib/lisp/org-e-html.el (org-e-html-export-to-html): Remove pub-dir argument. * contrib/lisp/org-e-latex.el (org-e-latex-export-to-latex, org-e-latex-export-to-pdf): Remove pub-dir argument. * contrib/lisp/org-e-man.el (org-e-man-export-to-man, org-e-man-export-to-pdf): Remove pub-dir argument. * contrib/lisp/org-e-odt.el (org-e-odt-export-to-odt): Remove pub-dir argument. * contrib/lisp/org-e-texinfo.el (org-e-texinfo-export-to-texinfo, org-e-texinfo-export-to-info): Remove pub-dir argument. * contrib/lisp/org-koma-letter.el (org-koma-letter-export-to-latex, org-koma-letter-export-to-pdf): Remove pub-dir argument. * contrib/lisp/org-md.el (org-md-export-to-markdown): Remove pub-dir argument. Publishing mechansim does not call any export command. It only relies on `org-export-file-name' and `org-export-to-file'. Only the former has to support a pub-dir argument.
-rw-r--r--contrib/lisp/org-e-ascii.el7
-rw-r--r--contrib/lisp/org-e-beamer.el15
-rw-r--r--contrib/lisp/org-e-groff.el15
-rw-r--r--contrib/lisp/org-e-html.el7
-rw-r--r--contrib/lisp/org-e-latex.el15
-rw-r--r--contrib/lisp/org-e-man.el15
-rw-r--r--contrib/lisp/org-e-odt.el7
-rw-r--r--contrib/lisp/org-e-texinfo.el12
-rw-r--r--contrib/lisp/org-koma-letter.el12
-rw-r--r--contrib/lisp/org-md.el7
10 files changed, 32 insertions, 80 deletions
diff --git a/contrib/lisp/org-e-ascii.el b/contrib/lisp/org-e-ascii.el
index 508659c..d44723f 100644
--- a/contrib/lisp/org-e-ascii.el
+++ b/contrib/lisp/org-e-ascii.el
@@ -1815,7 +1815,7 @@ is non-nil."
;;;###autoload
(defun org-e-ascii-export-to-ascii
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to a text file.
If narrowing is active in the current buffer, only export its
@@ -1837,12 +1837,9 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
- (let ((outfile (org-export-output-file-name ".txt" subtreep pub-dir)))
+ (let ((outfile (org-export-output-file-name ".txt" subtreep)))
(org-export-to-file
'e-ascii outfile subtreep visible-only body-only ext-plist)))
diff --git a/contrib/lisp/org-e-beamer.el b/contrib/lisp/org-e-beamer.el
index 6ea1fb5..bab655e 100644
--- a/contrib/lisp/org-e-beamer.el
+++ b/contrib/lisp/org-e-beamer.el
@@ -1015,7 +1015,7 @@ is non-nil."
;;;###autoload
(defun org-e-beamer-export-to-latex
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer as a Beamer presentation (tex).
If narrowing is active in the current buffer, only export its
@@ -1037,18 +1037,15 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
- (let ((outfile (org-export-output-file-name ".tex" subtreep pub-dir)))
+ (let ((outfile (org-export-output-file-name ".tex" subtreep)))
(org-export-to-file
'e-beamer outfile subtreep visible-only body-only ext-plist)))
;;;###autoload
(defun org-e-beamer-export-to-pdf
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer as a Beamer presentation (PDF).
If narrowing is active in the current buffer, only export its
@@ -1070,14 +1067,10 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return PDF file's name."
(interactive)
(org-e-latex-compile
- (org-e-beamer-export-to-latex
- subtreep visible-only body-only ext-plist pub-dir)))
+ (org-e-beamer-export-to-latex subtreep visible-only body-only ext-plist)))
;;;###autoload
(defun org-e-beamer-select-environment ()
diff --git a/contrib/lisp/org-e-groff.el b/contrib/lisp/org-e-groff.el
index 0da9c62..77b4e69 100644
--- a/contrib/lisp/org-e-groff.el
+++ b/contrib/lisp/org-e-groff.el
@@ -1886,7 +1886,7 @@ contextual information."
;;; Interactive functions
(defun org-e-groff-export-to-groff
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to a Groff file.
If narrowing is active in the current buffer, only export its
@@ -1905,19 +1905,16 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
(setq org-e-groff-registered-references nil)
(setq org-e-groff-special-content nil)
- (let ((outfile (org-export-output-file-name ".groff" subtreep pub-dir)))
+ (let ((outfile (org-export-output-file-name ".groff" subtreep)))
(org-export-to-file
'e-groff outfile subtreep visible-only body-only ext-plist)))
(defun org-e-groff-export-to-pdf
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to Groff then process through to PDF.
If narrowing is active in the current buffer, only export its
@@ -1936,14 +1933,10 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return PDF file's name."
(interactive)
(org-e-groff-compile
- (org-e-groff-export-to-groff
- subtreep visible-only body-only ext-plist pub-dir)))
+ (org-e-groff-export-to-groff subtreep visible-only body-only ext-plist)))
(defun org-e-groff-compile (file)
"Compile a Groff file.
diff --git a/contrib/lisp/org-e-html.el b/contrib/lisp/org-e-html.el
index 811f667..f970a29 100644
--- a/contrib/lisp/org-e-html.el
+++ b/contrib/lisp/org-e-html.el
@@ -2803,7 +2803,7 @@ is non-nil."
;;;###autoload
(defun org-e-html-export-to-html
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to a HTML file.
If narrowing is active in the current buffer, only export its
@@ -2825,13 +2825,10 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
(let* ((extension (concat "." org-e-html-extension))
- (file (org-export-output-file-name extension subtreep pub-dir))
+ (file (org-export-output-file-name extension subtreep))
(org-export-coding-system org-e-html-coding-system))
(org-export-to-file
'e-html file subtreep visible-only body-only ext-plist)))
diff --git a/contrib/lisp/org-e-latex.el b/contrib/lisp/org-e-latex.el
index 9dc08fa..6a55d64 100644
--- a/contrib/lisp/org-e-latex.el
+++ b/contrib/lisp/org-e-latex.el
@@ -2674,7 +2674,7 @@ is non-nil."
;;;###autoload
(defun org-e-latex-export-to-latex
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to a LaTeX file.
If narrowing is active in the current buffer, only export its
@@ -2696,18 +2696,15 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
- (let ((outfile (org-export-output-file-name ".tex" subtreep pub-dir)))
+ (let ((outfile (org-export-output-file-name ".tex" subtreep)))
(org-export-to-file
'e-latex outfile subtreep visible-only body-only ext-plist)))
;;;###autoload
(defun org-e-latex-export-to-pdf
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to LaTeX then process through to PDF.
If narrowing is active in the current buffer, only export its
@@ -2729,14 +2726,10 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return PDF file's name."
(interactive)
(org-e-latex-compile
- (org-e-latex-export-to-latex
- subtreep visible-only body-only ext-plist pub-dir)))
+ (org-e-latex-export-to-latex subtreep visible-only body-only ext-plist)))
(defun org-e-latex-compile (texfile)
"Compile a TeX file.
diff --git a/contrib/lisp/org-e-man.el b/contrib/lisp/org-e-man.el
index bafd0c0..2b70370 100644
--- a/contrib/lisp/org-e-man.el
+++ b/contrib/lisp/org-e-man.el
@@ -1146,7 +1146,7 @@ contextual information."
;;; Interactive functions
(defun org-e-man-export-to-man
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to a Man file.
If narrowing is active in the current buffer, only export its
@@ -1168,17 +1168,14 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
- (let ((outfile (org-export-output-file-name ".man" subtreep pub-dir)))
+ (let ((outfile (org-export-output-file-name ".man" subtreep)))
(org-export-to-file
'e-man outfile subtreep visible-only body-only ext-plist)))
(defun org-e-man-export-to-pdf
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to Groff then process through to PDF.
If narrowing is active in the current buffer, only export its
@@ -1200,14 +1197,10 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return PDF file's name."
(interactive)
(org-e-man-compile
- (org-e-man-export-to-man
- subtreep visible-only body-only ext-plist pub-dir)))
+ (org-e-man-export-to-man subtreep visible-only body-only ext-plist)))
(defun org-e-man-compile (file)
"Compile a Groff file.
diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el
index 119e584..7b2525f 100644
--- a/contrib/lisp/org-e-odt.el
+++ b/contrib/lisp/org-e-odt.el
@@ -3829,7 +3829,7 @@ formula file."
;;;###autoload
(defun org-e-odt-export-to-odt
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to a HTML file.
If narrowing is active in the current buffer, only export its
@@ -3851,13 +3851,10 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
(org-e-odt--export-wrap
- (org-export-output-file-name ".odt" subtreep pub-dir)
+ (org-export-output-file-name ".odt" subtreep)
(let* ((org-e-odt-embedded-images-count 0)
(org-e-odt-embedded-formulas-count 0)
(org-e-odt-automatic-styles nil)
diff --git a/contrib/lisp/org-e-texinfo.el b/contrib/lisp/org-e-texinfo.el
index d006c07..f870ba5 100644
--- a/contrib/lisp/org-e-texinfo.el
+++ b/contrib/lisp/org-e-texinfo.el
@@ -1643,7 +1643,7 @@ contextual information."
;;; Interactive functions
(defun org-e-texinfo-export-to-texinfo
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to a Texinfo file.
If narrowing is active in the current buffer, only export its
@@ -1665,17 +1665,14 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
- (let ((outfile (org-export-output-file-name ".texi" subtreep pub-dir)))
+ (let ((outfile (org-export-output-file-name ".texi" subtreep)))
(org-export-to-file
'e-texinfo outfile subtreep visible-only body-only ext-plist)))
(defun org-e-texinfo-export-to-info
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer to Texinfo then process through to INFO.
If narrowing is active in the current buffer, only export its
@@ -1703,8 +1700,7 @@ directory.
Return INFO file's name."
(interactive)
(org-e-texinfo-compile
- (org-e-texinfo-export-to-texinfo
- subtreep visible-only body-only ext-plist pub-dir)))
+ (org-e-texinfo-export-to-texinfo subtreep visible-only body-only ext-plist)))
(defun org-e-texinfo-compile (file)
"Compile a texinfo file.
diff --git a/contrib/lisp/org-koma-letter.el b/contrib/lisp/org-koma-letter.el
index 39c7168..d82b78e 100644
--- a/contrib/lisp/org-koma-letter.el
+++ b/contrib/lisp/org-koma-letter.el
@@ -263,7 +263,7 @@ non-nil."
;;;###autoload
(defun org-koma-letter-export-to-latex
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer as a KOMA Scrlttr2 letter (tex).
If narrowing is active in the current buffer, only export its
@@ -290,13 +290,13 @@ directory.
Return output file's name."
(interactive)
- (let ((outfile (org-export-output-file-name ".tex" subtreep pub-dir)))
+ (let ((outfile (org-export-output-file-name ".tex" subtreep)))
(org-export-to-file
'koma-letter outfile subtreep visible-only body-only ext-plist)))
;;;###autoload
(defun org-koma-letter-export-to-pdf
- (&optional subtreep visible-only body-only ext-plist pub-dir)
+ (&optional subtreep visible-only body-only ext-plist)
"Export current buffer as a KOMA Scrlttr2 letter (pdf).
If narrowing is active in the current buffer, only export its
@@ -318,14 +318,10 @@ EXT-PLIST, when provided, is a property list with external
parameters overriding Org default settings, but still inferior to
file-local settings.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return PDF file's name."
(interactive)
(org-e-latex-compile
- (org-koma-letter-export-to-latex
- subtreep visible-only body-only ext-plist pub-dir)))
+ (org-koma-letter-export-to-latex subtreep visible-only body-only ext-plist)))
(provide 'org-koma-letter)
;;; org-koma-letter.el ends here
diff --git a/contrib/lisp/org-md.el b/contrib/lisp/org-md.el
index b67e7ef..c640a1e 100644
--- a/contrib/lisp/org-md.el
+++ b/contrib/lisp/org-md.el
@@ -435,7 +435,7 @@ non-nil."
;;;###autoload
-(defun org-md-export-to-markdown (&optional subtreep visible-only pub-dir)
+(defun org-md-export-to-markdown (&optional subtreep visible-only)
"Export current buffer to a Markdown file.
If narrowing is active in the current buffer, only export its
@@ -450,12 +450,9 @@ first.
When optional argument VISIBLE-ONLY is non-nil, don't export
contents of hidden elements.
-When optional argument PUB-DIR is set, use it as the publishing
-directory.
-
Return output file's name."
(interactive)
- (let ((outfile (org-export-output-file-name ".md" subtreep pub-dir)))
+ (let ((outfile (org-export-output-file-name ".md" subtreep)))
(org-export-to-file 'md outfile subtreep visible-only)))