X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=290c50a0b2aa6c41c77f2b8215ca0878bd6cc387;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=1e5fc621a19b380378defd122a9ca1eca2a38211;hpb=c1173eb11c5f218cd459924eb44276445c499069;p=lyx.git diff --git a/src/Color.cpp b/src/Color.cpp index 1e5fc621a1..290c50a0b2 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -4,11 +4,11 @@ * Licence details can be found in the file COPYING. * * \author Asger Alstrup - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Matthias Ettrich * \author Jean-Marc Lasgouttes * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Martin Vermeer * * Full author contact details are available in file CREDITS. @@ -17,7 +17,9 @@ #include #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,109 @@ 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(float(red) / scale) + ", " + + convert(float(green) / scale) + ", " + + convert(float(blue) / scale); + return output; +} + + +RGBColor const RGBColorFromLaTeX(string const & color) +{ + vector 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(scale * convert(rgb[0]) + 0.5); + c.g = static_cast(scale * convert(rgb[1]) + 0.5); + c.b = static_cast(scale * convert(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 +{ + return baseColor == color.baseColor; +} + + +bool Color::operator!=(Color const & color) const +{ + return baseColor != color.baseColor; +} + + +bool Color::operator<(Color const & color) const +{ + return baseColor < color.baseColor; +} + + +bool Color::operator<=(Color const & color) const +{ + return baseColor <= color.baseColor; +} + + +std::ostream & operator<<(std::ostream & os, Color color) +{ + os << to_ascii(lcolor.getGUIName(color.baseColor)); + if (color.mergeColor != Color_ignore) + os << "[merged with:" + << to_ascii(lcolor.getGUIName(color.mergeColor)) << "]"; + return os; +} + ColorSet::ColorSet() { @@ -91,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" }, @@ -118,8 +224,11 @@ 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" }, + { Color_listingsbg, N_("listings background"), "listingsbg", "white", "listingsbg" }, { Color_branchlabel, N_("branch label"), "branchlabel", "#c88000", "branchlabel" }, { Color_footlabel, N_("footnote label"), "footlabel", "#00aaff", "footlabel" }, { Color_indexlabel, N_("index label"), "indexlabel", "green", "indexlabel" }, @@ -135,18 +244,17 @@ ColorSet::ColorSet() { Color_math, N_("math"), "math", "DarkBlue", "math" }, { Color_mathbg, N_("math background"), "mathbg", "linen", "mathbg" }, { Color_graphicsbg, N_("graphics background"), "graphicsbg", "linen", "graphicsbg" }, - { Color_mathmacrobg, N_("Math macro background"), "mathmacrobg", "linen", "mathmacrobg" }, + { Color_mathmacrobg, N_("math macro background"), "mathmacrobg", "linen", "mathmacrobg" }, { Color_mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" }, { Color_mathcorners, N_("math corners"), "mathcorners", "linen", "mathcorners" }, { Color_mathline, N_("math line"), "mathline", "Blue", "mathline" }, - { Color_mathmacrobg, N_("Math macro background"), "mathmacrobg", "#ede2d8", "mathmacrobg" }, - { Color_mathmacrohoverbg, N_("Math macro hovered background"), "mathmacrohoverbg", "#cdc3b8", "mathmacrohoverbg" }, - { Color_mathmacrolabel, N_("Math macro label"), "mathmacrolabel", "#a19992", "mathmacrolabel" }, - { Color_mathmacroframe, N_("Math macro frame"), "mathmacroframe", "#ede2d8", "mathmacroframe" }, - { 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_mathmacrobg, N_("math macro background"), "mathmacrobg", "#ede2d8", "mathmacrobg" }, + { Color_mathmacrohoverbg, N_("math macro hovered background"), "mathmacrohoverbg", "#cdc3b8", "mathmacrohoverbg" }, + { Color_mathmacrolabel, N_("math macro label"), "mathmacrolabel", "#a19992", "mathmacrolabel" }, + { Color_mathmacroframe, N_("math macro frame"), "mathmacroframe", "#ede2d8", "mathmacroframe" }, + { 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_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" }, @@ -155,10 +263,15 @@ ColorSet::ColorSet() { 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_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_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" }, @@ -168,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 } };