anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-12 11:32:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BufferParams.cpp: fix bug #8613 also for branch

Browse Source
This commit is contained in:
Uwe Stöhr 2014-02-09 23:17:38 +01:00
parent 6a8269033b
commit 5726535d96
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BufferParams.cpp
View File

@ -1743,10 +1743,12 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
// http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144349.html
lyxpreamble += from_ascii(features.getColorOptions());
// If we use hyperref, jurabib, japanese, or vietnamese, we have to call babel before them.
// If we use hyperref, jurabib, japanese, varioref or vietnamese,
// we have to call babel before them.
if (use_babel
&& (features.isRequired("jurabib")
|| features.isRequired("hyperref")
|| features.isRequired("varioref")
|| features.isRequired("vietnamese")
|| features.isRequired("japanese"))) {
// FIXME UNICODE
@ -1894,9 +1896,10 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
+ atlyxpreamble + "\\makeatother\n\n";
// We try to load babel late, in case it interferes with other packages.
// Jurabib and Hyperref have to be called after babel, though.
// Jurabib, hyperref and varioref have to be called after babel, though.
if (use_babel && !features.isRequired("jurabib")
&& !features.isRequired("hyperref")
&& !features.isRequired("varioref")
&& !features.isRequired("vietnamese")
&& !features.isRequired("japanese")) {
// FIXME UNICODE

2
status.20x
View File

@ -70,6 +70,8 @@ What's new
- Fix drawing of table lines of multicolumns (bug 8082).
- Correct language for textual references in multi-language documents (bug 8613).
- Handle undo in `branch-add' function.
- Fix the missing dynamic menus in general and restore correctly from fullscreen.