allow more than one optional inset

[lyx.git] / src / insets / insetoptarg.C

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 3b4fe9809f1adfa78ae2fff85887df1b2fed2dc9..9c2d88c75a1761655d53a814adcbbf6753dfd78a 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -14,14 +14,19 @@
 
 #include "debug.h"
 #include "gettext.h"
+#include "LColor.h"
 #include "paragraph.h"
 
+#include <sstream>
+
+using std::string;
 using std::auto_ptr;
 using std::ostream;
+using std::ostringstream;
 
 
 InsetOptArg::InsetOptArg(BufferParams const & ins)
-       : InsetCollapsable(ins, true)
+       : InsetCollapsable(ins, Collapsed)
 {
        LyXFont font(LyXFont::ALL_SANE);
        font.setColor(LColor::collapsable);
@@ -60,17 +65,20 @@ void InsetOptArg::write(Buffer const & buf, ostream & os) const
 
 
 int InsetOptArg::latex(Buffer const &, ostream &,
-                      LatexRunParams const &) const
+                      OutputParams const &) const
 {
        return 0;
 }
 
 
 int InsetOptArg::latexOptional(Buffer const & buf, ostream & os,
-                              LatexRunParams const & runparams) const
+                              OutputParams const & runparams) const
 {
-       os << '[';
-       int const i = inset.latex(buf, os, runparams);
-       os << ']';
-       return i + 2;
+       ostringstream ss;
+       int ret = InsetText::latex(buf, ss, runparams);
+       string str = ss.str();
+       if (str.find(']') != string::npos)
+               str = '{' + str + '}';
+       os << '[' << str << ']';
+       return ret;
 }