Kornel's gcc compile fix.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 2dd4817e3e541fae1db1aedee68ac0a8683c1ab3..f369c8d6d9cbdf03d67c3cf520ec2c45edc3a5ce 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -25,6 +25,7 @@
 #include "Color.h"
 #include "ColorSet.h"
 #include "Encoding.h"
+#include "HSpace.h"
 #include "IndicesList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -289,6 +290,7 @@ public:
        /** This is the amount of space used for paragraph_separation "skip",
         * and for detached paragraphs in "indented" documents.
         */
+       HSpace indentation;
        VSpace defskip;
        PDFOptions pdfoptions;
        LayoutFileIndex baseClass_;
@@ -361,6 +363,7 @@ BufferParams::BufferParams()
        columns = 1;
        listings_params = string();
        pagestyle = "default";
+       suppress_date = false;
        // white is equal to no background color
        backgroundcolor = lyx::rgbFromHexName("#ffffff");
        compressed = false;
@@ -468,6 +471,18 @@ PDFOptions const & BufferParams::pdfoptions() const
 }
 
 
+HSpace const & BufferParams::getIndentation() const
+{
+       return pimpl_->indentation;
+}
+
+
+void BufferParams::setIndentation(HSpace const & indent)
+{
+       pimpl_->indentation = indent;
+}
+
+
 VSpace const & BufferParams::getDefSkip() const
 {
        return pimpl_->defskip;
@@ -525,6 +540,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
        } else if (token == "\\master") {
                lex.eatLine();
                master = lex.getString();
+       } else if (token == "\\suppress_date") {
+               lex >> suppress_date;
        } else if (token == "\\language") {
                readLanguage(lex);
        } else if (token == "\\inputencoding") {
@@ -566,6 +583,10 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                string parsep;
                lex >> parsep;
                paragraph_separation = parseptranslator().find(parsep);
+       } else if (token == "\\paragraph_indentation") {
+               lex.next();
+               string indentation = lex.getString();
+               pimpl_->indentation = HSpace(indentation);
        } else if (token == "\\defskip") {
                lex.next();
                string defskip = lex.getString();
@@ -618,7 +639,11 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                                if (branch_ptr)
                                        branch_ptr->setSelected(lex.getInteger());
                        }
-                       // not yet operational
+                       if (tok == "\\filename_suffix") {
+                               lex.next();
+                               if (branch_ptr)
+                                       branch_ptr->setFilenameSuffix(lex.getInteger());
+                       }
                        if (tok == "\\color") {
                                lex.eatLine();
                                string color = lex.getString();
@@ -634,6 +659,7 @@ string BufferParams::readToken(Lexer & lex, string const & token,
        } else if (token == "\\index") {
                lex.eatLine();
                docstring index = lex.getDocString();
+               docstring shortcut;
                indiceslist().add(index);
                while (true) {
                        lex.next();
@@ -643,10 +669,10 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                        Index * index_ptr = indiceslist().find(index);
                        if (tok == "\\shortcut") {
                                lex.next();
+                               shortcut = lex.getDocString();
                                if (index_ptr)
-                                       index_ptr->setShortcut(lex.getDocString());
+                                       index_ptr->setShortcut(shortcut);
                        }
-                       // not yet operational
                        if (tok == "\\color") {
                                lex.eatLine();
                                string color = lex.getString();
@@ -656,7 +682,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                                if (color == "none")
                                        color = lcolor.getX11Name(Color_background);
                                // FIXME UNICODE
-                               lcolor.setColor(to_utf8(index), color);
+                               if (!shortcut.empty())
+                                       lcolor.setColor(to_utf8(shortcut), color);
                        }
                }
        } else if (token == "\\author") {
@@ -664,7 +691,7 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                istringstream ss(lex.getString());
                Author a;
                ss >> a;
-               author_map.push_back(pimpl_->authorlist.record(a));
+               author_map[a.buffer_id()] = pimpl_->authorlist.record(a);
        } else if (token == "\\paperorientation") {
                string orient;
                lex >> orient;
@@ -840,6 +867,7 @@ void BufferParams::writeFile(ostream & os) const
           << "\n\\use_bibtopic " << convert<string>(use_bibtopic)
           << "\n\\use_indices " << convert<string>(use_indices)
           << "\n\\paperorientation " << string_orientation[orientation]
+          << "\n\\suppress_date " << convert<string>(suppress_date)
           << '\n';
           if (backgroundcolor != lyx::rgbFromHexName("#ffffff"))
                os << "\\backgroundcolor " << lyx::X11hexname(backgroundcolor) << '\n';
@@ -849,6 +877,7 @@ void BufferParams::writeFile(ostream & os) const
        for (; it != end; ++it) {
                os << "\\branch " << to_utf8(it->branch())
                   << "\n\\selected " << it->isSelected()
+                  << "\n\\filename_suffix " << it->hasFilenameSuffix()
                   << "\n\\color " << lyx::X11hexname(it->color())
                   << "\n\\end_branch"
                   << "\n";
@@ -897,9 +926,12 @@ void BufferParams::writeFile(ostream & os) const
        os << "\\secnumdepth " << secnumdepth
           << "\n\\tocdepth " << tocdepth
           << "\n\\paragraph_separation "
-          << string_paragraph_separation[paragraph_separation]
-          << "\n\\defskip " << getDefSkip().asLyXCommand()
-          << "\n\\quotes_language "
+          << string_paragraph_separation[paragraph_separation];
+       if (!paragraph_separation)
+               os << "\n\\paragraph_indentation " << getIndentation().asLyXCommand();
+       else
+               os << "\n\\defskip " << getDefSkip().asLyXCommand();
+       os << "\n\\quotes_language "
           << string_quotes_language[quotes_language]
           << "\n\\papercolumns " << columns
           << "\n\\papersides " << sides
@@ -927,14 +959,7 @@ void BufferParams::writeFile(ostream & os) const
        os << "\\tracking_changes " << convert<string>(trackChanges) << "\n";
        os << "\\output_changes " << convert<string>(outputChanges) << "\n";
 
-       AuthorList::Authors::const_iterator a_it = pimpl_->authorlist.begin();
-       AuthorList::Authors::const_iterator a_end = pimpl_->authorlist.end();
-       for (; a_it != a_end; ++a_it) {
-               if (a_it->second.used())
-                       os << "\\author " << a_it->second << "\n";
-               else
-                       os << "\\author " << Author() << "\n";
-       }
+       os << pimpl_->authorlist;
 }
 
 
@@ -1364,6 +1389,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        }
 
        if (paragraph_separation) {
+               // when skip separation
                switch (getDefSkip().kind()) {
                case VSpace::SMALLSKIP:
                        os << "\\setlength{\\parskip}{\\smallskipamount}\n";
@@ -1384,9 +1410,17 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                        break;
                }
                texrow.newline();
-
                os << "\\setlength{\\parindent}{0pt}\n";
                texrow.newline();
+       } else {
+               // when separation by indentation
+               // only output something when a width is given
+               if (getIndentation().asLyXCommand() != "default") {
+                       os << "\\setlength{\\parindent}{"
+                               << from_utf8(getIndentation().asLatexCommand())
+                          << "}\n";
+                       texrow.newline();
+               }
        }
 
        // Now insert the LyX specific LaTeX commands...
@@ -1449,7 +1483,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        docstring atlyxpreamble;
 
        // Some macros LyX will need
-       docstring tmppreamble(from_ascii(features.getMacros()));
+       docstring tmppreamble(features.getMacros());
 
        if (!tmppreamble.empty())
                atlyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
@@ -1463,6 +1497,12 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                        "Textclass specific LaTeX commands.\n"
                        + tmppreamble + '\n';
 
+       // suppress date if selected
+       // use \@ifundefined because we cannot be sure that every document class
+       // has a \date command
+       if (suppress_date)
+               atlyxpreamble += "\\@ifundefined{date}{}{\\date{}}\n";
+
        /* the user-defined preamble */
        if (!containsOnly(preamble, " \n\t"))
                // FIXME UNICODE