Associate all defcustoms to options in back-end definitions

* lisp/ox-ascii.el:
* lisp/ox-beamer.el:
* lisp/ox-html.el:
* lisp/ox-latex.el:
* lisp/ox-man.el:
* lisp/ox-md.el:
* lisp/ox-odt.el:
* lisp/ox-org.el:
* lisp/ox-texinfo.el: All defcustoms are defined as options in the
  back-end.
* lisp/ox-icalendar.el (icalendar): Ditto.  Also rename :with-vtodo
  property to :icalendar-include-todo.

* doc/org.texi (Publishing options): Update back-end specific
  properties.  Remove @vindex entries so as not to clobber variables
  index.

This change allows to change default value for any defcustom on the
fly when publishing.  It also normalizes how to choose and name what
variables to define as back-end options.

11 files changed, 398 insertions, 102 deletions

diff --git a/doc/org.texi b/doc/org.texi
index 71fce65..adc3ec5 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -13412,41 +13412,21 @@ result into the destination folder.
 @subsection Options for the exporters
 @cindex options, for publishing
 
-The property list can be used to set many export options for the exporters.
-In most cases, these properties correspond to user variables in Org.  The
-first table below lists these properties along with the variable they belong
-to.  The second table list HTML specific properties.  See the documentation
-string of these options for details.
+The property list can be used to set export options during the publishing
+process.  In most cases, these properties correspond to user variables in
+Org.  While some properties are available for all export back-ends, most of
+them are back-end specific.  The following sections list properties along
+with the variable they belong to.  See the documentation string of these
+options for details.
+
+@vindex org-publish-project-alist
+When a property is given a value in @code{org-publish-project-alist}, its
+setting overrides the value of the corresponding user variable (if any)
+during publishing.  Options set within a file (@pxref{Export settings}),
+however, override everything.
+
+@subsubheading Generic properties
 
-@vindex org-display-custom-times
-@vindex org-export-default-language
-@vindex org-export-exclude-tags
-@vindex org-export-headline-levels
-@vindex org-export-preserve-breaks
-@vindex org-export-publishing-directory
-@vindex org-export-select-tags
-@vindex org-export-with-archived-trees
-@vindex org-export-with-author
-@vindex org-export-with-creator
-@vindex org-export-with-drawers
-@vindex org-export-with-email
-@vindex org-export-with-emphasize
-@vindex org-export-with-fixed-width
-@vindex org-export-with-footnotes
-@vindex org-export-with-latex
-@vindex org-export-with-planning
-@vindex org-export-with-priority
-@vindex org-export-with-properties
-@vindex org-export-with-section-numbers
-@vindex org-export-with-special-strings
-@vindex org-export-with-sub-superscripts
-@vindex org-export-with-tables
-@vindex org-export-with-tags
-@vindex org-export-with-tasks
-@vindex org-export-with-timestamps
-@vindex org-export-with-toc
-@vindex org-export-with-todo-keywords
-@vindex user-mail-address
 @multitable @columnfractions 0.32 0.68
 @item @code{:archived-trees}        @tab @code{org-export-with-archived-trees}
 @item @code{:exclude-tags}          @tab @code{org-export-exclude-tags}
@@ -13477,53 +13457,197 @@ string of these options for details.
 @item @code{:with-todo-keywords}    @tab @code{org-export-with-todo-keywords}
 @end multitable
 
-@vindex org-html-doctype
-@vindex org-html-container-element
-@vindex org-html-html5-fancy
-@vindex org-html-xml-declaration
-@vindex org-html-link-up
-@vindex org-html-link-home
-@vindex org-html-link-org-files-as-html
-@vindex org-html-link-use-abs-url
-@vindex org-html-head
-@vindex org-html-head-extra
-@vindex org-html-inline-images
-@vindex org-html-extension
-@vindex org-html-preamble
-@vindex org-html-postamble
-@vindex org-html-table-default-attributes
-@vindex org-html-table-row-tags
-@vindex org-html-head-include-default-style
-@vindex org-html-head-include-scripts
+@subsubheading ASCII specific properties
+
+@multitable @columnfractions 0.32 0.68
+@item @code{:ascii-bullets}                       @tab @code{org-ascii-bullets}
+@item @code{:ascii-caption-above}                 @tab @code{org-ascii-caption-above}
+@item @code{:ascii-charset}                       @tab @code{org-ascii-charset}
+@item @code{:ascii-global-margin}                 @tab @code{org-ascii-global-margin}
+@item @code{:ascii-format-drawer-function}        @tab @code{org-ascii-format-drawer-function}
+@item @code{:ascii-format-inlinetask-function}    @tab @code{org-ascii-format-inlinetask-function}
+@item @code{:ascii-headline-spacing}              @tab @code{org-ascii-headline-spacing}
+@item @code{:ascii-indented-line-width}           @tab @code{org-ascii-indented-line-width}
+@item @code{:ascii-inlinetask-width}              @tab @code{org-ascii-inlinetask-width}
+@item @code{:ascii-inner-margin}                  @tab @code{org-ascii-inner-margin}
+@item @code{:ascii-links-to-notes}                @tab @code{org-ascii-links-to-notes}
+@item @code{:ascii-paragraph-spacing}             @tab @code{org-ascii-paragraph-spacing}
+@item @code{:ascii-quote-margin}                  @tab @code{org-ascii-quote-margin}
+@item @code{:ascii-table-keep-all-vertical-lines} @tab @code{org-ascii-table-keep-all-vertical-lines}
+@item @code{:ascii-table-use-ascii-art}           @tab @code{org-ascii-table-use-ascii-art}
+@item @code{:ascii-table-widen-columns}           @tab @code{org-ascii-table-widen-columns}
+@item @code{:ascii-text-width}                    @tab @code{org-ascii-text-width}
+@item @code{:ascii-underline}                     @tab @code{org-ascii-underline}
+@item @code{:ascii-verbatim-format}               @tab @code{org-ascii-verbatim-format}
+@end multitable
+
+@subsubheading Beamer specific properties
+
 @multitable @columnfractions 0.32 0.68
-@item @code{:html-doctype}          @tab @code{org-html-doctype}
-@item @code{:html-container}        @tab @code{org-html-container-element}
-@item @code{:html-html5-fancy}      @tab @code{org-html-html5-fancy}
-@item @code{:html-xml-declaration}  @tab @code{org-html-xml-declaration}
-@item @code{:html-link-up}          @tab @code{org-html-link-up}
-@item @code{:html-link-home}        @tab @code{org-html-link-home}
-@item @code{:html-link-org-as-html} @tab @code{org-html-link-org-files-as-html}
-@item @code{:html-link-use-abs-url} @tab @code{org-html-link-use-abs-url}
-@item @code{:html-head}             @tab @code{org-html-head}
-@item @code{:html-head-extra}       @tab @code{org-html-head-extra}
-@item @code{:html-inline-images}    @tab @code{org-html-inline-images}
-@item @code{:html-extension}        @tab @code{org-html-extension}
-@item @code{:html-preamble}         @tab @code{org-html-preamble}
-@item @code{:html-postamble}        @tab @code{org-html-postamble}
-@item @code{:html-table-attributes} @tab @code{org-html-table-default-attributes}
-@item @code{:html-table-row-tags}   @tab @code{org-html-table-row-tags}
+@item @code{:beamer-theme}                 @tab @code{org-beamer-theme}
+@item @code{:beamer-column-view-format}    @tab @code{org-beamer-column-view-format}
+@item @code{:beamer-environments-extra}    @tab @code{org-beamer-environments-extra}
+@item @code{:beamer-frame-default-options} @tab @code{org-beamer-frame-default-options}
+@item @code{:beamer-outline-frame-options} @tab @code{org-beamer-outline-frame-options}
+@item @code{:beamer-outline-frame-title}   @tab @code{org-beamer-outline-frame-title}
+@end multitable
+
+@subsubheading HTML specific properties
+
+@multitable @columnfractions 0.32 0.68
+@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-divs}                       @tab @code{org-html-divs}
+@item @code{:html-doctype}                    @tab @code{org-html-doctype}
+@item @code{:html-extension}                  @tab @code{org-html-extension}
+@item @code{:html-footnote-format}            @tab @code{org-html-footnote-format}
+@item @code{:html-footnote-separator}         @tab @code{org-html-footnote-separator}
+@item @code{:html-footnotes-section}          @tab @code{org-html-footnotes-section}
+@item @code{:html-format-drawer-function}     @tab @code{org-html-format-drawer-function}
+@item @code{:html-format-headline-function}   @tab @code{org-html-format-headline-function}
+@item @code{:html-format-inlinetask-function} @tab @code{org-html-format-inlinetask-function}
+@item @code{:html-head-extra}                 @tab @code{org-html-head-extra}
 @item @code{:html-head-include-default-style} @tab @code{org-html-head-include-default-style}
-@item @code{:html-head-include-scripts} @tab @code{org-html-head-include-scripts}
+@item @code{:html-head-include-scripts}       @tab @code{org-html-head-include-scripts}
+@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-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-infojs-options}             @tab @code{org-html-infojs-options}
+@item @code{:html-infojs-template}            @tab @code{org-html-infojs-template}
+@item @code{:html-inline-image-rules}         @tab @code{org-html-inline-image-rules}
+@item @code{:html-inline-images}              @tab @code{org-html-inline-images}
+@item @code{:html-link-home}                  @tab @code{org-html-link-home}
+@item @code{:html-link-org-as-html}           @tab @code{org-html-link-org-files-as-html}
+@item @code{:html-link-up}                    @tab @code{org-html-link-up}
+@item @code{:html-link-use-abs-url}           @tab @code{org-html-link-use-abs-url}
+@item @code{:html-mathjax-options}            @tab @code{org-html-mathjax-options}
+@item @code{:html-mathjax-template}           @tab @code{org-html-mathjax-template}
+@item @code{:html-metadata-timestamp-format}  @tab @code{org-html-metadata-timestamp-format}
+@item @code{:html-postamble-format}           @tab @code{org-html-postamble-format}
+@item @code{:html-postamble}                  @tab @code{org-html-postamble}
+@item @code{:html-preamble-format}            @tab @code{org-html-preamble-format}
+@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-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-data-tags}            @tab @code{org-html-table-data-tags}
+@item @code{:html-table-header-tags}          @tab @code{org-html-table-header-tags}
+@item @code{:html-table-row-tags}             @tab @code{org-html-table-row-tags}
+@item @code{:html-table-use-header-tags-for-first-column} @tab @code{org-html-table-use-header-tags-for-first-column}
+@item @code{:html-tag-class-prefix}           @tab @code{org-html-tag-class-prefix}
+@item @code{:html-text-markup-alist}          @tab @code{org-html-text-markup-alist}
+@item @code{:html-todo-kwd-class-prefix}      @tab @code{org-html-todo-kwd-class-prefix}
+@item @code{:html-toplevel-hlevel}            @tab @code{org-html-toplevel-hlevel}
+@item @code{:html-use-infojs}                 @tab @code{org-html-use-infojs}
+@item @code{:html-use-unicode-chars}          @tab @code{org-html-use-unicode-chars}
+@item @code{:html-validation-link}            @tab @code{org-html-validation-link}
+@item @code{:html-xml-declaration}            @tab @code{org-html-xml-declaration}
 @end multitable
 
-Most of the @code{org-export-with-*} variables have the same effect in each
-exporter.
+@subsubheading @LaTeX{} specific properties
 
-@vindex org-publish-project-alist
-When a property is given a value in @code{org-publish-project-alist}, its
-setting overrides the value of the corresponding user variable (if any)
-during publishing.  Options set within a file (@pxref{Export settings}),
-however, override everything.
+@multitable @columnfractions 0.32 0.68
+@item @code{:latex-active-timestamp-format}    @tab @code{org-latex-active-timestamp-format}
+@item @code{:latex-classes}                    @tab @code{org-latex-classes}
+@item @code{:latex-class}                      @tab @code{org-latex-default-class t}
+@item @code{:latex-default-figure-position}    @tab @code{org-latex-default-figure-position}
+@item @code{:latex-default-table-environment}  @tab @code{org-latex-default-table-environment}
+@item @code{:latex-default-table-mode}         @tab @code{org-latex-default-table-mode}
+@item @code{:latex-diary-timestamp-format}     @tab @code{org-latex-diary-timestamp-format}
+@item @code{:latex-footnote-separator}         @tab @code{org-latex-footnote-separator}
+@item @code{:latex-format-drawer-function}     @tab @code{org-latex-format-drawer-function}
+@item @code{:latex-format-headline-function}   @tab @code{org-latex-format-headline-function}
+@item @code{:latex-format-inlinetask-function} @tab @code{org-latex-format-inlinetask-function}
+@item @code{:latex-hyperref-p}                 @tab @code{org-latex-with-hyperref t}
+@item @code{:latex-image-default-height}       @tab @code{org-latex-image-default-height}
+@item @code{:latex-image-default-option}       @tab @code{org-latex-image-default-option}
+@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-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-errors}               @tab @code{org-latex-known-errors}
+@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-options}           @tab @code{org-latex-listings-options}
+@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-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-scientific-notation}  @tab @code{org-latex-table-scientific-notation}
+@item @code{:latex-tables-booktabs}            @tab @code{org-latex-tables-booktabs}
+@item @code{:latex-tables-centered}            @tab @code{org-latex-tables-centered}
+@item @code{:latex-text-markup-alist}          @tab @code{org-latex-text-markup-alist}
+@item @code{:latex-title-command}              @tab @code{org-latex-title-command}
+@item @code{:latex-toc-command}                @tab @code{org-latex-toc-command}
+@end multitable
+
+@subsubheading Markdown specific properties
+
+@multitable @columnfractions 0.32 0.68
+@item @code{:md-headline-style} @tab @code{org-md-headline-style}
+@end multitable
+
+@subsubheading ODT specific properties
+
+@multitable @columnfractions 0.32 0.68
+@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}
+@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-format-drawer-function}     @tab @code{org-odt-format-drawer-function}
+@item @code{:odt-format-headline-function}   @tab @code{org-odt-format-headline-function}
+@item @code{:odt-format-inlinetask-function} @tab @code{org-odt-format-inlinetask-function}
+@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-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-table-styles}               @tab @code{org-odt-table-styles}
+@item @code{:odt-use-date-fields}            @tab @code{org-odt-use-date-fields}
+@end multitable
+
+@subsubheading Org specific properties
+
+@multitable @columnfractions 0.32 0.68
+@item @code{:org-htmlized-css-url} @tab @code{org-org-htmlized-css-url}
+@end multitable
+
+@subsubheading Texinfo specific properties
+
+@multitable @columnfractions 0.32 0.68
+@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-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-diary-timestamp-format}     @tab @code{org-texinfo-diary-timestamp-format}
+@item @code{:texinfo-filename}                   @tab @code{org-texinfo-filename}
+@item @code{:texinfo-format-drawer-function}     @tab @code{org-texinfo-format-drawer-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-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-logfiles-extensions}        @tab @code{org-texinfo-logfiles-extensions}
+@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-tables-verbatim}            @tab @code{org-texinfo-tables-verbatim}
+@item @code{:texinfo-text-markup-alist}          @tab @code{org-texinfo-text-markup-alist}
+@end multitable
 
 @node Publishing links
 @subsection Links between published files
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index f343d14..8e5b194 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -120,7 +120,28 @@
 		   (:filter-parse-tree org-ascii-filter-paragraph-spacing
 				       org-ascii-filter-comment-spacing)
 		   (:filter-section . org-ascii-filter-headline-blank-lines))
-  :options-alist '((:ascii-charset nil nil org-ascii-charset)))
+  :options-alist
+  '((:ascii-bullets nil nil org-ascii-bullets)
+    (:ascii-caption-above nil nil org-ascii-caption-above)
+    (:ascii-charset nil nil org-ascii-charset)
+    (:ascii-global-margin nil nil org-ascii-global-margin)
+    (:ascii-format-drawer-function nil nil org-ascii-format-drawer-function)
+    (:ascii-format-inlinetask-function
+     nil nil org-ascii-format-inlinetask-function)
+    (:ascii-headline-spacing nil nil org-ascii-headline-spacing)
+    (:ascii-indented-line-width nil nil org-ascii-indented-line-width)
+    (:ascii-inlinetask-width nil nil org-ascii-inlinetask-width)
+    (:ascii-inner-margin nil nil org-ascii-inner-margin)
+    (:ascii-links-to-notes nil nil org-ascii-links-to-notes)
+    (:ascii-paragraph-spacing nil nil org-ascii-paragraph-spacing)
+    (:ascii-quote-margin nil nil org-ascii-quote-margin)
+    (:ascii-table-keep-all-vertical-lines
+     nil nil org-ascii-table-keep-all-vertical-lines)
+    (:ascii-table-use-ascii-art nil nil org-ascii-table-use-ascii-art)
+    (:ascii-table-widen-columns nil nil org-ascii-table-widen-columns)
+    (:ascii-text-width nil nil org-ascii-text-width)
+    (:ascii-underline nil nil org-ascii-underline)
+    (:ascii-verbatim-format nil nil org-ascii-verbatim-format)))
 
 
 
diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el
index 499a885..3e1c00a 100644
--- a/lisp/ox-beamer.el
+++ b/lisp/ox-beamer.el
@@ -231,14 +231,20 @@ Return overlay specification, as a string, or nil."
 	      (if a (org-beamer-export-to-pdf t s v b)
 		(org-open-file (org-beamer-export-to-pdf nil s v b)))))))
   :options-alist
-  '((:latex-class "LATEX_CLASS" nil "beamer" t)
-    (:beamer-theme "BEAMER_THEME" nil org-beamer-theme)
+  '((:beamer-theme "BEAMER_THEME" nil org-beamer-theme)
     (:beamer-color-theme "BEAMER_COLOR_THEME" nil nil t)
     (:beamer-font-theme "BEAMER_FONT_THEME" nil nil t)
     (:beamer-inner-theme "BEAMER_INNER_THEME" nil nil t)
     (:beamer-outer-theme "BEAMER_OUTER_THEME" nil nil t)
     (:beamer-header-extra "BEAMER_HEADER" nil nil newline)
-    (:headline-levels nil "H" org-beamer-frame-level))
+    (:beamer-column-view-format nil nil org-beamer-column-view-format)
+    (:beamer-environments-extra nil nil org-beamer-environments-extra)
+    (:beamer-frame-default-options nil nil org-beamer-frame-default-options)
+    (:beamer-outline-frame-options nil nil org-beamer-outline-frame-options)
+    (:beamer-outline-frame-title nil nil org-beamer-outline-frame-title)
+    ;; Modify existing properties.
+    (:headline-levels nil "H" org-beamer-frame-level)
+    (:latex-class "LATEX_CLASS" nil "beamer" t))
   :translate-alist '((bold . org-beamer-bold)
 		     (export-block . org-beamer-export-block)
 		     (export-snippet . org-beamer-export-snippet)
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 0be45b7..19153fb 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -108,30 +108,77 @@
 	      (if a (org-html-export-to-html t s v b)
 		(org-open-file (org-html-export-to-html nil s v b)))))))
   :options-alist
-  '((:creator "CREATOR" nil org-html-creator-string)
-    (:html-doctype "HTML_DOCTYPE" nil org-html-doctype)
+  '((:html-doctype "HTML_DOCTYPE" nil org-html-doctype)
+    (:html-container "HTML_CONTAINER" nil org-html-container-element)
+    (: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-home "HTML_LINK_HOME" nil org-html-link-home)
     (:html-link-up "HTML_LINK_UP" nil org-html-link-up)
     (:html-head "HTML_HEAD" nil org-html-head newline)
     (:html-head-extra "HTML_HEAD_EXTRA" nil org-html-head-extra newline)
     (:html-container "HTML_CONTAINER" nil org-html-container-element)
     (:html-mathjax "HTML_MATHJAX" nil "" space)
-    (:infojs-opt "INFOJS_OPT" nil nil)
-    ;; Retrieve LaTeX header for fragments.
-    (:latex-header "LATEX_HEADER" nil nil newline)
     (: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-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-preamble nil "html-preamble" org-html-preamble)
-    (:html-head-include-default-style nil "html-style" org-html-head-include-default-style)
+    (:html-head "HTML_HEAD" nil org-html-head newline)
+    (:html-head-extra "HTML_HEAD_EXTRA" nil org-html-head-extra newline)
+    (:html-head-include-default-style
+     nil "html-style" org-html-head-include-default-style)
     (:html-head-include-scripts nil "html-scripts" org-html-head-include-scripts)
+    (: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-extension nil nil org-html-extension)
+    (:html-footnote-format nil nil org-html-footnote-format)
+    (:html-footnote-separator nil nil org-html-footnote-separator)
+    (:html-footnotes-section nil nil org-html-footnotes-section)
+    (:html-format-drawer-function nil nil org-html-format-drawer-function)
+    (:html-format-headline-function nil nil org-html-format-headline-function)
+    (:html-format-inlinetask-function
+     nil nil org-html-format-inlinetask-function)
+    (: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-infojs-options nil nil org-html-infojs-options)
+    (:html-infojs-template nil nil org-html-infojs-template)
+    (:html-inline-image-rules nil nil org-html-inline-image-rules)
+    (:html-link-org-as-html nil nil org-html-link-org-files-as-html)
+    (:html-mathjax-options nil nil org-html-mathjax-options)
+    (:html-mathjax-template nil nil org-html-mathjax-template)
+    (:html-metadata-timestamp-format nil nil org-html-metadata-timestamp-format)
+    (:html-postamble-format nil nil org-html-postamble-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
+     nil nil org-html-table-align-individual-fields)
+    (:html-table-caption-above nil nil org-html-table-caption-above)
+    (:html-table-data-tags nil nil org-html-table-data-tags)
+    (:html-table-header-tags nil nil org-html-table-header-tags)
+    (:html-table-use-header-tags-for-first-column
+     nil nil org-html-table-use-header-tags-for-first-column)
+    (:html-tag-class-prefix nil nil org-html-tag-class-prefix)
+    (:html-text-markup-alist nil nil org-html-text-markup-alist)
+    (:html-todo-kwd-class-prefix nil nil org-html-todo-kwd-class-prefix)
+    (:html-toplevel-hlevel nil nil org-html-toplevel-hlevel)
+    (:html-use-infojs nil nil org-html-use-infojs)
+    (:html-use-unicode-chars nil nil org-html-use-unicode-chars)
+    (:html-validation-link nil nil org-html-validation-link)
+    (:html-inline-images nil nil org-html-inline-images)
     (:html-table-attributes nil nil org-html-table-default-attributes)
     (:html-table-row-tags nil nil org-html-table-row-tags)
     (:html-xml-declaration nil nil org-html-xml-declaration)
-    (:html-inline-images nil nil org-html-inline-images)
-    (:with-latex nil "tex" org-html-with-latex)))
+    (:infojs-opt "INFOJS_OPT" nil nil)
+    ;; Redefine regular options.
+    (:creator "CREATOR" nil org-html-creator-string)
+    (:with-latex nil "tex" org-html-with-latex)
+    ;; Retrieve LaTeX header for fragments.
+    (:latex-header "LATEX_HEADER" nil nil newline)))
 
 
 ;;; Internal Variables
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el
index 1c2d41b..f09b04e 100644
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@@ -258,7 +258,21 @@ re-read the iCalendar file.")
   '((:exclude-tags
      "ICALENDAR_EXCLUDE_TAGS" nil org-icalendar-exclude-tags split)
     (:with-timestamps nil "<" org-icalendar-with-timestamps)
-    (:with-vtodo nil nil org-icalendar-include-todo)
+    ;; Other variables.
+    (:icalendar-alarm-time nil nil org-icalendar-alarm-time)
+    (: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-include-bbdb-anniversaries nil nil org-icalendar-include-bbdb-anniversaries)
+    (:icalendar-include-body nil nil org-icalendar-include-body)
+    (:icalendar-include-sexps nil nil org-icalendar-include-sexps)
+    (:icalendar-include-todo nil nil org-icalendar-include-todo)
+    (:icalendar-store-UID nil nil org-icalendar-store-UID)
+    (:icalendar-timezone nil nil org-icalendar-timezone)
+    (:icalendar-use-deadline nil nil org-icalendar-use-deadline)
+    (:icalendar-use-scheduled nil nil org-icalendar-use-scheduled)
     ;; The following property will be non-nil when export has been
     ;; started from org-agenda-mode.  In this case, any entry without
     ;; a non-nil "ICALENDAR_MARK" property will be ignored.
@@ -590,7 +604,7 @@ inlinetask within the section."
 	    ;; If so, call `org-icalendar--vtodo' to transcode it
 	    ;; into a "VTODO" component.
 	    (when (and todo-type
-		       (case (plist-get info :with-vtodo)
+		       (case (plist-get info :icalendar-include-todo)
 			 (all t)
 			 (unblocked
 			  (and (eq type 'headline)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 5435a73..93bcdd1 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -101,15 +101,50 @@
 	    (lambda (a s v b)
 	      (if a (org-latex-export-to-pdf t s v b)
 		(org-open-file (org-latex-export-to-pdf nil s v b)))))))
-  :options-alist '((:date "DATE" nil "\\today" t)
-		   (:latex-class "LATEX_CLASS" nil org-latex-default-class t)
-		   (:latex-class-options "LATEX_CLASS_OPTIONS" nil nil t)
-		   (:latex-header "LATEX_HEADER" nil nil newline)
-		   (:latex-header-extra "LATEX_HEADER_EXTRA" nil nil newline)
-		   (:latex-hyperref nil nil org-latex-hyperref-template t)
-		   (:latex-custom-id-labels nil nil org-latex-custom-id-as-label))
   :filters-alist '((:filter-options . org-latex-math-block-options-filter)
-		   (:filter-parse-tree . org-latex-math-block-tree-filter)))
+		   (:filter-parse-tree . org-latex-math-block-tree-filter))
+  :options-alist
+  '((:latex-class "LATEX_CLASS" nil org-latex-default-class t)
+    (:latex-class-options "LATEX_CLASS_OPTIONS" nil nil t)
+    (:latex-header "LATEX_HEADER" nil nil newline)
+    (:latex-header-extra "LATEX_HEADER_EXTRA" nil nil newline)
+    (:latex-hyperref-p nil "texht" org-latex-with-hyperref t)
+    ;; Other variables.
+    (:latex-active-timestamp-format nil nil org-latex-active-timestamp-format)
+    (:latex-classes nil nil org-latex-classes)
+    (:latex-default-figure-position nil nil org-latex-default-figure-position)
+    (:latex-default-table-environment nil nil org-latex-default-table-environment)
+    (:latex-default-table-mode nil nil org-latex-default-table-mode)
+    (:latex-diary-timestamp-format nil nil org-latex-diary-timestamp-format)
+    (:latex-footnote-separator nil nil org-latex-footnote-separator)
+    (:latex-format-drawer-function nil nil org-latex-format-drawer-function)
+    (:latex-format-headline-function nil nil org-latex-format-headline-function)
+    (:latex-format-inlinetask-function nil nil org-latex-format-inlinetask-function)
+    (:latex-image-default-height nil nil org-latex-image-default-height)
+    (:latex-image-default-option nil nil org-latex-image-default-option)
+    (:latex-image-default-width nil nil org-latex-image-default-width)
+    (:latex-inactive-timestamp-format nil nil org-latex-inactive-timestamp-format)
+    (:latex-inline-image-rules nil nil org-latex-inline-image-rules)
+    (:latex-inputenc-alist nil nil org-latex-inputenc-alist)
+    (:latex-known-errors nil nil org-latex-known-errors)
+    (:latex-link-with-unknown-path-format nil nil org-latex-link-with-unknown-path-format)
+    (:latex-listings nil nil org-latex-listings)
+    (:latex-listings-langs nil nil org-latex-listings-langs)
+    (: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-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-scientific-notation nil nil org-latex-table-scientific-notation)
+    (:latex-tables-booktabs nil nil org-latex-tables-booktabs)
+    (:latex-tables-centered nil nil org-latex-tables-centered)
+    (:latex-text-markup-alist nil nil org-latex-text-markup-alist)
+    (:latex-title-command nil nil org-latex-title-command)
+    (:latex-toc-command nil nil org-latex-toc-command)
+    ;; Redefine regular options.
+    (:date "DATE" nil "\\today" t)))
 
 
 
diff --git a/lisp/ox-man.el b/lisp/ox-man.el
index 987de40..473a282 100644
--- a/lisp/ox-man.el
+++ b/lisp/ox-man.el
@@ -112,7 +112,16 @@
   :options-alist
   '((:man-class "MAN_CLASS" nil nil t)
     (:man-class-options "MAN_CLASS_OPTIONS" nil nil t)
-    (:man-header-extra "MAN_HEADER" nil nil newline)))
+    (:man-header-extra "MAN_HEADER" nil nil newline)
+    ;; Other variables.
+    (:man-tables-centered nil nil org-man-tables-centered)
+    (:man-tables-verbatim nil nil org-man-tables-verbatim)
+    (:man-table-scientific-notation nil nil org-man-table-scientific-notation)
+    (: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)))
 
 
 
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index 578f1d0..c34a928 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -93,7 +93,8 @@ This variable can be set to either `atx' or `setext'."
 		     (section . org-md-section)
 		     (src-block . org-md-example-block)
 		     (template . org-md-template)
-		     (verbatim . org-md-verbatim)))
+		     (verbatim . org-md-verbatim))
+  :options-alist '((:md-headline-style nil nil org-md-headline-style)))
 
 
 ;;; Filters
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 4d2f257..8af848c 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -97,6 +97,27 @@
 		(org-open-file (org-odt-export-to-odt nil s v) 'system))))))
   :options-alist
   '((:odt-styles-file "ODT_STYLES_FILE" nil nil t)
+    ;; Other variables.
+    (: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-fontify-srcblocks nil nil org-odt-fontify-srcblocks)
+    (:odt-format-drawer-function nil nil org-odt-format-drawer-function)
+    (:odt-format-headline-function nil nil org-odt-format-headline-function)
+    (:odt-format-inlinetask-function nil nil org-odt-format-inlinetask-function)
+    (:odt-inline-formula-rules nil nil org-odt-inline-formula-rules)
+    (:odt-inline-image-rules nil nil org-odt-inline-image-rules)
+    (: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-table-styles nil nil org-odt-table-styles)
+    (:odt-use-date-fields nil nil org-odt-use-date-fields)
     ;; Redefine regular option.
     (:with-latex nil "tex" org-odt-with-latex)))
 
@@ -107,7 +128,6 @@
 
 ;;; Function Declarations
 
-(declare-function org-id-find-id-file "org-id" (id))
 (declare-function hfy-face-to-style "htmlfontify" (fn))
 (declare-function hfy-face-or-def-to-name "htmlfontify" (fn))
 (declare-function archive-zip-extract "arc-mode" (archive name))
diff --git a/lisp/ox-org.el b/lisp/ox-org.el
index fd40ea9..01b3292 100644
--- a/lisp/ox-org.el
+++ b/lisp/ox-org.el
@@ -102,6 +102,7 @@ setting of `org-html-htmlize-output-type' is 'css."
     (underline . org-org-identity)
     (verbatim . org-org-identity)
     (verse-block . org-org-identity))
+  :options-alist '((:org-htmlized-css-url nil nil org-org-htmlized-css-url))
   :menu-entry
   '(?O "Export to Org"
        ((?O "As Org buffer" org-org-export-as-org)
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index 9c22153..d11f387 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -128,7 +128,25 @@
     (:subauthor "SUBAUTHOR" nil nil newline)
     (:texinfo-dircat "TEXINFO_DIR_CATEGORY" 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.
+    (:texinfo-coding-system nil nil org-texinfo-coding-system)
+    (:texinfo-classes nil nil org-texinfo-classes)
+    (:texinfo-format-headline-function nil nil org-texinfo-format-headline-function)
+    (:texinfo-node-description-column nil nil org-texinfo-node-description-column)
+    (:texinfo-active-timestamp-format nil nil org-texinfo-active-timestamp-format)
+    (:texinfo-inactive-timestamp-format nil nil org-texinfo-inactive-timestamp-format)
+    (:texinfo-diary-timestamp-format nil nil org-texinfo-diary-timestamp-format)
+    (:texinfo-link-with-unknown-path-format nil nil org-texinfo-link-with-unknown-path-format)
+    (:texinfo-tables-verbatim nil nil org-texinfo-tables-verbatim)
+    (:texinfo-table-scientific-notation nil nil org-texinfo-table-scientific-notation)
+    (:texinfo-def-table-markup nil nil org-texinfo-def-table-markup)
+    (:texinfo-text-markup-alist nil nil org-texinfo-text-markup-alist)
+    (: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)))