Hi Vincent,
attached a 2 fixes for LyX 2.1 beta:
- the first one fixes a bug that lead to uncompilable documents when a file contains chemical
equations and integrals
http://www.lyx.org/trac/ticket/873
- the second one assures that tex2lyx does not create code for hyperref that is not given in the TeX
file
http://www.lyx.org/trac/ticket/8723
OK, to go in?
regards Uwe
diff --git "a/C:\\DOCUME~1\\usti\\LOCALS~1\\Temp\\TortoiseGit\\LaT26.tmp\\LaTeXFeatures-98936a3-left.cpp" "b/D:\\LyXGit\\Master\\src\\LaTeXFeatures.cpp"
index d23f8b0..bbc1e5e 100644
--- "a/C:\\DOCUME~1\\usti\\LOCALS~1\\Temp\\TortoiseGit\\LaT26.tmp\\LaTeXFeatures-98936a3-left.cpp"
+++ "b/D:\\LyXGit\\Master\\src\\LaTeXFeatures.cpp"
@@ -936,8 +936,13 @@ string const LaTeXFeatures::getPackages() const
if (mustProvide("setspace") && !isProvided("SetSpace"))
packages << "\\usepackage{setspace}\n";
- // esint must be after amsmath and wasysym, since it will redeclare
- // inconsistent integral symbols
+ if (mustProvide("mhchem") &&
+ params_.use_package("mhchem") != BufferParams::package_off)
+ packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
+ "\\usepackage{mhchem}\n";
+
+ // esint must be after amsmath (and packages requiring amsmath, like mhchem)
+ // and wasysym, since it will redeclare inconsistent integral symbols
if (mustProvide("esint") &&
params_.use_package("esint") != BufferParams::package_off)
packages << "\\usepackage{esint}\n";
@@ -999,11 +1004,6 @@ string const LaTeXFeatures::getPackages() const
packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
"\\usepackage{ulem}\n";
- if (mustProvide("mhchem") &&
- params_.use_package("mhchem") != BufferParams::package_off)
- packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
- "\\usepackage{mhchem}\n";
-
if (mustProvide("nomencl")) {
// Make it work with the new and old version of the package,
// but don't use the compatibility option since it is
diff --git "a/C:\\DOCUME~1\\usti\\LOCALS~1\\Temp\\TortoiseGit\\Pre1C.tmp\\Preamble-08b245b-left.cpp" "b/D:\\LyXGit\\Master\\src\\tex2lyx\\Preamble.cpp"
index 9759663..cfc433a 100644
--- "a/C:\\DOCUME~1\\usti\\LOCALS~1\\Temp\\TortoiseGit\\Pre1C.tmp\\Preamble-08b245b-left.cpp"
+++ "b/D:\\LyXGit\\Master\\src\\tex2lyx\\Preamble.cpp"
@@ -499,7 +499,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false),
//h_pdf_author;
//h_pdf_subject;
//h_pdf_keywords;
- h_pdf_bookmarks = "1";
+ h_pdf_bookmarks = "0";
h_pdf_bookmarksnumbered = "0";
h_pdf_bookmarksopen = "0";
h_pdf_bookmarksopenlevel = "1";
@@ -507,7 +507,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false),
h_pdf_pdfborder = "0";
h_pdf_colorlinks = "0";
h_pdf_backref = "section";
- h_pdf_pdfusetitle = "1";
+ h_pdf_pdfusetitle = "0";
//h_pdf_pagemode;
//h_pdf_quoted_options;
h_quotes_language = "english";
