X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=ae15380f54ddf1dbf4f4440a7674a78aa2a94b0a;hb=dacb5be6462e278d769686b7380984b584dd86ac;hp=158463fe90253f3d9007d8c041dd04aa8ffc0103;hpb=ab45a3ae914b295478724c1d80ca8ec84789e027;p=lyx.git

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 158463fe90..ae15380f54 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -50,15 +50,14 @@ BufferParams::BufferParams()
         use_amsmath = false;
 	secnumdepth = 3;
 	tocdepth = 3;
-	language = "default";
-	language_info = default_language;
+	language = default_language;
 	fonts = "default";
 	inputenc = "auto";
 	graphicsDriver = "default";
 	sides = LyXTextClass::OneSide;
 	columns = 1;
 	pagestyle = "default";
-	for(int iter = 0; iter < 4; ++iter) {
+	for (int iter = 0; iter < 4; ++iter) {
 		user_defined_bullets[iter] = temp_bullets[iter] 
 			                   = ITEMIZE_DEFAULTS[iter];
 	}
@@ -88,7 +87,7 @@ void BufferParams::writeFile(ostream & os) const
 	}
    
 	/* then the text parameters */
-	os << "\\language " << language
+	os << "\\language " << language->lang()
 	   << "\n\\inputencoding " << inputenc
 	   << "\n\\fontscheme " << fonts
 	   << "\n\\graphics " << graphicsDriver << '\n';
@@ -140,7 +139,7 @@ void BufferParams::writeFile(ostream & os) const
 	   << "\n\\defskip " << defskip.asLyXCommand()
 	   << "\n\\quotes_language "
 	   << string_quotes_language[quotes_language] << '\n';
-	switch(quotes_times) {
+	switch (quotes_times) {
 		// An output operator for insetquotes would be nice
 	case InsetQuotes::SingleQ:
 		os << "\\quotes_times 1\n"; break;
@@ -165,7 +164,7 @@ void BufferParams::writeFile(ostream & os) const
 			else {
 				os << "\\bulletLaTeX " << i
 				   << "\n\t"
-				   << user_defined_bullets[i].c_str()
+				   << user_defined_bullets[i].getText()
 				   << "\n\\end_bullet\n";
 			}
 		}
@@ -202,21 +201,14 @@ void BufferParams::readLanguage(LyXLex & lex)
 	string tmptok = lex.GetString();
 
 	// check if tmptok is part of tex_babel in tex-defs.h
-	Languages::iterator lit = languages.find(tmptok);
-	if (lit != languages.end()) {
-		// found it
-		language = tmptok;
-		language_info = &(*lit).second;
-	} else {
-		// not found
-		language = "default";
-		language_info = default_language;
-		if (tmptok != "default") {
-			lyxerr << "Warning: language `"
-			       << tmptok << "' not recognized!\n"
-			       << "         Setting language to `default'."
-			       << endl;
-		}
+	language = languages.getLanguage(tmptok);
+	if (!language) {
+		// Language tmptok was not found
+		language = default_language;
+		lyxerr << "Warning: language `"
+		       << tmptok << "' not recognized!\n"
+		       << "         Setting language to `" << language->lang()
+		       << "'." << endl;
 	}
 }