X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=c3418377fc189ffbd237d9eb4afdc28f1c09b962;hb=d5b3b6807a719bdc3510444b307a1d22a94c6876;hp=afa4c5b6bb95d1ed7c44cd6589b990056b41a719;hpb=b51e368b2b3e3ddd29b3dbcdb9b07a1d911188fb;p=lyx.git

diff --git a/src/bufferparams.C b/src/bufferparams.C
index afa4c5b6bb..c3418377fc 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -50,8 +50,7 @@ BufferParams::BufferParams()
         use_amsmath = false;
 	secnumdepth = 3;
 	tocdepth = 3;
-	language = "default";
-	language_info = default_language;
+	language = default_language;
 	fonts = "default";
 	inputenc = "auto";
 	graphicsDriver = "default";
@@ -62,7 +61,6 @@ BufferParams::BufferParams()
 		user_defined_bullets[iter] = temp_bullets[iter] 
 			                   = ITEMIZE_DEFAULTS[iter];
 	}
-	allowAccents = false;
 }
 
 
@@ -89,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';
@@ -166,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";
 			}
 		}
@@ -203,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;
 	}
 }