Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-01-11 12:20:52 +01:00
commit 9f96208eec
1 changed files with 3 additions and 6 deletions

View File

@ -2011,8 +2011,7 @@ See `org-latex-format-headline-function' for details."
text text
(and tags (and tags
(format "\\hfill{}\\textsc{%s}" (format "\\hfill{}\\textsc{%s}"
(mapconcat (lambda (tag) (org-latex-plain-text tag info)) (mapconcat #'org-latex--protect-text tags ":")))))
tags ":")))))
;;;; Horizontal Rule ;;;; Horizontal Rule
@ -2094,7 +2093,7 @@ holding contextual information."
todo todo-type priority title tags contents info))) todo todo-type priority title tags contents info)))
(defun org-latex-format-inlinetask-default-function (defun org-latex-format-inlinetask-default-function
(todo _todo-type priority title tags contents info) (todo _todo-type priority title tags contents info)
"Default format function for a inlinetasks. "Default format function for a inlinetasks.
See `org-latex-format-inlinetask-function' for details." See `org-latex-format-inlinetask-function' for details."
(let ((full-title (let ((full-title
@ -2103,9 +2102,7 @@ See `org-latex-format-inlinetask-function' for details."
title title
(when tags (when tags
(format "\\hfill{}\\textsc{:%s:}" (format "\\hfill{}\\textsc{:%s:}"
(mapconcat (mapconcat #'org-latex--protect-text tags ":"))))))
(lambda (tag) (org-latex-plain-text tag info))
tags ":"))))))
(concat "\\begin{center}\n" (concat "\\begin{center}\n"
"\\fbox{\n" "\\fbox{\n"
"\\begin{minipage}[c]{.6\\textwidth}\n" "\\begin{minipage}[c]{.6\\textwidth}\n"