The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 1f720826d6a12665145a15d06962ac9add7d80c9
Author: Juergen Spitzmueller <[email protected]>
Date:   Tue Dec 4 17:06:52 2012 +0100

    Fix InsetCaption::getArgument (subfigure problems reported by Kornel, but 
also listings caption)

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 22548a4..67bb360 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -272,7 +272,25 @@ docstring InsetCaption::xhtml(XHTMLStream & xs, 
OutputParams const & rp) const
 void InsetCaption::getArgument(otexstream & os,
                        OutputParams const & runparams) const
 {
-       InsetText::latex(os, runparams);
+       InsetLayout const & il = getLayout();
+
+       if (!il.leftdelim().empty())
+               os << il.leftdelim();
+  
+       OutputParams rp = runparams;
+       if (isPassThru())
+               rp.pass_thru = true;
+       if (il.isNeedProtect())
+               rp.moving_arg = true;
+       rp.par_begin = 0;
+       rp.par_end = paragraphs().size();
+
+       // Output the contents of the inset
+       latexParagraphs(buffer(), text(), os, rp);
+       runparams.encoding = rp.encoding;
+
+       if (!il.rightdelim().empty())
+               os << il.rightdelim();
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/insets/InsetCaption.cpp |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to