Dekels tabular/textinset patches

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 158463fe90253f3d9007d8c041dd04aa8ffc0103..0206ec3f9c8057a1ea16c3e3d56d52346750e663 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -50,15 +50,14 @@ BufferParams::BufferParams()
         use_amsmath = false;
        secnumdepth = 3;
        tocdepth = 3;
-       language = "default";
-       language_info = default_language;
+       language = default_language;
        fonts = "default";
        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];
        }
@@ -76,7 +75,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";
@@ -88,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';
@@ -140,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;
@@ -165,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";
                        }
                }
@@ -199,47 +198,34 @@ 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
-       Languages::iterator lit = languages.find(tmptok);
-       if (lit != languages.end()) {
-               // found it
-               language = tmptok;
-               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 = 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");