From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: [Accepted] Optional \caption argument for LaTeX export Date: Sun, 8 May 2011 22:16:43 +0200 (CEST) Message-ID: <20110508201643.8825B3A2C6B@carsten-dominiks-macbook-pro.local> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:58049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJgld-0003OH-Oo for emacs-orgmode@gnu.org; Tue, 10 May 2011 02:50:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJglc-0003h5-Gx for emacs-orgmode@gnu.org; Tue, 10 May 2011 02:50:01 -0400 Received: from gateway01.m3-connect.de ([88.79.237.11]:62475 helo=localhost.localhost) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJglc-0003gW-2E for emacs-orgmode@gnu.org; Tue, 10 May 2011 02:50:00 -0400 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Patch 794 (http://patchwork.newartisans.com/patch/794/) is now "Accepted". Maintainer comment: No comment This relates to the following submission: http://mid.gmane.org/%3Cm1wri1c5qc.fsf%40tsdye.com%3E Here is the original message containing the patch: > Content-Type: text/plain; charset="utf-8" > MIME-Version: 1.0 > Content-Transfer-Encoding: 7bit > Subject: [O] Optional \caption argument for LaTeX export > Date: Mon, 09 May 2011 01:11:39 -0000 > From: Thomas S. Dye > X-Patchwork-Id: 794 > Message-Id: > To: emacs-orgmode@gnu.org > > Aloha all, > > The attached patch initializes the existing variable shortn, adds it to > two caption situations in addition to the one already coded, and adds > some description to the manual. > > With this patch, #+CAPTION: [Short caption]{Long caption.} in the > Org-mode source exports to \caption[Short caption]{Long caption.} in the > LaTeX export, which is, I think, as it should be. > > Many thanks to Nick Dokos who made me understand why earlier patches > hadn't shown up on the patchwork server (wrong mime type, evil mail > client). This one sent with gnus and fingers crossed. > > All the best, > Tom > > > >From 9dc65f7e598dd171ebce9448cd39c4062f7cafff Mon Sep 17 00:00:00 2001 > From: Tom Dye > Date: Sun, 8 May 2011 06:56:25 -1000 > Subject: [PATCH] optional caption arguments in LaTeX export > > --- > doc/org.texi | 5 +++++ > lisp/org-exp.el | 2 +- > lisp/org-latex.el | 4 ++-- > 3 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/doc/org.texi b/doc/org.texi > index 844de6d..3988838 100644 > --- a/doc/org.texi > +++ b/doc/org.texi > @@ -8817,6 +8817,11 @@ the object with @code{\ref@{tab:basic-data@}}: > |-----|----| > @end example > > +Optionally, the caption can take the form: > +@example > +#+CAPTION: [Caption for list of figures]{Caption for table (or link).} > +@end example > + > @cindex inlined images, markup rules > Some backends (HTML, @LaTeX{}, and DocBook) allow you to directly include > images into the exported document. Org does this, if a link to an image > diff --git a/lisp/org-exp.el b/lisp/org-exp.el > index cda1f98..e840b6c 100644 > --- a/lisp/org-exp.el > +++ b/lisp/org-exp.el > @@ -1871,7 +1871,7 @@ table line. If it is a link, add it to the line containing the link." > 'org-label label)) > (if label (push (cons label label) target-alist)) > (goto-char end) > - (setq cap nil attr nil label nil))))) > + (setq cap nil shortn nil attr nil label nil))))) > target-alist) > > (defun org-export-remove-comment-blocks-and-subtrees () > diff --git a/lisp/org-latex.el b/lisp/org-latex.el > index bc9a3f3..516ee12 100644 > --- a/lisp/org-latex.el > +++ b/lisp/org-latex.el > @@ -2199,12 +2199,12 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER." > (multicolumnp "\\begin{figure*}%placement > \\centering > \\includegraphics[%attr]{%path} > -\\caption{%labelcmd%caption} > +\\caption%shortn{%labelcmd%caption} > \\end{figure*}") > (floatp "\\begin{figure}%placement > \\centering > \\includegraphics[%attr]{%path} > -\\caption{%labelcmd%caption} > +\\caption%shortn{%labelcmd%caption} > \\end{figure}") > (t "\\includegraphics[%attr]{%path}"))) > > -- > 1.7.1 > >