Really fix start_of_appendix output

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

diff --git a/src/tex2lyx/context.C b/src/tex2lyx/context.C
index 3318058f3b5f2829c40f9401077e4d1f526f6490..882637d4800b5584b98072023b66de76254c6f1c 100644 (file)
--- a/src/tex2lyx/context.C
+++ b/src/tex2lyx/context.C
@@ -12,6 +12,7 @@
 
 #include <iostream>
 
+#include "support/lstrings.h"
 #include "context.h"
 
 using std::ostream;
@@ -23,7 +24,7 @@ namespace {
 
 void begin_layout(ostream & os, LyXLayout_ptr layout)
 {
-       os << "\n\\begin_layout " << layout->name() << "\n\n";
+       os << "\n\\begin_layout " << layout->name() << "\n";
 }
 
 
@@ -35,25 +36,27 @@ void end_layout(ostream & os)
 
 void begin_deeper(ostream & os)
 {
-       os << "\n\\begin_deeper \n";
+       os << "\n\\begin_deeper";
 }
 
 
 void end_deeper(ostream & os)
 {
-       os << "\n\\end_deeper \n";
+       os << "\n\\end_deeper";
 }
 
 }
 
 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();
@@ -70,7 +73,10 @@ void Context::check_layout(ostream & os)
                // are we in a list-like environment?
                if (layout->isEnvironment()
                    && layout->latextype != LATEX_ENVIRONMENT) {
+                       // A list-like environment
                        if (has_item) {
+                               // a new item. If we had a standard
+                               // paragraph before, we have to end it.
                                if (deeper_paragraph) {
                                        end_deeper(os);
                                        deeper_paragraph = false;
@@ -91,14 +97,16 @@ void Context::check_layout(ostream & os)
                                deeper_paragraph = true;
                        }
                } else {
+                       // No list-like environment
                        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";
        }
 }
 
@@ -115,6 +123,8 @@ void Context::check_end_layout(ostream & os)
 void Context::check_deeper(ostream & os)
 {
        if (parent_layout->isEnvironment()) {
+               // We start a nested environment.
+               // We need to increase the depth.
                if (need_end_deeper) {
                        // no need to have \end_deeper \begin_deeper
                        need_end_deeper = false;
@@ -140,6 +150,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 <<" [";
@@ -147,6 +178,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();