X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=be159dc2a31e652896f7ae1c7c017c8f5eb533ad;hb=b9963e1a57135c3e2ab128a9ec4300f0e4886992;hp=a5bd2f88e68ef2625310c8787db96c78f38173d1;hpb=a56bd0b8b11cd02570d5780b24d255b2c9f34f4c;p=lyx.git

diff --git a/src/bufferparams.C b/src/bufferparams.C
index a5bd2f88e6..be159dc2a3 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -105,25 +105,6 @@ QuotesLangTranslator const & quoteslangtranslator()
 }
 
 
-// Quote times
-typedef Translator<int, InsetQuotes::quote_times> QuotesTimesTranslator;
-
-
-QuotesTimesTranslator const init_quotestimestranslator()
-{
-	QuotesTimesTranslator translator(1, InsetQuotes::SingleQ);
-	translator.addPair(2, InsetQuotes::DoubleQ);
-	return translator;
-}
-
-
-QuotesTimesTranslator const & quotestimestranslator()
-{
-	static QuotesTimesTranslator translator = init_quotestimestranslator();
-	return translator;
-}
-
-
 // Paper size
 typedef Translator<std::string, PAPER_SIZE> PaperSizeTranslator;
 
@@ -152,27 +133,6 @@ PaperSizeTranslator const & papersizetranslator()
 }
 
 
-// Paper packages
-typedef Translator<string, PAPER_PACKAGES> PaperPackagesTranslator;
-
-
-PaperPackagesTranslator const init_paperpackagestranslator()
-{
-	PaperPackagesTranslator translator(string_paperpackages[0], PACKAGE_NONE);
-	translator.addPair(string_paperpackages[1], PACKAGE_A4);
-	translator.addPair(string_paperpackages[2], PACKAGE_A4WIDE);
-	translator.addPair(string_paperpackages[3], PACKAGE_WIDEMARGINSA4);
-	return translator;
-}
-
-
-PaperPackagesTranslator const & paperpackagestranslator()
-{
-	static PaperPackagesTranslator translator = init_paperpackagestranslator();
-	return translator;
-}
-
-
 // Paper orientation
 typedef Translator<string, PAPER_ORIENTATION> PaperOrientationTranslator;
 
@@ -328,12 +288,10 @@ BufferParams::BufferParams()
 {
 	paragraph_separation = PARSEP_INDENT;
 	quotes_language = InsetQuotes::EnglishQ;
-	quotes_times = InsetQuotes::DoubleQ;
 	fontsize = "default";
 
 	/*  PaperLayout */
 	papersize = PAPER_DEFAULT;
-	paperpackage = PACKAGE_NONE;
 	orientation = ORIENTATION_PORTRAIT;
 	use_geometry = false;
 	use_amsmath = AMS_AUTO;
@@ -482,18 +440,10 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
 		string quotes_lang;
 		lex >> quotes_lang;
 		quotes_language = quoteslangtranslator().find(quotes_lang);
-	} else if (token == "\\quotes_times") {
-		int qtimes;
-		lex >> qtimes;
-		quotes_times = quotestimestranslator().find(qtimes);
 	} else if (token == "\\papersize") {
 		string ppsize;
 		lex >> ppsize;
 		papersize = papersizetranslator().find(ppsize);
-	} else if (token == "\\paperpackage") {
-		string ppackage;
-		lex >> ppackage;
-		paperpackage = paperpackagestranslator().find(ppackage);
 	} else if (token == "\\use_geometry") {
 		lex >> use_geometry;
 	} else if (token == "\\use_amsmath") {
@@ -639,7 +589,6 @@ void BufferParams::writeFile(ostream & os) const
 	spacing().writeFile(os);
 
 	os << "\\papersize " << string_papersize[papersize]
-	   << "\n\\paperpackage " << string_paperpackages[paperpackage]
 	   << "\n\\use_geometry " << convert<string>(use_geometry)
 	   << "\n\\use_amsmath " << use_amsmath
 	   << "\n\\cite_engine " << citeenginetranslator().find(cite_engine)
@@ -647,8 +596,8 @@ void BufferParams::writeFile(ostream & os) const
 	   << "\n\\paperorientation " << string_orientation[orientation]
 	   << '\n';
 
-	std::list<Branch>::const_iterator it = branchlist().begin();
-	std::list<Branch>::const_iterator end = branchlist().end();
+	BranchList::const_iterator it = branchlist().begin();
+	BranchList::const_iterator end = branchlist().end();
 	for (; it != end; ++it) {
 		os << "\\branch " << it->getBranch()
 		   << "\n\\selected " << it->getSelected()
@@ -690,9 +639,7 @@ void BufferParams::writeFile(ostream & os) const
 	   << string_paragraph_separation[paragraph_separation]
 	   << "\n\\defskip " << getDefSkip().asLyXCommand()
 	   << "\n\\quotes_language "
-	   << string_quotes_language[quotes_language] << '\n'
-	   << "\\quotes_times "
-	   << quotestimestranslator().find(quotes_times)
+	   << string_quotes_language[quotes_language]
 	   << "\n\\papercolumns " << columns
 	   << "\n\\papersides " << sides
 	   << "\n\\paperpagestyle " << pagestyle << '\n';
@@ -746,7 +693,7 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features,
 				     (papersize == PAPER_A3) ||
 				     (papersize == PAPER_CUSTOM);
 
-	if (!use_geometry && (paperpackage == PACKAGE_NONE)) {
+	if (!use_geometry) {
 		switch (papersize) {
 		case PAPER_A4:
 			clsoptions << "a4paper,";
@@ -867,26 +814,6 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features,
 		texrow.newline();
 	}
 
-	// At the very beginning the text parameters.
-	if (paperpackage != PACKAGE_NONE) {
-		switch (paperpackage) {
-		case PACKAGE_NONE:
-			break;
-		case PACKAGE_A4:
-			os << "\\usepackage{a4}\n";
-			texrow.newline();
-			break;
-		case PACKAGE_A4WIDE:
-			os << "\\usepackage{a4wide}\n";
-			texrow.newline();
-			break;
-		case PACKAGE_WIDEMARGINSA4:
-			os << "\\usepackage[widemargins]{a4}\n";
-			texrow.newline();
-			break;
-		}
-	}
-
 	if (use_geometry || nonstandard_papersize) {
 		os << "\\usepackage{geometry}\n";
 		texrow.newline();