fix bug 1750

[lyx.git] / src / tex2lyx / context.C

diff --git a/src/tex2lyx/context.C b/src/tex2lyx/context.C
index 5bc89cae13dbd45b2cb45a40d1f5ffe28f18a0f0..b980b3e695fcbb82ba2b07b65076eea70976e11a 100644 (file)
--- a/src/tex2lyx/context.C
+++ b/src/tex2lyx/context.C
@@ -12,16 +12,19 @@
 
 #include <iostream>
 
+#include "support/lstrings.h"
 #include "context.h"
 
 using std::ostream;
 using std::endl;
+using std::string;
+
 
 namespace {
 
 void begin_layout(ostream & os, LyXLayout_ptr layout)
 {
-       os << "\n\\begin_layout " << layout->name() << "\n\n";
+       os << "\n\\begin_layout " << layout->name() << "\n";
 }
 
 
@@ -33,25 +36,27 @@ void end_layout(ostream & os)
 
 void begin_deeper(ostream & os)
 {
-       os << "\n\\begin_deeper \n";
+       os << "\n\\begin_deeper\n";
 }
 
 
 void end_deeper(ostream & os)
 {
-       os << "\n\\end_deeper \n";
+       os << "\n\\end_deeper\n";
 }
 
 }
 
 Context::Context(bool need_layout_,
                 LyXTextClass const & textclass_,
-                LyXLayout_ptr layout_, LyXLayout_ptr parent_layout_)
+                LyXLayout_ptr layout_, LyXLayout_ptr parent_layout_,
+                Font font_)
        : need_layout(need_layout_),
          need_end_layout(false), need_end_deeper(false),
          has_item(false), deeper_paragraph(false),
          textclass(textclass_),
-         layout(layout_), parent_layout(parent_layout_)
+         layout(layout_), parent_layout(parent_layout_),
+         font(font_)
 {
        if (!layout.get())
                layout = textclass.defaultLayout();
@@ -92,11 +97,12 @@ void Context::check_layout(ostream & os)
                        begin_layout(os, layout);
                        need_layout=false;
                        need_end_layout = true;
-                       if (!extra_stuff.empty()) {
-                               os << extra_stuff;
-                               extra_stuff.erase();
-                       }
                }
+               if (!extra_stuff.empty()) {
+                       os << extra_stuff;
+                       extra_stuff.erase();
+               }
+               os << "\n";
        }
 }
 
@@ -138,6 +144,27 @@ void Context::check_end_deeper(ostream & os)
 }
 
 
+void Context::set_item()
+{
+       need_layout = true;
+       has_item = true;
+}
+
+
+void Context::new_paragraph(ostream & os)
+{
+       check_end_layout(os);
+       need_layout = true;
+}
+
+
+void Context::add_extra_stuff(std::string const & stuff)
+{
+       if (!lyx::support::contains(extra_stuff, stuff))
+               extra_stuff += stuff;
+}
+
+
 void Context::dump(ostream & os, string const & desc) const
 {
        os << "\n" << desc <<" [";
@@ -145,6 +172,12 @@ void Context::dump(ostream & os, string const & desc) const
                os << "need_layout ";
        if (need_end_layout)
                os << "need_end_layout ";
+       if (need_end_deeper)
+               os << "need_end_deeper ";
+       if (has_item)
+               os << "has_item ";
+       if (deeper_paragraph)
+               os << "deeper_paragraph ";
        if (!extra_stuff.empty())
                os << "extrastuff=[" << extra_stuff << "] ";
        os << "layout=" << layout->name();