#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;
}
-void InsetLatexAccent::metrics(MetricsInfo & mi, Dimension & dim) const
+bool 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
docstring dcon(contents.begin(), contents.end());
dim.wid = fm.width(dcon) + 4;
}
+ bool const changed = dim_ != dim;
dim_ = dim;
+ return changed;
}
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);
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);
}
case HUNGARIAN_UMLAUT:
- drawAccent(pi, x2 - fm.center('´'), baseline, '´');
- drawAccent(pi, x2 + fm.center('´'), baseline, '´');
+ drawAccent(pi, x2, baseline, 0x02DD);
break;
case UMLAUT:
}
-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 &, lyx::odocstream & os,
+int InsetLatexAccent::plaintext(Buffer const &, odocstream & os,
OutputParams const &) const
{
- os << lyx::from_ascii(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, lyx::odocstream & os,
+int InsetLatexAccent::textString(Buffer const & buf, odocstream & os,
OutputParams const & op) const
{
return plaintext(buf, os, op);
{
return o << int(at);
}
+
+
+} // namespace lyx