anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip polyglossia options from pdf string

Browse Source 
Fixes #11813

(cherry picked from commit f9999039ac)
This commit is contained in:
Juergen Spitzmueller 2020-04-05 15:23:22 +02:00
parent 3d0dd488c3
commit aede56fa20
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Buffer.cpp
View File

@ -1825,8 +1825,10 @@ void Buffer::writeLaTeXSource(otexstream & os,
LaTeXFeatures features(*this, params(), runparams);
validate(features);
// This is only set once per document (in master)
if (!runparams.is_child)
if (!runparams.is_child) {
runparams.use_polyglossia = features.usePolyglossia();
runparams.use_hyperref = features.isRequired("hyperref");
}
LYXERR(Debug::LATEX, " Buffer validation done.");
bool const output_preamble =
@ -4094,6 +4096,7 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
LaTeXFeatures features(*this, params(), runparams);
validate(features);
runparams.use_polyglossia = features.usePolyglossia();
runparams.use_hyperref = features.isRequired("hyperref");
// latex or literate
otexstream ots(os);
// output above

7
src/Font.cpp
View File

@ -288,8 +288,13 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
&& language() != prev.language()) {
if (!language()->polyglossia().empty()) {
string tmp = "\\text" + language()->polyglossia();
if (!language()->polyglossiaOpts().empty())
if (!language()->polyglossiaOpts().empty()) {
tmp += "[" + language()->polyglossiaOpts() + "]";
if (runparams.use_hyperref && runparams.moving_arg)
// We need to strip the command for
// the pdf string, see #11813
tmp = "\\texorpdfstring{" + tmp + "}{}";
}
tmp += "{";
os << from_ascii(tmp);
count += tmp.length();

2
src/OutputParams.cpp
View File

@ -22,7 +22,7 @@ OutputParams::OutputParams(Encoding const * enc)
: flavor(LATEX), math_flavor(NotApplicable), nice(false), is_child(false),
moving_arg(false), intitle(false), inbranch(false), inulemcmd(0),
local_font(0), master_language(0), encoding(enc), free_spacing(false),
use_babel(false), use_polyglossia(false),
use_babel(false), use_polyglossia(false), use_hyperref(false),
use_indices(false), use_japanese(false), linelen(0), depth(0),
exportdata(new ExportData), inDisplayMath(false), wasDisplayMath(false),
inComment(false), openbtUnit(false), only_childbibs(false),

4
src/OutputParams.h
View File

@ -161,6 +161,10 @@ public:
*/
bool use_polyglossia;
/** Do we use hyperref?
*/
bool use_hyperref;
/** Are we generating multiple indices?
*/
bool use_indices;

2
status.23x
View File

@ -61,6 +61,8 @@ What's new
- Fix loading of amsmath in beamer article classes (bug 11768).
- Prevent polyglossia options from being output to PDF TOC (bug 11813).
* USER INTERFACE