X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetQuotes.cpp;h=49922943c255dd6681e155a6fc11110596fa0dc3;hb=e5c79a43ee78192f45a9ab34873f8bb426b5f37e;hp=cc3e3e051e1475b62f558d4727e63c177e97e665;hpb=1ed70d10fdfa64186c1b640bc83158d94fd1f2f3;p=lyx.git diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp index cc3e3e051e..49922943c2 100644 --- a/src/insets/InsetQuotes.cpp +++ b/src/insets/InsetQuotes.cpp @@ -4,6 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Jean-Marc Lasgouttes + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ @@ -17,6 +18,7 @@ #include "BufferView.h" #include "Cursor.h" #include "Dimension.h" +#include "Encoding.h" #include "Font.h" #include "FuncStatus.h" #include "FuncRequest.h" @@ -37,7 +39,11 @@ #include "support/debug.h" #include "support/docstring.h" #include "support/docstream.h" +#include "support/gettext.h" #include "support/lstrings.h" +#include "support/textutils.h" + +#include using namespace std; using namespace lyx::support; @@ -47,200 +53,484 @@ namespace lyx { namespace { /* codes used to read/write quotes to LyX files - * e ``english'' - * s ''swedish'' - * g ,,german`` - * p ,,polish'' - * f <> - * a >>danish<< - * q "plain" + * available styles: + * e ``english'' (`inner quotation') + * s ''swedish'' ('inner quotation') + * g ,,german`` (,inner quotation`) + * p ,,polish'' (,inner quotation') + * c <> () + * a >>danish<< (>inner quotation<) + * q "plain" ('inner quotation') + * b `british' (``inner quotation'') + * w >>swedishg>> ('inner quotation') ["g" = Guillemets] + * f <> (``inner quotation'') + * i <> (<>) ["in" = Imprimerie Nationale] + * r <> (,,inner quotation``) + * j [U+300C]cjk[U+300D] ([U+300E]inner quotation[U+300F]) [CORNER BRACKETS] + * k [U+300A]cjkangle[U+300B] ([U+3008]inner quotation[U+3009]) [ANGLE BRACKETS] + * x dynamic style (inherits document settings) */ -char const * const style_char = "esgpfaq"; +char const * const style_char = "esgpcaqbwfirjkx"; char const * const side_char = "lr" ; char const * const level_char = "sd"; -// List of known quote chars -char const * const quote_char = ",'`<>\""; - -// Unicode characters needed by each quote type -char_type const display_quote_char[2][6] = { - { 0x201a, 0x2019, 0x2018, 0x2039, 0x203a, 0x0027}, - { 0x201e, 0x201d, 0x201c, 0x00ab, 0x00bb, 0x0022} -}; - -// Index of chars used for the quote. Index is [side, style] -int quote_index[2][7] = { - { 2, 1, 0, 0, 3, 4, 5 }, // { ` ' , , < > \" } - { 1, 1, 2, 1, 4, 3, 5 } // { ' ' ` ' > < \" } -}; - -// Corresponding LaTeX code, for double and single quotes. -char const * const latex_quote_t1[2][6] = { - { "\\quotesinglbase", "'", "`", - "\\guilsinglleft", "\\guilsinglright", "\\textquotesingle" }, - { ",,", "''", "``", "<<", ">>", "\\textquotedbl" } -}; - -char const * const latex_quote_ot1[2][6] = { - { "\\quotesinglbase", "'", "`", - "\\guilsinglleft", "\\guilsinglright", "\\textquotesingle" }, - { "\\quotedblbase", "''", "``", - "\\guillemotleft", "\\guillemotright", "\\textquotedbl" } -}; - -char const * const latex_quote_noligatures[2][6] = { - { "\\quotesinglbase", "\\textquoteleft", "\\textquoteright", - "\\guilsinglleft", "\\guilsinglright", "\\textquotesingle" }, - { "\\quotedblbase", "\\textquotedblleft", "\\textquotedblright", - "\\guillemotleft", "\\guillemotright", "\\textquotedbl" } -}; - -char const * const latex_quote_babel[2][6] = { - { "\\glq", "'", "`", "\\flq", "\\frq", "\\textquotesingle" }, - { "\\glqq", "''", "``", "\\flqq", "\\frqq", "\\textquotedbl" } -}; - -char const * const html_quote[2][6] = { - { "‚", "’", "‘", - "‹", "›", "'" }, - { "„", "”", "“", "«", "»", """ } -}; - -} // namespace anon - - -InsetQuotes::InsetQuotes(Buffer * buf, string const & str) : Inset(buf) -{ - parseString(str); -} +} // namespace -InsetQuotes::InsetQuotes(Buffer * buf, char_type c, QuoteLevel level, - string const & side, string const & style) - : Inset(buf), level_(level), pass_thru_(false) -{ - if (buf) { - style_ = style.empty() ? buf->params().quotes_style : getStyle(style); - fontenc_ = (buf->params().fontenc == "global") - ? lyxrc.fontenc : buf->params().fontenc; - } else { - style_ = style.empty() ? EnglishQuotes : getStyle(style); - fontenc_ = lyxrc.fontenc; - } +///////////////////////////////////////////////////////////////////// +// +// InsetQuotesParams +// +/////////////////////////////////////////////////////////////////////// - if (side == "left") - side_ = LeftQuote; - else if (side == "right") - side_ = RightQuote; - else - setSide(c); -} +InsetQuotesParams quoteparams; -docstring InsetQuotes::layoutName() const +int InsetQuotesParams::stylescount() const { - return from_ascii("Quotes"); + return strlen(style_char); } -void InsetQuotes::setSide(char_type c) +char InsetQuotesParams::getStyleChar(QuoteStyle const & style) const { - // Decide whether left or right - switch (c) { - case ' ': - case '(': - case '[': - side_ = LeftQuote; // left quote - break; - default: - side_ = RightQuote; // right quote - } + return style_char[style]; } -void InsetQuotes::parseString(string const & s, bool const allow_wildcards) +InsetQuotesParams::QuoteStyle InsetQuotesParams::getQuoteStyle(string const & s, + bool const allow_wildcards, QuoteStyle fb) { + QuoteStyle res = fb; + string str = s; if (str.length() != 3) { - lyxerr << "ERROR (InsetQuotes::InsetQuotes):" - " bad string length." << endl; + LYXERR0("ERROR (InsetQuotes::InsetQuotes):" + " bad string length."); str = "eld"; } int i; - // '.' wildcard means: keep current stylee + // '.' wildcard means: keep current style if (!allow_wildcards || str[0] != '.') { - for (i = 0; i < 7; ++i) { + for (i = 0; i < stylescount(); ++i) { if (str[0] == style_char[i]) { - style_ = QuoteStyle(i); + res = QuoteStyle(i); break; } } - if (i >= 7) { - lyxerr << "ERROR (InsetQuotes::InsetQuotes):" - " bad style specification." << endl; - style_ = EnglishQuotes; + if (i >= stylescount()) { + LYXERR0("ERROR (InsetQuotes::InsetQuotes):" + " bad style specification."); + res = EnglishQuotes; } } + return res; +} + + +InsetQuotesParams::QuoteSide InsetQuotesParams::getQuoteSide(string const & s, + bool const allow_wildcards, QuoteSide fb) +{ + QuoteSide res = fb; + + string str = s; + if (str.length() != 3) { + LYXERR0("ERROR (InsetQuotes::InsetQuotes):" + " bad string length."); + str = "eld"; + } + + int i; + // '.' wildcard means: keep current side if (!allow_wildcards || str[1] != '.') { for (i = 0; i < 2; ++i) { if (str[1] == side_char[i]) { - side_ = QuoteSide(i); + res = InsetQuotesParams::QuoteSide(i); break; } } if (i >= 2) { - lyxerr << "ERROR (InsetQuotes::InsetQuotes):" - " bad side specification." << endl; - side_ = LeftQuote; + LYXERR0("ERROR (InsetQuotes::InsetQuotes):" + " bad side specification."); + res = OpeningQuote; } } + return res; +} + + +InsetQuotesParams::QuoteLevel InsetQuotesParams::getQuoteLevel(string const & s, + bool const allow_wildcards, QuoteLevel fb) +{ + QuoteLevel res = fb; + + string str = s; + if (str.length() != 3) { + LYXERR0("ERROR (InsetQuotes::InsetQuotes):" + " bad string length."); + str = "eld"; + } + + int i; + // '.' wildcard means: keep current level if (!allow_wildcards || str[2] != '.') { for (i = 0; i < 2; ++i) { if (str[2] == level_char[i]) { - level_ = QuoteLevel(i); + res = InsetQuotesParams::QuoteLevel(i); break; } } if (i >= 2) { - lyxerr << "ERROR (InsetQuotes::InsetQuotes):" - " bad level specification." << endl; - level_ = DoubleQuotes; + LYXERR0("ERROR (InsetQuotes::InsetQuotes):" + " bad level specification."); + res = InsetQuotesParams::PrimaryQuotes; } } + + return res; } -InsetQuotes::QuoteStyle InsetQuotes::getStyle(string const & s) +char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel const & level, + QuoteSide const & side) const { - QuoteStyle qs = EnglishQuotes; - - if (s == "english") - qs = EnglishQuotes; - else if (s == "swedish") - qs = SwedishQuotes; - else if (s == "german") - qs = GermanQuotes; - else if (s == "polish") - qs = PolishQuotes; - else if (s == "french") - qs = FrenchQuotes; - else if (s == "danish") - qs = DanishQuotes; - else if (s == "plain") - qs = PlainQuotes; + // main opening quotation mark + char_type left_primary; + // main closing quotation mark + char_type right_primary; + // secondary (inner, 'single') opening quotation mark + char_type left_secondary; + // secondary (inner, 'single') closing quotation mark + char_type right_secondary; + + switch (style) { + case EnglishQuotes: { + left_primary = 0x201c; // `` + right_primary = 0x201d; // '' + left_secondary = 0x2018; // ` + right_secondary = 0x2019; // ' + break; + } + case SwedishQuotes: { + left_primary = 0x201d; // '' + right_primary = 0x201d; // '' + left_secondary = 0x2019; // ' + right_secondary = 0x2019; // ' + break; + } + case GermanQuotes: { + left_primary = 0x201e; // ,, + right_primary = 0x201c; // `` + left_secondary = 0x201a; // , + right_secondary = 0x2018; // ` + break; + } + case PolishQuotes: { + left_primary = 0x201e; // ,, + right_primary = 0x201d; // '' + left_secondary = 0x201a; // , + right_secondary = 0x2019; // ' + break; + } + case SwissQuotes: { + left_primary = 0x00ab; // << + right_primary = 0x00bb; // >> + left_secondary = 0x2039; // < + right_secondary = 0x203a; // > + break; + } + case DanishQuotes: { + left_primary = 0x00bb; // >> + right_primary = 0x00ab; // << + left_secondary = 0x203a; // > + right_secondary = 0x2039; // < + break; + } + case PlainQuotes: { + left_primary = 0x0022; // " + right_primary = 0x0022; // " + left_secondary = 0x0027; // ' + right_secondary = 0x0027; // ' + break; + } + case BritishQuotes: { + left_primary = 0x2018; // ` + right_primary = 0x2019; // ' + left_secondary = 0x201c; // `` + right_secondary = 0x201d; // '' + break; + } + case SwedishGQuotes: { + left_primary = 0x00bb; // >> + right_primary = 0x00bb; // >> + left_secondary = 0x2019; // ' + right_secondary = 0x2019; // ' + break; + } + case FrenchQuotes: { + left_primary = 0x00ab; // << + right_primary = 0x00bb; // >> + left_secondary = 0x201c; // `` + right_secondary = 0x201d; // '' + break; + } + case FrenchINQuotes:{ + left_primary = 0x00ab; // << + right_primary = 0x00bb; // >> + left_secondary = 0x00ab; // << + right_secondary = 0x00bb; // >> + break; + } + case RussianQuotes:{ + left_primary = 0x00ab; // << + right_primary = 0x00bb; // >> + left_secondary = 0x201e; // ,, + right_secondary = 0x201c; // `` + break; + } + case CJKQuotes:{ + left_primary = 0x300c; // LEFT CORNER BRACKET + right_primary = 0x300d; // RIGHT CORNER BRACKET + left_secondary = 0x300e; // LEFT WHITE CORNER BRACKET + right_secondary = 0x300f; // RIGHT WHITE CORNER BRACKET + break; + } + case CJKAngleQuotes:{ + left_primary = 0x300a; // LEFT DOUBLE ANGLE BRACKET + right_primary = 0x300b; // RIGHT DOUBLE ANGLE BRACKET + left_secondary = 0x3008; // LEFT ANGLE BRACKET + right_secondary = 0x3009; // RIGHT ANGLE BRACKET + break; + } + case DynamicQuotes: + default: + // should not happen + left_primary = 0x003f; // ? + right_primary = 0x003f; // ? + left_secondary = 0x003f; // ? + right_secondary = 0x003f; // ? + break; + } - return qs; + switch (level) { + case SecondaryQuotes: + return (side == OpeningQuote) ? left_secondary : right_secondary; + case PrimaryQuotes: + return (side == OpeningQuote) ? left_primary : right_primary; + default: + break; + } + + // should not happen + return 0x003f; +} + + +docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op) const +{ + string res; + + switch (c){ + case 0x201a: {// , + if (op == "babel") + res = "\\glq"; + else + res = "\\quotesinglbase"; + break; + } + case 0x2019: {// ' + if (op == "int") + res = "\\textquoteleft"; + else + res = "'"; + break; + } + case 0x2018: {// ` + if (op == "int") + res = "\\textquoteright"; + else + res = "`"; + break; + } + case 0x2039: {// < + if (op == "babel") + res = "\\flq"; + else + res = "\\guilsinglleft"; + break; + } + case 0x203a: {// > + if (op == "babel") + res = "\\frq"; + else + res = "\\guilsinglright"; + break; + } + case 0x0027: {// ' (plain) + res = "\\textquotesingle"; + break; + } + case 0x201e: {// ,, + if (op == "t1") + res = ",,"; + else if (op == "babel") + res = "\\glqq"; + else + res = "\\quotedblbase"; + break; + } + case 0x201d: {// '' + if (op == "int") + res = "\\textquotedblleft"; + else + res = "''"; + break; + } + case 0x201c: {// `` + if (op == "int") + res = "\\textquotedblright"; + else + res = "``"; + break; + } + case 0x00ab: {// << + if (op == "t1") + res = "<<"; + else if (op == "babel") + res = "\\flqq"; + else + res = "\\guillemotleft"; + break; + } + case 0x00bb: {// >> + if (op == "t1") + res = ">>"; + else if (op == "babel") + res = "\\frqq"; + else + res = "\\guillemotright"; + break; + } + case 0x0022: {// " + res = "\\textquotedbl"; + break; + } + // The following are fakes + // This is just to get something symbolic + // in encodings where this chars would not be used ayway + case 0x300c: // LEFT CORNER BRACKET + res = "\\ensuremath{\\lceil}"; + break; + case 0x300d: // RIGHT CORNER BRACKET + res = "\\ensuremath{\\rfloor}"; + break; + case 0x300e: // LEFT WHITE CORNER BRACKET + res = "\\ensuremath{\\llceil}"; + break; + case 0x300f: // RIGHT WHITE CORNER BRACKET + res = "\\ensuremath{\\rrfloor}"; + break; + case 0x300a: // LEFT DOUBLE ANGLE BRACKET + res = "\\ensuremath{\\langle\\kern-2.5pt\\langle}"; + break; + case 0x300b: // RIGHT DOUBLE ANGLE BRACKET + res = "\\ensuremath{\\rangle\\kern-2.5pt\\rangle}"; + break; + case 0x3008: // LEFT ANGLE BRACKET + res = "\\ensuremath{\\langle}"; + break; + case 0x3009: // RIGHT ANGLE BRACKET + res = "\\ensuremath{\\rangle}"; + break; + default: + break; + } + + return from_ascii(res); } -map InsetQuotes::getTypes() const +docstring InsetQuotesParams::getHTMLQuote(char_type c) const +{ + string res; + + switch (c){ + case 0x201a: // , + res = "‚"; + break; + case 0x2019: // ' + res = "’"; + break; + case 0x2018: // ` + res = "‘"; + break; + case 0x2039: // < + res = "‹"; + break; + case 0x203a: // > + res = "›"; + break; + case 0x0027: // ' (plain) + res = "'"; + break; + case 0x201e: // ,, + res = "„"; + break; + case 0x201d: // '' + res = "”"; + break; + case 0x201c: // `` + res = "“"; + break; + case 0x00ab: // << + res = "«"; + break; + case 0x00bb: // >> + res = "»"; + break; + case 0x0022: // " + res = """; + break; + case 0x300c: // LEFT CORNER BRACKET + res = "「"; + break; + case 0x300d: // RIGHT CORNER BRACKET + res = "」"; + break; + case 0x300e: // LEFT WHITE CORNER BRACKET + res = "『"; + break; + case 0x300f: // RIGHT WHITE CORNER BRACKET + res = "』"; + break; + case 0x300a: // LEFT DOUBLE ANGLE BRACKET + res = "《"; + break; + case 0x300b: // RIGHT DOUBLE ANGLE BRACKET + res = "》"; + break; + case 0x3008: // LEFT ANGLE BRACKET + res = "〈"; + break; + case 0x3009: // RIGHT ANGLE BRACKET + res = "〉"; + break; + default: + break; + } + + return from_ascii(res); +} + + +map InsetQuotesParams::getTypes() const { map res; @@ -251,8 +541,10 @@ map InsetQuotes::getTypes() const string type; // get all quote types - for (sty = 0; sty < 7; ++sty) { + for (sty = 0; sty < stylescount(); ++sty) { style = QuoteStyle(sty); + if (style == DynamicQuotes) + continue; for (sid = 0; sid < 2; ++sid) { side = QuoteSide(sid); for (lev = 0; lev < 2; ++lev) { @@ -260,7 +552,7 @@ map InsetQuotes::getTypes() const type += side_char[sid]; level = QuoteLevel(lev); type += level_char[lev]; - res[type] = docstring(1, display_quote_char[level][quote_index[side][style]]); + res[type] = docstring(1, getQuoteChar(style, level, side)); type.clear(); } } @@ -269,21 +561,176 @@ map InsetQuotes::getTypes() const } +docstring const InsetQuotesParams::getGuiLabel(QuoteStyle const & qs, bool langdef) +{ + docstring const styledesc = + bformat(_("%1$souter%2$s and %3$sinner%4$s[[quotation marks]]"), + docstring(1, getQuoteChar(qs, PrimaryQuotes, OpeningQuote)), + docstring(1, getQuoteChar(qs, PrimaryQuotes, ClosingQuote)), + docstring(1, getQuoteChar(qs, SecondaryQuotes, OpeningQuote)), + docstring(1, getQuoteChar(qs, SecondaryQuotes, ClosingQuote)) + ); + + if (!langdef) + return styledesc; + + return bformat(_("%1$s[[quot. mark description]] (language default)"), + styledesc); +} + + +docstring const InsetQuotesParams::getShortGuiLabel(docstring const string) +{ + std::string const s = to_ascii(string); + QuoteStyle const style = getQuoteStyle(s); + QuoteSide const side = getQuoteSide(s); + QuoteLevel const level = getQuoteLevel(s); + + return (side == OpeningQuote) ? + bformat(_("%1$stext"), + docstring(1, getQuoteChar(style, level, side))) : + bformat(_("text%1$s"), + docstring(1, getQuoteChar(style, level, side))); +} + + +///////////////////////////////////////////////////////////////////// +// +// InsetQuotes +// +/////////////////////////////////////////////////////////////////////// + +InsetQuotes::InsetQuotes(Buffer * buf, string const & str) + : Inset(buf), + style_(InsetQuotesParams::EnglishQuotes), side_(InsetQuotesParams::OpeningQuote), + pass_thru_(false), internal_fontenc_(false) +{ + if (buf) { + global_style_ = buf->masterBuffer()->params().quotes_style; + fontspec_ = buf->masterBuffer()->params().useNonTeXFonts; + } + else { + global_style_ = InsetQuotesParams::EnglishQuotes; + fontspec_ = false; + } + + parseString(str); +} + + +InsetQuotes::InsetQuotes(Buffer * buf, char_type c, InsetQuotesParams::QuoteLevel level, + string const & side, string const & style) + : Inset(buf), level_(level), pass_thru_(false), fontspec_(false), internal_fontenc_(false) +{ + bool dynamic = false; + if (buf) { + global_style_ = buf->masterBuffer()->params().quotes_style; + fontenc_ = buf->masterBuffer()->params().main_font_encoding(); + dynamic = buf->masterBuffer()->params().dynamic_quotes; + fontspec_ = buf->masterBuffer()->params().useNonTeXFonts; + } else { + global_style_ = InsetQuotesParams::EnglishQuotes; + fontenc_ = "OT1"; + fontspec_ = false; + } + if (style.empty()) + style_ = dynamic ? InsetQuotesParams::DynamicQuotes : global_style_; + else + style_ = getStyle(style); + + if (side == "left" || side == "opening") + side_ = InsetQuotesParams::OpeningQuote; + else if (side == "right" || side == "closing") + side_ = InsetQuotesParams::ClosingQuote; + else + setSide(c); +} + + +docstring InsetQuotes::layoutName() const +{ + return from_ascii("Quotes"); +} + + +void InsetQuotes::setSide(char_type c) +{ + // Decide whether opening or closing quote + if (lyx::isSpace(c) || isOpenPunctuation(c)) + side_ = InsetQuotesParams::OpeningQuote;// opening quote + else + side_ = InsetQuotesParams::ClosingQuote;// closing quote +} + + +void InsetQuotes::parseString(string const & s, bool const allow_wildcards) +{ + style_ = quoteparams.getQuoteStyle(s, allow_wildcards, style_); + side_ = quoteparams.getQuoteSide(s, allow_wildcards, side_); + level_ = quoteparams.getQuoteLevel(s, allow_wildcards, level_); +} + + +InsetQuotesParams::QuoteStyle InsetQuotes::getStyle(string const & s) +{ + InsetQuotesParams::QuoteStyle qs = InsetQuotesParams::EnglishQuotes; + + if (s == "english") + qs = InsetQuotesParams::EnglishQuotes; + else if (s == "swedish") + qs = InsetQuotesParams::SwedishQuotes; + else if (s == "german") + qs = InsetQuotesParams::GermanQuotes; + else if (s == "polish") + qs = InsetQuotesParams::PolishQuotes; + else if (s == "swiss") + qs = InsetQuotesParams::SwissQuotes; + else if (s == "danish") + qs = InsetQuotesParams::DanishQuotes; + else if (s == "plain") + qs = InsetQuotesParams::PlainQuotes; + else if (s == "british") + qs = InsetQuotesParams::BritishQuotes; + else if (s == "swedishg") + qs = InsetQuotesParams::SwedishGQuotes; + else if (s == "french") + qs = InsetQuotesParams::FrenchQuotes; + else if (s == "frenchin") + qs = InsetQuotesParams::FrenchINQuotes; + else if (s == "russian") + qs = InsetQuotesParams::RussianQuotes; + else if (s == "cjk") + qs = InsetQuotesParams::CJKQuotes; + else if (s == "cjkangle") + qs = InsetQuotesParams::CJKAngleQuotes; + else if (s == "dynamic") + qs = InsetQuotesParams::DynamicQuotes; + + return qs; +} + + docstring InsetQuotes::displayString() const { // In PassThru, we use straight quotes if (pass_thru_) - return (level_ == DoubleQuotes) ? from_ascii("\"") : from_ascii("'"); + return (level_ == InsetQuotesParams::PrimaryQuotes) ? + from_ascii("\"") : from_ascii("'"); + + InsetQuotesParams::QuoteStyle style = + (style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_; - int const index = quote_index[side_][style_]; - docstring retdisp = docstring(1, display_quote_char[level_][index]); + docstring retdisp = docstring(1, quoteparams.getQuoteChar(style, level_, side_)); // in French, thin spaces are added inside double guillemets if (prefixIs(context_lang_, "fr") - && level_ == DoubleQuotes && style_ == FrenchQuotes) { + && level_ == InsetQuotesParams::PrimaryQuotes + && (style == InsetQuotesParams::SwissQuotes + || style == InsetQuotesParams::FrenchQuotes + || style == InsetQuotesParams::FrenchINQuotes)) { // THIN SPACE (U+2009) char_type const thin_space = 0x2009; - if (side_ == LeftQuote) + if (side_ == InsetQuotesParams::OpeningQuote) retdisp += thin_space; else retdisp = thin_space + retdisp; @@ -306,7 +753,10 @@ void InsetQuotes::metrics(MetricsInfo & mi, Dimension & dim) const void InsetQuotes::draw(PainterInfo & pi, int x, int y) const { FontInfo font = pi.base.font; - font.setPaintColor(pi.textColor(font.realColor())); + if (style_ == InsetQuotesParams::DynamicQuotes) + font.setPaintColor(Color_special); + else + font.setPaintColor(pi.textColor(font.realColor())); pi.pain.text(x, y, displayString(), font); } @@ -350,7 +800,7 @@ void InsetQuotes::doDispatch(Cursor & cur, FuncRequest & cmd) } cur.recordUndoInset(this); parseString(cmd.getArg(1), true); - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); break; } default: @@ -384,28 +834,42 @@ bool InsetQuotes::getStatus(Cursor & cur, FuncRequest const & cmd, void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const { - const int quoteind = quote_index[side_][style_]; + InsetQuotesParams::QuoteStyle style = + (style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_; + char_type quotechar = quoteparams.getQuoteChar(style, level_, side_); docstring qstr; // In pass-thru context, we output plain quotes if (runparams.pass_thru) - qstr = (level_ == DoubleQuotes) ? from_ascii("\"") : from_ascii("'"); - else if (style_ == PlainQuotes && runparams.isFullUnicode()) { + qstr = (level_ == InsetQuotesParams::PrimaryQuotes) ? from_ascii("\"") : from_ascii("'"); + else if (style == InsetQuotesParams::PlainQuotes && fontspec_) { // For XeTeX and LuaTeX,we need to disable mapping to get straight // quotes. We define our own commands that do this - qstr = (level_ == DoubleQuotes) ? + qstr = (level_ == InsetQuotesParams::PrimaryQuotes) ? from_ascii("\\textquotedblplain") : from_ascii("\\textquotesingleplain"); } else if (runparams.use_polyglossia) { - // For polyglossia, we directly output the respective unicode chars + // For polyglossia, we directly output the respective unicode chars // (spacing and kerning is then handled respectively) - qstr = docstring(1, display_quote_char[level_][quoteind]); + qstr = docstring(1, quotechar); } - else if (style_ == FrenchQuotes && level_ == DoubleQuotes + // The CJK marks are not yet covered by utf8 inputenc (we don't have the entry in + // unicodesymbols, since we don't want to add fake synbols there). + else if (style == InsetQuotesParams::CJKQuotes || style == InsetQuotesParams::CJKAngleQuotes) { + if (runparams.encoding && runparams.encoding->name() != "utf8" + && runparams.encoding->encodable(quotechar)) + qstr = docstring(1, quotechar); + else + qstr = quoteparams.getLaTeXQuote(quotechar, "int"); + } + else if ((style == InsetQuotesParams::SwissQuotes + || style == InsetQuotesParams::FrenchQuotes + || style == InsetQuotesParams::FrenchINQuotes) + && level_ == InsetQuotesParams::PrimaryQuotes && prefixIs(runparams.local_font->language()->code(), "fr")) { // Specific guillemets of French babel // including correct French spacing - if (side_ == LeftQuote) + if (side_ == InsetQuotesParams::OpeningQuote) qstr = from_ascii("\\og"); else qstr = from_ascii("\\fg"); @@ -413,48 +877,56 @@ void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const && !runparams.local_font->language()->internalFontEncoding()) { // Quotation marks for T1 font encoding // (using ligatures) - qstr = from_ascii(latex_quote_t1[level_][quoteind]); + qstr = quoteparams.getLaTeXQuote(quotechar, "t1"); } else if (runparams.local_font->language()->internalFontEncoding()) { // Quotation marks for internal font encodings // (ligatures not featured) - qstr = from_ascii(latex_quote_noligatures[level_][quoteind]); + qstr = quoteparams.getLaTeXQuote(quotechar, "int"); #ifdef DO_USE_DEFAULT_LANGUAGE - } else if (doclang == "default") { + } else if ((doclang == "default" #else - } else if (!runparams.use_babel || runparams.isFullUnicode()) { + } else if ((!runparams.use_babel #endif + || (fontenc_ != "T1" && fontenc_ != "OT1")) + || runparams.isFullUnicode()) { // Standard quotation mark macros // These are also used by babel // without fontenc (XeTeX/LuaTeX) - qstr = from_ascii(latex_quote_ot1[level_][quoteind]); + qstr = quoteparams.getLaTeXQuote(quotechar, "ot1"); } else { // Babel shorthand quotation marks (for T1/OT1) - qstr = from_ascii(latex_quote_babel[level_][quoteind]); + qstr = quoteparams.getLaTeXQuote(quotechar, "babel"); } if (!runparams.pass_thru) { // Guard against unwanted ligatures with preceding text char_type const lastchar = os.lastChar(); + // LuaTeX does not respect {} as ligature breaker by design, + // see https://tex.stackexchange.com/q/349725/19291 + docstring const nolig = + (runparams.flavor == OutputParams::LUATEX + || runparams.flavor == OutputParams::DVILUATEX) ? + from_ascii("\\/") : from_ascii("{}"); // !` ?` => !{}` ?{}` if (prefixIs(qstr, from_ascii("`")) && (lastchar == '!' || lastchar == '?')) - os << "{}"; + os << nolig; // ``` ''' ,,, <<< >>> // => `{}`` '{}'' ,{},, <{}<< >{}>> if (contains(from_ascii(",'`<>"), lastchar) && prefixIs(qstr, lastchar)) - os << "{}"; + os << nolig; } os << qstr; - if (prefixIs(qstr, from_ascii("\\"))) + if (prefixIs(qstr, from_ascii("\\")) && !suffixIs(qstr, '}')) // properly terminate the command depending on the context os << termcmd; } -int InsetQuotes::plaintext(odocstringstream & os, +int InsetQuotes::plaintext(odocstringstream & os, OutputParams const &, size_t) const { docstring const str = displayString(); @@ -464,14 +936,18 @@ int InsetQuotes::plaintext(odocstringstream & os, docstring InsetQuotes::getQuoteEntity() const { - const int quoteind = quote_index[side_][style_]; - docstring res = from_ascii(html_quote[level_][quoteind]); + InsetQuotesParams::QuoteStyle style = + (style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_; + docstring res = quoteparams.getHTMLQuote(quoteparams.getQuoteChar(style, level_, side_)); // in French, thin spaces are added inside double guillemets if (prefixIs(context_lang_, "fr") - && level_ == DoubleQuotes && style_ == FrenchQuotes) { + && level_ == InsetQuotesParams::PrimaryQuotes + && (style == InsetQuotesParams::FrenchQuotes + || style == InsetQuotesParams::FrenchINQuotes + || style == InsetQuotesParams::SwissQuotes)) { // THIN SPACE (U+2009) docstring const thin_space = from_ascii(" "); - if (side_ == LeftQuote) + if (side_ == InsetQuotesParams::OpeningQuote) res += thin_space; else res = thin_space + res; @@ -511,68 +987,78 @@ void InsetQuotes::updateBuffer(ParIterator const & it, UpdateType /* utype*/) BufferParams const & bp = buffer().masterBuffer()->params(); pass_thru_ = it.paragraph().isPassThru(); context_lang_ = it.paragraph().getFontSettings(bp, it.pos()).language()->code(); - fontenc_ = (bp.fontenc == "global") ? lyxrc.fontenc : bp.fontenc; + internal_fontenc_ = it.paragraph().getFontSettings(bp, it.pos()).language()->internalFontEncoding(); + fontenc_ = bp.main_font_encoding(); + global_style_ = bp.quotes_style; + fontspec_ = bp.useNonTeXFonts; } void InsetQuotes::validate(LaTeXFeatures & features) const { - char type = quote_char[quote_index[side_][style_]]; + InsetQuotesParams::QuoteStyle style = + (style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_; + char_type type = quoteparams.getQuoteChar(style, level_, side_); + // Handle characters that are not natively supported by + // specific font encodings (we roll our own definitions) #ifdef DO_USE_DEFAULT_LANGUAGE if (features.bufferParams().language->lang() == "default" #else if (!features.useBabel() #endif && !features.runparams().isFullUnicode() && fontenc_ != "T1") { - if (level_ == SingleQuotes) - switch (type) { - case ',': - features.require("quotesinglbase"); - break; - case '<': - features.require("guilsinglleft"); - break; - case '>': - features.require("guilsinglright"); - break; - default: - break; - } - else - switch (type) { - case ',': - features.require("quotedblbase"); - break; - case '<': - features.require("guillemotleft"); - break; - case '>': - features.require("guillemotright"); - break; - default: - break; - } - } - if (type == '"') { - switch (level_) { - case SingleQuotes: { - if (features.runparams().isFullUnicode()) - features.require("textquotesinglep"); - else - features.require("textcomp"); + switch (type) { + case 0x201a: + features.require("quotesinglbase"); break; - } - case DoubleQuotes: { - if (features.runparams().isFullUnicode()) - features.require("textquotedblp"); - else if (fontenc_ != "T1") - features.require("textquotedbl"); + case 0x2039: + features.require("guilsinglleft"); + break; + case 0x203a: + features.require("guilsinglright"); + break; + case 0x201e: + features.require("quotedblbase"); + break; + case 0x00ab: + features.require("guillemotleft"); + break; + case 0x00bb: + features.require("guillemotright"); break; default: break; } - } + } + // Handle straight quotation marks. These need special care + // in most output formats + switch (type) { + case 0x0027: { + if (features.runparams().isFullUnicode() && fontspec_) + features.require("textquotesinglep"); + else + features.require("textcomp"); + break; + } + case 0x0022: { + if (features.runparams().isFullUnicode() && fontspec_) + features.require("textquotedblp"); + else if (fontenc_ != "T1" || internal_fontenc_) + features.require("textquotedbl"); + break; + } + // we fake these from math (also for utf8 inputenc + // currently; see above) + case 0x300e: // LEFT WHITE CORNER BRACKET + case 0x300f: // RIGHT WHITE CORNER BRACKET + if (!features.runparams().encoding + || features.runparams().encoding->name() == "utf8" + || !features.runparams().encoding->encodable(type)) + features.require("stmaryrd"); + break; + default: + break; } }