forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
9665f83f7b
|
@ -3973,7 +3973,6 @@ header, or they will be appended."
|
||||||
("" "wrapfig" nil)
|
("" "wrapfig" nil)
|
||||||
("" "rotating" nil)
|
("" "rotating" nil)
|
||||||
("normalem" "ulem" t)
|
("normalem" "ulem" t)
|
||||||
("" "soul" t)
|
|
||||||
("" "amsmath" t)
|
("" "amsmath" t)
|
||||||
("" "textcomp" t)
|
("" "textcomp" t)
|
||||||
("" "marvosym" t)
|
("" "marvosym" t)
|
||||||
|
|
|
@ -605,7 +605,7 @@ When nil, no transformation is made."
|
||||||
(code . verb)
|
(code . verb)
|
||||||
(italic . "\\emph{%s}")
|
(italic . "\\emph{%s}")
|
||||||
(strike-through . "\\sout{%s}")
|
(strike-through . "\\sout{%s}")
|
||||||
(underline . "\\ul{%s}")
|
(underline . "\\uline{%s}")
|
||||||
(verbatim . protectedtexttt))
|
(verbatim . protectedtexttt))
|
||||||
"Alist of LaTeX expressions to convert text markup.
|
"Alist of LaTeX expressions to convert text markup.
|
||||||
|
|
||||||
|
@ -1422,7 +1422,16 @@ holding contextual information."
|
||||||
((= (length sec) 4)
|
((= (length sec) 4)
|
||||||
(if numberedp (concat (car sec) "\n%s" (nth 1 sec))
|
(if numberedp (concat (car sec) "\n%s" (nth 1 sec))
|
||||||
(concat (nth 2 sec) "\n%s" (nth 3 sec)))))))
|
(concat (nth 2 sec) "\n%s" (nth 3 sec)))))))
|
||||||
(text (org-export-data (org-element-property :title headline) info))
|
;; Create a temporary export back-end that hard-codes
|
||||||
|
;; "\underline" within "\section" and alike.
|
||||||
|
(section-back-end
|
||||||
|
(org-export-create-backend
|
||||||
|
:parent 'latex
|
||||||
|
:transcoders
|
||||||
|
'((underline . (lambda (o c i) (format "\\underline{%s}" c))))))
|
||||||
|
(text
|
||||||
|
(org-export-data-with-backend
|
||||||
|
(org-element-property :title headline) section-back-end info))
|
||||||
(todo
|
(todo
|
||||||
(and (plist-get info :with-todo-keywords)
|
(and (plist-get info :with-todo-keywords)
|
||||||
(let ((todo (org-element-property :todo-keyword headline)))
|
(let ((todo (org-element-property :todo-keyword headline)))
|
||||||
|
@ -1480,8 +1489,9 @@ holding contextual information."
|
||||||
(let ((opt-title
|
(let ((opt-title
|
||||||
(funcall org-latex-format-headline-function
|
(funcall org-latex-format-headline-function
|
||||||
todo todo-type priority
|
todo todo-type priority
|
||||||
(org-export-data
|
(org-export-data-with-backend
|
||||||
(org-export-get-alt-title headline info) info)
|
(org-export-get-alt-title headline info)
|
||||||
|
section-back-end info)
|
||||||
(and (eq (plist-get info :with-tags) t) tags))))
|
(and (eq (plist-get info :with-tags) t) tags))))
|
||||||
(if (and numberedp opt-title
|
(if (and numberedp opt-title
|
||||||
(not (equal opt-title full-text))
|
(not (equal opt-title full-text))
|
||||||
|
|
Loading…
Reference in a new issue