Buffer param \cite_engine_type (authoryear|numerical).

[lyx.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index a8c583d5a8e6b181afab020b880999a83fc12604..290c50a0b2aa6c41c77f2b8215ca0878bd6cc387 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -17,7 +17,9 @@
 #include <config.h>
 
 #include "Color.h"
+#include "ColorSet.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -83,6 +85,70 @@ RGBColor rgbFromHexName(string const & x11hexname)
        return c;
 }
 
+string const outputLaTeXColor(RGBColor const & color)
+{
+       // this routine returns a LaTeX readable color string in the form
+       // "red, green, blue" where the colors are a number in the range 0-1 
+       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) / 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)
@@ -130,6 +196,7 @@ ColorSet::ColorSet()
        char const * grey80 = "#cccccc";
        //char const * grey90 = "#e5e5e5";
        //  ColorCode, gui, latex, x11, lyx
+       // Warning: several of these entries are overridden in GuiApplication constructor
        static ColorEntry const items[] = {
        { Color_none, N_("none"), "none", "black", "none" },
        { Color_black, N_("black"), "black", "black", "black" },
@@ -157,6 +224,7 @@ ColorSet::ColorSet()
        { Color_commentlabel, N_("comment label"), "comment", "magenta", "comment" },
        { Color_commentbg, N_("comment background"), "commentbg", "linen", "commentbg" },
        { Color_greyedoutlabel, N_("greyedout inset label"), "greyedout", "#ff0080", "greyedout" },
+       { Color_greyedouttext, N_("greyedout inset text"), "greyedouttext", grey80, "greyedouttext" },
        { Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" },
        { Color_phantomtext, N_("phantom inset text"), "phantomtext", "#7f7f7f", "phantomtext" },
        { Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
@@ -187,7 +255,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", "DarkRed", "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" },
@@ -205,7 +272,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" },
@@ -215,7 +281,10 @@ ColorSet::ColorSet()
        { Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
        { Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" },
        { Color_buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" },
+       { Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", grey80, "paragraphmarker"},
+       { Color_previewframe, N_("preview frame"), "previewframe", "black", "previewframe"},
        { Color_inherit, N_("inherit"), "inherit", "black", "inherit" },
+       { Color_regexpframe, N_("regexp frame"), "green", "green", "green" },
        { Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
        { Color_ignore, 0, 0, 0, 0 }
        };