* Doxy: polish html output.

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

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index d7baa2822aca54140d944c4297624a3beb7364fa..e2cc1b5e704e771a303428bb7679ef62e0dec8bd 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, Layout_ptr layout, TeXFont const & font,
+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);
@@ -85,7 +84,7 @@ bool Context::empty = true;
 
 Context::Context(bool need_layout_,
                 TextClass const & textclass_,
-                Layout_ptr layout_, Layout_ptr parent_layout_,
+                LayoutPtr layout_, LayoutPtr parent_layout_,
                 TeXFont font_)
        : need_layout(need_layout_),
          need_end_layout(false), need_end_deeper(false),
@@ -104,8 +103,8 @@ Context::Context(bool need_layout_,
 Context::~Context()
 {
        if (!extra_stuff.empty())
-               std::cerr << "Bug: Ignoring extra stuff '" << extra_stuff
-                         << '\'' << std::endl;
+               cerr << "Bug: Ignoring extra stuff '" << extra_stuff
+                         << '\'' << endl;
 }
 
 
@@ -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;
 }