mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-12-03 08:30:03 +00:00
Merge branch 'maint'
Conflicts: contrib/lisp/ox-koma-letter.el
This commit is contained in:
Nicolas Goaziou
commit
0cdf2eb7ce
@ -499,27 +499,27 @@ holding export options."
|
||||
(and (plist-get info :time-stamp-file)
|
||||
(format-time-string "%% Created %Y-%m-%d %a %H:%M\n"))
|
||||
;; Document class and packages.
|
||||
(let ((class (plist-get info :latex-class))
|
||||
(class-options (plist-get info :latex-class-options)))
|
||||
(org-element-normalize-string
|
||||
(let* ((header (nth 1 (assoc class org-latex-classes)))
|
||||
(document-class-string
|
||||
(and (stringp header)
|
||||
(if (not class-options) header
|
||||
(replace-regexp-in-string
|
||||
"^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
|
||||
class-options header t nil 1)))))
|
||||
(if (not document-class-string)
|
||||
(user-error "Unknown LaTeX class `%s'" class)
|
||||
(org-latex-guess-babel-language
|
||||
(org-latex-guess-inputenc
|
||||
(org-splice-latex-header
|
||||
document-class-string
|
||||
org-latex-default-packages-alist ; defined in org.el
|
||||
org-latex-packages-alist nil ; defined in org.el
|
||||
(concat (plist-get info :latex-header)
|
||||
(plist-get info :latex-header-extra))))
|
||||
info)))))
|
||||
(let* ((class (plist-get info :latex-class))
|
||||
(class-options (plist-get info :latex-class-options))
|
||||
(header (nth 1 (assoc class org-latex-classes)))
|
||||
(document-class-string
|
||||
(and (stringp header)
|
||||
(if (not class-options) header
|
||||
(replace-regexp-in-string
|
||||
"^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
|
||||
class-options header t nil 1)))))
|
||||
(if (not document-class-string)
|
||||
(user-error "Unknown LaTeX class `%s'" class)
|
||||
(org-latex-guess-babel-language
|
||||
(org-latex-guess-inputenc
|
||||
(org-element-normalize-string
|
||||
(org-splice-latex-header
|
||||
document-class-string
|
||||
org-latex-default-packages-alist ; Defined in org.el.
|
||||
org-latex-packages-alist nil ; Defined in org.el.
|
||||
(concat (org-element-normalize-string (plist-get info :latex-header))
|
||||
(plist-get info :latex-header-extra)))))
|
||||
info)))
|
||||
(let ((lco (plist-get info :lco))
|
||||
(author (plist-get info :author))
|
||||
(from-address (org-koma-letter--determine-special-value info 'from))
|
||||
@ -578,8 +578,8 @@ holding export options."
|
||||
(dotimes (x l y)
|
||||
(setq y (concat (if (> x 0) "%s," "%s") y)))
|
||||
subject-format) "}\n"))
|
||||
(when (and subject with-subject)
|
||||
(format "\\setkomavar{subject}{%s}\n\n" subject))))
|
||||
(when (and subject with-subject)
|
||||
(format "\\setkomavar{subject}{%s}\n\n" subject))))
|
||||
;; Letter start
|
||||
(format "\\begin{letter}{%%\n%s}\n\n"
|
||||
(org-koma-letter--determine-special-value info 'to))
|
||||
|
||||
@ -861,28 +861,30 @@ holding export options."
|
||||
(and (plist-get info :time-stamp-file)
|
||||
(format-time-string "%% Created %Y-%m-%d %a %H:%M\n"))
|
||||
;; 2. Document class and packages.
|
||||
(let ((class (plist-get info :latex-class))
|
||||
(class-options (plist-get info :latex-class-options)))
|
||||
(org-element-normalize-string
|
||||
(let* ((header (nth 1 (assoc class org-latex-classes)))
|
||||
(document-class-string
|
||||
(and (stringp header)
|
||||
(if (not class-options) header
|
||||
(replace-regexp-in-string
|
||||
"^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
|
||||
class-options header t nil 1)))))
|
||||
(if (not document-class-string)
|
||||
(user-error "Unknown LaTeX class `%s'" class)
|
||||
(org-latex-guess-babel-language
|
||||
(org-latex-guess-inputenc
|
||||
(org-splice-latex-header
|
||||
document-class-string
|
||||
org-latex-default-packages-alist
|
||||
org-latex-packages-alist nil
|
||||
(concat (plist-get info :latex-header)
|
||||
(plist-get info :latex-header-extra)
|
||||
(plist-get info :beamer-header-extra))))
|
||||
info)))))
|
||||
(let* ((class (plist-get info :latex-class))
|
||||
(class-options (plist-get info :latex-class-options))
|
||||
(header (nth 1 (assoc class org-latex-classes)))
|
||||
(document-class-string
|
||||
(and (stringp header)
|
||||
(if (not class-options) header
|
||||
(replace-regexp-in-string
|
||||
"^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
|
||||
class-options header t nil 1)))))
|
||||
(if (not document-class-string)
|
||||
(user-error "Unknown LaTeX class `%s'" class)
|
||||
(org-latex-guess-babel-language
|
||||
(org-latex-guess-inputenc
|
||||
(org-element-normalize-string
|
||||
(org-splice-latex-header
|
||||
document-class-string
|
||||
org-latex-default-packages-alist
|
||||
org-latex-packages-alist nil
|
||||
(concat (org-element-normalize-string
|
||||
(plist-get info :latex-header))
|
||||
(org-element-normalize-string
|
||||
(plist-get info :latex-header-extra))
|
||||
(plist-get info :beamer-header-extra)))))
|
||||
info)))
|
||||
;; 3. Insert themes.
|
||||
(let ((format-theme
|
||||
(function
|
||||
|
||||
@ -1077,27 +1077,28 @@ holding export options."
|
||||
(and (plist-get info :time-stamp-file)
|
||||
(format-time-string "%% Created %Y-%m-%d %a %H:%M\n"))
|
||||
;; Document class and packages.
|
||||
(let ((class (plist-get info :latex-class))
|
||||
(class-options (plist-get info :latex-class-options)))
|
||||
(org-element-normalize-string
|
||||
(let* ((header (nth 1 (assoc class org-latex-classes)))
|
||||
(document-class-string
|
||||
(and (stringp header)
|
||||
(if (not class-options) header
|
||||
(replace-regexp-in-string
|
||||
"^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
|
||||
class-options header t nil 1)))))
|
||||
(if (not document-class-string)
|
||||
(user-error "Unknown LaTeX class `%s'" class)
|
||||
(org-latex-guess-babel-language
|
||||
(org-latex-guess-inputenc
|
||||
(org-splice-latex-header
|
||||
document-class-string
|
||||
org-latex-default-packages-alist
|
||||
org-latex-packages-alist nil
|
||||
(concat (plist-get info :latex-header)
|
||||
(plist-get info :latex-header-extra))))
|
||||
info)))))
|
||||
(let* ((class (plist-get info :latex-class))
|
||||
(class-options (plist-get info :latex-class-options))
|
||||
(header (nth 1 (assoc class org-latex-classes)))
|
||||
(document-class-string
|
||||
(and (stringp header)
|
||||
(if (not class-options) header
|
||||
(replace-regexp-in-string
|
||||
"^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
|
||||
class-options header t nil 1)))))
|
||||
(if (not document-class-string)
|
||||
(user-error "Unknown LaTeX class `%s'" class)
|
||||
(org-latex-guess-babel-language
|
||||
(org-latex-guess-inputenc
|
||||
(org-element-normalize-string
|
||||
(org-splice-latex-header
|
||||
document-class-string
|
||||
org-latex-default-packages-alist
|
||||
org-latex-packages-alist nil
|
||||
(concat (org-element-normalize-string
|
||||
(plist-get info :latex-header))
|
||||
(plist-get info :latex-header-extra)))))
|
||||
info)))
|
||||
;; Possibly limit depth for headline numbering.
|
||||
(let ((sec-num (plist-get info :section-numbers)))
|
||||
(when (integerp sec-num)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user