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
- // "red, green, blue" where the colors are a number in the range 0-1
+ // "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) / 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;
}
-Color::Color(ColorCode base_color) : baseColor(base_color),
+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)
{}
}
-bool Color::operator!=(Color const & color) const
+bool Color::operator!=(Color const & color) const
{
return baseColor != color.baseColor;
}
{ Color_none, N_("none"), "none", "black", "none" },
{ Color_black, N_("black"), "black", "black", "black" },
{ Color_white, N_("white"), "white", "white", "white" },
- { Color_red, N_("red"), "red", "red", "red" },
- { Color_green, N_("green"), "green", "green", "green" },
{ Color_blue, N_("blue"), "blue", "blue", "blue" },
+ { Color_brown, N_("brown"), "brown", "brown", "brown" },
{ Color_cyan, N_("cyan"), "cyan", "cyan", "cyan" },
+ { Color_darkgray, N_("darkgray"), "darkgray", "darkgray", "darkgray" },
+ { Color_gray, N_("gray"), "gray", "gray", "gray" },
+ { Color_green, N_("green"), "green", "green", "green" },
+ { Color_lightgray, N_("lightgray"), "lightgray", "lightgray", "lightgray" },
+ { Color_lime, N_("lime"), "lime", "lime", "lime" },
{ Color_magenta, N_("magenta"), "magenta", "magenta", "magenta" },
+ { Color_olive, N_("olive"), "olive", "olive", "olive" },
+ { Color_orange, N_("orange"), "orange", "orange", "orange" },
+ { Color_pink, N_("pink"), "pink", "pink", "pink" },
+ { Color_purple, N_("purple"), "purple", "purple", "purple" },
+ { Color_red, N_("red"), "red", "red", "red" },
+ { Color_teal, N_("teal"), "teal", "teal", "teal" },
+ { Color_violet, N_("violet"), "violet", "violet", "violet" },
{ Color_yellow, N_("yellow"), "yellow", "yellow", "yellow" },
{ Color_cursor, N_("cursor"), "cursor", "black", "cursor" },
{ Color_background, N_("background"), "background", "linen", "background" },
{ Color_urllabel, N_("URL label"), "urllabel", "blue", "urllabel" },
{ Color_urltext, N_("URL text"), "urltext", "blue", "urltext" },
{ Color_depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
+ { Color_scroll, N_("scroll indicator"), "scroll", "IndianRed", "scroll" },
{ Color_language, N_("language"), "language", "Blue", "language" },
{ Color_command, N_("command inset"), "command", "black", "command" },
{ Color_commandbg, N_("command inset background"), "commandbg", "azure", "commandbg" },
{ 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_collapsible, N_("collapsible inset text"), "collapsible", "DarkRed", "collapsible" },
+ { Color_collapsibleframe, N_("collapsible inset frame"), "collapsibleframe", "IndianRed", "collapsibleframe" },
{ Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" },
{ Color_insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },
{ Color_error, N_("LaTeX error"), "error", "Red", "error" },
{ Color_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
{ Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" },
{ Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" },
- { Color_deletedtext, N_("deleted text"), "deletedtext", "#ff0000", "deletedtext" },
- { Color_addedtext, N_("added text"), "addedtext", "#0000ff", "addedtext" },
- { Color_changedtextauthor1, N_("changed text 1st author"), "changedtextauthor1", "#0000ff", "changedtextauthor1" },
- { Color_changedtextauthor2, N_("changed text 2nd author"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" },
- { Color_changedtextauthor3, N_("changed text 3rd author"), "changedtextauthor3", "#ff0000", "changedtextauthor3" },
- { Color_changedtextauthor4, N_("changed text 4th author"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" },
- { Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
- { Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" },
+ { Color_deletedtext, N_("deleted text (output)"), "deletedtext", "#ff0000", "deletedtext" },
+ { Color_addedtext, N_("added text (output)"), "addedtext", "#0000ff", "addedtext" },
+ { Color_addedtextauthor1, N_("added text (workarea, 1st author)"), "changedtextauthor1", "#0000ff", "changedtextauthor1" },
+ { Color_addedtextauthor2, N_("added text (workarea, 2nd author)"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" },
+ { Color_addedtextauthor3, N_("added text (workarea, 3rd author)"), "changedtextauthor3", "#ff0000", "changedtextauthor3" },
+ { Color_addedtextauthor4, N_("added text (workarea, 4th author)"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" },
+ { Color_addedtextauthor5, N_("added text (workarea, 5th author)"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
+ { Color_deletedtextmodifier, N_("deleted text modifier (workarea)"), "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" },
+ { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", "LightSteelBlue", "tabularonoffline" },
{ Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" },
{ Color_newpage, N_("new page"), "newpage", "Blue", "newpage" },
{ Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" },
- { Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
+ { Color_buttonframe, N_("button frame"), "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_regexpframe, N_("regexp frame"), "regexpframe", "green", "regexpframe" },
{ Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
{ Color_ignore, 0, 0, 0, 0 }
};
projects / lyx.git / blobdiff