anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 15:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore geometry-related settings if the class provides geometry

Browse Source 
Fixes #11724

(cherry picked from commit dce9e44a14)
This commit is contained in:
Juergen Spitzmueller 2020-01-29 11:25:01 +01:00
parent 15949fc99a
commit b0a2868938
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/BufferParams.cpp
View File

@ -1803,7 +1803,8 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
os << "}\n";
}
if (use_geometry || nonstandard_papersize) {
if (!features.isProvided("geometry")
&& (use_geometry || nonstandard_papersize)) {
odocstringstream ods;
if (!getGraphicsDriver("geometry").empty())
ods << getGraphicsDriver("geometry");
@ -1915,20 +1916,17 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
break;
}
docstring g_options = trim(ods.str(), ",");
os << "\\usepackage";
// geometry-light means that the class works with geometry, but overwrites
// the package options and paper sizes (memoir does this).
// In this case, all options need to go to \geometry
// and the standard paper sizes need to go to the class options.
if (!features.isProvided("geometry")) {
os << "\\usepackage";
if (!g_options.empty() && !features.isProvided("geometry-light")) {
os << '[' << g_options << ']';
g_options.clear();
}
os << "{geometry}\n";
if (!g_options.empty() && !features.isProvided("geometry-light")) {
os << '[' << g_options << ']';
g_options.clear();
}
if (use_geometry || features.isProvided("geometry")
|| features.isProvided("geometry-light")) {
os << "{geometry}\n";
if (use_geometry || features.isProvided("geometry-light")) {
os << "\\geometry{verbose";
if (!g_options.empty())
// Output general options here with "geometry light".

4
status.23x
View File

@ -47,6 +47,8 @@ What's new
- Fix problems with recent LaTeX when \input@path contains tilde and space
(bug 11699).
- Fix output with class-provided geometry package (bug 11724).
- Fix erroneous space in output caused by changebar module (bug 11473).
- Correctly strike out deleted text after deleted display math (bug 11716).
@ -56,7 +58,7 @@ What's new
- Fix backspace deletion of selected items with change tracking (bug 11630).
- Fix display glith where the change tracking cue blinks with the cursor
- Fix display glitch where the change tracking cue blinks with the cursor
(bug 11684).
- Consider shorthand in biblatex cite display (bug 11696).