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

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 7c1a56f327..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.
  *
  * ====================================================== */
 
@@ -25,7 +25,8 @@
 #include "lyxrc.h"
 #include "language.h"
 
-extern LyXRC * lyxrc;
+using std::ostream;
+using std::endl;
 
 BufferParams::BufferParams()
 {
@@ -49,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;
@@ -60,7 +61,6 @@ BufferParams::BufferParams()
 		user_defined_bullets[iter] = temp_bullets[iter] 
 			                   = ITEMIZE_DEFAULTS[iter];
 	}
-	allowAccents = false;
 }
 
 
@@ -87,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';
@@ -164,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";
 			}
 		}
@@ -199,42 +199,17 @@ void BufferParams::readLanguage(LyXLex & lex)
 	if (!lex.next()) return;
 	
 	string tmptok = lex.GetString();
-#if 0
-	string test;
-	int n = 0;
-#endif
+
 	// 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;
-		return;
-	}
-	// not found
-	lyxerr << "Warning: language `"
-	       << tmptok << "' not recognized!\n"
-	       << "         Setting language to `default'."
-	       << endl;
-	language = "default";
-	
-#if 0	
-	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;
 	}
-#endif
 }
 
 
@@ -265,11 +240,3 @@ void BufferParams::readGraphicsDriver(LyXLex & lex)
 		}      
 	}
 }
-
-
-LyXDirection BufferParams::getDocumentDirection() const
-{
-	return (lyxrc->rtl_support &&
-		(language == "hebrew" || language == "arabic"))
-		? LYX_DIR_RIGHT_TO_LEFT : LYX_DIR_LEFT_TO_RIGHT;
-}