pimpl not needed here

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

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index 36d1ec17828bad6cebd2edf6a968817c695f2598..ae64f434809d38962696c8b6d534ac52092df109 100644 (file)
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -10,10 +10,12 @@
 
 #include <config.h>
 
-#include <iostream>
+#include "Context.h"
+#include "Layout.h"
 
 #include "support/lstrings.h"
-#include "Context.h"
+
+#include <iostream>
 
 
 namespace lyx {
@@ -25,10 +27,10 @@ using std::string;
 
 namespace {
 
-void begin_layout(ostream & os, LyXLayout_ptr layout, Font const & font,
-                 Font const & normalfont)
+void begin_layout(ostream & os, LayoutPtr 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 +57,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 +67,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 +81,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_)
+                TextClass const & textclass_,
+                LayoutPtr layout_, LayoutPtr parent_layout_,
+                TeXFont font_)
        : need_layout(need_layout_),
          need_end_layout(false), need_end_deeper(false),
          has_item(false), deeper_paragraph(false),
@@ -231,8 +233,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;
 }