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

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 27a1d23784..c3418377fc 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  * 	 
  *	     Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -22,6 +22,11 @@
 #include "debug.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
+#include "lyxrc.h"
+#include "language.h"
+
+using std::ostream;
+using std::endl;
 
 BufferParams::BufferParams()
 {
@@ -45,9 +50,9 @@ BufferParams::BufferParams()
         use_amsmath = false;
 	secnumdepth = 3;
 	tocdepth = 3;
-	language = "default";
+	language = default_language;
 	fonts = "default";
-	inputenc = "latin1";
+	inputenc = "auto";
 	graphicsDriver = "default";
 	sides = LyXTextClass::OneSide;
 	columns = 1;
@@ -56,11 +61,10 @@ BufferParams::BufferParams()
 		user_defined_bullets[iter] = temp_bullets[iter] 
 			                   = ITEMIZE_DEFAULTS[iter];
 	}
-	allowAccents = false;
 }
 
 
-void BufferParams::writeFile(ostream & os)
+void BufferParams::writeFile(ostream & os) const
 {
 	// The top of the file is written by the buffer.
 	// Prints out the buffer info into the .lyx file given by file
@@ -71,9 +75,9 @@ void BufferParams::writeFile(ostream & os)
 	// then the the preamble
 	if (!preamble.empty()) {
 		// remove '\n' from the end of preamble
-		preamble = strip(preamble, '\n');
+		string tmppreamble = strip(preamble, '\n');
 		os << "\\begin_preamble\n"
-		   << preamble
+		   << tmppreamble
 		   << "\n\\end_preamble\n";
 	}
       
@@ -83,7 +87,7 @@ void BufferParams::writeFile(ostream & os)
 	}
    
 	/* then the text parameters */
-	os << "\\language " << language
+	os << "\\language " << language->lang()
 	   << "\n\\inputencoding " << inputenc
 	   << "\n\\fontscheme " << fonts
 	   << "\n\\graphics " << graphicsDriver << '\n';
@@ -160,7 +164,7 @@ void BufferParams::writeFile(ostream & os)
 			else {
 				os << "\\bulletLaTeX " << i
 				   << "\n\t"
-				   << user_defined_bullets[i].c_str()
+				   << user_defined_bullets[i].getText()
 				   << "\n\\end_bullet\n";
 			}
 		}
@@ -195,24 +199,16 @@ void BufferParams::readLanguage(LyXLex & lex)
 	if (!lex.next()) return;
 	
 	string tmptok = lex.GetString();
-	string test;
-	int n = 0;
+
 	// check if tmptok is part of tex_babel in tex-defs.h
-	while (true) {
-		test = tex_babel[n++];
-		
-		if (test == tmptok) {
-			language = tmptok;
-			break;
-		}
-		else if (test.empty()) {
-			lyxerr << "Warning: language `"
-			       << tmptok << "' not recognized!\n"
-			       << "         Setting language to `default'."
-			       << endl;
-			language = "default";
-			break;	 
-		}      
+	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;
 	}
 }