anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 10:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for recent luatex versions.

Browse Source
This commit is contained in:
Juergen Spitzmueller 2016-07-09 16:45:27 +02:00
parent e8b41bf1fd
commit 7d52d37662
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/LaTeXFeatures.cpp
View File

@ -229,6 +229,13 @@ static docstring const papersizepdf_def = from_ascii(
"\\pdfpageheight\\paperheight\n" "\\pdfpageheight\\paperheight\n"
"\\pdfpagewidth\\paperwidth\n"); "\\pdfpagewidth\\paperwidth\n");
static docstring const papersizepdflua_def = from_ascii(
"% Backwards compatibility for LuaTeX < 0.90\n"
"\\@ifundefined{pageheight}{\\let\\pageheight\\pdfpageheight}\n"
"\\@ifundefined{pagewidth}{\\let\\pagewidth\\pdfpagewidth}\n"
"\\pageheight\\paperheight\n"
"\\pagewidth\\paperwidth\n");
static docstring const cedilla_def = from_ascii( static docstring const cedilla_def = from_ascii(
"\\newcommand{\\docedilla}[2]{\\underaccent{#1\\mathchar'30}{#2}}\n" "\\newcommand{\\docedilla}[2]{\\underaccent{#1\\mathchar'30}{#2}}\n"
"\\newcommand{\\cedilla}[1]{\\mathpalette\\docedilla{#1}}\n"); "\\newcommand{\\cedilla}[1]{\\mathpalette\\docedilla{#1}}\n");
@ -1169,8 +1176,11 @@ docstring const LaTeXFeatures::getMacros() const
} }
if (mustProvide("papersize")) { if (mustProvide("papersize")) {
if (runparams_.flavor == OutputParams::LATEX) if (runparams_.flavor == OutputParams::LATEX
|| runparams_.flavor == OutputParams::DVILUATEX)
macros << papersizedvi_def << '\n'; macros << papersizedvi_def << '\n';
else if (runparams_.flavor == OutputParams::LUATEX)
macros << papersizepdflua_def << '\n';
else else
macros << papersizepdf_def << '\n'; macros << papersizepdf_def << '\n';
} }

2
status.22x
View File

@ -63,6 +63,8 @@ What's new
- Fix error with older versions of the covington package in the - Fix error with older versions of the covington package in the
Linguistics module (bug 10340). Linguistics module (bug 10340).
- Fix LaTeX error with recent LuaTeX versions when using landscape.
* LYX2LYX * LYX2LYX