citation patch from Angus

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 9ab6982ac9335f842139408ec9ebfded9346bfdd..158463fe90253f3d9007d8c041dd04aa8ffc0103 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -25,6 +25,8 @@
 #include "lyxrc.h"
 #include "language.h"
 
+using std::ostream;
+using std::endl;
 
 BufferParams::BufferParams()
 {
@@ -49,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;
@@ -59,7 +62,6 @@ BufferParams::BufferParams()
                user_defined_bullets[iter] = temp_bullets[iter] 
                                           = ITEMIZE_DEFAULTS[iter];
        }
-       allowAccents = false;
 }
 
 
@@ -204,15 +206,17 @@ void BufferParams::readLanguage(LyXLex & lex)
        if (lit != languages.end()) {
                // found it
                language = tmptok;
-               return;
-       }
-       // not found
-       language = "default";
-       if (tmptok != "default") {
-               lyxerr << "Warning: language `"
-                      << tmptok << "' not recognized!\n"
-                      << "         Setting language to `default'."
-                      << endl;
+               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;
+               }
        }
 }
 
@@ -244,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;
-}