tex2lyx: support all MoreOpts

[lyx.git] / src / tex2lyx / Context.cpp

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index ecf6a14199824cbc49fa6219009a66aa8d34c219..f214f770ee466a39c5803c2ad278f61caa6d8724 100644 (file)
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -41,7 +41,7 @@ void end_deeper(ostream & os)
        os << "\n\\end_deeper";
 }
 
-}
+} // namespace
 
 
 bool operator==(TeXFont const & f1, TeXFont const & f2)
@@ -78,13 +78,14 @@ bool Context::empty = true;
 Context::Context(bool need_layout_,
                 TeX2LyXDocClass const & textclass_,
                 Layout const * layout_, Layout const * parent_layout_,
-                TeXFont font_)
+                TeXFont const & font_)
        : need_layout(need_layout_),
          need_end_layout(false), need_end_deeper(false),
-         has_item(false), deeper_paragraph(false),
-         new_layout_allowed(true), textclass(textclass_),
+         has_item(false), in_list_preamble(false), deeper_paragraph(false),
+         new_layout_allowed(true), merging_hyphens_allowed(true),
+         textclass(textclass_),
          layout(layout_), parent_layout(parent_layout_),
-         font(font_)
+         font(font_), tablerotation(0)
 {
        if (!layout)
                layout = &textclass.defaultLayout();
@@ -96,7 +97,7 @@ Context::Context(bool need_layout_,
 Context::~Context()
 {
        if (!par_extra_stuff.empty())
-               cerr << "Bug: Ignoring par-level extra stuff '" 
+               cerr << "Bug: Ignoring par-level extra stuff '"
                     << par_extra_stuff << '\'' << endl;
 }
 
@@ -115,7 +116,7 @@ void Context::begin_layout(ostream & os, Layout const * const & l)
        // \\Huge par1 \\par par2
        // FIXME: If the document language is not english this outputs a
        // superflous language change. Fortunately this is only file format
-       // bloat an does not change the TeX export of LyX.
+       // bloat and does not change the TeX export of LyX.
        output_font_change(os, normalfont, font);
 }
 
@@ -139,9 +140,9 @@ void Context::check_layout(ostream & os)
                                begin_layout(os, layout);
                                has_item = false;
                        } else {
-                               // a standard paragraph in an
-                               // enumeration. We have to recognize
-                               // that this may require a begin_deeper.
+                               // A standard paragraph in a list.
+                               // We have to recognize that this
+                               // may require a begin_deeper.
                                if (!deeper_paragraph)
                                        begin_deeper(os);
                                begin_layout(os, &textclass.defaultLayout());
@@ -153,7 +154,6 @@ void Context::check_layout(ostream & os)
                }
                need_layout = false;
                need_end_layout = true;
-               os << "\n";
                empty = false;
        }
 }
@@ -241,10 +241,14 @@ void Context::dump(ostream & os, string const & desc) const
                os << "deeper_paragraph ";
        if (new_layout_allowed)
                os << "new_layout_allowed ";
+       if (merging_hyphens_allowed)
+               os << "merging_hyphens_allowed ";
        if (!extra_stuff.empty())
                os << "extrastuff=[" << extra_stuff << "] ";
        if (!par_extra_stuff.empty())
                os << "parextrastuff=[" << par_extra_stuff << "] ";
+       if (!list_extra_stuff.empty())
+               os << "listextrastuff=[" << list_extra_stuff << "] ";
        os << "textclass=" << textclass.name()
           << " layout=" << to_utf8(layout->name())
           << " parent_layout=" << to_utf8(parent_layout->name()) << "] font=["