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 ae15380f54ddf1dbf4f4440a7674a78aa2a94b0a..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-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -48,6 +48,8 @@ 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;
@@ -75,7 +77,7 @@ void BufferParams::writeFile(ostream & os) const
        // then the the preamble
        if (!preamble.empty()) {
                // remove '\n' from the end of preamble
-               string tmppreamble = strip(preamble, '\n');
+               string const tmppreamble = strip(preamble, '\n');
                os << "\\begin_preamble\n"
                   << tmppreamble
                   << "\n\\end_preamble\n";
@@ -87,8 +89,9 @@ void BufferParams::writeFile(ostream & os) const
        }
    
        /* then the text parameters */
-       os << "\\language " << language->lang()
-          << "\n\\inputencoding " << inputenc
+       if (language != ignore_language)
+               os << "\\language " << language->lang() << '\n';
+       os << "\\inputencoding " << inputenc
           << "\n\\fontscheme " << fonts
           << "\n\\graphics " << graphicsDriver << '\n';
 
@@ -103,6 +106,8 @@ void BufferParams::writeFile(ostream & os) const
           << "\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())
@@ -172,7 +177,8 @@ void BufferParams::writeFile(ostream & os) const
 }
 
 
-void BufferParams::useClassDefaults() {
+void BufferParams::useClassDefaults()
+{
        LyXTextClass const & tclass = textclasslist.TextClass(textclass);
 
        sides = tclass.sides();
@@ -184,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;
 
@@ -198,16 +217,15 @@ void BufferParams::readLanguage(LyXLex & lex)
 {
        if (!lex.next()) return;
        
-       string tmptok = lex.GetString();
+       string const tmptok = lex.getString();
 
        // check if tmptok is part of tex_babel in tex-defs.h
        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()
+               lyxerr << "Warning: Setting language `"
+                      << tmptok << "' to `" << language->lang()
                       << "'." << endl;
        }
 }
@@ -215,23 +233,18 @@ void BufferParams::readLanguage(LyXLex & lex)
 
 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");