[PATCH] Optional \caption argument in LaTeX export

[org-mode@tsdye2.com (Thomas S. Dye)]

[-- Attachment #1: Type: text/plain, Size: 736 bytes --]

Aloha all,

The attached patch initializes the shortn variable, uses it to add the
optional argument to \caption in two places where this wasn't
implemented, and adds a bit of documentation.

Note that the shortn variable in org-mode is already used to add an
optional argument to \caption in one case.  The patch enables this
behavior for other captions, as well.

Note also, that if the shortn variable isn't initialized nil, the
optional argument to one \caption is recycled to the next \caption
indefinitely until shortn is reset.

Thanks to Nick Dokos for explaining why an earlier patch of mine didn't
show up on patchwork (wrong MIME type, evil mail client).  This one is
sent from gnus with crossed fingers.

All the best,
Tom


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Optional caption argument in LaTeX export --]
[-- Type: text/x-patch, Size: 1993 bytes --]

From 9dc65f7e598dd171ebce9448cd39c4062f7cafff Mon Sep 17 00:00:00 2001
From: Tom Dye <tsd@tsdye.com>
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


[-- Attachment #3: Type: text/plain, Size: 27 bytes --]


-- 
http://www.tsdye.com