Small fixes noticed by Jean-Marc.

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 8dc2e25e37488e2c0f46a4d35ac6dbe213fff0c2..ae15380f54ddf1dbf4f4440a7674a78aa2a94b0a 100644 (file)
--- 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.
  *
  * ====================================================== */
 
@@ -23,8 +23,10 @@
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 #include "lyxrc.h"
+#include "language.h"
 
-extern LyXRC * lyxrc;
+using std::ostream;
+using std::endl;
 
 BufferParams::BufferParams()
 {
@@ -48,18 +50,17 @@ 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;
        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];
        }
-       allowAccents = false;
 }
 
 
@@ -86,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';
@@ -138,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;
@@ -163,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";
                        }
                }
@@ -198,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;
        }
 }
 
@@ -247,10 +240,3 @@ void BufferParams::readGraphicsDriver(LyXLex & lex)
                }      
        }
 }
-
-
-LyXDirection BufferParams::getDocumentDirection() const
-{
-       return (lyxrc->rtl_support && language == "hebrew")
-               ? LYX_DIR_RIGHT_TO_LEFT : LYX_DIR_LEFT_TO_RIGHT;
-}