X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetQuotes.cpp;h=515d24119d959a93526a64f6a43b6cacfb766181;hb=87a7f728ca9b8b4d358cf06de980f61b67a927ac;hp=248d5deab955ef17a79fbec0c2ee688cb71b570d;hpb=2e255b1c4f3264571a6bd9ade8651c1657c995c6;p=lyx.git diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp index 248d5deab9..515d24119d 100644 --- a/src/insets/InsetQuotes.cpp +++ b/src/insets/InsetQuotes.cpp @@ -18,6 +18,7 @@ #include "BufferView.h" #include "Cursor.h" #include "Dimension.h" +#include "Encoding.h" #include "Font.h" #include "FuncStatus.h" #include "FuncRequest.h" @@ -40,6 +41,7 @@ #include "support/docstream.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/textutils.h" #include @@ -56,16 +58,24 @@ namespace { * s ''swedish'' ('inner quotation') * g ,,german`` (,inner quotation`) * p ,,polish'' (,inner quotation') - * f <> () + * 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"; -} // namespace anon +} // namespace ///////////////////////////////////////////////////////////////////// @@ -83,8 +93,113 @@ int InsetQuotesParams::stylescount() const } +char InsetQuotesParams::getStyleChar(QuoteStyle const & style) const +{ + return style_char[style]; +} + + +InsetQuotesParams::QuoteStyle InsetQuotesParams::getQuoteStyle(string const & s, + bool const allow_wildcards, QuoteStyle fb) +{ + QuoteStyle res = fb; + + string str = s; + if (str.length() != 3) { + LYXERR0("ERROR (InsetQuotes::InsetQuotes):" + " bad string length."); + str = "eld"; + } + + int i; + + // '.' wildcard means: keep current style + if (!allow_wildcards || str[0] != '.') { + for (i = 0; i < stylescount(); ++i) { + if (str[0] == style_char[i]) { + res = QuoteStyle(i); + break; + } + } + 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]) { + res = InsetQuotesParams::QuoteSide(i); + break; + } + } + if (i >= 2) { + 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]) { + res = InsetQuotesParams::QuoteLevel(i); + break; + } + } + if (i >= 2) { + LYXERR0("ERROR (InsetQuotes::InsetQuotes):" + " bad level specification."); + res = InsetQuotesParams::PrimaryQuotes; + } + } + + return res; +} + + char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel const & level, - QuoteSide const & side) const + QuoteSide const & side, bool const rtl) const { // main opening quotation mark char_type left_primary; @@ -124,7 +239,7 @@ char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel c right_secondary = 0x2019; // ' break; } - case FrenchQuotes: { + case SwissQuotes: { left_primary = 0x00ab; // << right_primary = 0x00bb; // >> left_secondary = 0x2039; // < @@ -145,6 +260,56 @@ char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel c 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; // ? @@ -155,10 +320,14 @@ char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel c } switch (level) { - case SingleQuotes: - return (side == LeftQuote) ? left_secondary : right_secondary; - case DoubleQuotes: - return (side == LeftQuote) ? left_primary : right_primary; + case SecondaryQuotes: + if (rtl) + return (side == ClosingQuote) ? left_secondary : right_secondary; + return (side == OpeningQuote) ? left_secondary : right_secondary; + case PrimaryQuotes: + if (rtl) + return (side == ClosingQuote) ? left_primary : right_primary; + return (side == OpeningQuote) ? left_primary : right_primary; default: break; } @@ -168,7 +337,8 @@ char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel c } -docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op) const +docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op, + bool const rtl) const { string res; @@ -182,14 +352,16 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op) const } case 0x2019: {// ' if (op == "int") - res = "\\textquoteleft"; + // This macro is redefined in rtl mode + res = rtl ? "\\textquoteright" : "\\textquoteleft"; else res = "'"; break; } case 0x2018: {// ` if (op == "int") - res = "\\textquoteright"; + // This macro is redefined in rtl mode + res = rtl ? "\\textquoteleft" : "\\textquoteright"; else res = "`"; break; @@ -223,14 +395,16 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op) const } case 0x201d: {// '' if (op == "int") - res = "\\textquotedblleft"; + // This macro is redefined in rtl mode + res = rtl ? "\\textquotedblright" : "\\textquotedblleft"; else res = "''"; break; } case 0x201c: {// `` if (op == "int") - res = "\\textquotedblright"; + // This macro is redefined in rtl mode + res = rtl ? "\\textquotedblleft" : "\\textquotedblright"; else res = "``"; break; @@ -257,10 +431,37 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op) const 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); } @@ -306,10 +507,34 @@ docstring InsetQuotesParams::getHTMLQuote(char_type c) const 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); } @@ -327,6 +552,8 @@ map InsetQuotesParams::getTypes() const // get all quote types 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) { @@ -343,14 +570,36 @@ map InsetQuotesParams::getTypes() const } -docstring const InsetQuotesParams::getGuiLabel(QuoteStyle const & qs) +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) { - return bformat(_("%1$souter%2$s and %3$sinner%4$s[[quotation marks]]"), - docstring(1, quoteparams.getQuoteChar(qs, DoubleQuotes, LeftQuote)), - docstring(1, quoteparams.getQuoteChar(qs, DoubleQuotes, RightQuote)), - docstring(1, quoteparams.getQuoteChar(qs, SingleQuotes, LeftQuote)), - docstring(1, quoteparams.getQuoteChar(qs, SingleQuotes, RightQuote)) - ); + 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))); } @@ -360,29 +609,49 @@ docstring const InsetQuotesParams::getGuiLabel(QuoteStyle const & qs) // /////////////////////////////////////////////////////////////////////// -InsetQuotes::InsetQuotes(Buffer * buf, string const & str) : Inset(buf) +InsetQuotes::InsetQuotes(Buffer * buf, string const & str) + : Inset(buf), + style_(InsetQuotesParams::EnglishQuotes), side_(InsetQuotesParams::OpeningQuote), + pass_thru_(false), internal_fontenc_(false), rtl_(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) + : Inset(buf), level_(level), pass_thru_(false), fontspec_(false), + internal_fontenc_(false), rtl_(false) { + bool dynamic = false; if (buf) { - style_ = style.empty() ? buf->params().quotes_style : getStyle(style); - fontenc_ = (buf->params().fontenc == "global") - ? lyxrc.fontenc : buf->params().fontenc; + 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 { - style_ = style.empty() ? InsetQuotesParams::EnglishQuotes : getStyle(style); - fontenc_ = lyxrc.fontenc; + 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_ = InsetQuotesParams::LeftQuote; - else if (side == "right") - side_ = InsetQuotesParams::RightQuote; + if (side == "left" || side == "opening") + side_ = InsetQuotesParams::OpeningQuote; + else if (side == "right" || side == "closing") + side_ = InsetQuotesParams::ClosingQuote; else setSide(c); } @@ -396,81 +665,26 @@ docstring InsetQuotes::layoutName() const void InsetQuotes::setSide(char_type c) { - // Decide whether left or right - switch (c) { - case ' ': - case '(': - case '[': - side_ = InsetQuotesParams::LeftQuote; // left quote - break; - default: - side_ = InsetQuotesParams::RightQuote; // right quote - } + // 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) { - string str = s; - if (str.length() != 3) { - lyxerr << "ERROR (InsetQuotes::InsetQuotes):" - " bad string length." << endl; - str = "eld"; - } - - int i; - - // '.' wildcard means: keep current stylee - if (!allow_wildcards || str[0] != '.') { - for (i = 0; i < quoteparams.stylescount(); ++i) { - if (str[0] == style_char[i]) { - style_ = InsetQuotesParams::QuoteStyle(i); - break; - } - } - if (i >= quoteparams.stylescount()) { - LYXERR0("ERROR (InsetQuotes::InsetQuotes):" - " bad style specification."); - style_ = InsetQuotesParams::EnglishQuotes; - } - } - - // '.' wildcard means: keep current side - if (!allow_wildcards || str[1] != '.') { - for (i = 0; i < 2; ++i) { - if (str[1] == side_char[i]) { - side_ = InsetQuotesParams::QuoteSide(i); - break; - } - } - if (i >= 2) { - LYXERR0("ERROR (InsetQuotes::InsetQuotes):" - " bad side specification."); - side_ = InsetQuotesParams::LeftQuote; - } - } - - // '.' wildcard means: keep current level - if (!allow_wildcards || str[2] != '.') { - for (i = 0; i < 2; ++i) { - if (str[2] == level_char[i]) { - level_ = InsetQuotesParams::QuoteLevel(i); - break; - } - } - if (i >= 2) { - LYXERR0("ERROR (InsetQuotes::InsetQuotes):" - " bad level specification."); - level_ = InsetQuotesParams::DoubleQuotes; - } - } + 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") @@ -479,12 +693,28 @@ InsetQuotesParams::QuoteStyle InsetQuotes::getStyle(string const & s) qs = InsetQuotesParams::GermanQuotes; else if (s == "polish") qs = InsetQuotesParams::PolishQuotes; - else if (s == "french") - qs = InsetQuotesParams::FrenchQuotes; + 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; } @@ -494,18 +724,23 @@ docstring InsetQuotes::displayString() const { // In PassThru, we use straight quotes if (pass_thru_) - return (level_ == InsetQuotesParams::DoubleQuotes) ? + return (level_ == InsetQuotesParams::PrimaryQuotes) ? from_ascii("\"") : from_ascii("'"); - docstring retdisp = docstring(1, quoteparams.getQuoteChar(style_, level_, side_)); + InsetQuotesParams::QuoteStyle style = + (style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_; + + docstring retdisp = docstring(1, quoteparams.getQuoteChar(style, level_, side_, rtl_)); // in French, thin spaces are added inside double guillemets if (prefixIs(context_lang_, "fr") - && level_ == InsetQuotesParams::DoubleQuotes - && style_ == InsetQuotesParams::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_ == InsetQuotesParams::LeftQuote) + if (side_ == InsetQuotesParams::OpeningQuote) retdisp += thin_space; else retdisp = thin_space + retdisp; @@ -528,7 +763,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); } @@ -572,7 +810,7 @@ void InsetQuotes::doDispatch(Cursor & cur, FuncRequest & cmd) } cur.recordUndoInset(this); parseString(cmd.getArg(1), true); - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); break; } default: @@ -606,29 +844,42 @@ bool InsetQuotes::getStatus(Cursor & cur, FuncRequest const & cmd, void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const { - char_type quotechar = quoteparams.getQuoteChar(style_, level_, side_); + InsetQuotesParams::QuoteStyle style = + (style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_; + char_type quotechar = quoteparams.getQuoteChar(style, level_, side_, rtl_); docstring qstr; // In pass-thru context, we output plain quotes if (runparams.pass_thru) - qstr = (level_ == InsetQuotesParams::DoubleQuotes) ? from_ascii("\"") : from_ascii("'"); - else if (style_ == InsetQuotesParams::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_ == InsetQuotesParams::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, quotechar); } - else if (style_ == InsetQuotesParams::FrenchQuotes - && level_ == InsetQuotesParams::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_ == InsetQuotesParams::LeftQuote) + if (side_ == InsetQuotesParams::OpeningQuote) qstr = from_ascii("\\og"); else qstr = from_ascii("\\fg"); @@ -640,12 +891,14 @@ void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const } else if (runparams.local_font->language()->internalFontEncoding()) { // Quotation marks for internal font encodings // (ligatures not featured) - qstr = quoteparams.getLaTeXQuote(quotechar, "int"); + qstr = quoteparams.getLaTeXQuote(quotechar, "int", rtl_); #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) @@ -658,26 +911,32 @@ void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const 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(); @@ -687,14 +946,18 @@ int InsetQuotes::plaintext(odocstringstream & os, docstring InsetQuotes::getQuoteEntity() const { - docstring res = quoteparams.getHTMLQuote(quoteparams.getQuoteChar(style_, level_, side_)); + 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_ == InsetQuotesParams::DoubleQuotes - && style_ == InsetQuotesParams::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_ == InsetQuotesParams::LeftQuote) + if (side_ == InsetQuotesParams::OpeningQuote) res += thin_space; else res = thin_space + res; @@ -732,15 +995,22 @@ void InsetQuotes::forOutliner(docstring & os, size_t const, bool const) const void InsetQuotes::updateBuffer(ParIterator const & it, UpdateType /* utype*/) { BufferParams const & bp = buffer().masterBuffer()->params(); + Font const & font = it.paragraph().getFontSettings(bp, it.pos()); pass_thru_ = it.paragraph().isPassThru(); - context_lang_ = it.paragraph().getFontSettings(bp, it.pos()).language()->code(); - fontenc_ = (bp.fontenc == "global") ? lyxrc.fontenc : bp.fontenc; + context_lang_ = font.language()->code(); + internal_fontenc_ = font.language()->internalFontEncoding(); + fontenc_ = bp.main_font_encoding(); + global_style_ = bp.quotes_style; + fontspec_ = bp.useNonTeXFonts; + rtl_ = font.isRightToLeft(); } void InsetQuotes::validate(LaTeXFeatures & features) const { - char_type type = quoteparams.getQuoteChar(style_, level_, side_); + 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) @@ -777,19 +1047,28 @@ void InsetQuotes::validate(LaTeXFeatures & features) const // in most output formats switch (type) { case 0x0027: { - if (features.runparams().isFullUnicode()) + if (features.runparams().isFullUnicode() && fontspec_) features.require("textquotesinglep"); else features.require("textcomp"); break; } case 0x0022: { - if (features.runparams().isFullUnicode()) + if (features.runparams().isFullUnicode() && fontspec_) features.require("textquotedblp"); - else if (fontenc_ != "T1") + 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; }