More 'standard conformant blurb' nonsense.

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 7743aa2c694cbbb6f9682754546394752c72f5f6..837e481f29f489c57a32b6db32e0e477984c5280 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -24,6 +24,8 @@
 #include "author.h"
 #include "gettext.h"
 
+#include "LColor.h"
+
 #include "support/lyxalgo.h" // for lyx::count
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
@@ -73,6 +75,7 @@ BufferParams::BufferParams()
        sides = LyXTextClass::OneSide;
        columns = 1;
        pagestyle = "default";
+       compressed = false;
        for (int iter = 0; iter < 4; ++iter) {
                user_defined_bullets[iter] = ITEMIZE_DEFAULTS[iter];
                temp_bullets[iter] = ITEMIZE_DEFAULTS[iter];
@@ -119,7 +122,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
                if (tmpret == -1)
                        ++tmpret;
                paragraph_separation =
-                       static_cast<BufferParams::PARSEP>(tmpret);
+                       static_cast<PARSEP>(tmpret);
        } else if (token == "\\defskip") {
                lex.nextToken();
                defskip = VSpace(lex.getString());
@@ -172,7 +175,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
                int tmpret = lex.findToken(string_paperpackages);
                if (tmpret == -1) {
                        ++tmpret;
-                       paperpackage = BufferParams::PACKAGE_NONE;
+                       paperpackage = PACKAGE_NONE;
                } else
                        paperpackage = PAPER_PACKAGES(tmpret);
        } else if (token == "\\use_geometry") {
@@ -180,7 +183,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
                use_geometry = lex.getInteger();
        } else if (token == "\\use_amsmath") {
                lex.nextToken();
-               use_amsmath = static_cast<BufferParams::AMS>(
+               use_amsmath = static_cast<AMS>(
                        lex.getInteger());
        } else if (token == "\\use_natbib") {
                lex.nextToken();
@@ -191,6 +194,31 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
        } else if (token == "\\tracking_changes") {
                lex.nextToken();
                tracking_changes = lex.getInteger();
+       } else if (token == "\\branch") {
+               lex.nextToken();
+               string branch = lex.getString();
+               branchlist.add(branch);
+               while (true) {
+                       lex.nextToken();
+                       string const tok = lex.getString();
+                       if (tok == "\\end_branch")
+                               break;
+                       if (tok == "\\selected") {
+                               lex.nextToken();
+                               branchlist.setSelected(branch, lex.getInteger());
+                       }
+                       // not yet operational
+                       if (tok == "\\color") {
+                               lex.nextToken();
+                               string color = lex.getString();
+                               branchlist.setColor(branch, color);
+                               // Update also the LColor table:
+                               if (color == "none") 
+                                       color = lcolor.getX11Name(LColor::background);
+                               lcolor.fill(static_cast<LColor::color>(lcolor.size()), 
+                                               branch, color);
+                       }
+               }
        } else if (token == "\\author") {
                lex.nextToken();
                istringstream ss(STRCONV(lex.getString()));
@@ -202,7 +230,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
                if (tmpret == -1)
                        ++tmpret;
                orientation =
-                       static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
+                       static_cast<PAPER_ORIENTATION>(tmpret);
        } else if (token == "\\paperwidth") {
                lex.next();
                paperwidth = lex.getString();
@@ -379,6 +407,17 @@ void BufferParams::writeFile(ostream & os) const
           << "\n\\use_numerical_citations " << use_numerical_citations
           << "\n\\paperorientation " << string_orientation[orientation]
           << '\n';
+
+       std::list<Branch>::const_iterator it = branchlist.begin();
+       std::list<Branch>::const_iterator end = branchlist.end();
+       for (; it != end; ++it) {
+               os << "\\branch " << it->getBranch()
+                  << "\n\\selected " << it->getSelected()      
+                  << "\n\\color " << it->getColor()    
+                  << "\n\\end_branch" 
+                  << "\n";
+       }
+
        if (!paperwidth.empty())
                os << "\\paperwidth "
                   << VSpace(paperwidth).asLyXCommand() << '\n';
@@ -1004,7 +1043,7 @@ string const BufferParams::dvips_options() const
                string const paper_option = paperSizeName();
                if (paper_option != "letter" ||
                    orientation != ORIENTATION_LANDSCAPE) {
-                       // dvips won't accept -t letter -t landscape.  
+                       // dvips won't accept -t letter -t landscape.
                        // In all other cases, include the paper size
                        // explicitly.
                        result = lyxrc.print_paper_flag;