anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix quotation marks in RTL script

Browse Source 
Fixes: #11188
This commit is contained in:
Juergen Spitzmueller 2018-07-15 12:11:10 +02:00
parent 1e5acc5656
commit aa1d9638fe
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/insets/InsetQuotes.cpp
View File

@ -199,7 +199,7 @@ InsetQuotesParams::QuoteLevel InsetQuotesParams::getQuoteLevel(string const & s,
char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel const & level, 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 // main opening quotation mark
char_type left_primary; char_type left_primary;
@ -321,8 +321,12 @@ char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel c
switch (level) { switch (level) {
case SecondaryQuotes: case SecondaryQuotes:
if (rtl)
return (side == ClosingQuote) ? left_secondary : right_secondary;
return (side == OpeningQuote) ? left_secondary : right_secondary; return (side == OpeningQuote) ? left_secondary : right_secondary;
case PrimaryQuotes: case PrimaryQuotes:
if (rtl)
return (side == ClosingQuote) ? left_primary : right_primary;
return (side == OpeningQuote) ? left_primary : right_primary; return (side == OpeningQuote) ? left_primary : right_primary;
default: default:
break; break;
@ -333,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; string res;
@ -347,14 +352,16 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op) const
} }
case 0x2019: {// ' case 0x2019: {// '
if (op == "int") if (op == "int")
res = "\\textquoteleft"; // This macro is redefined in rtl mode
res = rtl ? "\\textquoteright" : "\\textquoteleft";
else else
res = "'"; res = "'";
break; break;
} }
case 0x2018: {// ` case 0x2018: {// `
if (op == "int") if (op == "int")
res = "\\textquoteright"; // This macro is redefined in rtl mode
res = rtl ? "\\textquoteleft" : "\\textquoteright";
else else
res = "`"; res = "`";
break; break;
@ -388,14 +395,16 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op) const
} }
case 0x201d: {// '' case 0x201d: {// ''
if (op == "int") if (op == "int")
res = "\\textquotedblleft"; // This macro is redefined in rtl mode
res = rtl ? "\\textquotedblright" : "\\textquotedblleft";
else else
res = "''"; res = "''";
break; break;
} }
case 0x201c: {// `` case 0x201c: {// ``
if (op == "int") if (op == "int")
res = "\\textquotedblright"; // This macro is redefined in rtl mode
res = rtl ? "\\textquotedblleft" : "\\textquotedblright";
else else
res = "``"; res = "``";
break; break;
@ -603,7 +612,7 @@ docstring const InsetQuotesParams::getShortGuiLabel(docstring const string)
InsetQuotes::InsetQuotes(Buffer * buf, string const & str) InsetQuotes::InsetQuotes(Buffer * buf, string const & str)
: Inset(buf), : Inset(buf),
style_(InsetQuotesParams::EnglishQuotes), side_(InsetQuotesParams::OpeningQuote), style_(InsetQuotesParams::EnglishQuotes), side_(InsetQuotesParams::OpeningQuote),
pass_thru_(false), internal_fontenc_(false) pass_thru_(false), internal_fontenc_(false), rtl_(false)
{ {
if (buf) { if (buf) {
global_style_ = buf->masterBuffer()->params().quotes_style; global_style_ = buf->masterBuffer()->params().quotes_style;
@ -620,7 +629,8 @@ InsetQuotes::InsetQuotes(Buffer * buf, string const & str)
InsetQuotes::InsetQuotes(Buffer * buf, char_type c, InsetQuotesParams::QuoteLevel level, InsetQuotes::InsetQuotes(Buffer * buf, char_type c, InsetQuotesParams::QuoteLevel level,
string const & side, string const & style) string const & side, string const & style)
: Inset(buf), level_(level), pass_thru_(false), fontspec_(false), internal_fontenc_(false) : Inset(buf), level_(level), pass_thru_(false), fontspec_(false),
internal_fontenc_(false), rtl_(false)
{ {
bool dynamic = false; bool dynamic = false;
if (buf) { if (buf) {
@ -720,7 +730,7 @@ docstring InsetQuotes::displayString() const
InsetQuotesParams::QuoteStyle style = InsetQuotesParams::QuoteStyle style =
(style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : 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 // in French, thin spaces are added inside double guillemets
if (prefixIs(context_lang_, "fr") if (prefixIs(context_lang_, "fr")
@ -836,7 +846,7 @@ void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const
{ {
InsetQuotesParams::QuoteStyle style = InsetQuotesParams::QuoteStyle style =
(style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : 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; docstring qstr;
// In pass-thru context, we output plain quotes // In pass-thru context, we output plain quotes
@ -881,7 +891,7 @@ void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const
} else if (runparams.local_font->language()->internalFontEncoding()) { } else if (runparams.local_font->language()->internalFontEncoding()) {
// Quotation marks for internal font encodings // Quotation marks for internal font encodings
// (ligatures not featured) // (ligatures not featured)
qstr = quoteparams.getLaTeXQuote(quotechar, "int"); qstr = quoteparams.getLaTeXQuote(quotechar, "int", rtl_);
#ifdef DO_USE_DEFAULT_LANGUAGE #ifdef DO_USE_DEFAULT_LANGUAGE
} else if ((doclang == "default" } else if ((doclang == "default"
#else #else
@ -985,12 +995,14 @@ void InsetQuotes::forOutliner(docstring & os, size_t const, bool const) const
void InsetQuotes::updateBuffer(ParIterator const & it, UpdateType /* utype*/) void InsetQuotes::updateBuffer(ParIterator const & it, UpdateType /* utype*/)
{ {
BufferParams const & bp = buffer().masterBuffer()->params(); BufferParams const & bp = buffer().masterBuffer()->params();
Font const & font = it.paragraph().getFontSettings(bp, it.pos());
pass_thru_ = it.paragraph().isPassThru(); pass_thru_ = it.paragraph().isPassThru();
context_lang_ = it.paragraph().getFontSettings(bp, it.pos()).language()->code(); context_lang_ = font.language()->code();
internal_fontenc_ = it.paragraph().getFontSettings(bp, it.pos()).language()->internalFontEncoding(); internal_fontenc_ = font.language()->internalFontEncoding();
fontenc_ = bp.main_font_encoding(); fontenc_ = bp.main_font_encoding();
global_style_ = bp.quotes_style; global_style_ = bp.quotes_style;
fontspec_ = bp.useNonTeXFonts; fontspec_ = bp.useNonTeXFonts;
rtl_ = font.isRightToLeft();
} }

7
src/insets/InsetQuotes.h
View File

@ -74,11 +74,12 @@ public:
}; };
/// Returns the unicode character of a given quote /// Returns the unicode character of a given quote
char_type getQuoteChar(QuoteStyle const &, QuoteLevel const &, char_type getQuoteChar(QuoteStyle const &, QuoteLevel const &,
QuoteSide const &) const; QuoteSide const &, bool const rtl = false) const;
/// Returns a map of quotation marks /// Returns a map of quotation marks
std::map<std::string, docstring> getTypes() const; std::map<std::string, docstring> getTypes() const;
/// ///
docstring getLaTeXQuote(char_type c, std::string const &) const; docstring getLaTeXQuote(char_type c, std::string const &,
bool const rtl = false) const;
/// ///
docstring getHTMLQuote(char_type c) const; docstring getHTMLQuote(char_type c) const;
/// Returns a descriptive label of a style suitable for dialog and menu /// Returns a descriptive label of a style suitable for dialog and menu
@ -201,6 +202,8 @@ private:
bool fontspec_; bool fontspec_;
/// Do we have an internal font encoding? /// Do we have an internal font encoding?
bool internal_fontenc_; bool internal_fontenc_;
/// Are we writing RTL?
bool rtl_;
/// ///
friend class InsetQuotesParams; friend class InsetQuotesParams;