X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=d9933ce34e342e0611bb6a8b3974c5e875ec7401;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=3474850fbcac8772a6861fa8d842ea4cae57c1ef;hpb=02703f47bfdb01dbe229d13ec02c9f567995f6ee;p=lyx.git diff --git a/src/Color.cpp b/src/Color.cpp index 3474850fbc..d9933ce34e 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. @@ -16,10 +16,14 @@ #include -#include "debug.h" -#include "gettext.h" #include "Color.h" +#include "ColorSet.h" + +#include "support/convert.h" +#include "support/debug.h" +#include "support/gettext.h" #include "support/lstrings.h" +#include "support/lassert.h" #include #include @@ -27,49 +31,29 @@ #include -#ifndef CXX_GLOBAL_CSTD -using std::floor; -#endif - -using std::max; -using std::min; -using std::setw; - -using std::istringstream; -using std::ostringstream; -using std::string; -using std::endl; - -using lyx::support::compare_ascii_no_case; -using lyx::support::ascii_lowercase; +using namespace std; +using namespace lyx::support; +namespace lyx { -namespace { -struct ColorEntry { - lyx::Color::color lcolor; +struct ColorSet::ColorEntry { + ColorCode lcolor; char const * guiname; char const * latexname; char const * x11name; char const * lyxname; }; -int const nohue = -1; -int hexstrToInt(string const & str) +static int hexstrToInt(string const & str) { int val = 0; istringstream is(str); - is >> std::setbase(16) >> val; + is >> setbase(16) >> val; return val; } -} // namespace anon - - - -namespace lyx { - ///////////////////////////////////////////////////////////////////// // @@ -82,7 +66,7 @@ string const X11hexname(RGBColor const & col) { ostringstream ostr; - ostr << '#' << std::setbase(16) << std::setfill('0') + ostr << '#' << setbase(16) << setfill('0') << setw(2) << col.r << setw(2) << col.g << setw(2) << col.b; @@ -91,275 +75,266 @@ string const X11hexname(RGBColor const & col) } -RGBColor::RGBColor(string const & x11hexname) - : r(0), g(0), b(0) +RGBColor rgbFromHexName(string const & x11hexname) { - BOOST_ASSERT(x11hexname.size() == 7 && x11hexname[0] == '#'); - r = hexstrToInt(x11hexname.substr(1,2)); - g = hexstrToInt(x11hexname.substr(3,2)); - b = hexstrToInt(x11hexname.substr(5,2)); + RGBColor c; + 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; } -RGBColor::RGBColor(HSVColor const & hsv) +string const outputLaTeXColor(RGBColor const & color) { - double h = hsv.h; - double const s = hsv.s; - double const v = hsv.v; - - double rd, gd, bd; - - if (h == nohue || s == 0.0) { - rd = gd = bd = v; - } else { - if (h == 360.0) h = 0.0; - h /= 60.0; - - int const j = max(0, static_cast(::floor(h))); - //if (j < 0) j = 0; - - double const f = h - j; - double const p = v * (1.0 - s); - double const q = v * (1.0 - (s * f)); - double const t = v * (1.0 - (s * (1.0 - f))); - - switch (j) { - case 0: - rd = v; - gd = t; - bd = p; - break; - case 1: - rd = q; - gd = v; - bd = p; - break; - case 2: - rd = p; - gd = v; - bd = t; - break; - case 3: - rd = p; - gd = q; - bd = v; - break; - case 4: - rd = t; - gd = p; - bd = v; - break; - case 5: - rd = v; - gd = p; - bd = q; - break; - default: - rd = v; - gd = t; - bd = p; - break; // should never happen. - } - } + // 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; +} + - r = static_cast(::floor((rd * 255.0) + 0.5)); - g = static_cast(::floor((gd * 255.0) + 0.5)); - b = static_cast(::floor((bd * 255.0) + 0.5)); +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; } -///////////////////////////////////////////////////////////////////// -// -// HSVColor -// -///////////////////////////////////////////////////////////////////// +Color::Color(ColorCode base_color) : baseColor(base_color), + mergeColor(Color_ignore) +{} -HSVColor::HSVColor(RGBColor const & rgb) + +bool Color::operator==(Color const & color) const { - double const r = rgb.r / 255.0; - double const g = rgb.g / 255.0; - double const b = rgb.b / 255.0; - - double const maxval = max(max(r, g), b); - double const minval = min(min(r, g), b); - - v = maxval; - - double const diff = maxval - minval; - if (maxval != 0.0) - s = diff / maxval; - else - s = 0.0; - - h = nohue; - if (s != 0.0) { - double const rc = (maxval - r) / diff; - double const gc = (maxval - g) / diff; - double const bc = (maxval - b) / diff; - - if (r == maxval) - h = bc - gc; - else if (g == maxval) - h = 2.0 + rc - bc; - else if (b == maxval) - h = 4.0 + gc - rc; - - h *= 60.0; - if (h < 0) - h += 360; - } + return baseColor == color.baseColor; } +bool Color::operator!=(Color const & color) const +{ + return baseColor != color.baseColor; +} -///////////////////////////////////////////////////////////////////// -// -// Color::Pimpl -// -///////////////////////////////////////////////////////////////////// -class Color::Pimpl { -public: - /// - class information { - public: - /// the name as it appears in the GUI - string guiname; - /// the name used in LaTeX - string latexname; - /// the name for X11 - string x11name; - /// the name for LyX - string lyxname; - }; +bool Color::operator<(Color const & color) const +{ + return baseColor < color.baseColor; +} - /// initialise a color entry - void fill(ColorEntry const & entry) - { - information in; - in.lyxname = entry.lyxname; - in.latexname = entry.latexname; - in.x11name = entry.x11name; - in.guiname = entry.guiname; - infotab[entry.lcolor] = in; - lyxcolors[entry.lyxname] = entry.lcolor; - latexcolors[entry.latexname] = entry.lcolor; - } - /// - typedef std::map InfoTab; - /// the table of color information - InfoTab infotab; +bool Color::operator<=(Color const & color) const +{ + return baseColor <= color.baseColor; +} - typedef std::map Transform; - /// the transform between LyX color name string and integer code. - Transform lyxcolors; - /// the transform between LaTeX color name string and integer code. - Transform latexcolors; -}; +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; +} -Color::Color() - : pimpl_(new Pimpl) +ColorSet::ColorSet() { - // Color::color, gui, latex, x11, lyx + char const * grey40 = "#666666"; + char const * grey60 = "#999999"; + 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[] = { - { none, N_("none"), "none", "black", "none" }, - { black, N_("black"), "black", "black", "black" }, - { white, N_("white"), "white", "white", "white" }, - { red, N_("red"), "red", "red", "red" }, - { green, N_("green"), "green", "green", "green" }, - { blue, N_("blue"), "blue", "blue", "blue" }, - { cyan, N_("cyan"), "cyan", "cyan", "cyan" }, - { magenta, N_("magenta"), "magenta", "magenta", "magenta" }, - { yellow, N_("yellow"), "yellow", "yellow", "yellow" }, - { cursor, N_("cursor"), "cursor", "black", "cursor" }, - { background, N_("background"), "background", "linen", "background" }, - { foreground, N_("text"), "foreground", "black", "foreground" }, - { selection, N_("selection"), "selection", "LightBlue", "selection" }, - { latex, N_("LaTeX text"), "latex", "DarkRed", "latex" }, - { preview, N_("previewed snippet"), "preview", "black", "preview" }, - { note, N_("note"), "note", "blue", "note" }, - { notebg, N_("note background"), "notebg", "yellow", "notebg" }, - { comment, N_("comment"), "comment", "magenta", "comment" }, - { commentbg, N_("comment background"), "commentbg", "linen", "commentbg" }, - { greyedout, N_("greyedout inset"), "greyedout", "red", "greyedout" }, - { greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" }, - { shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" }, - { depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" }, - { language, N_("language"), "language", "Blue", "language" }, - { command, N_("command inset"), "command", "black", "command" }, - { commandbg, N_("command inset background"), "commandbg", "azure", "commandbg" }, - { commandframe, N_("command inset frame"), "commandframe", "black", "commandframe" }, - { special, N_("special character"), "special", "RoyalBlue", "special" }, - { math, N_("math"), "math", "DarkBlue", "math" }, - { mathbg, N_("math background"), "mathbg", "linen", "mathbg" }, - { graphicsbg, N_("graphics background"), "graphicsbg", "linen", "graphicsbg" }, - { mathmacrobg, N_("Math macro background"), "mathmacrobg", "linen", "mathmacrobg" }, - { mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" }, - { mathline, N_("math line"), "mathline", "Blue", "mathline" }, - { captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" }, - { collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" }, - { collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" }, - { insetbg, N_("inset background"), "insetbg", "grey80", "insetbg" }, - { insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" }, - { error, N_("LaTeX error"), "error", "Red", "error" }, - { eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" }, - { appendix, N_("appendix marker"), "appendix", "Brown", "appendix" }, - { changebar, N_("change bar"), "changebar", "Blue", "changebar" }, - { strikeout, N_("Deleted text"), "strikeout", "Red", "strikeout" }, - { newtext, N_("Added text"), "newtext", "Blue", "newtext" }, - { added_space, N_("added space markers"), "added_space", "Brown", "added_space" }, - { topline, N_("top/bottom line"), "topline", "Brown", "topline" }, - { tabularline, N_("table line"), "tabularline", "black", - "tabularline" }, - { tabularonoffline, N_("table on/off line"), "tabularonoffline", + { Color_none, N_("none"), "none", "black", "none" }, + { Color_black, N_("black"), "black", "black", "black" }, + { Color_white, N_("white"), "white", "white", "white" }, + { 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_foreground, N_("text"), "foreground", "black", "foreground" }, + { Color_selection, N_("selection"), "selection", "LightBlue", "selection" }, + { Color_selectiontext, N_("selected text"), + "selectiontext", "black", "selectiontext" }, + { Color_latex, N_("LaTeX text"), "latex", "DarkRed", "latex" }, + { Color_inlinecompletion, N_("inline completion"), + "inlinecompletion", grey60, "inlinecompletion" }, + { Color_nonunique_inlinecompletion, N_("non-unique inline completion"), + "nonuniqueinlinecompletion", grey80, "nonuniqueinlinecompletion" }, + { Color_preview, N_("previewed snippet"), "preview", "black", "preview" }, + { Color_notelabel, N_("note label"), "note", "yellow", "note" }, + { Color_notebg, N_("note background"), "notebg", "yellow", "notebg" }, + { 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" }, + { Color_marginlabel, N_("margin note label"), "marginlabel", "#aa55ff", "marginlabel" }, + { 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_commandframe, N_("command inset frame"), "commandframe", "black", "commandframe" }, + { Color_special, N_("special character"), "special", "RoyalBlue", "special" }, + { 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_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_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_added_space, N_("added space markers"), "added_space", "Brown", "added_space" }, + { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" }, + { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", "LightSteelBlue", "tabularonoffline" }, - { bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" }, - { pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" }, - { buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" }, - { buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" }, - { buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" }, - { inherit, N_("inherit"), "inherit", "black", "inherit" }, - { ignore, N_("ignore"), "ignore", "black", "ignore" }, - { ignore, 0, 0, 0, 0 } + { 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_("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"), "regexpframe", "green", "regexpframe" }, + { Color_ignore, N_("ignore"), "ignore", "black", "ignore" }, + { Color_ignore, 0, 0, 0, 0 } }; for (int i = 0; items[i].guiname; ++i) - pimpl_->fill(items[i]); + fill(items[i]); } -Color::Color(Color const & c) - : pimpl_(new Pimpl(*c.pimpl_)) -{} - - -Color::~Color() -{} - - -Color & Color::operator=(Color tmp) +/// initialise a color entry +void ColorSet::fill(ColorEntry const & entry) { - boost::swap(pimpl_, tmp.pimpl_); - return *this; + Information in; + in.lyxname = entry.lyxname; + in.latexname = entry.latexname; + in.x11name = entry.x11name; + in.guiname = entry.guiname; + infotab[entry.lcolor] = in; + lyxcolors[entry.lyxname] = entry.lcolor; + latexcolors[entry.latexname] = entry.lcolor; } -docstring const Color::getGUIName(Color::color c) const +docstring const ColorSet::getGUIName(ColorCode c) const { - Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c); - if (it != pimpl_->infotab.end()) + InfoTab::const_iterator it = infotab.find(c); + if (it != infotab.end()) return _(it->second.guiname); return from_ascii("none"); } -string const Color::getX11Name(Color::color c) const +string const ColorSet::getX11Name(ColorCode c) const { - Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c); - if (it != pimpl_->infotab.end()) + InfoTab::const_iterator it = infotab.find(c); + if (it != infotab.end()) return it->second.x11name; lyxerr << "LyX internal error: Missing color" @@ -369,38 +344,36 @@ string const Color::getX11Name(Color::color c) const } -string const Color::getLaTeXName(Color::color c) const +string const ColorSet::getLaTeXName(ColorCode c) const { - Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c); - if (it != pimpl_->infotab.end()) + InfoTab::const_iterator it = infotab.find(c); + if (it != infotab.end()) return it->second.latexname; return "black"; } -string const Color::getLyXName(Color::color c) const +string const ColorSet::getLyXName(ColorCode c) const { - Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c); - if (it != pimpl_->infotab.end()) + InfoTab::const_iterator it = infotab.find(c); + if (it != infotab.end()) return it->second.lyxname; return "black"; } -bool Color::setColor(Color::color col, string const & x11name) +bool ColorSet::setColor(ColorCode col, string const & x11name) { - Pimpl::InfoTab::iterator it = pimpl_->infotab.find(col); - if (it == pimpl_->infotab.end()) { - lyxerr << "Color " << col << " not found in database." - << std::endl; + InfoTab::iterator it = infotab.find(col); + if (it == infotab.end()) { + LYXERR0("Color " << col << " not found in database."); return false; } // "inherit" is returned for colors not in the database // (and anyway should not be redefined) - if (col == none || col == inherit || col == ignore) { - lyxerr << "Color " << getLyXName(col) - << " may not be redefined" << endl; + if (col == Color_none || col == Color_inherit || col == Color_ignore) { + LYXERR0("Color " << getLyXName(col) << " may not be redefined."); return false; } @@ -409,56 +382,57 @@ bool Color::setColor(Color::color col, string const & x11name) } -bool Color::setColor(string const & lyxname, string const &x11name) +bool ColorSet::setColor(string const & lyxname, string const &x11name) { string const lcname = ascii_lowercase(lyxname); - if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) { - LYXERR(Debug::GUI) - << "Color::setColor: Unknown color \"" - << lyxname << '"' << endl; - addColor(static_cast(pimpl_->infotab.size()), lcname); + if (lyxcolors.find(lcname) == lyxcolors.end()) { + LYXERR(Debug::GUI, "ColorSet::setColor: Unknown color \"" + << lyxname << '"'); + addColor(static_cast(infotab.size()), lcname); } - return setColor(pimpl_->lyxcolors[lcname], x11name); + return setColor(lyxcolors[lcname], x11name); } -void Color::addColor(Color::color c, string const & lyxname) const +void ColorSet::addColor(ColorCode c, string const & lyxname) { ColorEntry ce = { c, "", "", "", lyxname.c_str() }; - pimpl_->fill(ce); + fill(ce); } -Color::color Color::getFromLyXName(string const & lyxname) const +ColorCode ColorSet::getFromLyXName(string const & lyxname) const { string const lcname = ascii_lowercase(lyxname); - if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) { - lyxerr << "Color::getFromLyXName: Unknown color \"" - << lyxname << '"' << endl; - return none; + Transform::const_iterator it = lyxcolors.find(lcname); + if (it == lyxcolors.end()) { + LYXERR0("ColorSet::getFromLyXName: Unknown color \"" + << lyxname << '"'); + return Color_none; } - return pimpl_->lyxcolors[lcname]; + return it->second; } -Color::color Color::getFromLaTeXName(string const & latexname) const +ColorCode ColorSet::getFromLaTeXName(string const & latexname) const { - if (pimpl_->latexcolors.find(latexname) == pimpl_->latexcolors.end()) { - lyxerr << "Color::getFromLaTeXName: Unknown color \"" + Transform::const_iterator it = latexcolors.find(latexname); + if (it == latexcolors.end()) { + lyxerr << "ColorSet::getFromLaTeXName: Unknown color \"" << latexname << '"' << endl; - return none; + return Color_none; } - return pimpl_->latexcolors[latexname]; + return it->second; } // The evil global Color instance -Color lcolor; +ColorSet lcolor; // An equally evil global system Color instance -Color system_lcolor; +ColorSet system_lcolor; } // namespace lyx