From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: Re: [patch, ox-latex] captions and latex-environments Date: Thu, 16 Mar 2017 13:09:03 +0100 Message-ID: <87bmt1v2xs.fsf@gmx.us> References: <87k27pv38z.fsf@gmx.us> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coUDb-0007uF-TK for emacs-orgmode@gnu.org; Thu, 16 Mar 2017 08:09:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coUDX-00082x-2h for emacs-orgmode@gnu.org; Thu, 16 Mar 2017 08:09:23 -0400 Received: from [195.159.176.226] (port=60550 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1coUDW-00082J-Rv for emacs-orgmode@gnu.org; Thu, 16 Mar 2017 08:09:18 -0400 Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1coUDH-0005ey-U7 for emacs-orgmode@gnu.org; Thu, 16 Mar 2017 13:09:03 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit The patch looks a bit dodgy, maybe because I used magit, which I don’t really understand, instead of the shell. I have attached it anew. -- This message is brought to you by the department of redundant departments --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-ox-latex-Support-caption-for-latex-environment.patch >From 4304552a0c8a72c6aeb2805a8cf703eddb5da123 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Thu, 16 Mar 2017 12:45:10 +0100 Subject: [PATCH] ox-latex: Support caption for latex-environment * lisp/ox-latex.el (org-latex-environment--type): New function determining type of a latex-environment. (org-latex-latex-environment): Add support for caption. (org-latex--caption/label-string): Use correct type for non-floating latex-environments. --- lisp/ox-latex.el | 78 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 2727359cb..f226dc7ae 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1312,14 +1312,19 @@ For non-floats, see `org-latex--wrap-label'." (t (format (if nonfloat "\\captionof{%s}%s{%s%s}\n" "\\caption%s%s{%s%s}\n") - (if nonfloat - (cl-case type - (paragraph "figure") - (src-block (if (plist-get info :latex-listings) - "listing" - "figure")) - (t (symbol-name type))) - "") + (let ((type* (if (eq type 'latex-environment) + (org-latex-environment--type element) + type))) + (if nonfloat + (cl-case type* + (paragraph "figure") + (image "figure") + (special-block "figure") + (src-block (if (plist-get info :latex-listings) + "listing" + "figure")) + (t (symbol-name type*))) + "")) (if short (format "[%s]" (org-export-data short info)) "") label (org-export-data main info)))))) @@ -2250,24 +2255,65 @@ CONTENTS is nil. INFO is a plist holding contextual information." ;;;; Latex Environment +(defun org-latex-environment--type (latex-environment) + "Return the TYPE of LATEX-ENVIRONMENT. + +The TYPE is determined from the actual latex environment, and +could be a member of `org-latex-caption-above' or `math'." + (let* ((value (org-remove-indentation + (org-element-property :value latex-environment))) + (latex-begin-re (cadr (assoc "begin" org-latex-regexps))) + (env (progn (string-match latex-begin-re value) + (match-string 2 value)))) + (cond + ((string-match org-latex-math-environments-re value) 'math) + ((string-match-p "tab\\(le\\|ular\\)" env) 'table) + ((string-match-p "figure" env) 'image) + ;; Default coding environments + ((or (string-match-p "\\(\\(lst\\)?listing\\|verbatim\\|minted\\)" env) + (string-match-p + (regexp-opt + (mapcar (lambda (str) + (let ((s (cadr str))) + (if (string-match latex-begin-re s) + (match-string 2 s) + s))) + org-latex-custom-lang-environments)) + env)) + 'src-block) + (t 'special-block)))) + (defun org-latex-latex-environment (latex-environment _contents info) "Transcode a LATEX-ENVIRONMENT element from Org to LaTeX. CONTENTS is nil. INFO is a plist holding contextual information." (when (plist-get info :with-latex) - (let ((value (org-remove-indentation - (org-element-property :value latex-environment)))) - (if (not (org-element-property :name latex-environment)) value + (let* ((value (org-remove-indentation + (org-element-property :value latex-environment))) + (type (org-latex-environment--type latex-environment)) + (caption (if (eq type 'math) + (org-latex--label latex-environment info nil t) + (org-latex--caption/label-string latex-environment info))) + (caption-above-p + (memq type (append (plist-get info :latex-caption-above) '(math))))) + (if (not (or (org-element-property :name latex-environment) + (org-element-property :caption latex-environment))) + value ;; Environment is labeled: label must be within the environment ;; (otherwise, a reference pointing to that element will count - ;; the section instead). + ;; the section instead). Also insert caption if `latex-environment' + ;; is not a math environment. (with-temp-buffer (insert value) - (goto-char (point-min)) - (forward-line) - (insert (org-latex--label latex-environment info nil t)) + (if caption-above-p + (progn + (goto-char (point-min)) + (forward-line) + (insert caption)) + (goto-char (point-max)) + (forward-line -1) + (insert caption)) (buffer-string)))))) - ;;;; Latex Fragment (defun org-latex-latex-fragment (latex-fragment _contents _info) -- 2.12.0 --=-=-=--