forked from mirrors/org-mode
ox-texinfo: Change default table markup
* lisp/ox-texinfo.el (org-texinfo-table-default-markup): Rename from `org-texinfo-def-table-markup'. Set default value to the neutral "@asis". (org-texinfo-plain-list): Use new name. * lisp/org-compat.el (org-texinfo-def-table-markup): Mark as obsolete. * doc/org.texi (Publishing options): Document change.
This commit is contained in:
parent
3e35a78287
commit
be30c8b126
|
@ -14558,7 +14558,7 @@ however, override everything.
|
||||||
@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-def-table-markup} @tab @code{org-texinfo-def-table-markup}
|
@item @code{:texinfo-table-default-markup} @tab @code{org-texinfo-table-default-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}
|
||||||
@item @code{:texinfo-format-drawer-function} @tab @code{org-texinfo-format-drawer-function}
|
@item @code{:texinfo-format-drawer-function} @tab @code{org-texinfo-format-drawer-function}
|
||||||
|
|
|
@ -372,6 +372,9 @@ use of this function is for the stuck project list."
|
||||||
(define-obsolete-variable-alias 'org-usenet-links-prefer-google
|
(define-obsolete-variable-alias 'org-usenet-links-prefer-google
|
||||||
'org-gnus-prefer-web-links "Org 9.1")
|
'org-gnus-prefer-web-links "Org 9.1")
|
||||||
|
|
||||||
|
(define-obsolete-variable-alias 'org-texinfo-def-table-markup
|
||||||
|
'org-texinfo-table-default-markup "Org 9.1")
|
||||||
|
|
||||||
|
|
||||||
;;;; Obsolete link types
|
;;;; Obsolete link types
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@
|
||||||
(:texinfo-link-with-unknown-path-format nil nil org-texinfo-link-with-unknown-path-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-tables-verbatim nil nil org-texinfo-tables-verbatim)
|
||||||
(:texinfo-table-scientific-notation nil nil org-texinfo-table-scientific-notation)
|
(:texinfo-table-scientific-notation nil nil org-texinfo-table-scientific-notation)
|
||||||
(:texinfo-def-table-markup nil nil org-texinfo-def-table-markup)
|
(:texinfo-table-default-markup nil nil org-texinfo-table-default-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-format-inlinetask-function nil nil org-texinfo-format-inlinetask-function)))
|
||||||
|
@ -279,15 +279,18 @@ When nil, no transformation is made."
|
||||||
(string :tag "Format string")
|
(string :tag "Format string")
|
||||||
(const :tag "No formatting" nil)))
|
(const :tag "No formatting" nil)))
|
||||||
|
|
||||||
(defcustom org-texinfo-def-table-markup "@samp"
|
(defcustom org-texinfo-table-default-markup "@asis"
|
||||||
"Default markup for first column in two-column tables.
|
"Default markup for first column in two-column tables.
|
||||||
|
|
||||||
This should an indicating command, e.g., \"@code\", \"@kbd\" or
|
This should an indicating command, e.g., \"@code\", \"@kbd\" or
|
||||||
\"@asis\".
|
\"@samp\".
|
||||||
|
|
||||||
It can be overridden locally using the \":indic\" attribute."
|
It can be overridden locally using the \":indic\" attribute."
|
||||||
:group 'org-export-texinfo
|
:group 'org-export-texinfo
|
||||||
:type 'string)
|
:type 'string
|
||||||
|
:version "26.1"
|
||||||
|
:package-version '(Org . "9.1")
|
||||||
|
:safe #'stringp)
|
||||||
|
|
||||||
;;;; Text markup
|
;;;; Text markup
|
||||||
|
|
||||||
|
@ -1250,7 +1253,7 @@ CONTENTS is the contents of the list. INFO is a plist holding
|
||||||
contextual information."
|
contextual information."
|
||||||
(let* ((attr (org-export-read-attribute :attr_texinfo plain-list))
|
(let* ((attr (org-export-read-attribute :attr_texinfo plain-list))
|
||||||
(indic (let ((i (or (plist-get attr :indic)
|
(indic (let ((i (or (plist-get attr :indic)
|
||||||
(plist-get info :texinfo-def-table-markup))))
|
(plist-get info :texinfo-table-default-markup))))
|
||||||
;; Allow indicating commands with missing @ sign.
|
;; Allow indicating commands with missing @ sign.
|
||||||
(if (string-prefix-p "@" i) i (concat "@" i))))
|
(if (string-prefix-p "@" i) i (concat "@" i))))
|
||||||
(table-type (plist-get attr :table-type))
|
(table-type (plist-get attr :table-type))
|
||||||
|
|
Loading…
Reference in New Issue