citation patch from Angus

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 7c1a56f32736d78c0c5fee2d707608ce9b42ee77..158463fe90253f3d9007d8c041dd04aa8ffc0103 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.
  *
  * ====================================================== */
 
@@ -25,7 +25,8 @@
 #include "lyxrc.h"
 #include "language.h"
 
-extern LyXRC * lyxrc;
+using std::ostream;
+using std::endl;
 
 BufferParams::BufferParams()
 {
@@ -50,8 +51,9 @@ BufferParams::BufferParams()
        secnumdepth = 3;
        tocdepth = 3;
        language = "default";
+       language_info = default_language;
        fonts = "default";
-       inputenc = "latin1";
+       inputenc = "auto";
        graphicsDriver = "default";
        sides = LyXTextClass::OneSide;
        columns = 1;
@@ -60,7 +62,6 @@ BufferParams::BufferParams()
                user_defined_bullets[iter] = temp_bullets[iter] 
                                           = ITEMIZE_DEFAULTS[iter];
        }
-       allowAccents = false;
 }
 
 
@@ -199,42 +200,24 @@ 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()) {
+               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 = "default";
-                       break;   
-               }      
+               }
        }
-#endif
 }
 
 
@@ -265,11 +248,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;
-}