#include <config.h>
-#include <iostream>
+#include "Context.h"
+#include "Layout.h"
#include "support/lstrings.h"
-#include "Context.h"
+
+#include <iostream>
namespace lyx {
namespace {
-void begin_layout(ostream & os, LyXLayout_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);
Context::Context(bool need_layout_,
- LyXTextClass const & textclass_,
- LyXLayout_ptr layout_, LyXLayout_ptr parent_layout_,
+ TextClass const & textclass_,
+ LayoutPtr layout_, LayoutPtr parent_layout_,
TeXFont font_)
: need_layout(need_layout_),
need_end_layout(false), need_end_deeper(false),
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;
}