]> git.lyx.org Git - lyx.git/blobdiff - src/buffer.C
Small fixes noticed by Jean-Marc.
[lyx.git] / src / buffer.C
index 9f4ab480e2e26cd195964a1095122304db2fa78e..62750128c60941c70bda4896eb53bf3539415296 100644 (file)
@@ -84,6 +84,7 @@
 #include "support/syscall.h"
 #include "support/lyxlib.h"
 #include "support/FileInfo.h"
+#include "support/lyxmanip.h"
 #include "lyxtext.h"
 #include "gettext.h"
 #include "language.h"
@@ -104,7 +105,6 @@ using std::pair;
 using std::vector;
 using std::max;
 using std::set;
-using std::istringstream;
 
 // all these externs should eventually be removed.
 extern BufferList bufferlist;
@@ -178,7 +178,7 @@ void Buffer::setReadonly(bool flag)
        if (read_only != flag) {
                read_only = flag; 
                updateTitles();
-               users->owner()->getDialogs()->updateBufferDependent();
+               users->owner()->getDialogs()->updateBufferDependent(false);
        }
        if (read_only) {
                WarnReadonly(filename);
@@ -218,7 +218,7 @@ void Buffer::resetAutosaveTimers() const
 }
 
 
-void Buffer::fileName(string const & newfile)
+void Buffer::setFileName(string const & newfile)
 {
        filename = MakeAbsPath(newfile);
        filepath = OnlyPath(filename);
@@ -246,15 +246,15 @@ bool Buffer::readLyXformat2(LyXLex & lex, LyXParagraph * par)
        bool the_end_read = false;
 
        LyXParagraph * return_par = 0;
-       LyXFont font(LyXFont::ALL_INHERIT, params.language_info);
-       if (format < 2.16 && params.language == "hebrew")
+       LyXFont font(LyXFont::ALL_INHERIT, params.language);
+       if (format < 2.16 && params.language->lang() == "hebrew")
                font.setLanguage(default_language);
 
        // If we are inserting, we cheat and get a token in advance
        bool has_token = false;
        string pretoken;
 
-       if(!par) {
+       if (!par) {
                par = new LyXParagraph;
        } else {
                users->text->BreakParagraph(users);
@@ -363,8 +363,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                par->footnotekind = footnotekind;
 #endif
                par->depth = depth;
-               font = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
-               if (format < 2.16 && params.language == "hebrew")
+               font = LyXFont(LyXFont::ALL_INHERIT, params.language);
+               if (format < 2.16 && params.language->lang() == "hebrew")
                        font.setLanguage(default_language);
 #ifndef NEW_INSETS
        } else if (token == "\\end_float") {
@@ -379,8 +379,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                pos = 0;
                lex.EatLine();
                par->layout = LYX_DUMMY_LAYOUT;
-               font = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
-               if (format < 2.16 && params.language == "hebrew")
+               font = LyXFont(LyXFont::ALL_INHERIT, params.language);
+               if (format < 2.16 && params.language->lang() == "hebrew")
                        font.setLanguage(default_language);
        } else if (token == "\\begin_float") {
                int tmpret = lex.FindToken(string_footnotekinds);
@@ -550,7 +550,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                if (tmpret != LYX_LAYOUT_DEFAULT) {
                        InsetQuotes::quote_language tmpl = 
                                InsetQuotes::EnglishQ;
-                       switch(tmpret) {
+                       switch (tmpret) {
                        case 0:
                                tmpl = InsetQuotes::EnglishQ;
                                break;
@@ -574,7 +574,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                }
        } else if (token == "\\quotes_times") {
                lex.nextToken();
-               switch(lex.GetInteger()) {
+               switch (lex.GetInteger()) {
                case 1: 
                        params.quotes_times = InsetQuotes::SingleQ; 
                        break;
@@ -641,7 +641,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                params.columns = lex.GetInteger();
        } else if (token == "\\papersides") {
                lex.nextToken();
-               switch(lex.GetInteger()) {
+               switch (lex.GetInteger()) {
                default:
                case 1: params.sides = LyXTextClass::OneSide; break;
                case 2: params.sides = LyXTextClass::TwoSides; break;
@@ -771,11 +771,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
        } else if (token == "\\lang") {
                lex.next();
                string const tok = lex.GetString();
-               Languages::iterator lit = languages.find(tok);
-               if (lit != languages.end()) {
-                       font.setLanguage(&(*lit).second);
+               Language const * lang = languages.getLanguage(tok);
+               if (lang) {
+                       font.setLanguage(lang);
                } else {
-                       font.setLanguage(params.language_info);
+                       font.setLanguage(params.language);
                        lex.printError("Unknown language `$$Token'");
                }
        } else if (token == "\\numeric") {
@@ -882,7 +882,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                par->InsertChar(pos, LyXParagraph::META_NEWLINE, font);
                ++pos;
        } else if (token == "\\LyXTable") {
-               Inset * inset = new InsetTabular(this);
+               Inset * inset = new InsetTabular(*this);
                inset->Read(this, lex);
                par->InsertInset(pos, inset, font);
                ++pos;
@@ -921,7 +921,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                               "Inserting as text.");
                string::const_iterator cit = token.begin();
                string::const_iterator end = token.end();
-               for(; cit != end; ++cit) {
+               for (; cit != end; ++cit) {
                        par->InsertChar(pos, (*cit), font);
                        ++pos;
                }
@@ -960,7 +960,7 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par,
                } else if (inscmd.getCmdName() == "index") {
                        inset = new InsetIndex(inscmd);
                } else if (inscmd.getCmdName() == "include") {
-                       inset = new InsetInclude(inscmd, this);
+                       inset = new InsetInclude(inscmd, *this);
                } else if (inscmd.getCmdName() == "label") {
                        inset = new InsetLabel(inscmd);
                } else if (inscmd.getCmdName() == "url"
@@ -973,7 +973,7 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par,
                           || inscmd.getCmdName() == "prettyref") {
                        if (!inscmd.getOptions().empty()
                            || !inscmd.getContents().empty()) {
-                               inset = new InsetRef(inscmd);
+                               inset = new InsetRef(inscmd, *this);
                        }
                } else if (inscmd.getCmdName() == "tableofcontents"
                           || inscmd.getCmdName() == "listofalgorithms"
@@ -983,7 +983,7 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par,
                } else if (inscmd.getCmdName() == "printindex") {
                        inset = new InsetPrintIndex(inscmd);
                } else if (inscmd.getCmdName() == "lyxparent") {
-                       inset = new InsetParent(inscmd, this);
+                       inset = new InsetParent(inscmd, *this);
                }
        } else {
                if (tmptok == "Quotes") {
@@ -995,16 +995,16 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par,
                } else if (tmptok == "Formula") {
                        inset = new InsetFormula;
                } else if (tmptok == "Figure") {
-                       inset = new InsetFig(100, 100, this);
+                       inset = new InsetFig(100, 100, *this);
                } else if (tmptok == "Info") {
                        inset = new InsetInfo;
                } else if (tmptok == "Include") {
                        InsetCommandParams p( "Include" );
-                       inset = new InsetInclude(p, this);
+                       inset = new InsetInclude(p, *this);
                } else if (tmptok == "ERT") {
                        inset = new InsetERT;
                } else if (tmptok == "Tabular") {
-                       inset = new InsetTabular(this);
+                       inset = new InsetTabular(*this);
                } else if (tmptok == "Text") {
                        inset = new InsetText;
                } else if (tmptok == "Foot") {
@@ -1045,15 +1045,14 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par)
                if (token == "\\lyxformat") { // the first token _must_ be...
                        lex.EatLine();
                        format = lex.GetFloat();
-                       if (format > 1) {
+                       if (format > 1.0) {
                                if (LYX_FORMAT - format > 0.05) {
-                                       
-                                       printf(_("Warning: need lyxformat %.2f but found %.2f\n"),
-                                              LYX_FORMAT, format);
+                                       lyxerr << fmt(_("Warning: need lyxformat %.2f but found %.2f"),
+                                                     LYX_FORMAT, format) << endl;
                                }
                                if (format - LYX_FORMAT > 0.05) {
-                                       printf(_("ERROR: need lyxformat %.2f but found %.2f\n"),
-                                              LYX_FORMAT, format);
+                                       lyxerr << fmt(_("ERROR: need lyxformat %.2f but found %.2f"),
+                                                     LYX_FORMAT, format) << endl;
                                }
                                bool the_end = readLyXformat2(lex, par);
                                // Formats >= 2.13 support "\the_end" marker
@@ -1069,7 +1068,7 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par)
                                // We simulate a safe reading anyways to allow
                                // users to take the chance... (Asger)
                                return true;
-                       } // format < 1
+                       } // format < 1.0
                        else {
                                WriteAlert(_("ERROR!"),
                                           _("Old LyX file format found. "
@@ -1238,9 +1237,31 @@ bool Buffer::writeFile(string const & fname, bool flag) const
 
        // Write marker that shows file is complete
        ofs << "\n\\the_end" << endl;
+
        ofs.close();
+
        // how to check if close went ok?
-       return true;
+       // Following is an attempt... (BE 20001011)
+       
+       // good() returns false if any error occured, including some
+       //        formatting error.
+       // bad()  returns true if something bad happened in the buffer,
+       //        which should include file system full errors.
+
+       bool status = true;
+       if (!ofs.good()) {
+               status = false;
+#if 0
+               if (ofs.bad()) {
+                       lyxerr << "Buffer::writeFile: BAD ERROR!" << endl;
+               } else {
+                       lyxerr << "Buffer::writeFile: NOT SO BAD ERROR!"
+                              << endl;
+               }
+#endif
+       }
+       
+       return status;
 }
 
 
@@ -1268,7 +1289,7 @@ void Buffer::writeFileAscii(string const & fname, int linelen)
                return;
        }
 
-       string const fname1 = TmpFileName();
+       string const fname1 = lyx::tempName(); //TmpFileName();
        LyXParagraph * par = paragraph;
        while (par) {
                int noparbreak = 0;
@@ -1363,15 +1384,15 @@ void Buffer::writeFileAscii(string const & fname, int linelen)
                }
       
                LyXFont font1 =
-                       LyXFont(LyXFont::ALL_INHERIT, params.language_info);
+                       LyXFont(LyXFont::ALL_INHERIT, params.language);
                 actcell = 0;
                for (i = 0, actpos = 1; i < par->size(); ++i, ++actpos) {
                        if (!i && !footnoteflag && !noparbreak){
                                ofs << "\n\n";
-                               for(j = 0; j < depth; ++j)
+                               for (j = 0; j < depth; ++j)
                                        ofs << "  ";
                                currlinelen = depth * 2;
-                               switch(ltype) {
+                               switch (ltype) {
                                case 0: /* Standard */
                                case 4: /* (Sub)Paragraph */
                                 case 5: /* Description */
@@ -1390,7 +1411,7 @@ void Buffer::writeFileAscii(string const & fname, int linelen)
                                        break;
                                }
                                if (ltype_depth > depth) {
-                                       for(j = ltype_depth - 1; j > depth; --j)
+                                       for (j = ltype_depth - 1; j > depth; --j)
                                                ofs << "  ";
                                        currlinelen += (ltype_depth-depth)*2;
                                }
@@ -1418,11 +1439,11 @@ void Buffer::writeFileAscii(string const & fname, int linelen)
                                break;
                        case LyXParagraph::META_NEWLINE:
                                ofs << "\n";
-                               for(j = 0; j < depth; ++j)
+                               for (j = 0; j < depth; ++j)
                                        ofs << "  ";
                                currlinelen = depth * 2;
                                if (ltype_depth > depth) {
-                                       for(j = ltype_depth;
+                                       for (j = ltype_depth;
                                            j > depth; --j)
                                                ofs << "  ";
                                        currlinelen += (ltype_depth - depth) * 2;
@@ -1438,11 +1459,11 @@ void Buffer::writeFileAscii(string const & fname, int linelen)
                                if (currlinelen > linelen - 10
                                     && c == ' ' && i + 2 < par->size()) {
                                        ofs << "\n";
-                                       for(j = 0; j < depth; ++j)
+                                       for (j = 0; j < depth; ++j)
                                                ofs << "  ";
                                        currlinelen = depth * 2;
                                        if (ltype_depth > depth) {
-                                               for(j = ltype_depth;
+                                               for (j = ltype_depth;
                                                    j > depth; --j)
                                                        ofs << "  ";
                                                currlinelen += (ltype_depth-depth)*2;
@@ -1571,24 +1592,31 @@ string const Buffer::asciiParagraph(LyXParagraph const * par,
 #endif
        }
       
-       font1 = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
+       font1 = LyXFont(LyXFont::ALL_INHERIT, params.language);
        for (LyXParagraph::size_type i = 0; i < par->size(); ++i) {
                if (!i && !footnoteflag && !noparbreak){
-                       buffer << "\n\n";
-                       for(char j = 0; j < depth; ++j)
+                       if (linelen > 0)
+                               buffer << "\n\n";
+                       for (char j = 0; j < depth; ++j)
                                buffer << "  ";
                        currlinelen = depth * 2;
-                       switch(ltype) {
+                       switch (ltype) {
                        case 0: /* Standard */
                        case 4: /* (Sub)Paragraph */
                        case 5: /* Description */
                                break;
                        case 6: /* Abstract */
-                               buffer << "Abstract\n\n";
+                               if (linelen > 0)
+                                       buffer << "Abstract\n\n";
+                               else
+                                       buffer << "Abstract: ";
                                break;
                        case 7: /* Bibliography */
                                if (!ref_printed) {
-                                       buffer << "References\n\n";
+                                       if (linelen > 0)
+                                               buffer << "References\n\n";
+                                       else
+                                               buffer << "References: ";
                                        ref_printed = true;
                                }
                                break;
@@ -1597,7 +1625,7 @@ string const Buffer::asciiParagraph(LyXParagraph const * par,
                                break;
                        }
                        if (ltype_depth > depth) {
-                               for(char j = ltype_depth - 1; j > depth; --j)
+                               for (char j = ltype_depth - 1; j > depth; --j)
                                        buffer << "  ";
                                currlinelen += (ltype_depth-depth)*2;
                        }
@@ -1619,7 +1647,7 @@ string const Buffer::asciiParagraph(LyXParagraph const * par,
                        if ((inset = par->GetInset(i))) {
                                if (!inset->Ascii(this, buffer)) {
                                        string dummy;
-                                       string s = rsplit(buffer.str(),
+                                       string s = rsplit(buffer.str().c_str(),
                                                          dummy, '\n');
                                        currlinelen += s.length();
                                } else {
@@ -1629,12 +1657,14 @@ string const Buffer::asciiParagraph(LyXParagraph const * par,
                        }
                        break;
                case LyXParagraph::META_NEWLINE:
-                       buffer << "\n";
-                       for(char j = 0; j < depth; ++j)
-                               buffer << "  ";
+                       if (linelen > 0) {
+                               buffer << "\n";
+                               for (char j = 0; j < depth; ++j)
+                                       buffer << "  ";
+                       }
                        currlinelen = depth * 2;
                        if (ltype_depth > depth) {
-                               for(char j = ltype_depth;
+                               for (char j = ltype_depth;
                                    j > depth; --j)
                                        buffer << "  ";
                                currlinelen += (ltype_depth - depth) * 2;
@@ -1651,11 +1681,11 @@ string const Buffer::asciiParagraph(LyXParagraph const * par,
                            (c == ' ') && ((i + 2) < par->size()))
                        {
                                buffer << "\n";
-                               for(char j = 0; j < depth; ++j)
+                               for (char j = 0; j < depth; ++j)
                                        buffer << "  ";
                                currlinelen = depth * 2;
                                if (ltype_depth > depth) {
-                                       for(char j = ltype_depth;
+                                       for (char j = ltype_depth;
                                            j > depth; --j)
                                                buffer << "  ";
                                        currlinelen += (ltype_depth-depth)*2;
@@ -1668,7 +1698,7 @@ string const Buffer::asciiParagraph(LyXParagraph const * par,
                        break;
                }
        }
-       return buffer.str();
+       return buffer.str().c_str();
 }
 
 
@@ -1822,17 +1852,21 @@ void Buffer::makeLaTeXFile(string const & fname,
                
                // language should be a parameter to \documentclass
                bool use_babel = false;
-               if (params.language_info->lang() == "hebrew") // This seems necessary
+               if (params.language->babel() == "hebrew") // This seems necessary
                        features.UsedLanguages.insert(default_language);
-               if (params.language != "default" ||
-                   !features.UsedLanguages.empty() ) {
+#ifdef DO_USE_DEFAULT_LANGUAGE
+               if (params.language->lang() != "default" ||
+                   !features.UsedLanguages.empty()) {
+#endif
                        use_babel = true;
                        for (LaTeXFeatures::LanguageList::const_iterator cit =
                                     features.UsedLanguages.begin();
                             cit != features.UsedLanguages.end(); ++cit)
-                               options += (*cit)->lang() + ",";
-                       options += params.language_info->lang() + ',';
+                               options += (*cit)->babel() + ",";
+                       options += params.language->babel() + ',';
+#ifdef DO_USE_DEFAULT_LANGUAGE
                }
+#endif
 
                // the user-defined options
                if (!params.options.empty()) {
@@ -1864,7 +1898,7 @@ void Buffer::makeLaTeXFile(string const & fname,
 
                if (params.inputenc == "auto") {
                        string const doc_encoding =
-                               params.language_info->encoding()->LatexName();
+                               params.language->encoding()->LatexName();
 
                        // Create a list with all the input encodings used 
                        // in the document
@@ -1876,9 +1910,8 @@ void Buffer::makeLaTeXFile(string const & fname,
                                        encodings.insert((*it)->encoding()->LatexName());
 
                        ofs << "\\usepackage[";
-                       for (set<string>::const_iterator it = encodings.begin();
-                            it != encodings.end(); ++it)
-                               ofs << *it << ",";
+                       std::copy(encodings.begin(), encodings.end(),
+                                 std::ostream_iterator<string>(ofs, ","));
                        ofs << doc_encoding << "]{inputenc}\n";
                        texrow.newline();
                } else if (params.inputenc != "default") {
@@ -2132,9 +2165,13 @@ void Buffer::makeLaTeXFile(string const & fname,
                texrow.newline();
        } // only_body
        lyxerr.debug() << "preamble finished, now the body." << endl;
-       if (!lyxrc.language_auto_begin && params.language != "default") {
+#ifdef DO_USE_DEFAULT_LANGUAGE
+       if (!lyxrc.language_auto_begin && params.language->lang() != "default") {
+#else
+       if (!lyxrc.language_auto_begin) {
+#endif
                ofs << subst(lyxrc.language_command_begin, "$$lang",
-                            params.language)
+                            params.language->babel())
                    << endl;
                texrow.newline();
        }
@@ -2145,9 +2182,13 @@ void Buffer::makeLaTeXFile(string const & fname,
        ofs << endl;
        texrow.newline();
 
-       if (!lyxrc.language_auto_end && params.language != "default") {
+#ifdef DO_USE_DEFAULT_LANGUAGE
+       if (!lyxrc.language_auto_end && params.language->lang() != "default") {
+#else
+               if (!lyxrc.language_auto_end) {
+#endif
                ofs << subst(lyxrc.language_command_end, "$$lang",
-                            params.language)
+                            params.language->babel())
                    << endl;
                texrow.newline();
        }
@@ -2331,7 +2372,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
        LaTeXFeatures features(params, tclass.numLayouts());
        validate(features);
 
-       //if(nice)
+       //if (nice)
        tex_code_break_column = lyxrc.ascii_linelen;
        //else
        //tex_code_break_column = 0;
@@ -2348,7 +2389,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                            << params.preamble << sgml_includedfiles << " \n]>\n\n";
                }
 
-               if(params.options.empty())
+               if (params.options.empty())
                        sgmlOpenTag(ofs, 0, top_element);
                else {
                        string top = top_element;
@@ -2393,11 +2434,11 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                // write opening SGML tags
                switch (style.latextype) {
                case LATEX_PARAGRAPH:
-                       if(depth == par->depth 
+                       if (depth == par->depth 
                           && !environment_stack[depth].empty()) {
                                sgmlCloseTag(ofs, depth, environment_stack[depth]);
                                environment_stack[depth].erase();
-                               if(depth) 
+                               if (depth) 
                                        --depth;
                                else
                                        ofs << "</p>";
@@ -2436,7 +2477,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                               environment_stack[depth].erase();
                        }
                        if (environment_stack[depth] != style.latexname()) {
-                               if(depth == 0) {
+                               if (depth == 0) {
                                        string const temp = "p";
                                        sgmlOpenTag(ofs, depth, temp);
                                }
@@ -2444,11 +2485,11 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                                sgmlOpenTag(ofs, depth,
                                            environment_stack[depth]);
                        }
-                       if(style.latextype == LATEX_ENVIRONMENT) break;
+                       if (style.latextype == LATEX_ENVIRONMENT) break;
 
                        desc_on = (style.labeltype == LABEL_MANUAL);
 
-                       if(desc_on)
+                       if (desc_on)
                                item_name = "tag";
                        else
                                item_name = "item";
@@ -2474,7 +2515,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
 
                ofs << "\n";
                // write closing SGML tags
-               switch(style.latextype) {
+               switch (style.latextype) {
                case LATEX_COMMAND:
                case LATEX_ENVIRONMENT:
                case LATEX_ITEM_ENVIRONMENT:
@@ -2486,10 +2527,10 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
        }
    
        // Close open tags
-       for(; depth > 0; --depth)
+       for (; depth > 0; --depth)
                sgmlCloseTag(ofs, depth, environment_stack[depth]);
 
-       if(!environment_stack[depth].empty())
+       if (!environment_stack[depth].empty())
                sgmlCloseTag(ofs, depth, environment_stack[depth]);
 
        if (!body_only) {
@@ -2538,7 +2579,7 @@ void Buffer::DocBookHandleCaption(ostream & os, string & inner_tag,
                SimpleDocBookOnePar(os, extra_par, tpar,
                                    desc_on, depth + 2);
                sgmlCloseTag(os, depth+1, inner_tag);
-               if(!extra_par.empty())
+               if (!extra_par.empty())
                        os << extra_par;
        }
 }
@@ -2637,9 +2678,9 @@ void Buffer::DocBookHandleFootnote(ostream & os, LyXParagraph * & par,
                par = par->next;
        }
        os << tmp_par;
-       if(!inner_tag.empty()) sgmlCloseTag(os, depth + 1, inner_tag);
-       if(!extra_par.empty()) os << extra_par;
-       if(!tag.empty()) sgmlCloseTag(os, depth, tag);
+       if (!inner_tag.empty()) sgmlCloseTag(os, depth + 1, inner_tag);
+       if (!extra_par.empty()) os << extra_par;
+       if (!tag.empty()) sgmlCloseTag(os, depth, tag);
 }
 #endif
 
@@ -2648,7 +2689,9 @@ void Buffer::DocBookHandleFootnote(ostream & os, LyXParagraph * & par,
 void Buffer::push_tag(ostream & os, string const & tag,
                      int & pos, char stack[5][3])
 {
+#ifdef WITH_WARNINGS
 #warning Use a real stack! (Lgb)
+#endif
        // pop all previous tags
        for (int j = pos; j >= 0; --j)
                os << "</" << stack[j] << ">";
@@ -2754,7 +2797,7 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
                LyXFont const font2 = par->getFont(params, i);
 
                if (font1.family() != font2.family()) {
-                       switch(family_type) {
+                       switch (family_type) {
                        case 0:
                                if (font2.family() == LyXFont::TYPEWRITER_FAMILY) {
                                        push_tag(os, "tt", stack_num, stack);
@@ -2798,7 +2841,7 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
 
                // handle italic and slanted fonts
                if (font1.shape() != font2.shape()) {
-                       switch(shape_type) {
+                       switch (shape_type) {
                        case 0:
                                if (font2.shape() == LyXFont::ITALIC_SHAPE) {
                                        push_tag(os, "it", stack_num, stack);
@@ -2888,7 +2931,7 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
        }
 
        // resets description flag correctly
-       switch(desc_on){
+       switch (desc_on){
        case 1:
                // <tag> not closed...
                linux_doc_line_break(os, char_line_count, 6);
@@ -2943,7 +2986,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
        LaTeXFeatures features(params, tclass.numLayouts());
        validate(features);
 
-       //if(nice)
+       //if (nice)
        tex_code_break_column = lyxrc.ascii_linelen;
        //else
        //tex_code_break_column = 0;
@@ -2956,7 +2999,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
    
        texrow.reset();
 
-       if(!only_body) {
+       if (!only_body) {
                string sgml_includedfiles=features.getIncludedFiles();
 
                ofs << "<!doctype " << top_element
@@ -2968,7 +3011,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                        ofs << "\n [ " << params.preamble 
                            << sgml_includedfiles << " \n]>\n\n";
 
-               if(params.options.empty())
+               if (params.options.empty())
                        sgmlOpenTag(ofs, 0, top_element);
                else {
                        string top = top_element;
@@ -2988,12 +3031,12 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                                            par->layout);
 
                // environment tag closing
-               for; depth > par->depth; --depth) {
-                       if(environment_inner[depth] != "!-- --") {
+               for (; depth > par->depth; --depth) {
+                       if (environment_inner[depth] != "!-- --") {
                                item_name= "listitem";
                                sgmlCloseTag(ofs, command_depth + depth,
                                             item_name);
-                               ifenvironment_inner[depth] == "varlistentry")
+                               if (environment_inner[depth] == "varlistentry")
                                        sgmlCloseTag(ofs, depth+command_depth,
                                                     environment_inner[depth]);
                        }
@@ -3003,14 +3046,14 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                        environment_inner[depth].erase();
                }
 
-               if(depth == par->depth
+               if (depth == par->depth
                   && environment_stack[depth] != style.latexname()
                   && !environment_stack[depth].empty()) {
-                       if(environment_inner[depth] != "!-- --") {
+                       if (environment_inner[depth] != "!-- --") {
                                item_name= "listitem";
                                sgmlCloseTag(ofs, command_depth+depth,
                                             item_name);
-                               ifenvironment_inner[depth] == "varlistentry")
+                               if (environment_inner[depth] == "varlistentry")
                                        sgmlCloseTag(ofs,
                                                     depth + command_depth,
                                                     environment_inner[depth]);
@@ -3024,9 +3067,9 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                 }
 
                // Write opening SGML tags.
-               switch(style.latextype) {
+               switch (style.latextype) {
                case LATEX_PARAGRAPH:
-                       if(style.latexname() != "dummy")
+                       if (style.latexname() != "dummy")
                                sgmlOpenTag(ofs, depth+command_depth,
                                            style.latexname());
                        break;
@@ -3044,18 +3087,18 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                        
                        cmd_depth= lyx::atoi(c_depth);
                        
-                       if(command_flag) {
-                               if(cmd_depth<command_base) {
-                                       for(int j = command_depth;
+                       if (command_flag) {
+                               if (cmd_depth<command_base) {
+                                       for (int j = command_depth;
                                            j >= command_base; --j)
-                                               if(!command_stack[j].empty())
+                                               if (!command_stack[j].empty())
                                                        sgmlCloseTag(ofs, j, command_stack[j]);
                                        command_depth= command_base= cmd_depth;
-                               } else if(cmd_depth <= command_depth) {
-                                       for(int j = command_depth;
+                               } else if (cmd_depth <= command_depth) {
+                                       for (int j = command_depth;
                                            j >= cmd_depth; --j)
 
-                                               if(!command_stack[j].empty())
+                                               if (!command_stack[j].empty())
                                                        sgmlCloseTag(ofs, j, command_stack[j]);
                                        command_depth= cmd_depth;
                                } else
@@ -3097,7 +3140,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                                sgmlOpenTag(ofs, depth + command_depth,
                                            environment_stack[depth]);
                        } else {
-                               if(environment_inner[depth] != "!-- --") {
+                               if (environment_inner[depth] != "!-- --") {
                                        item_name= "listitem";
                                        sgmlCloseTag(ofs,
                                                     command_depth + depth,
@@ -3109,8 +3152,8 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                                }
                        }
                        
-                       if(style.latextype == LATEX_ENVIRONMENT) {
-                               if(!style.latexparam().empty())
+                       if (style.latextype == LATEX_ENVIRONMENT) {
+                               if (!style.latexparam().empty())
                                        sgmlOpenTag(ofs, depth + command_depth,
                                                    style.latexparam());
                                break;
@@ -3118,7 +3161,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 
                        desc_on = (style.labeltype == LABEL_MANUAL);
 
-                       if(desc_on)
+                       if (desc_on)
                                environment_inner[depth]= "varlistentry";
                        else
                                environment_inner[depth]= "listitem";
@@ -3126,7 +3169,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                        sgmlOpenTag(ofs, depth + 1 + command_depth,
                                    environment_inner[depth]);
 
-                       if(desc_on) {
+                       if (desc_on) {
                                item_name= "term";
                                sgmlOpenTag(ofs, depth + 1 + command_depth,
                                            item_name);
@@ -3157,23 +3200,23 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 #endif
                string end_tag;
                // write closing SGML tags
-               switch(style.latextype) {
+               switch (style.latextype) {
                case LATEX_COMMAND:
                        end_tag = "title";
                        sgmlCloseTag(ofs, depth + command_depth, end_tag);
                        break;
                case LATEX_ENVIRONMENT:
-                       if(!style.latexparam().empty())
+                       if (!style.latexparam().empty())
                                sgmlCloseTag(ofs, depth + command_depth,
                                             style.latexparam());
                        break;
                case LATEX_ITEM_ENVIRONMENT:
-                       if(desc_on == 1) break;
+                       if (desc_on == 1) break;
                        end_tag= "para";
                        sgmlCloseTag(ofs, depth + 1 + command_depth, end_tag);
                        break;
                case LATEX_PARAGRAPH:
-                       if(style.latexname() != "dummy")
+                       if (style.latexname() != "dummy")
                                sgmlCloseTag(ofs, depth + command_depth,
                                             style.latexname());
                        break;
@@ -3185,13 +3228,13 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
        }
 
        // Close open tags
-       for(; depth >= 0; --depth) {
-               if(!environment_stack[depth].empty()) {
-                       if(environment_inner[depth] != "!-- --") {
+       for (; depth >= 0; --depth) {
+               if (!environment_stack[depth].empty()) {
+                       if (environment_inner[depth] != "!-- --") {
                                item_name= "listitem";
                                sgmlCloseTag(ofs, command_depth + depth,
                                             item_name);
-                               ifenvironment_inner[depth] == "varlistentry")
+                               if (environment_inner[depth] == "varlistentry")
                                       sgmlCloseTag(ofs, depth + command_depth,
                                                    environment_inner[depth]);
                        }
@@ -3201,8 +3244,8 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                }
        }
        
-       for(int j = command_depth; j >= command_base; --j)
-               if(!command_stack[j].empty())
+       for (int j = command_depth; j >= command_base; --j)
+               if (!command_stack[j].empty())
                        sgmlCloseTag(ofs, j, command_stack[j]);
 
        if (!only_body) {
@@ -3217,7 +3260,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 
 void Buffer::SimpleDocBookOnePar(ostream & os, string & extra,
                                 LyXParagraph * par, int & desc_on,
-                                int depth) 
+                                int depth) const
 {
        bool emph_flag = false;
 
@@ -3234,7 +3277,7 @@ void Buffer::SimpleDocBookOnePar(ostream & os, string & extra,
        LyXFont font1 = main_body > 0 ? style.labelfont : style.font;
        
        int char_line_count = depth;
-       if(!style.free_spacing)
+       if (!style.free_spacing)
                for (int j = 0; j < depth; ++j)
                        os << ' ';
 
@@ -3272,9 +3315,9 @@ void Buffer::SimpleDocBookOnePar(ostream & os, string & extra,
                        //   and title should come first
                        //         desc_on == 4
                        //
-                       if(desc_on!= 3 || i!= 0) {
-                               if(!tmp_out.empty() && tmp_out[0] == '@') {
-                                       if(desc_on == 4)
+                       if (desc_on!= 3 || i!= 0) {
+                               if (!tmp_out.empty() && tmp_out[0] == '@') {
+                                       if (desc_on == 4)
                                                extra += frontStrip(tmp_out, '@');
                                        else
                                                os << frontStrip(tmp_out, '@');
@@ -3317,7 +3360,7 @@ void Buffer::SimpleDocBookOnePar(ostream & os, string & extra,
        }
        
        // resets description flag correctly
-       switch(desc_on){
+       switch (desc_on){
        case 1:
                // <term> not closed...
                os << "</term>";
@@ -3671,7 +3714,7 @@ void Buffer::resizeInsets(BufferView * bv)
 {
        /// then remove all LyXText in text-insets
        LyXParagraph * par = paragraph;
-       for(; par; par = par->next) {
+       for (; par; par = par->next) {
            par->resizeInsetsLyXText(bv);
        }
 }