From e1eb6a4af232d5f57fce60393a1ea0aab4bb0149 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 18 May 2012 10:33:21 +0200 Subject: [PATCH] org-export: Rename `org-export-option-alist' into `org-export-options-alist' * contrib/lisp/org-e-ascii.el (org-e-ascii-options-alist): Renamed from `org-e-ascii-option-alist'. * contrib/lisp/org-e-html.el (org-e-html-options-alist): Renamed from `org-e-html-option-alist'. * contrib/lisp/org-e-latex.el (org-e-latex-options-alist): Renamed from `org-e-latex-option-alist'. * contrib/lisp/org-e-odt.el (org-e-odt-options-alist): Renamed from `org-e-odt-option-alist'. * contrib/lisp/org-export.el (org-export-define-derived-backend, org-export-parse-option-keyword, org-export-get-inbuffer-options, org-export-get-global-options): Rename `org-export-option-alist' into `org-export-options-alist'. --- contrib/lisp/org-e-ascii.el | 4 ++-- contrib/lisp/org-e-html.el | 4 ++-- contrib/lisp/org-e-latex.el | 4 ++-- contrib/lisp/org-e-odt.el | 4 ++-- contrib/lisp/org-export.el | 34 +++++++++++++++++----------------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/contrib/lisp/org-e-ascii.el b/contrib/lisp/org-e-ascii.el index 0a48a71f0..8654df553 100644 --- a/contrib/lisp/org-e-ascii.el +++ b/contrib/lisp/org-e-ascii.el @@ -134,10 +134,10 @@ (verse-block . org-e-ascii-verse-block)) "Alist between element or object types and translators.") -(defconst org-e-ascii-option-alist +(defconst org-e-ascii-options-alist '((:ascii-charset nil nil org-e-ascii-charset)) "Alist between ASCII export properties and ways to set them. -See `org-export-option-alist' for more information on the +See `org-export-options-alist' for more information on the structure of the values.") (defconst org-e-ascii-filters-alist diff --git a/contrib/lisp/org-e-html.el b/contrib/lisp/org-e-html.el index 3478fbd80..a887cffcb 100644 --- a/contrib/lisp/org-e-html.el +++ b/contrib/lisp/org-e-html.el @@ -143,7 +143,7 @@ (verse-block . org-e-html-verse-block)) "Alist between element or object types and translators.") -(defconst org-e-html-option-alist +(defconst org-e-html-options-alist '((:agenda-style nil nil org-agenda-export-html-style) (:convert-org-links nil nil org-e-html-link-org-files-as-html) ;; FIXME Use (org-xml-encode-org-text-skip-links s) ?? @@ -164,7 +164,7 @@ (:LaTeX-fragments nil "LaTeX" org-export-with-LaTeX-fragments) (:mathjax "MATHJAX" nil "" space)) "Alist between HTML export properties and ways to set them. -See `org-export-option-alist' for more information on the +See `org-export-options-alist' for more information on the structure of the values.") (defconst org-e-html-filters-alist diff --git a/contrib/lisp/org-e-latex.el b/contrib/lisp/org-e-latex.el index 974b6b3d6..c14d6a40d 100644 --- a/contrib/lisp/org-e-latex.el +++ b/contrib/lisp/org-e-latex.el @@ -139,13 +139,13 @@ (verse-block . org-e-latex-verse-block)) "Alist between element or object types and translators.") -(defconst org-e-latex-option-alist +(defconst org-e-latex-options-alist '((:date "DATE" nil org-e-latex-date-format t) (:latex-class "LATEX_CLASS" nil org-e-latex-default-class t) (:latex-class-options "LATEX_CLASS_OPTIONS" nil nil t) (:latex-header-extra "LATEX_HEADER" nil nil newline)) "Alist between LaTeX export properties and ways to set them. -See `org-export-option-alist' for more information on the +See `org-export-options-alist' for more information on the structure of the values.") diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el index b713b0580..433b535a0 100644 --- a/contrib/lisp/org-e-odt.el +++ b/contrib/lisp/org-e-odt.el @@ -87,7 +87,7 @@ (verse-block . org-e-odt-verse-block)) "Alist between element or object types and translators.") -(defvar org-e-odt-option-alist +(defconst org-e-odt-options-alist '( ;; (:agenda-style nil nil org-agenda-export-html-style) ;; (:convert-org-links nil nil org-e-odt-link-org-files-as-html) @@ -109,7 +109,7 @@ (:odt-styles-file "ODT_STYLES_FILE" nil nil t) (:LaTeX-fragments nil "LaTeX" org-export-with-LaTeX-fragments)) "Alist between ODT export properties and ways to set them. -See `org-export-option-alist' for more information on the +See `org-export-options-alist' for more information on the structure of the values.") diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el index fa9bce2c6..5ac00e2fa 100644 --- a/contrib/lisp/org-export.el +++ b/contrib/lisp/org-export.el @@ -78,10 +78,10 @@ ;; recognized as an element or an object. It must accept two ;; arguments: the text string and the information channel. ;; -;; 2. Optionally define a variable, `org-BACKEND-option-alist', in +;; 2. Optionally define a variable, `org-BACKEND-options-alist', in ;; order to support new export options, buffer keywords or ;; "#+OPTIONS:" items specific to the back-end. See -;; `org-export-option-alist' for supported defaults and syntax. +;; `org-export-options-alist' for supported defaults and syntax. ;; ;; 3. Optionally define a variable, `org-BACKEND-filters-alist', in ;; order to apply developer filters. See "The Filter System" @@ -114,13 +114,13 @@ ;;; Internal Variables ;; ;; Among internal variables, the most important is -;; `org-export-option-alist'. This variable define the global export +;; `org-export-options-alist'. This variable define the global export ;; options, shared between every exporter, and how they are acquired. (defconst org-export-max-depth 19 "Maximum nesting depth for headlines, counting from 0.") -(defconst org-export-option-alist +(defconst org-export-options-alist '((:author "AUTHOR" nil user-full-name t) (:creator "CREATOR" nil org-export-creator-string) (:date "DATE" nil nil t) @@ -177,7 +177,7 @@ KEYWORD and OPTION have precedence over DEFAULT. All these properties should be back-end agnostic. For back-end specific properties, define a similar variable named -`org-BACKEND-option-alist', replacing BACKEND with the name of +`org-BACKEND-options-alist', replacing BACKEND with the name of the appropriate back-end. You can also redefine properties there, as they have precedence over these.") @@ -277,7 +277,7 @@ rules.") ;; Configuration for the masses. ;; ;; They should never be accessed directly, as their value is to be -;; stored in a property list (cf. `org-export-option-alist'). +;; stored in a property list (cf. `org-export-options-alist'). ;; Back-ends will read their value from there instead. (defgroup org-export nil @@ -753,14 +753,14 @@ The back-end could then be called with, for example: "Alist between filters keywords and back-end specific filters. See `org-export-filters-alist' for more information."))) ;; Define options. - ,(let ((parent-options (intern (format "org-%s-option-alist" parent)))) + ,(let ((parent-options (intern (format "org-%s-options-alist" parent)))) (when (or (boundp parent-options) options) - `(defconst ,(intern (format "org-%s-option-alist" child)) + `(defconst ,(intern (format "org-%s-options-alist" child)) ',(append options (and (boundp parent-options) (copy-sequence (symbol-value parent-options)))) "Alist between LaTeX export properties and ways to set them. -See `org-export-option-alist' for more information on the +See `org-export-options-alist' for more information on the structure of the values."))) ;; Define translators. (defvar ,(intern (format "org-%s-translate-alist" child)) @@ -785,7 +785,7 @@ structure of the values."))) ;; function. ;; ;; Most environment options are defined through the -;; `org-export-option-alist' variable. +;; `org-export-options-alist' variable. ;; ;; 2. Tree properties are extracted directly from the parsed tree, ;; just before export, by `org-export-collect-tree-properties'. @@ -1080,10 +1080,10 @@ inferior to file-local settings." Optional argument BACKEND is a symbol specifying which back-end specific items to read, if any." (let* ((all - (append org-export-option-alist + (append org-export-options-alist (and backend (let ((var (intern - (format "org-%s-option-alist" backend)))) + (format "org-%s-options-alist" backend)))) (and (boundp var) (eval var)))))) ;; Build an alist between #+OPTION: item and property-name. (alist (delq nil @@ -1202,14 +1202,14 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored." nil nil 1) restr))))))))))) (setq plist (org-combine-plists plist prop))))))) - ;; 2. Standard options, as in `org-export-option-alist'. - (let* ((all (append org-export-option-alist + ;; 2. Standard options, as in `org-export-options-alist'. + (let* ((all (append org-export-options-alist ;; Also look for back-end specific options ;; if BACKEND is defined. (and backend (let ((var (intern - (format "org-%s-option-alist" backend)))) + (format "org-%s-options-alist" backend)))) (and (boundp var) (eval var)))))) ;; Build alist between keyword name and property name. (alist @@ -1291,10 +1291,10 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored." Optional argument BACKEND, if non-nil, is a symbol specifying which back-end specific export options should also be read in the process." - (let ((all (append org-export-option-alist + (let ((all (append org-export-options-alist (and backend (let ((var (intern - (format "org-%s-option-alist" backend)))) + (format "org-%s-options-alist" backend)))) (and (boundp var) (eval var)))))) ;; Output value. plist)