Applied, thanks. - Carsten
On 10.10.2011, at 01:24, Thomas S. Dye wrote: > Carsten Dominik <carsten.domi...@gmail.com> writes: > >> On 3.10.2011, at 16:43, Nick Dokos wrote: >> >>> Eric S Fraga <e.fr...@ucl.ac.uk> wrote: >>> >>>> t...@tsdye.com (Thomas S. Dye) writes: >>>> >>>>> Nick Dokos <nicholas.do...@hp.com> writes: >>>> >>>>>> The following patch (deliberately hidden as a binary octet-stream to >>>>>> keep it >>>>>> out of patchwork) will do that - but IMO, it would be better to have yet >>>>>> another >>>>>> user-settable option to control the placement. >>>>>> >>>>>> Nick >>>>>> >>>>>> >>>>> >>>>> Aloha all, >>>>> >>>>> The inlined patch introduces a variable >>>>> org-export-latex-table-caption-above to control the placement of table >>>>> captions. Thanks to Nick Dokos for leading the way on this. >>>>> >>>>> Tom >>>> >>>> >>>> thanks for doing this -- I was swamped last week so had no chance of >>>> following the thread until today! >>>> >>>> One comment on the last version of the patch: would it not be better for >>>> the variable to be a defcustom variable instead of defvar? >>> >>> I agree - being able to customize variables without resorting to lisp is >>> generally preferable: it is friendlier to newcomers and it allows even >>> experienced users to find the various knobs. >> >> If you provide a new patch doing a defcustom, I think this patch would be >> good to have. Please go ahead and check it in! >> >> - Carsten >> > > Aloha Carsten, > > The inlined patch changes the defvar to a defcustom. It is meant to be > applied after the first patch. > > All the best, > Tom > > From af153cdaa827903e4ada316b99adef25a735ada7 Mon Sep 17 00:00:00 2001 > From: Tom Dye <t...@tsdye.com> > Date: Sun, 9 Oct 2011 13:09:02 -1000 > Subject: [PATCH 2/2] LaTeX export: Add switch to place captions above or > below tables > > * lisp/org-latex.el (org-export-latex-tables): Add new variable > org-export-latex-table-caption-above > > Modified from an idea suggested by Eric Fraga and fleshed out by Nick Dokos. > --- > lisp/org-latex.el | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/lisp/org-latex.el b/lisp/org-latex.el > index f91b93e..7957ffe 100644 > --- a/lisp/org-latex.el > +++ b/lisp/org-latex.el > @@ -73,7 +73,6 @@ > org-deadline-string "\\|" > org-closed-string"\\)") > "Regexp matching special time planning keywords plus the time after it.") > -(defvar org-export-latex-table-caption-above t) > (defvar org-re-quote) ; dynamically scoped from org.el > (defvar org-commentsp) ; dynamically scoped from org.el > > @@ -364,6 +363,12 @@ When nil, grouping causes only separation lines between > groups." > :group 'org-export-latex > :type 'boolean) > > +(defcustom org-export-latex-table-caption-above t > + "When non-nil, the caption is set above the table. When nil, > +the caption is set below the table." > + :group 'org-export-latex > + :type 'boolean) > + > (defcustom org-export-latex-low-levels 'itemize > "How to convert sections below the current level of sectioning. > This is specified by the `org-export-headline-levels' option or the > -- > 1.7.1 > > > >>> >>> If the patch is deemed acceptable, it might also be nice to be able to >>> set the variable per-file through the OPTIONS line, but that can >>> certainly wait. >>> >>>> Otherwise, >>>> the patch looks fine to me although I'm unlikely to use the new >>>> functionality ;-) >>> >>> Unless you try to publish an article in a journal with a perverse layout >>> policy :-) >>> >>> I applied the patch and took it for a short spin. git complained about >>> trailing whitespace: >>> >>> ,---- >>> | /home/nick/Mail/inbox/1021:197: trailing whitespace. >>> | (if (and floatp >>> org-export-latex-table-caption-above) >>> | /home/nick/Mail/inbox/1021:212: trailing whitespace. >>> | (if (and floatp (not >>> org-export-latex-table-caption-above)) >>> | /home/nick/Mail/inbox/1021:225: trailing whitespace. >>> | (if (not org-export-latex-table-caption-above) tbl) >>> | /home/nick/Mail/inbox/1021:231: trailing whitespace. >>> | (if org-export-latex-table-caption-above tbl) >>> | warning: 4 lines add whitespace errors. >>> `---- >>> >>> but other than that the patch worked fine. >>> >>> Thanks, Tom! >>> Nick >>> >>> >>> >> >> >> > > -- > Thomas S. Dye > http://www.tsdye.com