Fix working of the spellchecker dialog with ispell when there are no

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 27a1d2378436ffeda573584e9d64fc50486c5ff1..958800c69ec873d923ddb8a339e1603339fff646 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-2001 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()
 {
@@ -43,24 +48,25 @@ BufferParams::BufferParams()
        orientation = ORIENTATION_PORTRAIT;
         use_geometry = false;
         use_amsmath = false;
+        use_natbib = false;
+       use_numerical_citations = 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;
 }
 
 
-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 +77,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 const tmppreamble = strip(preamble, '\n');
                os << "\\begin_preamble\n"
-                  << preamble
+                  << tmppreamble
                   << "\n\\end_preamble\n";
        }
       
@@ -83,8 +89,9 @@ void BufferParams::writeFile(ostream & os)
        }
    
        /* then the text parameters */
-       os << "\\language " << language
-          << "\n\\inputencoding " << inputenc
+       if (language != ignore_language)
+               os << "\\language " << language->lang() << '\n';
+       os << "\\inputencoding " << inputenc
           << "\n\\fontscheme " << fonts
           << "\n\\graphics " << graphicsDriver << '\n';
 
@@ -99,6 +106,8 @@ void BufferParams::writeFile(ostream & os)
           << "\n\\paperpackage " << string_paperpackages[paperpackage]
           << "\n\\use_geometry " << use_geometry
           << "\n\\use_amsmath " << use_amsmath
+          << "\n\\use_natbib " << use_natbib
+          << "\n\\use_numerical_citations " << use_numerical_citations
           << "\n\\paperorientation " << string_orientation[orientation]
           << '\n';
         if (!paperwidth.empty())
@@ -135,7 +144,7 @@ void BufferParams::writeFile(ostream & os)
           << "\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;
@@ -160,7 +169,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";
                        }
                }
@@ -168,7 +177,8 @@ void BufferParams::writeFile(ostream & os)
 }
 
 
-void BufferParams::useClassDefaults() {
+void BufferParams::useClassDefaults()
+{
        LyXTextClass const & tclass = textclasslist.TextClass(textclass);
 
        sides = tclass.sides();
@@ -180,9 +190,22 @@ void BufferParams::useClassDefaults() {
 }
 
 
+bool BufferParams::hasClassDefaults() const
+{
+       LyXTextClass const & tclass = textclasslist.TextClass(textclass);
+       
+       return (sides == tclass.sides()
+               && columns == tclass.columns()
+               && pagestyle == tclass.pagestyle()
+               && options == tclass.options()
+               && secnumdepth == tclass.secnumdepth()
+               && tocdepth == tclass.tocdepth());
+}
+
+
 void BufferParams::readPreamble(LyXLex & lex)
 {
-       if (lex.GetString() != "\\begin_preamble")
+       if (lex.getString() != "\\begin_preamble")
                lyxerr << "Error (BufferParams::readPreamble):"
                        "consistency check failed." << endl;
 
@@ -194,48 +217,34 @@ void BufferParams::readLanguage(LyXLex & lex)
 {
        if (!lex.next()) return;
        
-       string tmptok = lex.GetString();
-       string test;
-       int n = 0;
+       string const tmptok = lex.getString();
+
        // 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: Setting language `"
+                      << tmptok << "' to `" << language->lang()
+                      << "'." << endl;
        }
 }
 
 
 void BufferParams::readGraphicsDriver(LyXLex & lex)
 {
-       string tmptok;
-       string test;
-       int n = 0;
-       
-       
        if (!lex.next()) return;
        
-       tmptok = lex.GetString();
+       string const tmptok = lex.getString();
        // check if tmptok is part of tex_graphics in tex_defs.h
+       int n = 0;
        while (true) {
-               test = tex_graphics[n++];
+               string const test = tex_graphics[n++];
                
                if (test == tmptok) {    
                        graphicsDriver = tmptok;
                        break;
-               }      
-               else if (test == "last_item") {
+               } else if (test == "last_item") {
                        lex.printError(
                                "Warning: graphics driver `$$Token' not recognized!\n"
                                "         Setting graphics driver to `default'.\n");