X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=e4d23afe0b17614abefc3cacf998cf8e2f6b135b;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=1af925829e9eb59f279a7c58dab23f7b347b9842;hpb=fa1856440c9b323c4f1b5a9034264357c7087bb4;p=lyx.git

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 1af925829e..e4d23afe0b 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -174,23 +174,22 @@ SidesTranslator const & sidestranslator()
 }
 
 
+// LaTeX packages
+typedef Translator<int, BufferParams::Package> PackageTranslator;
 
-// AMS
-typedef Translator<int, BufferParams::AMS> AMSTranslator;
 
-
-AMSTranslator const init_amstranslator()
+PackageTranslator const init_packagetranslator()
 {
-	AMSTranslator translator(0, BufferParams::AMS_OFF);
-	translator.addPair(1, BufferParams::AMS_AUTO);
-	translator.addPair(2, BufferParams::AMS_ON);
+	PackageTranslator translator(0, BufferParams::package_off);
+	translator.addPair(1, BufferParams::package_auto);
+	translator.addPair(2, BufferParams::package_on);
 	return translator;
 }
 
 
-AMSTranslator const & amstranslator()
+PackageTranslator const & packagetranslator()
 {
-	static AMSTranslator translator = init_amstranslator();
+	static PackageTranslator translator = init_packagetranslator();
 	return translator;
 }
 
@@ -297,7 +296,8 @@ BufferParams::BufferParams()
 	papersize = PAPER_DEFAULT;
 	orientation = ORIENTATION_PORTRAIT;
 	use_geometry = false;
-	use_amsmath = AMS_AUTO;
+	use_amsmath = package_auto;
+	use_esint = package_auto;
 	cite_engine = biblio::ENGINE_BASIC;
 	use_bibtopic = false;
 	trackChanges = false;
@@ -482,7 +482,11 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
 	} else if (token == "\\use_amsmath") {
 		int use_ams;
 		lex >> use_ams;
-		use_amsmath = amstranslator().find(use_ams);
+		use_amsmath = packagetranslator().find(use_ams);
+	} else if (token == "\\use_esint") {
+		int useesint;
+		lex >> useesint;
+		use_esint = packagetranslator().find(useesint);
 	} else if (token == "\\cite_engine") {
 		string engine;
 		lex >> engine;
@@ -495,7 +499,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
 		lex >> outputChanges;
 	} else if (token == "\\branch") {
 		lex.next();
-		string branch = lex.getString();
+		docstring branch = lex.getDocString();
 		branchlist().add(branch);
 		while (true) {
 			lex.next();
@@ -517,7 +521,8 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
 				// Update also the LColor table:
 				if (color == "none")
 					color = lcolor.getX11Name(LColor::background);
-				lcolor.setColor(branch, color);
+				// FIXME UNICODE
+				lcolor.setColor(to_utf8(branch), color);
 
 			}
 		}
@@ -631,6 +636,7 @@ void BufferParams::writeFile(ostream & os) const
 	os << "\\papersize " << string_papersize[papersize]
 	   << "\n\\use_geometry " << convert<string>(use_geometry)
 	   << "\n\\use_amsmath " << use_amsmath
+	   << "\n\\use_esint " << use_esint
 	   << "\n\\cite_engine " << citeenginetranslator().find(cite_engine)
 	   << "\n\\use_bibtopic " << convert<string>(use_bibtopic)
 	   << "\n\\paperorientation " << string_orientation[orientation]
@@ -639,7 +645,7 @@ void BufferParams::writeFile(ostream & os) const
 	BranchList::const_iterator it = branchlist().begin();
 	BranchList::const_iterator end = branchlist().end();
 	for (; it != end; ++it) {
-		os << "\\branch " << it->getBranch()
+		os << "\\branch " << to_utf8(it->getBranch())
 		   << "\n\\selected " << it->getSelected()
 		   << "\n\\color " << lyx::X11hexname(it->getColor())
 		   << "\n\\end_branch"
@@ -1011,13 +1017,13 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	// Now insert the LyX specific LaTeX commands...
 
 	// The optional packages;
-	string lyxpreamble(features.getPackages());
+	docstring lyxpreamble(from_ascii(features.getPackages()));
 
 	// this might be useful...
 	lyxpreamble += "\n\\makeatletter\n";
 
 	// Some macros LyX will need
-	string tmppreamble(features.getMacros());
+	docstring tmppreamble(from_ascii(features.getMacros()));
 
 	if (!tmppreamble.empty()) {
 		lyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
@@ -1035,9 +1041,10 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 
 	/* the user-defined preamble */
 	if (!preamble.empty()) {
+		// FIXME UNICODE
 		lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
 			"User specified LaTeX commands.\n"
-			+ preamble + '\n';
+			+ from_utf8(preamble) + '\n';
 	}
 
 	// Itemize bullet settings need to be last in case the user
@@ -1046,11 +1053,11 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	// Actually it has to be done much later than that
 	// since some packages like frenchb make modifications
 	// at \begin{document} time -- JMarc
-	string bullets_def;
+	docstring bullets_def;
 	for (int i = 0; i < 4; ++i) {
 		if (user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) {
 			if (bullets_def.empty())
-				bullets_def="\\AtBeginDocument{\n";
+				bullets_def += "\\AtBeginDocument{\n";
 			bullets_def += "  \\def\\labelitemi";
 			switch (i) {
 				// `i' is one less than the item to modify
@@ -1066,9 +1073,8 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 				bullets_def += 'v';
 				break;
 			}
-			// FIXME UNICODE
 			bullets_def += '{' +
-				lyx::to_ascii(user_defined_bullet(i).getText())
+				user_defined_bullet(i).getText()
 				+ "}\n";
 		}
 	}
@@ -1080,8 +1086,9 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	// with other packages.
 	// Jurabib has to be called after babel, though.
 	if (use_babel && !features.isRequired("jurabib")) {
-		lyxpreamble += babelCall(language_options.str()) + '\n';
-		lyxpreamble += features.getBabelOptions();
+		// FIXME UNICODE
+		lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
+		lyxpreamble += from_utf8(features.getBabelOptions());
 	}
 
 	lyxpreamble += "\\makeatother\n";
@@ -1102,8 +1109,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 		texrow.newline();
 	}
 
-	// FIXME UNICODE
-	os << from_utf8(lyxpreamble);
+	os << lyxpreamble;
 	return use_babel;
 }