X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.cpp;h=03b1bd5e2300ca2adab9d76334dbda7d85e990e6;hb=2a0e4c199c4f18d80ec5a2ab452f3cf18eafc56c;hp=2736c26977f78df08e9c7504803f5e13f674ce48;hpb=b3cc07e3a69bfcb2a99fc17ad033b1b05ccfd345;p=lyx.git

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 2736c26977..03b1bd5e23 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -393,6 +393,7 @@ BufferParams::BufferParams()
 	use_geometry = false;
 	biblio_style = "plain";
 	use_bibtopic = false;
+	multibib = string();
 	use_indices = false;
 	save_transient_properties = true;
 	track_changes = false;
@@ -414,6 +415,7 @@ BufferParams::BufferParams()
 	fonts_default_family = "default";
 	useNonTeXFonts = false;
 	use_microtype = false;
+	use_dash_ligatures = true;
 	fonts_expert_sc = false;
 	fonts_old_figures = false;
 	fonts_sans_scale[0] = 100;
@@ -522,6 +524,14 @@ map<string, string> const & BufferParams::auto_packages()
 }
 
 
+bool BufferParams::useBibtopic() const
+{
+	if (useBiblatex())
+		return false;
+	return (use_bibtopic || (!multibib.empty() && multibib != "child"));
+}
+
+
 AuthorList & BufferParams::authors()
 {
 	return pimpl_->authorlist;
@@ -803,6 +813,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
 		lex >> fonts_cjk;
 	} else if (token == "\\use_microtype") {
 		lex >> use_microtype;
+	} else if (token == "\\use_dash_ligatures") {
+		lex >> use_dash_ligatures;
 	} else if (token == "\\paragraph_separation") {
 		string parsep;
 		lex >> parsep;
@@ -858,6 +870,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
 		biblatex_citestyle = trim(lex.getString());
 	} else if (token == "\\use_bibtopic") {
 		lex >> use_bibtopic;
+	} else if (token == "\\multibib") {
+		lex >> multibib;
 	} else if (token == "\\use_indices") {
 		lex >> use_indices;
 	} else if (token == "\\tracking_changes") {
@@ -1185,6 +1199,7 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
 		os << "\\font_cjk " << fonts_cjk << '\n';
 	}
 	os << "\\use_microtype " << convert<string>(use_microtype) << '\n';
+	os << "\\use_dash_ligatures " << convert<string>(use_dash_ligatures) << '\n';
 	os << "\\graphics " << graphics_driver << '\n';
 	os << "\\default_output_format " << default_output_format << '\n';
 	os << "\\output_sync " << output_sync << '\n';
@@ -1233,6 +1248,8 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
 		os << "\n\\biblatex_bibstyle " << biblatex_bibstyle;
 	if (!biblatex_citestyle.empty())
 		os << "\n\\biblatex_citestyle " << biblatex_citestyle;
+	if (!multibib.empty())
+		os << "\n\\multibib " << multibib;
 
 	os << "\n\\use_bibtopic " << convert<string>(use_bibtopic)
 	   << "\n\\use_indices " << convert<string>(use_indices)
@@ -1633,7 +1650,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 
 	// if we use fontspec or newtxmath, we have to load the AMS packages here
 	string const ams = features.loadAMSPackages();
-	bool const ot1 = (font_encoding() == "default" || font_encoding() == "OT1");
+	bool const ot1 = (main_font_encoding() == "default" || main_font_encoding() == "OT1");
 	bool const use_newtxmath =
 		theLaTeXFonts().getLaTeXFont(from_ascii(fontsMath())).getUsedPackage(
 			ot1, false, false) == "newtxmath";
@@ -1660,7 +1677,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 	// set font encoding
 	// XeTeX and LuaTeX (with OS fonts) do not need fontenc
 	if (!useNonTeXFonts && !features.isProvided("fontenc")
-	    && font_encoding() != "default") {
+	    && main_font_encoding() != "default") {
 		// get main font encodings
 		vector<string> fontencs = font_encodings();
 		// get font encodings of secondary languages
@@ -1961,20 +1978,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 		IndicesList::const_iterator iit = indiceslist().begin();
 		IndicesList::const_iterator iend = indiceslist().end();
 		for (; iit != iend; ++iit) {
-			pair<docstring, docstring> indexname_latex =
-				features.runparams().encoding->latexString(iit->index(),
-									   features.runparams().dryrun);
-			if (!indexname_latex.second.empty()) {
-				// issue a warning about omitted characters
-				// FIXME: should be passed to the error dialog
-				frontend::Alert::warning(_("Uncodable characters"),
-					bformat(_("The following characters that are used in an index name are not\n"
-						  "representable in the current encoding and therefore have been omitted:\n%1$s."),
-						indexname_latex.second));
-			}
-			os << "\\newindex[";
-			os << indexname_latex.first;
-			os << "]{";
+			os << "\\newindex{";
 			os << escape(iit->shortcut());
 			os << "}\n";
 		}
@@ -2176,12 +2180,19 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 		os << "}\n";
 	}
 
-	// xunicode needs to be loaded at least after amsmath, amssymb,
+	// xunicode only needs to be loaded if tipa is used
+	// (the rest is obsoleted by the new TU encoding).
+	// It needs to be loaded at least after amsmath, amssymb,
 	// esint and the other packages that provide special glyphs
-	// The package only supports XeTeX currently.
-	if (features.runparams().flavor == OutputParams::XETEX
-	    && useNonTeXFonts)
+	if (features.mustProvide("tipa") && useNonTeXFonts) {
+		// The package officially only supports XeTeX, but also works
+		// with LuaTeX. Thus we work around its XeTeX test.
+		if (features.runparams().flavor != OutputParams::XETEX) {
+			os << "% Pretend to xunicode that we are XeTeX\n"
+			   << "\\def\\XeTeXpicfile{}\n";
+		}
 		os << "\\usepackage{xunicode}\n";
+	}
 
 	// Polyglossia must be loaded last ...
 	if (use_polyglossia) {
@@ -2226,6 +2237,10 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 				delim = ",";
 			}
 		}
+		if (!multibib.empty() && multibib != "child") {
+			opts += delim + "refsection=" + multibib;
+			delim = ",";
+		}
 		if (bibtexCommand() == "bibtex8"
 		    || prefixIs(bibtexCommand(), "bibtex8 ")) {
 			opts += delim + "backend=bibtex8";
@@ -2981,7 +2996,7 @@ string const BufferParams::dvips_options() const
 }
 
 
-string const BufferParams::font_encoding() const
+string const BufferParams::main_font_encoding() const
 {
 	return font_encodings().empty() ? "default" : font_encodings().back();
 }
@@ -3217,7 +3232,7 @@ string const BufferParams::loadFonts(LaTeXFeatures & features) const
 	}
 
 	// Tex Fonts
-	bool const ot1 = (font_encoding() == "default" || font_encoding() == "OT1");
+	bool const ot1 = (main_font_encoding() == "default" || main_font_encoding() == "OT1");
 	bool const dryrun = features.runparams().dryrun;
 	bool const complete = (fontsSans() == "default" && fontsTypewriter() == "default");
 	bool const nomath = (fontsMath() == "default");
@@ -3294,8 +3309,12 @@ bool BufferParams::addCiteEngine(vector<string> const & engine)
 
 string const & BufferParams::defaultBiblioStyle() const
 {
-	map<string, string> bs = documentClass().defaultBiblioStyle();
-	return bs[theCiteEnginesList.getTypeAsString(citeEngineType())];
+	map<string, string> const & bs = documentClass().defaultBiblioStyle();
+	auto cit = bs.find(theCiteEnginesList.getTypeAsString(citeEngineType()));
+	if (cit != bs.end())
+		return cit->second;
+	else
+		return empty_string();
 }