anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use proper listings font styles with polyglossia and RTL

Browse Source 
Fixes: #11554

Also load color with minted and polyglossia/RTL, as minted loads it
too late.

(cherry picked from commit 3e516a6219)
This commit is contained in:
Juergen Spitzmueller 2019-04-19 17:18:18 +02:00
parent ac1ee5947f
commit ccf93fc0d6
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/LaTeXFeatures.h
View File

@ -177,13 +177,13 @@ public:
void setHTMLTitle(docstring const & t) { htmltitle_ = t; }
///
docstring const & htmlTitle() const { return htmltitle_; }
///
bool hasRTLLanguage() const;
private:
///
void useLayout(docstring const &, int);
///
bool hasRTLLanguage() const;
///
std::list<docstring> usedLayouts_;
///
std::list<docstring> usedInsetLayouts_;

24
src/insets/InsetListings.cpp
View File

@ -147,6 +147,22 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
// of the listings package (see page 25 of the manual)
bool const isInline = params().isInline();
bool const use_minted = buffer().params().use_minted;
static regex const reg1("(.*)(basicstyle=\\{)([^\\}]*)(\\\\ttfamily)([^\\}]*)(\\})(.*)");
static regex const reg2("(.*)(basicstyle=\\{)([^\\}]*)(\\\\rmfamily)([^\\}]*)(\\})(.*)");
static regex const reg3("(.*)(basicstyle=\\{)([^\\}]*)(\\\\sffamily)([^\\}]*)(\\})(.*)");
if (runparams.use_polyglossia && runparams.local_font->isRightToLeft()) {
// We need to use the *latin switches (#11554)
smatch sub;
if (regex_match(param_string, sub, reg1))
param_string = sub.str(1) + sub.str(2) + sub.str(3) + sub.str(4)
+ "latin" + sub.str(5) + sub.str(6) + sub.str(7);
if (regex_match(param_string, sub, reg2))
param_string = sub.str(1) + sub.str(2) + sub.str(3) + sub.str(4)
+ "latin" + sub.str(5) + sub.str(6) + sub.str(7);
if (regex_match(param_string, sub, reg3))
param_string = sub.str(1) + sub.str(2) + sub.str(3) + sub.str(4)
+ "latin" + sub.str(5) + sub.str(6) + sub.str(7);
}
string minted_language;
string float_placement;
bool const isfloat = params().isFloat();
@ -159,11 +175,11 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
if (prefixIs(opts[i], "float")) {
if (prefixIs(opts[i], "float="))
float_placement = opts[i].substr(6);
opts.erase(opts.begin() + i--);
opts.erase(opts.begin() + int(i--));
}
else if (prefixIs(opts[i], "language=")) {
minted_language = opts[i].substr(9);
opts.erase(opts.begin() + i--);
opts.erase(opts.begin() + int(i--));
}
}
param_string = getStringFromVector(opts, ",");
@ -489,6 +505,10 @@ void InsetListings::validate(LaTeXFeatures & features) const
OutputParams rp = features.runparams();
if (!params().isFloat() && !getCaption(rp).str.empty())
features.require("lyxmintcaption");
if (features.usePolyglossia() && features.hasRTLLanguage())
// minted loads color, but color must be loaded before bidi
// (i.e., polyglossia)
features.require("color");
} else {
features.require("listings");
if (contains(param_string, "\\color"))

2
status.23x
View File

@ -100,6 +100,8 @@ What's new
- Fix text direction of namerefs in RTL scripts when using polyglossia (bidi)
(bug 11518).
- Use proper listings font styles with polyglossia (bidi) and RTL (bug 11554).
- Fix LaTeX export of query strings in Hyperlinks (bugs 11482, 11511).
- Fix breakage caused by commas in the caption of listings (bug 11484).