#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, 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);
}
-bool operator==(Font const & f1, Font const & f2)
+bool operator==(TeXFont const & f1, TeXFont const & f2)
{
return
f1.size == f2.size &&
}
-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';
}
-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),
Context::~Context()
{
if (!extra_stuff.empty())
- std::cerr << "Bug: Ignoring extra stuff '" << extra_stuff
- << '\'' << std::endl;
+ cerr << "Bug: Ignoring extra stuff '" << extra_stuff
+ << '\'' << endl;
}
}
-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;
}
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;
}