A little more lv cleanup.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 04d035481f9c4272b58447e17ac26777e970225d..5d6e56046ff45220afd5ab4d19a80145646c783c 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -367,8 +367,14 @@ BufferParams::BufferParams()
        listings_params = string();
        pagestyle = "default";
        suppress_date = false;
-       // white is equal to no background color
+       // no color is the default (white)
        backgroundcolor = lyx::rgbFromHexName("#ffffff");
+       isbackgroundcolor = false;
+       // no color is the default (black)
+       fontcolor = lyx::rgbFromHexName("#000000");
+       isfontcolor = false;
+       // light gray is the default font color for greyed-out notes
+       notefontcolor = lyx::rgbFromHexName("#cccccc");
        compressed = lyxrc.save_compressed;
        for (int iter = 0; iter < 4; ++iter) {
                user_defined_bullet(iter) = ITEMIZE_DEFAULTS[iter];
@@ -721,6 +727,18 @@ string BufferParams::readToken(Lexer & lex, string const & token,
        } else if (token == "\\backgroundcolor") {
                lex.eatLine();
                backgroundcolor = lyx::rgbFromHexName(lex.getString());
+               isbackgroundcolor = true;
+       } else if (token == "\\fontcolor") {
+               lex.eatLine();
+               fontcolor = lyx::rgbFromHexName(lex.getString());
+               isfontcolor = true;
+       } else if (token == "\\notefontcolor") {
+               lex.eatLine();
+               string color = lex.getString();
+               notefontcolor = lyx::rgbFromHexName(color);
+               // set the font color within LyX
+               // FIXME: the color is correctly set but later overwritten by the default
+               lcolor.setColor(Color_greyedouttext, color);
        } else if (token == "\\paperwidth") {
                lex >> paperwidth;
        } else if (token == "\\paperheight") {
@@ -911,8 +929,12 @@ void BufferParams::writeFile(ostream & os) const
           << "\n\\paperorientation " << string_orientation[orientation]
           << "\n\\suppress_date " << convert<string>(suppress_date)
           << '\n';
-          if (backgroundcolor != lyx::rgbFromHexName("#ffffff"))
+       if (isbackgroundcolor == true)
                os << "\\backgroundcolor " << lyx::X11hexname(backgroundcolor) << '\n';
+       if (isfontcolor == true)
+               os << "\\fontcolor " << lyx::X11hexname(fontcolor) << '\n';
+       if (notefontcolor != lyx::rgbFromHexName("#cccccc"))
+               os << "\\notefontcolor " << lyx::X11hexname(notefontcolor) << '\n';
 
        BranchList::const_iterator it = branchlist().begin();
        BranchList::const_iterator end = branchlist().end();
@@ -1200,10 +1222,12 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                // viet = string::npos when not found
                // the same is for all other languages that are not directly supported by
                // babel, but where LaTeX-packages add babel support.
-               // this is currently the case for Latvian, Lithuanian, and Mongolian
+               // this is currently the case for Latvian, Lithuanian, Mongolian
+               // and Turkmen
                size_t latvian = language_options.str().find("latvian");
                size_t lithu = language_options.str().find("lithuanian");
                size_t mongo = language_options.str().find("mongolian");
+               size_t turkmen = language_options.str().find("turkmen");
                // if Japanese is used, babel must directly be loaded
                // with language options, not in the class options, see
                // http://www.lyx.org/trac/ticket/4597#c4
@@ -1211,7 +1235,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                if (lyxrc.language_global_options && !language_options.str().empty()
                        && viet == string::npos && japan == string::npos
                        && latvian == string::npos && lithu == string::npos
-                       && mongo == string::npos)
+                       && mongo == string::npos && turkmen == string::npos)
                        clsoptions << language_options.str() << ',';
        }
 
@@ -1433,8 +1457,8 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                texrow.newline();
        }
 
-       // only output when the background color is not white
-       if (backgroundcolor != lyx::rgbFromHexName("#ffffff")) {
+       // only output when the background color is not default
+       if (isbackgroundcolor == true) {
                // only require color here, the background color will be defined
                // in LaTeXFeatures.cpp to avoid interferences with the LaTeX
                // package pdfpages 
@@ -1442,6 +1466,15 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                features.require("pagecolor");
        }
 
+       // only output when the font color is not default
+       if (isfontcolor == true) {
+               // only require color here, the font color will be defined
+               // in LaTeXFeatures.cpp to avoid interferences with the LaTeX
+               // package pdfpages 
+               features.require("color");
+               features.require("fontcolor");
+       }
+
        // Only if class has a ToC hierarchy
        if (tclass.hasTocLevels()) {
                if (secnumdepth != tclass.secnumdepth()) {
@@ -2093,17 +2126,20 @@ string BufferParams::babelCall(string const & lang_opts) const
        // viet = string::npos when not found
        // the same is for all other languages that are not directly supported by
        // babel, but where LaTeX-packages add babel support.
-       // this is currently the case for Latvian, Lithuanian, and Mongolian
+       // this is currently the case for Latvian, Lithuanian, Mongolian
+       // and Turkmen
        size_t latvian = lang_opts.find("latvian");
        size_t lithu = lang_opts.find("lithuanian");
        size_t mongo = lang_opts.find("mongolian");
+       size_t turkmen = lang_opts.find("turkmen");
        // If Japanese is used, babel must directly be loaded with the
        // language options, see
        // http://www.lyx.org/trac/ticket/4597#c4
        size_t japan = lang_opts.find("japanese");
        if (!lyxrc.language_global_options || viet != string::npos
                || japan != string::npos || latvian != string::npos
-               || lithu != string::npos || mongo != string::npos)
+               || lithu != string::npos || mongo != string::npos
+               || turkmen != string::npos)
                return "\\usepackage[" + lang_opts + "]{babel}";
        return lang_pack;
 }