char const * const side_char = "lr" ;
char const * const level_char = "sd";
-} // namespace anon
+} // namespace
/////////////////////////////////////////////////////////////////////
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;
switch (level) {
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;
}
-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;
}
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;
}
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;
InsetQuotes::InsetQuotes(Buffer * buf, string const & str)
: Inset(buf),
style_(InsetQuotesParams::EnglishQuotes), side_(InsetQuotesParams::OpeningQuote),
- pass_thru_(false)
+ pass_thru_(false), internal_fontenc_(false), rtl_(false)
{
if (buf) {
global_style_ = buf->masterBuffer()->params().quotes_style;
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)
+ : Inset(buf), level_(level), pass_thru_(false), fontspec_(false),
+ internal_fontenc_(false), rtl_(false)
{
bool dynamic = false;
if (buf) {
InsetQuotesParams::QuoteStyle style =
(style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_;
- docstring retdisp = docstring(1, quoteparams.getQuoteChar(style, level_, side_));
+ docstring retdisp = docstring(1, quoteparams.getQuoteChar(style, level_, side_, rtl_));
// in French, thin spaces are added inside double guillemets
if (prefixIs(context_lang_, "fr")
}
cur.recordUndoInset(this);
parseString(cmd.getArg(1), true);
- cur.buffer()->updateBuffer();
+ cur.forceBufferUpdate();
break;
}
default:
{
InsetQuotesParams::QuoteStyle style =
(style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_;
- char_type quotechar = quoteparams.getQuoteChar(style, level_, side_);
+ char_type quotechar = quoteparams.getQuoteChar(style, level_, side_, rtl_);
docstring qstr;
// In pass-thru context, we output plain quotes
} 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_ == "T2A")
+ || runparams.isFullUnicode()) {
// Standard quotation mark macros
// These are also used by babel
// without fontenc (XeTeX/LuaTeX)
+ // We use those for T2A (russian), since
+ // babel falls back for ugly OT1 versions for
+ // the guillemots.
qstr = quoteparams.getLaTeXQuote(quotechar, "ot1");
} else {
// Babel shorthand quotation marks (for T1/OT1)
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;
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();
+ 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();
}
case 0x0022: {
if (features.runparams().isFullUnicode() && fontspec_)
features.require("textquotedblp");
- else if (fontenc_ != "T1")
+ else if (fontenc_ != "T1" || internal_fontenc_)
features.require("textquotedbl");
break;
}