hopefully fix tex2lyx linking.

[lyx.git] / src / insets / insetlatexaccent.C

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index 429bfbea588e15545572c600aff0e16d966f6f83..3634bff9009964056a154f7448d1e66f8f9b6bbb 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -24,10 +24,11 @@
 
 #include "support/lstrings.h"
 
-using lyx::char_type;
-using lyx::docstring;
-using lyx::support::contains;
-using lyx::support::trim;
+
+namespace lyx {
+
+using support::contains;
+using support::trim;
 
 using std::endl;
 using std::string;
@@ -244,7 +245,7 @@ void InsetLatexAccent::checkContents()
 void InsetLatexAccent::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        LyXFont & font = mi.base.font;
-       lyx::frontend::FontMetrics const & fm = theFontMetrics(font);
+       frontend::FontMetrics const & fm =      theFontMetrics(font);
 
        // This function is a bit too simplistic and is just a
        // "try to make a fit for all accents" approach, to
@@ -328,7 +329,7 @@ void InsetLatexAccent::drawAccent(PainterInfo const & pi, int x, int y,
        char_type accent) const
 {
        LyXFont const & font = pi.base.font;
-       lyx::frontend::FontMetrics const & fm = theFontMetrics(font);
+       frontend::FontMetrics const & fm =      theFontMetrics(font);
 
        x -= fm.center(accent);
        y -= fm.ascent(ic);
@@ -352,7 +353,7 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1)
                font.setLanguage(english_language);
 
-       lyx::frontend::FontMetrics const & fm = theFontMetrics(font);
+       frontend::FontMetrics const & fm =      theFontMetrics(font);
 
        if (candisp) {
                int x2 = int(x + (fm.rbearing(ic) - fm.lbearing(ic)) / 2);
@@ -571,31 +572,32 @@ void InsetLatexAccent::read(Buffer const &, LyXLex & lex)
 }
 
 
-int InsetLatexAccent::latex(Buffer const &, ostream & os,
+int InsetLatexAccent::latex(Buffer const &, odocstream & os,
                            OutputParams const &) const
 {
-       os << contents;
+       os << from_ascii(contents);
        return 0;
 }
 
 
-int InsetLatexAccent::plaintext(Buffer const &, ostream & os,
+int InsetLatexAccent::plaintext(Buffer const &, odocstream & os,
                            OutputParams const &) const
 {
-       os << contents;
+       os << from_ascii(contents);
        return 0;
 }
 
 
-int InsetLatexAccent::docbook(Buffer const &, ostream & os,
+int InsetLatexAccent::docbook(Buffer const &, odocstream & os,
                              OutputParams const &) const
 {
-       os << contents;
+        // FIXME UNICODE
+        os << from_ascii(contents);
        return 0;
 }
 
 
-int InsetLatexAccent::textString(Buffer const & buf, ostream & os,
+int InsetLatexAccent::textString(Buffer const & buf, odocstream & os,
                       OutputParams const & op) const
 {
        return plaintext(buf, os, op);
@@ -618,3 +620,6 @@ ostream & operator<<(ostream & o, InsetLatexAccent::ACCENT_TYPES at)
 {
        return o << int(at);
 }
+
+
+} // namespace lyx