X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.cpp;h=bf24b5937cb7c177fd25564897ea164963f2d1a4;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=f369c8d6d9cbdf03d67c3cf520ec2c45edc3a5ce;hpb=db0c752fc2101762dcc4c92d89e44cf3d0bd929f;p=lyx.git

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index f369c8d6d9..bf24b5937c 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -336,6 +336,7 @@ BufferParams::BufferParams()
 	use_geometry = false;
 	use_amsmath = package_auto;
 	use_esint = package_auto;
+	use_mhchem = package_auto;
 	cite_engine_ = ENGINE_BASIC;
 	use_bibtopic = false;
 	use_indices = false;
@@ -345,6 +346,7 @@ BufferParams::BufferParams()
 	secnumdepth = 3;
 	tocdepth = 3;
 	language = default_language;
+	fontenc = "global";
 	fontsRoman = "default";
 	fontsSans = "default";
 	fontsTypewriter = "default";
@@ -373,6 +375,8 @@ BufferParams::BufferParams()
 	}
 	// default index
 	indiceslist().addDefault(B_("Index"));
+	html_be_strict = true;
+	html_use_mathml = true;
 }
 
 
@@ -532,6 +536,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
 		readModules(lex);
 	} else if (token == "\\begin_removed_modules") {
 		readRemovedModules(lex);
+	} else if (token == "\\begin_includeonly") {
+		readIncludeonly(lex);
 	} else if (token == "\\options") {
 		lex.eatLine();
 		options = lex.getString();
@@ -556,6 +562,9 @@ string BufferParams::readToken(Lexer & lex, string const & token,
 	} else if (token == "\\index_command") {
 		lex.eatLine();
 		index_command = lex.getString();
+	} else if (token == "\\fontencoding") {
+		lex.eatLine();
+		fontenc = lex.getString();
 	} else if (token == "\\font_roman") {
 		lex.eatLine();
 		fontsRoman = lex.getString();
@@ -612,6 +621,10 @@ string BufferParams::readToken(Lexer & lex, string const & token,
 		int useesint;
 		lex >> useesint;
 		use_esint = packagetranslator().find(useesint);
+	} else if (token == "\\use_mhchem") {
+		int usemhchem;
+		lex >> usemhchem;
+		use_mhchem = packagetranslator().find(usemhchem);
 	} else if (token == "\\cite_engine") {
 		string engine;
 		lex >> engine;
@@ -759,6 +772,10 @@ string BufferParams::readToken(Lexer & lex, string const & token,
 				toktmp << endl;
 			return toktmp;
 		}
+	} else if (token == "\\html_use_mathml") {
+		lex >> html_use_mathml;
+	} else if (token == "\\html_be_strict") {
+		lex >> html_be_strict;
 	} else {
 		lyxerr << "BufferParams::readToken(): Unknown token: " << 
 			token << endl;
@@ -819,7 +836,17 @@ void BufferParams::writeFile(ostream & os) const
 			os << *it << '\n';
 		os << "\\end_modules" << '\n';
 	}
-	
+
+	// includeonly
+	if (!includedChildren_.empty()) {
+		os << "\\begin_includeonly" << '\n';
+		list<string>::const_iterator it = includedChildren_.begin();
+		list<string>::const_iterator en = includedChildren_.end();
+		for (; it != en; it++)
+			os << *it << '\n';
+		os << "\\end_includeonly" << '\n';
+	}
+
 	// local layout information
 	if (!local_layout.empty()) {
 		// remove '\n' from the end 
@@ -833,6 +860,7 @@ void BufferParams::writeFile(ostream & os) const
 	if (language != ignore_language)
 		os << "\\language " << language->lang() << '\n';
 	os << "\\inputencoding " << inputenc
+	   << "\n\\fontencoding " << fontenc
 	   << "\n\\font_roman " << fontsRoman
 	   << "\n\\font_sans " << fontsSans
 	   << "\n\\font_typewriter " << fontsTypewriter
@@ -863,6 +891,7 @@ void BufferParams::writeFile(ostream & os) const
 	   << "\n\\use_geometry " << convert<string>(use_geometry)
 	   << "\n\\use_amsmath " << use_amsmath
 	   << "\n\\use_esint " << use_esint
+	   << "\n\\use_mhchem " << use_mhchem
 	   << "\n\\cite_engine " << citeenginetranslator().find(cite_engine_)
 	   << "\n\\use_bibtopic " << convert<string>(use_bibtopic)
 	   << "\n\\use_indices " << convert<string>(use_indices)
@@ -956,8 +985,10 @@ void BufferParams::writeFile(ostream & os) const
 		}
 	}
 
-	os << "\\tracking_changes " << convert<string>(trackChanges) << "\n";
-	os << "\\output_changes " << convert<string>(outputChanges) << "\n";
+	os << "\\tracking_changes " << convert<string>(trackChanges) << "\n"
+	   << "\\output_changes " << convert<string>(outputChanges) << "\n"
+	   << "\\html_use_mathml " << convert<string>(html_use_mathml) << "\n"
+	   << "\\html_be_strict " << convert<string>(html_be_strict) << "\n";
 
 	os << pimpl_->authorlist;
 }
@@ -1012,6 +1043,8 @@ void BufferParams::validate(LaTeXFeatures & features) const
 		features.require("amsmath");
 	if (use_esint == package_on)
 		features.require("esint");
+	if (use_mhchem == package_on)
+		features.require("mhchem");
 
 	// Document-level line spacing
 	if (spacing().getSpace() != Spacing::Single && !spacing().isDefault())
@@ -1043,7 +1076,7 @@ void BufferParams::validate(LaTeXFeatures & features) const
 		features.require("hyperref");
 		// due to interferences with babel and hyperref, the color package has to
 		// be loaded after hyperref when hyperref is used with the colorlinks
-		// option, see http://bugzilla.lyx.org/show_bug.cgi?id=5291
+		// option, see http://www.lyx.org/trac/ticket/5291
 		if (pdfoptions().colorlinks)
 			features.require("color");
 	}
@@ -1059,7 +1092,7 @@ void BufferParams::validate(LaTeXFeatures & features) const
 
 
 bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
-			      TexRow & texrow) const
+			      TexRow & texrow, FileName const & filepath) const
 {
 	os << "\\documentclass";
 
@@ -1160,7 +1193,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 		size_t mongo = language_options.str().find("mongolian");
 		// if Japanese is used, babel must directly be loaded
 		// with language options, not in the class options, see
-		// http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+		// http://www.lyx.org/trac/ticket/4597#c4
 		size_t japan = language_options.str().find("japanese");
 		if (lyxrc.language_global_options && !language_options.str().empty()
 			&& viet == string::npos && japan == string::npos
@@ -1208,19 +1241,18 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 		   << from_ascii(fontsDefaultFamily) << "}\n";
 
 	// set font encoding
-	// this one is not per buffer
 	// for arabic_arabi and farsi we also need to load the LAE and
 	// LFE encoding
 	// XeTeX works without fontenc
-	if (lyxrc.fontenc != "default" && language->lang() != "japanese"
+	if (font_encoding() != "default" && language->lang() != "japanese"
 	    && !useXetex) {
 		if (language->lang() == "arabic_arabi"
 		    || language->lang() == "farsi") {
-			os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
+			os << "\\usepackage[" << from_ascii(font_encoding())
 			   << ",LFE,LAE]{fontenc}\n";
 			texrow.newline();
 		} else {
-			os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
+			os << "\\usepackage[" << from_ascii(font_encoding())
 			   << "]{fontenc}\n";
 			texrow.newline();
 		}
@@ -1229,6 +1261,31 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	// handle inputenc etc.
 	writeEncodingPreamble(os, features, texrow);
 
+	// includeonly
+	if (!includedChildren_.empty()) {
+		os << "\\includeonly{";
+		list<string>::const_iterator it = includedChildren_.begin();
+		bool first = true;
+		for (; it != includedChildren_.end() ; ++it) {
+			string incfile = *it;
+			FileName inc = makeAbsPath(incfile, filepath.absFilename());
+			string mangled = DocFileName(changeExtension(inc.absFilename(), ".tex")).
+			mangledFilename();
+			if (!features.runparams().nice)
+				incfile = mangled;
+			// \includeonly doesn't want an extension 
+			incfile = changeExtension(incfile, string());
+			incfile = latex_path(incfile);
+			if (!incfile.empty()) {
+				if (!first)
+					os << ",";
+				os << from_utf8(incfile);
+			}
+			first = false;
+		}
+		os << "}\n";
+	}
+
 	if (!listings_params.empty() || features.isRequired("listings")) {
 		os << "\\usepackage{listings}\n";
 		texrow.newline();
@@ -1429,7 +1486,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	// due to interferences with babel and hyperref, the color package has to
 	// be loaded (when it is not already loaded) before babel when hyperref
 	// is used with the colorlinks option, see
-	// http://bugzilla.lyx.org/show_bug.cgi?id=5291
+	// http://www.lyx.org/trac/ticket/5291
 	// we decided therefore to load color always before babel, see
 	// http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144349.html
 	lyxpreamble += from_ascii(features.getColorOptions());
@@ -1883,6 +1940,23 @@ void BufferParams::readRemovedModules(Lexer & lex)
 }
 
 
+void BufferParams::readIncludeonly(Lexer & lex)
+{
+	if (!lex.eatLine()) {
+		lyxerr << "Error (BufferParams::readIncludeonly):"
+				"Unexpected end of input." << endl;
+		return;
+	}
+	while (true) {
+		string child = lex.getString();
+		if (child == "\\end_includeonly")
+			break;
+		includedChildren_.push_back(child);
+		lex.eatLine();
+	}
+}
+
+
 string BufferParams::paperSizeName(PapersizePurpose purpose) const
 {
 	char real_papersize = papersize;
@@ -1975,6 +2049,12 @@ string const BufferParams::dvips_options() const
 }
 
 
+string const BufferParams::font_encoding() const
+{
+	return (fontenc == "global") ? lyxrc.fontenc : fontenc;
+}
+
+
 string BufferParams::babelCall(string const & lang_opts) const
 {
 	string lang_pack = lyxrc.language_package;
@@ -1998,7 +2078,7 @@ string BufferParams::babelCall(string const & lang_opts) const
 	size_t mongo = lang_opts.find("mongolian");
 	// If Japanese is used, babel must directly be loaded with the
 	// language options, see
-	// http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+	// http://www.lyx.org/trac/ticket/4597#c4
 	size_t japan = lang_opts.find("japanese");
 	if (!lyxrc.language_global_options || viet != string::npos
 		|| japan != string::npos || latvian != string::npos
@@ -2190,7 +2270,7 @@ string const BufferParams::loadFonts(string const & rm,
 	// AE
 	else if (rm == "ae") {
 		// not needed when using OT1 font encoding.
-		if (lyxrc.fontenc != "default")
+		if (font_encoding() != "default")
 			os << "\\usepackage{ae,aecompl}\n";
 	}
 	// Times
@@ -2229,7 +2309,7 @@ string const BufferParams::loadFonts(string const & rm,
 		// fourier supersedes utopia.sty, but does
 		// not work with OT1 encoding.
 		if (LaTeXFeatures::isAvailable("fourier")
-		    && lyxrc.fontenc != "default") {
+		    && font_encoding() != "default") {
 			os << "\\usepackage";
 			if (osf || sc) {
 				os << '[';