Browse Source

Remove some options associated to variables

* lisp/ox-html.el: Remove options.

* lisp/ox-icalendar.el: Remove options.

* lisp/ox-latex.el (org-latex-guess-inputenc, org-latex-compile,
  org-latex--collect-warnings): Use full variable name instead of an
  option.

* lisp/ox-man.el: Remove options.

* lisp/ox-odt.el: Remove options.

* lisp/ox-texinfo.el: Remove options.

* doc/org.texi (Publishing options): Update documentation accordingly.

These variables are meant to be used outside (or on the fringe) of the
export process, where information channel is not available.

remove
Nicolas Goaziou 10 years ago
parent
commit
fd448cb1e2
8 changed files with 15 additions and 73 deletions
  1. 2 28
      doc/org.texi
  2. 0 6
      lisp/ox-html.el
  3. 0 3
      lisp/ox-icalendar.el
  4. 11 18
      lisp/ox-latex.el
  5. 1 4
      lisp/ox-man.el
  6. 0 8
      lisp/ox-odt.el
  7. 0 1
      lisp/ox-org.el
  8. 1 5
      lisp/ox-texinfo.el

+ 2 - 28
doc/org.texi

@@ -13506,7 +13506,6 @@ however, override everything.
 
 
 @multitable {@code{:html-table-use-header-tags-for-first-column}} {@code{org-html-table-use-header-tags-for-first-column}}
 @multitable {@code{:html-table-use-header-tags-for-first-column}} {@code{org-html-table-use-header-tags-for-first-column}}
 @item @code{:html-allow-name-attribute-in-anchors} @tab @code{org-html-allow-name-attribute-in-anchors}
 @item @code{:html-allow-name-attribute-in-anchors} @tab @code{org-html-allow-name-attribute-in-anchors}
-@item @code{:html-coding-system}              @tab @code{org-html-coding-system}
 @item @code{:html-container}                  @tab @code{org-html-container-element}
 @item @code{:html-container}                  @tab @code{org-html-container-element}
 @item @code{:html-divs}                       @tab @code{org-html-divs}
 @item @code{:html-divs}                       @tab @code{org-html-divs}
 @item @code{:html-doctype}                    @tab @code{org-html-doctype}
 @item @code{:html-doctype}                    @tab @code{org-html-doctype}
@@ -13523,8 +13522,6 @@ however, override everything.
 @item @code{:html-head}                       @tab @code{org-html-head}
 @item @code{:html-head}                       @tab @code{org-html-head}
 @item @code{:html-home/up-format}             @tab @code{org-html-home/up-format}
 @item @code{:html-home/up-format}             @tab @code{org-html-home/up-format}
 @item @code{:html-html5-fancy}                @tab @code{org-html-html5-fancy}
 @item @code{:html-html5-fancy}                @tab @code{org-html-html5-fancy}
-@item @code{:html-htmlize-font-prefix}        @tab @code{org-html-htmlize-font-prefix}
-@item @code{:html-htmlize-output-type}        @tab @code{org-html-htmlize-output-type}
 @item @code{:html-indent}                     @tab @code{org-html-indent}
 @item @code{:html-indent}                     @tab @code{org-html-indent}
 @item @code{:html-infojs-options}             @tab @code{org-html-infojs-options}
 @item @code{:html-infojs-options}             @tab @code{org-html-infojs-options}
 @item @code{:html-infojs-template}            @tab @code{org-html-infojs-template}
 @item @code{:html-infojs-template}            @tab @code{org-html-infojs-template}
@@ -13541,7 +13538,6 @@ however, override everything.
 @item @code{:html-postamble}                  @tab @code{org-html-postamble}
 @item @code{:html-postamble}                  @tab @code{org-html-postamble}
 @item @code{:html-preamble-format}            @tab @code{org-html-preamble-format}
 @item @code{:html-preamble-format}            @tab @code{org-html-preamble-format}
 @item @code{:html-preamble}                   @tab @code{org-html-preamble}
 @item @code{:html-preamble}                   @tab @code{org-html-preamble}
-@item @code{:html-protect-char-alist}         @tab @code{org-html-protect-char-alist}
 @item @code{:html-table-align-individual-fields} @tab @code{org-html-table-align-individual-fields}
 @item @code{:html-table-align-individual-fields} @tab @code{org-html-table-align-individual-fields}
 @item @code{:html-table-attributes}           @tab @code{org-html-table-default-attributes}
 @item @code{:html-table-attributes}           @tab @code{org-html-table-default-attributes}
 @item @code{:html-table-caption-above}        @tab @code{org-html-table-caption-above}
 @item @code{:html-table-caption-above}        @tab @code{org-html-table-caption-above}
@@ -13579,17 +13575,12 @@ however, override everything.
 @item @code{:latex-image-default-width}        @tab @code{org-latex-image-default-width}
 @item @code{:latex-image-default-width}        @tab @code{org-latex-image-default-width}
 @item @code{:latex-inactive-timestamp-format}  @tab @code{org-latex-inactive-timestamp-format}
 @item @code{:latex-inactive-timestamp-format}  @tab @code{org-latex-inactive-timestamp-format}
 @item @code{:latex-inline-image-rules}         @tab @code{org-latex-inline-image-rules}
 @item @code{:latex-inline-image-rules}         @tab @code{org-latex-inline-image-rules}
-@item @code{:latex-inputenc-alist}             @tab @code{org-latex-inputenc-alist}
-@item @code{:latex-known-warnings}             @tab @code{org-latex-known-warnings}
 @item @code{:latex-link-with-unknown-path-format} @tab @code{org-latex-link-with-unknown-path-format}
 @item @code{:latex-link-with-unknown-path-format} @tab @code{org-latex-link-with-unknown-path-format}
 @item @code{:latex-listings-langs}             @tab @code{org-latex-listings-langs}
 @item @code{:latex-listings-langs}             @tab @code{org-latex-listings-langs}
 @item @code{:latex-listings-options}           @tab @code{org-latex-listings-options}
 @item @code{:latex-listings-options}           @tab @code{org-latex-listings-options}
 @item @code{:latex-listings}                   @tab @code{org-latex-listings}
 @item @code{:latex-listings}                   @tab @code{org-latex-listings}
-@item @code{:latex-logfiles-extensions}        @tab @code{org-latex-logfiles-extensions}
 @item @code{:latex-minted-langs}               @tab @code{org-latex-minted-langs}
 @item @code{:latex-minted-langs}               @tab @code{org-latex-minted-langs}
 @item @code{:latex-minted-options}             @tab @code{org-latex-minted-options}
 @item @code{:latex-minted-options}             @tab @code{org-latex-minted-options}
-@item @code{:latex-pdf-process}                @tab @code{org-latex-pdf-process}
-@item @code{:latex-remove-logfiles}            @tab @code{org-latex-remove-logfiles}
 @item @code{:latex-table-caption-above}        @tab @code{org-latex-table-caption-above}
 @item @code{:latex-table-caption-above}        @tab @code{org-latex-table-caption-above}
 @item @code{:latex-table-scientific-notation}  @tab @code{org-latex-table-scientific-notation}
 @item @code{:latex-table-scientific-notation}  @tab @code{org-latex-table-scientific-notation}
 @item @code{:latex-tables-booktabs}            @tab @code{org-latex-tables-booktabs}
 @item @code{:latex-tables-booktabs}            @tab @code{org-latex-tables-booktabs}
@@ -13607,11 +13598,8 @@ however, override everything.
 
 
 @subsubheading ODT specific properties
 @subsubheading ODT specific properties
 
 
-@multitable {@code{:odt-create-custom-styles-for-srcblocks}} {@code{org-odt-create-custom-styles-for-srcblocks}}
-@item @code{:odt-convert-capabilities}       @tab @code{org-odt-convert-capabilities}
-@item @code{:odt-convert-processes}          @tab @code{org-odt-convert-processes}
-@item @code{:odt-convert-process}            @tab @code{org-odt-convert-process}
-@item @code{:odt-create-custom-styles-for-srcblocks} @tab @code{org-odt-create-custom-styles-for-srcblocks}
+@multitable {@code{:odt-format-inlinetask-function}} {@code{org-odt-format-inlinetask-function}}
+@item @code{:odt-content-template-file}      @tab @code{org-odt-content-template-file}
 @item @code{:odt-display-outline-level}      @tab @code{org-odt-display-outline-level}
 @item @code{:odt-display-outline-level}      @tab @code{org-odt-display-outline-level}
 @item @code{:odt-fontify-srcblocks}          @tab @code{org-odt-fontify-srcblocks}
 @item @code{:odt-fontify-srcblocks}          @tab @code{org-odt-fontify-srcblocks}
 @item @code{:odt-format-drawer-function}     @tab @code{org-odt-format-drawer-function}
 @item @code{:odt-format-drawer-function}     @tab @code{org-odt-format-drawer-function}
@@ -13620,28 +13608,17 @@ however, override everything.
 @item @code{:odt-inline-formula-rules}       @tab @code{org-odt-inline-formula-rules}
 @item @code{:odt-inline-formula-rules}       @tab @code{org-odt-inline-formula-rules}
 @item @code{:odt-inline-image-rules}         @tab @code{org-odt-inline-image-rules}
 @item @code{:odt-inline-image-rules}         @tab @code{org-odt-inline-image-rules}
 @item @code{:odt-pixels-per-inch}            @tab @code{org-odt-pixels-per-inch}
 @item @code{:odt-pixels-per-inch}            @tab @code{org-odt-pixels-per-inch}
-@item @code{:odt-preferred-output-format}    @tab @code{org-odt-preferred-output-format}
-@item @code{:odt-prettify-xml}               @tab @code{org-odt-prettify-xml}
-@item @code{:odt-schema-dir}                 @tab @code{org-odt-schema-dir}
-@item @code{:odt-styles-file}                @tab @code{org-odt-content-template-file}
 @item @code{:odt-styles-file}                @tab @code{org-odt-styles-file}
 @item @code{:odt-styles-file}                @tab @code{org-odt-styles-file}
 @item @code{:odt-table-styles}               @tab @code{org-odt-table-styles}
 @item @code{:odt-table-styles}               @tab @code{org-odt-table-styles}
 @item @code{:odt-use-date-fields}            @tab @code{org-odt-use-date-fields}
 @item @code{:odt-use-date-fields}            @tab @code{org-odt-use-date-fields}
 @end multitable
 @end multitable
 
 
-@subsubheading Org specific properties
-
-@multitable {@code{:org-htmlized-css-url}} {@code{org-org-htmlized-css-url}}
-@item @code{:org-htmlized-css-url} @tab @code{org-org-htmlized-css-url}
-@end multitable
-
 @subsubheading Texinfo specific properties
 @subsubheading Texinfo specific properties
 
 
 @multitable {@code{:texinfo-link-with-unknown-path-format}} {@code{org-texinfo-link-with-unknown-path-format}}
 @multitable {@code{:texinfo-link-with-unknown-path-format}} {@code{org-texinfo-link-with-unknown-path-format}}
 @item @code{:texinfo-active-timestamp-format}    @tab @code{org-texinfo-active-timestamp-format}
 @item @code{:texinfo-active-timestamp-format}    @tab @code{org-texinfo-active-timestamp-format}
 @item @code{:texinfo-classes}                    @tab @code{org-texinfo-classes}
 @item @code{:texinfo-classes}                    @tab @code{org-texinfo-classes}
 @item @code{:texinfo-class}                      @tab @code{org-texinfo-default-class}
 @item @code{:texinfo-class}                      @tab @code{org-texinfo-default-class}
-@item @code{:texinfo-coding-system}              @tab @code{org-texinfo-coding-system}
 @item @code{:texinfo-def-table-markup}           @tab @code{org-texinfo-def-table-markup}
 @item @code{:texinfo-def-table-markup}           @tab @code{org-texinfo-def-table-markup}
 @item @code{:texinfo-diary-timestamp-format}     @tab @code{org-texinfo-diary-timestamp-format}
 @item @code{:texinfo-diary-timestamp-format}     @tab @code{org-texinfo-diary-timestamp-format}
 @item @code{:texinfo-filename}                   @tab @code{org-texinfo-filename}
 @item @code{:texinfo-filename}                   @tab @code{org-texinfo-filename}
@@ -13649,11 +13626,8 @@ however, override everything.
 @item @code{:texinfo-format-headline-function}   @tab @code{org-texinfo-format-headline-function}
 @item @code{:texinfo-format-headline-function}   @tab @code{org-texinfo-format-headline-function}
 @item @code{:texinfo-format-inlinetask-function} @tab @code{org-texinfo-format-inlinetask-function}
 @item @code{:texinfo-format-inlinetask-function} @tab @code{org-texinfo-format-inlinetask-function}
 @item @code{:texinfo-inactive-timestamp-format}  @tab @code{org-texinfo-inactive-timestamp-format}
 @item @code{:texinfo-inactive-timestamp-format}  @tab @code{org-texinfo-inactive-timestamp-format}
-@item @code{:texinfo-info-process}               @tab @code{org-texinfo-info-process}
 @item @code{:texinfo-link-with-unknown-path-format} @tab @code{org-texinfo-link-with-unknown-path-format}
 @item @code{:texinfo-link-with-unknown-path-format} @tab @code{org-texinfo-link-with-unknown-path-format}
-@item @code{:texinfo-logfiles-extensions}        @tab @code{org-texinfo-logfiles-extensions}
 @item @code{:texinfo-node-description-column}    @tab @code{org-texinfo-node-description-column}
 @item @code{:texinfo-node-description-column}    @tab @code{org-texinfo-node-description-column}
-@item @code{:texinfo-remove-logfiles}            @tab @code{org-texinfo-remove-logfiles}
 @item @code{:texinfo-table-scientific-notation}  @tab @code{org-texinfo-table-scientific-notation}
 @item @code{:texinfo-table-scientific-notation}  @tab @code{org-texinfo-table-scientific-notation}
 @item @code{:texinfo-tables-verbatim}            @tab @code{org-texinfo-tables-verbatim}
 @item @code{:texinfo-tables-verbatim}            @tab @code{org-texinfo-tables-verbatim}
 @item @code{:texinfo-text-markup-alist}          @tab @code{org-texinfo-text-markup-alist}
 @item @code{:texinfo-text-markup-alist}          @tab @code{org-texinfo-text-markup-alist}

+ 0 - 6
lisp/ox-html.el

@@ -117,8 +117,6 @@
     (:html-head-extra "HTML_HEAD_EXTRA" nil org-html-head-extra newline)
     (:html-head-extra "HTML_HEAD_EXTRA" nil org-html-head-extra newline)
     (:html-container "HTML_CONTAINER" nil org-html-container-element)
     (:html-container "HTML_CONTAINER" nil org-html-container-element)
     (:html-mathjax "HTML_MATHJAX" nil "" space)
     (:html-mathjax "HTML_MATHJAX" nil "" space)
-    (:html-extension nil nil org-html-extension)
-    (:html-link-org-as-html nil nil org-html-link-org-files-as-html)
     (:html-html5-fancy nil "html5-fancy" org-html-html5-fancy)
     (:html-html5-fancy nil "html5-fancy" org-html-html5-fancy)
     (:html-link-use-abs-url nil "html-link-use-abs-url" org-html-link-use-abs-url)
     (:html-link-use-abs-url nil "html-link-use-abs-url" org-html-link-use-abs-url)
     (:html-postamble nil "html-postamble" org-html-postamble)
     (:html-postamble nil "html-postamble" org-html-postamble)
@@ -130,7 +128,6 @@
     (:html-head-include-scripts nil "html-scripts" org-html-head-include-scripts)
     (:html-head-include-scripts nil "html-scripts" org-html-head-include-scripts)
     (:html-allow-name-attribute-in-anchors
     (:html-allow-name-attribute-in-anchors
      nil nil org-html-allow-name-attribute-in-anchors)
      nil nil org-html-allow-name-attribute-in-anchors)
-    (:html-coding-system nil nil org-html-coding-system)
     (:html-divs nil nil org-html-divs)
     (:html-divs nil nil org-html-divs)
     (:html-extension nil nil org-html-extension)
     (:html-extension nil nil org-html-extension)
     (:html-footnote-format nil nil org-html-footnote-format)
     (:html-footnote-format nil nil org-html-footnote-format)
@@ -141,8 +138,6 @@
     (:html-format-inlinetask-function
     (:html-format-inlinetask-function
      nil nil org-html-format-inlinetask-function)
      nil nil org-html-format-inlinetask-function)
     (:html-home/up-format nil nil org-html-home/up-format)
     (:html-home/up-format nil nil org-html-home/up-format)
-    (:html-htmlize-font-prefix nil nil org-html-htmlize-font-prefix)
-    (:html-htmlize-output-type nil nil org-html-htmlize-output-type)
     (:html-indent nil nil org-html-indent)
     (:html-indent nil nil org-html-indent)
     (:html-infojs-options nil nil org-html-infojs-options)
     (:html-infojs-options nil nil org-html-infojs-options)
     (:html-infojs-template nil nil org-html-infojs-template)
     (:html-infojs-template nil nil org-html-infojs-template)
@@ -153,7 +148,6 @@
     (:html-metadata-timestamp-format nil nil org-html-metadata-timestamp-format)
     (:html-metadata-timestamp-format nil nil org-html-metadata-timestamp-format)
     (:html-postamble-format nil nil org-html-postamble-format)
     (:html-postamble-format nil nil org-html-postamble-format)
     (:html-preamble-format nil nil org-html-preamble-format)
     (:html-preamble-format nil nil org-html-preamble-format)
-    (:html-protect-char-alist nil nil org-html-protect-char-alist)
     (:html-table-align-individual-fields
     (:html-table-align-individual-fields
      nil nil org-html-table-align-individual-fields)
      nil nil org-html-table-align-individual-fields)
     (:html-table-caption-above nil nil org-html-table-caption-above)
     (:html-table-caption-above nil nil org-html-table-caption-above)

+ 0 - 3
lisp/ox-icalendar.el

@@ -261,9 +261,6 @@ re-read the iCalendar file.")
     ;; Other variables.
     ;; Other variables.
     (:icalendar-alarm-time nil nil org-icalendar-alarm-time)
     (:icalendar-alarm-time nil nil org-icalendar-alarm-time)
     (:icalendar-categories nil nil org-icalendar-categories)
     (:icalendar-categories nil nil org-icalendar-categories)
-    (:icalendar-combined-agenda-file nil nil org-icalendar-combined-agenda-file)
-    (:icalendar-combined-description nil nil org-icalendar-combined-description)
-    (:icalendar-combined-name nil nil org-icalendar-combined-name)
     (:icalendar-date-time-format nil nil org-icalendar-date-time-format)
     (:icalendar-date-time-format nil nil org-icalendar-date-time-format)
     (:icalendar-include-bbdb-anniversaries nil nil org-icalendar-include-bbdb-anniversaries)
     (:icalendar-include-bbdb-anniversaries nil nil org-icalendar-include-bbdb-anniversaries)
     (:icalendar-include-body nil nil org-icalendar-include-body)
     (:icalendar-include-body nil nil org-icalendar-include-body)

+ 11 - 18
lisp/ox-latex.el

@@ -124,17 +124,12 @@
     (:latex-image-default-width nil nil org-latex-image-default-width)
     (:latex-image-default-width nil nil org-latex-image-default-width)
     (:latex-inactive-timestamp-format nil nil org-latex-inactive-timestamp-format)
     (:latex-inactive-timestamp-format nil nil org-latex-inactive-timestamp-format)
     (:latex-inline-image-rules nil nil org-latex-inline-image-rules)
     (:latex-inline-image-rules nil nil org-latex-inline-image-rules)
-    (:latex-inputenc-alist nil nil org-latex-inputenc-alist)
-    (:latex-known-warnings nil nil org-latex-known-warnings)
     (:latex-link-with-unknown-path-format nil nil org-latex-link-with-unknown-path-format)
     (:latex-link-with-unknown-path-format nil nil org-latex-link-with-unknown-path-format)
     (:latex-listings nil nil org-latex-listings)
     (:latex-listings nil nil org-latex-listings)
     (:latex-listings-langs nil nil org-latex-listings-langs)
     (:latex-listings-langs nil nil org-latex-listings-langs)
     (:latex-listings-options nil nil org-latex-listings-options)
     (:latex-listings-options nil nil org-latex-listings-options)
-    (:latex-logfiles-extensions nil nil org-latex-logfiles-extensions)
     (:latex-minted-langs nil nil org-latex-minted-langs)
     (:latex-minted-langs nil nil org-latex-minted-langs)
     (:latex-minted-options nil nil org-latex-minted-options)
     (:latex-minted-options nil nil org-latex-minted-options)
-    (:latex-pdf-process nil nil org-latex-pdf-process)
-    (:latex-remove-logfiles nil nil org-latex-remove-logfiles)
     (:latex-table-caption-above nil nil org-latex-table-caption-above)
     (:latex-table-caption-above nil nil org-latex-table-caption-above)
     (:latex-table-scientific-notation nil nil org-latex-table-scientific-notation)
     (:latex-table-scientific-notation nil nil org-latex-table-scientific-notation)
     (:latex-tables-booktabs nil nil org-latex-tables-booktabs)
     (:latex-tables-booktabs nil nil org-latex-tables-booktabs)
@@ -1024,7 +1019,7 @@ Return the new header, as a string."
 		 "utf8")))
 		 "utf8")))
     (if (not cs) header
     (if (not cs) header
       ;; First translate if that is requested.
       ;; First translate if that is requested.
-      (setq cs (or (cdr (assoc cs (plist-get info :latex-inputenc-alist))) cs))
+      (setq cs (or (cdr (assoc cs org-latex-inputenc-alist)) cs))
       ;; Then find the \usepackage statement and replace the option.
       ;; Then find the \usepackage statement and replace the option.
       (replace-regexp-in-string "\\\\usepackage\\[\\(AUTO\\)\\]{inputenc}"
       (replace-regexp-in-string "\\\\usepackage\\[\\(AUTO\\)\\]{inputenc}"
 				cs header t nil 1))))
 				cs header t nil 1))))
@@ -3059,17 +3054,17 @@ Return PDF file name or an error if it couldn't be produced."
 				(file-name-directory full-name)
 				(file-name-directory full-name)
 			      default-directory))
 			      default-directory))
 	 (time (current-time))
 	 (time (current-time))
-	 (process (plist-get info :latex-pdf-process))
 	 warnings)
 	 warnings)
     (unless snippet (message (format "Processing LaTeX file %s..." texfile)))
     (unless snippet (message (format "Processing LaTeX file %s..." texfile)))
     (save-window-excursion
     (save-window-excursion
       (cond
       (cond
        ;; A function is provided: Apply it.
        ;; A function is provided: Apply it.
-       ((functionp process) (funcall process (shell-quote-argument texfile)))
+       ((functionp org-latex-pdf-process)
+	(funcall org-latex-pdf-process (shell-quote-argument texfile)))
        ;; A list is provided: Replace %b, %f and %o with appropriate
        ;; A list is provided: Replace %b, %f and %o with appropriate
        ;; values in each command before applying it.  Output is
        ;; values in each command before applying it.  Output is
        ;; redirected to "*Org PDF LaTeX Output*" buffer.
        ;; redirected to "*Org PDF LaTeX Output*" buffer.
-       ((consp process)
+       ((consp org-latex-pdf-process)
 	(let ((outbuf (and (not snippet)
 	(let ((outbuf (and (not snippet)
 			   (get-buffer-create "*Org PDF LaTeX Output*"))))
 			   (get-buffer-create "*Org PDF LaTeX Output*"))))
 	  (mapc
 	  (mapc
@@ -3082,7 +3077,7 @@ Return PDF file name or an error if it couldn't be produced."
 		(replace-regexp-in-string
 		(replace-regexp-in-string
 		 "%o" (shell-quote-argument out-dir) command t t) t t) t t)
 		 "%o" (shell-quote-argument out-dir) command t t) t t) t t)
 	      outbuf))
 	      outbuf))
-	   process)
+	   org-latex-pdf-process)
 	  ;; Collect standard errors from output buffer.
 	  ;; Collect standard errors from output buffer.
 	  (setq warnings (and (not snippet)
 	  (setq warnings (and (not snippet)
 			      (org-latex--collect-warnings outbuf)))))
 			      (org-latex--collect-warnings outbuf)))))
@@ -3095,15 +3090,13 @@ Return PDF file name or an error if it couldn't be produced."
 	    (error (format "PDF file %s wasn't produced" pdffile))
 	    (error (format "PDF file %s wasn't produced" pdffile))
 	  ;; Else remove log files, when specified, and signal end of
 	  ;; Else remove log files, when specified, and signal end of
 	  ;; process to user, along with any error encountered.
 	  ;; process to user, along with any error encountered.
-	  (when (and (not snippet) (plist-get info :latex-remove-logfiles))
+	  (when (and (not snippet) org-latex-remove-logfiles)
 	    (dolist (file (directory-files
 	    (dolist (file (directory-files
 			   out-dir t
 			   out-dir t
-			   (concat
-			    (regexp-quote base-name)
-			    "\\(?:\\.[0-9]+\\)?"
-			    "\\."
-			    (regexp-opt
-			     (plist-get info :latex-logfiles-extensions)))))
+			   (concat (regexp-quote base-name)
+				   "\\(?:\\.[0-9]+\\)?"
+				   "\\."
+				   (regexp-opt org-latex-logfiles-extensions))))
 	      (delete-file file)))
 	      (delete-file file)))
 	  (message (concat "PDF file produced"
 	  (message (concat "PDF file produced"
 			   (cond
 			   (cond
@@ -3125,7 +3118,7 @@ encountered or nil if there was none."
 	(if (re-search-forward "^!" nil t) 'error
 	(if (re-search-forward "^!" nil t) 'error
 	  (let ((case-fold-search t)
 	  (let ((case-fold-search t)
 		(warnings ""))
 		(warnings ""))
-	    (dolist (warning (plist-get info :latex-known-warnings))
+	    (dolist (warning org-latex-known-warnings)
 	      (save-excursion
 	      (save-excursion
 		(when (save-excursion (re-search-forward (car warning) nil t))
 		(when (save-excursion (re-search-forward (car warning) nil t))
 		  (setq warnings (concat warnings " " (cdr warning))))))
 		  (setq warnings (concat warnings " " (cdr warning))))))

+ 1 - 4
lisp/ox-man.el

@@ -117,10 +117,7 @@
     (:man-tables-verbatim nil nil org-man-tables-verbatim)
     (:man-tables-verbatim nil nil org-man-tables-verbatim)
     (:man-table-scientific-notation nil nil org-man-table-scientific-notation)
     (:man-table-scientific-notation nil nil org-man-table-scientific-notation)
     (:man-source-highlight nil nil org-man-source-highlight)
     (:man-source-highlight nil nil org-man-source-highlight)
-    (:man-source-highlight-langs nil nil org-man-source-highlight-langs)
-    (:man-pdf-process nil nil org-man-pdf-process)
-    (:man-logfiles-extensions nil nil org-man-logfiles-extensions)
-    (:man-remove-logfiles nil nil org-man-remove-logfiles)))
+    (:man-source-highlight-langs nil nil org-man-source-highlight-langs)))
 
 
 
 
 
 

+ 0 - 8
lisp/ox-odt.el

@@ -98,11 +98,6 @@
   '((:odt-styles-file "ODT_STYLES_FILE" nil nil t)
   '((:odt-styles-file "ODT_STYLES_FILE" nil nil t)
     ;; Other variables.
     ;; Other variables.
     (:odt-content-template-file nil nil org-odt-content-template-file)
     (:odt-content-template-file nil nil org-odt-content-template-file)
-    (:odt-convert-capabilities nil nil org-odt-convert-capabilities)
-    (:odt-convert-process nil nil org-odt-convert-process)
-    (:odt-convert-processes nil nil org-odt-convert-processes)
-    (:odt-create-custom-styles-for-srcblocks
-     nil nil org-odt-create-custom-styles-for-srcblocks)
     (:odt-display-outline-level nil nil org-odt-display-outline-level)
     (:odt-display-outline-level nil nil org-odt-display-outline-level)
     (:odt-fontify-srcblocks nil nil org-odt-fontify-srcblocks)
     (:odt-fontify-srcblocks nil nil org-odt-fontify-srcblocks)
     (:odt-format-drawer-function nil nil org-odt-format-drawer-function)
     (:odt-format-drawer-function nil nil org-odt-format-drawer-function)
@@ -111,9 +106,6 @@
     (:odt-inline-formula-rules nil nil org-odt-inline-formula-rules)
     (:odt-inline-formula-rules nil nil org-odt-inline-formula-rules)
     (:odt-inline-image-rules nil nil org-odt-inline-image-rules)
     (:odt-inline-image-rules nil nil org-odt-inline-image-rules)
     (:odt-pixels-per-inch nil nil org-odt-pixels-per-inch)
     (:odt-pixels-per-inch nil nil org-odt-pixels-per-inch)
-    (:odt-preferred-output-format nil nil org-odt-preferred-output-format)
-    (:odt-prettify-xml nil nil org-odt-prettify-xml)
-    (:odt-schema-dir nil nil org-odt-schema-dir)
     (:odt-styles-file nil nil org-odt-styles-file)
     (:odt-styles-file nil nil org-odt-styles-file)
     (:odt-table-styles nil nil org-odt-table-styles)
     (:odt-table-styles nil nil org-odt-table-styles)
     (:odt-use-date-fields nil nil org-odt-use-date-fields)
     (:odt-use-date-fields nil nil org-odt-use-date-fields)

+ 0 - 1
lisp/ox-org.el

@@ -102,7 +102,6 @@ setting of `org-html-htmlize-output-type' is 'css."
     (underline . org-org-identity)
     (underline . org-org-identity)
     (verbatim . org-org-identity)
     (verbatim . org-org-identity)
     (verse-block . org-org-identity))
     (verse-block . org-org-identity))
-  :options-alist '((:org-htmlized-css-url nil nil org-org-htmlized-css-url))
   :menu-entry
   :menu-entry
   '(?O "Export to Org"
   '(?O "Export to Org"
        ((?O "As Org buffer" org-org-export-as-org)
        ((?O "As Org buffer" org-org-export-as-org)

+ 1 - 5
lisp/ox-texinfo.el

@@ -129,7 +129,6 @@
     (:texinfo-dirtitle "TEXINFO_DIR_TITLE" nil nil t)
     (:texinfo-dirtitle "TEXINFO_DIR_TITLE" nil nil t)
     (:texinfo-dirdesc "TEXINFO_DIR_DESC" nil nil t)
     (:texinfo-dirdesc "TEXINFO_DIR_DESC" nil nil t)
     ;; Other variables.
     ;; Other variables.
-    (:texinfo-coding-system nil nil org-texinfo-coding-system)
     (:texinfo-classes nil nil org-texinfo-classes)
     (:texinfo-classes nil nil org-texinfo-classes)
     (:texinfo-format-headline-function nil nil org-texinfo-format-headline-function)
     (:texinfo-format-headline-function nil nil org-texinfo-format-headline-function)
     (:texinfo-node-description-column nil nil org-texinfo-node-description-column)
     (:texinfo-node-description-column nil nil org-texinfo-node-description-column)
@@ -142,10 +141,7 @@
     (:texinfo-def-table-markup nil nil org-texinfo-def-table-markup)
     (:texinfo-def-table-markup nil nil org-texinfo-def-table-markup)
     (:texinfo-text-markup-alist nil nil org-texinfo-text-markup-alist)
     (:texinfo-text-markup-alist nil nil org-texinfo-text-markup-alist)
     (:texinfo-format-drawer-function nil nil org-texinfo-format-drawer-function)
     (:texinfo-format-drawer-function nil nil org-texinfo-format-drawer-function)
-    (:texinfo-format-inlinetask-function nil nil org-texinfo-format-inlinetask-function)
-    (:texinfo-info-process nil nil org-texinfo-info-process)
-    (:texinfo-logfiles-extensions nil nil org-texinfo-logfiles-extensions)
-    (:texinfo-remove-logfiles nil nil org-texinfo-remove-logfiles)))
+    (:texinfo-format-inlinetask-function nil nil org-texinfo-format-inlinetask-function)))