tex2lyx/text.cpp: take care of the brace pair after comment environments that are...

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

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index 36d1ec17828bad6cebd2edf6a968817c695f2598..1e05984bcfb7a4371ce1b8ee8517e0a35e23dea7 100644 (file)
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -10,25 +10,24 @@
 
 #include <config.h>
 
-#include <iostream>
-
-#include "support/lstrings.h"
 #include "Context.h"
+#include "Layout.h"
 
+#include "support/lstrings.h"
 
-namespace lyx {
+#include <iostream>
 
-using std::ostream;
-using std::endl;
-using std::string;
+using namespace std;
+using namespace lyx::support;
 
+namespace lyx {
 
 namespace {
 
-void begin_layout(ostream & os, LyXLayout_ptr layout, Font const & font,
-                 Font const & normalfont)
+void begin_layout(ostream & os, Layout const * const & layout, TeXFont const & font,
+                 TeXFont const & normalfont)
 {
-       os << "\n\\begin_layout " << layout->name() << "\n";
+       os << "\n\\begin_layout " << to_utf8(layout->name()) << "\n";
        // FIXME: This is not enough for things like
        // \\Huge par1 \\par par2
        output_font_change(os, normalfont, font);
@@ -55,7 +54,7 @@ void end_deeper(ostream & os)
 }
 
 
-bool operator==(Font const & f1, Font const & f2)
+bool operator==(TeXFont const & f1, TeXFont const & f2)
 {
        return
                f1.size == f2.size &&
@@ -65,8 +64,8 @@ bool operator==(Font const & f1, Font const & f2)
 }
 
 
-void output_font_change(ostream & os, Font const & oldfont,
-                       Font const & newfont)
+void output_font_change(ostream & os, TeXFont const & oldfont,
+                       TeXFont const & newfont)
 {
        if (oldfont.family != newfont.family)
                os << "\n\\family " << newfont.family << '\n';
@@ -79,14 +78,14 @@ void output_font_change(ostream & os, Font const & oldfont,
 }
 
 
-Font Context::normalfont;
+TeXFont Context::normalfont;
 bool Context::empty = true;
 
 
 Context::Context(bool need_layout_,
-                LyXTextClass const & textclass_,
-                LyXLayout_ptr layout_, LyXLayout_ptr parent_layout_,
-                Font font_)
+                TeX2LyXDocClass const & textclass_,
+                Layout const * layout_, Layout const * parent_layout_,
+                TeXFont font_)
        : need_layout(need_layout_),
          need_end_layout(false), need_end_deeper(false),
          has_item(false), deeper_paragraph(false),
@@ -94,18 +93,18 @@ Context::Context(bool need_layout_,
          layout(layout_), parent_layout(parent_layout_),
          font(font_)
 {
-       if (!layout.get())
-               layout = textclass.defaultLayout();
-       if (!parent_layout.get())
-               parent_layout = textclass.defaultLayout();
+       if (!layout)
+               layout = &textclass.defaultLayout();
+       if (!parent_layout)
+               parent_layout = &textclass.defaultLayout();
 }
 
 
 Context::~Context()
 {
        if (!extra_stuff.empty())
-               std::cerr << "Bug: Ignoring extra stuff '" << extra_stuff
-                         << '\'' << std::endl;
+               cerr << "Bug: Ignoring extra stuff '" << extra_stuff
+                         << '\'' << endl;
 }
 
 
@@ -133,7 +132,7 @@ void Context::check_layout(ostream & os)
                                // that this may require a begin_deeper.
                                if (!deeper_paragraph)
                                        begin_deeper(os);
-                               begin_layout(os, textclass.defaultLayout(),
+                               begin_layout(os, &textclass.defaultLayout(),
                                             font, normalfont);
                                deeper_paragraph = true;
                        }
@@ -206,9 +205,9 @@ void Context::new_paragraph(ostream & os)
 }
 
 
-void Context::add_extra_stuff(std::string const & stuff)
+void Context::add_extra_stuff(string const & stuff)
 {
-       if (!lyx::support::contains(extra_stuff, stuff))
+       if (!contains(extra_stuff, stuff))
                extra_stuff += stuff;
 }
 
@@ -231,8 +230,8 @@ void Context::dump(ostream & os, string const & desc) const
        if (!extra_stuff.empty())
                os << "extrastuff=[" << extra_stuff << "] ";
        os << "textclass=" << textclass.name()
-          << " layout=" << layout->name()
-          << " parent_layout=" << parent_layout->name() << "] font=["
+          << " layout=" << to_utf8(layout->name())
+          << " parent_layout=" << to_utf8(parent_layout->name()) << "] font=["
           << font.size << ' ' << font.family << ' ' << font.series << ' '
           << font.shape << ']' << endl;
 }