X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=1b1f513862397c7f7d08138f1e25b7c7de028994;hb=4b7f1b3c3918cd32070c72b6d8e95a888981c7a2;hp=f4e84aeee1c0087cf013ac279fc763f014e96396;hpb=2e968d06610325ad5b69cee0e93f99b8435d5542;p=lyx.git diff --git a/src/Color.cpp b/src/Color.cpp index f4e84aeee1..1b1f513862 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" @@ -77,12 +79,73 @@ RGBColor rgbFromHexName(string const & x11hexname) { RGBColor c; LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#', /**/); - c.r = hexstrToInt(x11hexname.substr(1,2)); - c.g = hexstrToInt(x11hexname.substr(3,2)); - c.b = hexstrToInt(x11hexname.substr(5,2)); + 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 + int red = color.r; + int green = color.g; + int blue = color.b; + // 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 + if (red != 0) + ++red; + if (green != 0) + ++green; + if (blue != 0) + ++blue; + string output; + output = convert(float(red) / 256) + ", " + + convert(float(green) / 256) + ", " + + convert(float(blue) / 256); + return output; +} + + +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() { @@ -119,7 +182,9 @@ ColorSet::ColorSet() { Color_commentbg, N_("comment background"), "commentbg", "linen", "commentbg" }, { Color_greyedoutlabel, N_("greyedout inset label"), "greyedout", "#ff0080", "greyedout" }, { 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,17 +200,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_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_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" }, { Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" }, @@ -155,8 +220,14 @@ 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" }, @@ -168,6 +239,7 @@ 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_inherit, N_("inherit"), "inherit", "black", "inherit" }, { Color_ignore, N_("ignore"), "ignore", "black", "ignore" }, { Color_ignore, 0, 0, 0, 0 }