some tabular fixes for the problems reported by Helge

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

diff --git a/src/tex2lyx/context.C b/src/tex2lyx/context.C
index a914c098de4a0692459314e90b0ed06e82db4286..882637d4800b5584b98072023b66de76254c6f1c 100644 (file)
--- a/src/tex2lyx/context.C
+++ b/src/tex2lyx/context.C
@@ -36,13 +36,13 @@ 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";
 }
 
 }
@@ -50,7 +50,7 @@ void end_deeper(ostream & os)
 Context::Context(bool need_layout_,
                 LyXTextClass const & textclass_,
                 LyXLayout_ptr layout_, LyXLayout_ptr parent_layout_,
-                 Font font_)
+                Font font_)
        : need_layout(need_layout_),
          need_end_layout(false), need_end_deeper(false),
          has_item(false), deeper_paragraph(false),
@@ -73,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;
@@ -94,6 +97,7 @@ 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;
@@ -119,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;