X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetquotes.C;h=eb7c87e454086a3daf03fd07dfb4d88d9e4f1ca6;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=a5f16116903735157e72750705e38eaa4be22842;hpb=afed118a7b159d6ecdd8442909b9f8de59d08689;p=lyx.git diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index a5f1611690..eb7c87e454 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -24,13 +24,15 @@ #include "paragraph.h" #include "paragraph_funcs.h" -#include "frontends/font_metrics.h" +#include "frontends/FontMetrics.h" #include "frontends/Painter.h" #include "support/lstrings.h" -using lyx::support::prefixIs; +namespace lyx { + +using support::prefixIs; using std::endl; using std::string; @@ -83,29 +85,34 @@ char const * const latex_quote_babel[2][5] = InsetQuotes::InsetQuotes(string const & str) { parseString(str); + setInsetName(from_utf8("InsetQuotes")); } InsetQuotes::InsetQuotes(quote_language l, quote_side s, quote_times t) : language_(l), side_(s), times_(t) -{} +{ + setInsetName(from_utf8("InsetQuotes")); +} -InsetQuotes::InsetQuotes(char c, BufferParams const & params) +InsetQuotes::InsetQuotes(char_type c, BufferParams const & params) : language_(params.quotes_language), times_(params.quotes_times) { getPosition(c); + setInsetName(from_utf8("InsetQuotes")); } -InsetQuotes::InsetQuotes(char c, quote_language l, quote_times t) +InsetQuotes::InsetQuotes(char_type c, quote_language l, quote_times t) : language_(l), times_(t) { getPosition(c); + setInsetName(from_utf8("InsetQuotes")); } -void InsetQuotes::getPosition(char c) +void InsetQuotes::getPosition(char_type c) { // Decide whether left or right switch (c) { @@ -167,51 +174,74 @@ void InsetQuotes::parseString(string const & s) } -string const InsetQuotes::dispString(Language const * loclang) const +docstring const InsetQuotes::dispString(Language const * loclang) const { string disp; disp += quote_char[quote_index[side_][language_]]; if (times_ == DoubleQ) disp += disp; - if (lyxrc.font_norm_type == LyXRC::ISO_8859_1 - || lyxrc.font_norm_type == LyXRC::ISO_8859_9 - || lyxrc.font_norm_type == LyXRC::ISO_8859_15) { - if (disp == "<<") - disp = '«'; - else if (disp == ">>") - disp = '»'; - } + docstring retdisp; + if (disp == "<<") + retdisp = docstring(1, 0x00ab); //'«'; + else if (disp == ">>") + retdisp = docstring(1, 0x00bb); //'»'; +#if 0 + // The below are supposed to work, but something fails. + else if (disp == ",,") + retdisp = docstring(1, 0x201e); + else if (disp == "''") + retdisp == docstring(1, 0x201d); + else if (disp == "``") + retdisp == docstring(1, 0x201c); + else if (disp == "<") + retdisp = docstring(1, 0x2039); + else if (disp == ">") + retdisp = docstring(1, 0x203a); + else if (disp == ",") + retdisp = docstring(1, 0x201a); + else if (disp == "'") + retdisp = docstring(1, 0x2019); + else if (disp == "`") + retdisp = docstring(1, 0x2018); +#endif + else + retdisp = lyx::from_ascii(disp); + // in french, spaces are added inside double quotes if (times_ == DoubleQ && prefixIs(loclang->code(), "fr")) { if (side_ == LeftQ) - disp += ' '; + retdisp += ' '; else - disp.insert(string::size_type(0), 1, ' '); + retdisp.insert(docstring::size_type(0), 1, ' '); } - return disp; + return retdisp; } -void InsetQuotes::metrics(MetricsInfo & mi, Dimension & dim) const +bool InsetQuotes::metrics(MetricsInfo & mi, Dimension & dim) const { LyXFont & font = mi.base.font; - dim.asc = font_metrics::maxAscent(font); - dim.des = font_metrics::maxDescent(font); + frontend::FontMetrics const & fm = + theFontMetrics(font); + dim.asc = fm.maxAscent(); + dim.des = fm.maxDescent(); dim.wid = 0; - string const text = dispString(font.language()); + docstring const text = dispString(font.language()); for (string::size_type i = 0; i < text.length(); ++i) { if (text[i] == ' ') - dim.wid += font_metrics::width('i', font); + dim.wid += fm.width('i'); else if (i == 0 || text[i] != text[i - 1]) - dim.wid += font_metrics::width(text[i], font); + dim.wid += fm.width(text[i]); else - dim.wid += font_metrics::width(',', font); + dim.wid += fm.width(','); } + bool const changed = dim_ != dim; dim_ = dim; + return changed; } @@ -230,15 +260,17 @@ LyXFont const InsetQuotes::convertFont(LyXFont const & f) const void InsetQuotes::draw(PainterInfo & pi, int x, int y) const { - string const text = dispString(pi.base.font.language()); + docstring const text = dispString(pi.base.font.language()); if (text.length() == 2 && text[0] == text[1]) { pi.pain.text(x, y, text[0], pi.base.font); - int const t = font_metrics::width(',', pi.base.font); + int const t = theFontMetrics(pi.base.font) + .width(','); pi.pain.text(x + t, y, text[0], pi.base.font); } else { pi.pain.text(x, y, text, pi.base.font); } + setPosCache(pi, x, y); } @@ -263,7 +295,7 @@ void InsetQuotes::read(Buffer const &, LyXLex & lex) } -int InsetQuotes::latex(Buffer const &, ostream & os, +int InsetQuotes::latex(Buffer const &, odocstream & os, OutputParams const & runparams) const { const int quoteind = quote_index[side_][language_]; @@ -291,28 +323,20 @@ int InsetQuotes::latex(Buffer const &, ostream & os, if (prefixIs(qstr, "`")) qstr.insert(0, "{}"); - os << qstr; + os << from_ascii(qstr); return 0; } -int InsetQuotes::plaintext(Buffer const &, ostream & os, - OutputParams const &) const +int InsetQuotes::plaintext(Buffer const & buf, odocstream & os, + OutputParams const &) const { - os << '"'; + os << dispString(buf.params().language); return 0; } -int InsetQuotes::linuxdoc(Buffer const &, ostream & os, - OutputParams const &) const -{ - os << '"'; - return 0; -} - - -int InsetQuotes::docbook(Buffer const &, ostream & os, +int InsetQuotes::docbook(Buffer const &, odocstream & os, OutputParams const &) const { if (times_ == DoubleQ) { @@ -330,6 +354,12 @@ int InsetQuotes::docbook(Buffer const &, ostream & os, } +void InsetQuotes::textString(Buffer const & buf, odocstream & os) const +{ + os << dispString(buf.params().language); +} + + void InsetQuotes::validate(LaTeXFeatures & features) const { bool const use_babel = features.useBabel(); @@ -367,5 +397,8 @@ auto_ptr InsetQuotes::doClone() const InsetBase::Code InsetQuotes::lyxCode() const { - return InsetBase::QUOTE_CODE; + return InsetBase::QUOTE_CODE; } + + +} // namespace lyx