Reduce caption hardcoding

[lyx.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index a16cdc48cbbcdc9671f82c1ebcd1645a7e38f502..31d5f6269736b5ba2431724578526b6a60a1c0ee 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -78,13 +78,15 @@ string const X11hexname(RGBColor const & col)
 RGBColor rgbFromHexName(string const & x11hexname)
 {
        RGBColor c;
-       LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#', /**/);
+       LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#',
+               return c);
        c.r = hexstrToInt(x11hexname.substr(1, 2));
        c.g = hexstrToInt(x11hexname.substr(3, 2));
        c.b = hexstrToInt(x11hexname.substr(5, 2));
        return c;
 }
 
+
 string const outputLaTeXColor(RGBColor const & color)
 {
        // this routine returns a LaTeX readable color string in the form
@@ -92,22 +94,64 @@ string const outputLaTeXColor(RGBColor const & color)
        int red = color.r;
        int green = color.g;
        int blue = color.b;
+#ifdef USE_CORRECT_RGB_CONVERSION
+       int const scale = 255;
+#else
        // the color values are given in the range of 0-255, so to get
        // an output of "0.5" for the value 127 we need to do the following
+       // FIXME: This is wrong, since it creates a nonlinear mapping:
+       //        There is a gap between 0/256 and 2/256!
+       //        0.5 cannot be represented in 8bit hex RGB, it would be 127.5.
        if (red != 0)
                ++red;
        if (green != 0)
                ++green;
        if (blue != 0)
                ++blue;
+       int const scale = 256;
+#endif
        string output;
-       output = convert<string>(float(red) / 256) + ", "
-                        + convert<string>(float(green) / 256) + ", "
-                        + convert<string>(float(blue) / 256);
+       output = convert<string>(float(red) / scale) + ", "
+                        + convert<string>(float(green) / scale) + ", "
+                        + convert<string>(float(blue) / scale);
        return output;
 }
 
 
+RGBColor const RGBColorFromLaTeX(string const & color)
+{
+       vector<string> rgb = getVectorFromString(color);
+       while (rgb.size() < 3)
+               rgb.push_back("0");
+       RGBColor c;
+       for (int i = 0; i < 3; ++i) {
+               rgb[i] = trim(rgb[i]);
+               if (!isStrDbl(rgb[i]))
+                       return c;
+       }
+#ifdef USE_CORRECT_RGB_CONVERSION
+       int const scale = 255;
+#else
+       // FIXME: This is wrong, since it creates a nonlinear mapping:
+       //        Both 0/256 and 1/256 are mapped to 0!
+       //        The wrong code exists only to match outputLaTeXColor().
+       int const scale = 256;
+#endif
+       c.r = static_cast<unsigned int>(scale * convert<double>(rgb[0]) + 0.5);
+       c.g = static_cast<unsigned int>(scale * convert<double>(rgb[1]) + 0.5);
+       c.b = static_cast<unsigned int>(scale * convert<double>(rgb[2]) + 0.5);
+#ifndef USE_CORRECT_RGB_CONVERSION
+       if (c.r != 0)
+               c.r--;
+       if (c.g != 0)
+               c.g--;
+       if (c.b != 0)
+               c.b--;
+#endif
+       return c;
+}
+
+
 Color::Color(ColorCode base_color) : baseColor(base_color), 
        mergeColor(Color_ignore)
 {}
@@ -213,7 +257,6 @@ ColorSet::ColorSet()
        { Color_mathmacroblend, N_("math macro blended out"), "mathmacroblend", "black", "mathmacroblend" },
        { Color_mathmacrooldarg, N_("math macro old parameter"), "mathmacrooldarg", grey80, "mathmacrooldarg" },
        { Color_mathmacronewarg, N_("math macro new parameter"), "mathmacronewarg", "black", "mathmacronewarg" },
-       { Color_captionframe, N_("caption frame"), "captionframe", "IndianRed", "captionframe" },
        { Color_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },
        { Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" },
        { Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" },
@@ -231,7 +274,6 @@ ColorSet::ColorSet()
        { Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
        { Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" },
        { Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
-       { Color_topline, N_("top/bottom line"), "topline", "Brown", "topline" },
        { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" },
        { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline",
             "LightSteelBlue", "tabularonoffline" },