-// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1998-2000 The LyX Team
+/**
+ * \file LColor.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- *======================================================*/
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Martin Vermeer
+ *
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <X11/Xlib.h>
-
#include "debug.h"
-#include "LColor.h"
-#include "support/LAssert.h"
#include "gettext.h"
+#include "LColor.h"
#include "support/lstrings.h"
+#include <map>
+
+using lyx::support::compare_ascii_no_case;
+using lyx::support::ascii_lowercase;
+
using std::endl;
+using std::string;
-void LColor::fill(LColor::color col, string const & gui,
- string const & latex, string const & x11,
- string const & lyx) {
- information in;
- in.guiname = gui;
- in.latexname = latex;
- in.x11name = x11;
- in.lyxname = lyx;
- infotab[col] = in;
-}
+namespace {
struct ColorEntry {
- LColor::color lcolor;
+ int lcolor;
char const * guiname;
char const * latexname;
char const * x11name;
char const * lyxname;
};
+}
+
+struct LColor::Pimpl {
+ ///
+ struct information {
+ /// 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;
+ };
+
+ /// initialise a color entry
+ void fill(ColorEntry const & entry)
+ {
+ information in;
+ in.lyxname = string(entry.lyxname);
+ in.latexname = string(entry.latexname);
+ in.x11name = string(entry.x11name);
+ in.guiname = string(entry.guiname);
+ infotab[entry.lcolor] = in;
+ transform[string(entry.lyxname)] = int(entry.lcolor);
+ }
+
+ ///
+ typedef std::map<int, information> InfoTab;
+ /// the table of color information
+ InfoTab infotab;
+
+ typedef std::map<string, int> Transform;
+ /// the transform between colour name string and integer code.
+ Transform transform;
+
+};
+
LColor::LColor()
+ : pimpl_(new Pimpl)
{
// LColor::color, gui, latex, x11, lyx
- ColorEntry items[] = {
+ static ColorEntry const items[] = {
{ none, N_("none"), "none", "black", "none" },
{ black, N_("black"), "black", "black", "black" },
{ white, N_("white"), "white", "white", "white" },
{ background, N_("background"), "background", "linen", "background" },
{ foreground, N_("text"), "foreground", "black", "foreground" },
{ selection, N_("selection"), "selection", "LightBlue", "selection" },
- { latex, N_("latex"), "latex", "DarkRed", "latex" },
- { floats, N_("floats"), "floats", "red", "floats" },
- { note, N_("note"), "note", "black", "note" },
+ { latex, N_("LaTeX text"), "latex", "DarkRed", "latex" },
+ { preview, N_("previewed snippet"), "preview", "black", "preview" },
+ { note, N_("note"), "note", "yellow", "note" },
{ notebg, N_("note background"), "notebg", "yellow", "notebg" },
- { noteframe, N_("note frame"), "noteframe", "black", "noteframe" },
+ { 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" },
{ 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", "grey80", "commandbg" },
- { commandframe, N_("command-inset frame"), "commandframe", "black", "commandframe" },
- { accent, N_("accent"), "accent", "black", "accent" },
- { accentbg, N_("accent background"), "accentbg", "linen", "accentbg" },
- { accentframe, N_("accent frame"), "accentframe", "linen", "accentframe" },
- { minipageline, N_("minipage line"), "minipageline", "violet", "minipageline" },
- { special, N_("special char"), "special", "RoyalBlue", "special" },
+ { 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", "AntiqueWhite", "mathbg" },
+ { 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" },
- { mathcursor, N_("math cursor"), "mathcursor", "black", "mathcursor" },
{ mathline, N_("math line"), "mathline", "Blue", "mathline" },
- { footnote, N_("footnote"), "footnote", "DarkRed", "footnote" },
- { footnotebg, N_("footnote background"), "footnotebg", "grey60", "footnotebg" },
- { footnoteframe, N_("footnote frame"), "footnoteframe", "IndianRed", "footnoteframe" },
- { ert, N_("latex inset"), "ert", "DarkRed", "ert" },
- { inset, N_("inset"), "inset", "black", "inset" },
- { insetbg, N_("inset background"), "insetbg", "grey60", "insetbg" },
+ { 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_("error"), "error", "Red", "error" },
+ { error, N_("LaTeX error"), "error", "Red", "error" },
{ eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
- { appendixline, N_("appendix line"), "appendixline", "Brown", "appendixline" },
- { vfillline, N_("vfill line"), "vfillline", "Brown", "vfillline" },
+ { 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" },
- { tableline, N_("table line"), "tableline", "black", "tableline" },
- { tabularline, N_("tabular line"), "tabularline", "black",
+ { tabularline, N_("table line"), "tabularline", "black",
"tabularline" },
- { tabularonoffline, N_("tabularonoff line"), "tabularonoffline",
+ { tabularonoffline, N_("table on/off line"), "tabularonoffline",
"LightSteelBlue", "tabularonoffline" },
{ bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
{ pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
- { top, N_("top of button"), "top", "grey80", "top" },
- { bottom, N_("bottom of button"), "bottom", "grey40", "bottom" },
- { left, N_("left of button"), "left", "grey80", "left" },
- { right, N_("right of button"), "right", "grey40", "right" },
- { buttonbg, N_("button background"), "buttonbg", "grey60", "buttonbg" },
+ { top, N_("top of button"), "top", "grey90", "top" },
+ { bottom, N_("bottom of button"), "bottom", "grey60", "bottom" },
+ { left, N_("left of button"), "left", "grey90", "left" },
+ { right, N_("right of button"), "right", "grey60", "right" },
+ { buttonbg, N_("button background"), "buttonbg", "grey80", "buttonbg" },
{ inherit, N_("inherit"), "inherit", "black", "inherit" },
{ ignore, N_("ignore"), "ignore", "black", "ignore" },
{ ignore, 0, 0, 0, 0 }
};
- int i = 0;
- while (items[i].guiname) {
- fill(items[i].lcolor, items[i].guiname, items[i].latexname,
- items[i].x11name, items[i].lyxname);
- ++i;
- }
+ for (int i = 0; items[i].guiname; ++i)
+ pimpl_->fill(items[i]);
}
-string const LColor::getGUIName(LColor::color c) const
+LColor::LColor(LColor const & c)
+ : pimpl_(new Pimpl(*c.pimpl_))
+{}
+
+
+LColor::~LColor()
+{}
+
+
+void LColor::operator=(LColor const & c)
{
- InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
- return _((*ici).second.guiname);
+ LColor tmp(c);
+ boost::swap(pimpl_, tmp.pimpl_);
+}
+
+string const LColor::getGUIName(LColor::color c) const
+{
+ Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+ if (it != pimpl_->infotab.end())
+ return _(it->second.guiname);
return "none";
}
string const LColor::getX11Name(LColor::color c) const
{
- InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
- return (*ici).second.x11name;
+ Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+ if (it != pimpl_->infotab.end())
+ return it->second.x11name;
lyxerr << "LyX internal error: Missing color"
- " entry in LColor.C for " << int(c) << '\n';
- lyxerr << "Using black.\n";
+ " entry in LColor.C for " << int(c) << '\n'
+ << "Using black." << endl;
return "black";
}
string const LColor::getLaTeXName(LColor::color c) const
{
- InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
- return (*ici).second.latexname;
+ Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+ if (it != pimpl_->infotab.end())
+ return it->second.latexname;
return "black";
}
string const LColor::getLyXName(LColor::color c) const
{
- InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
- return (*ici).second.lyxname;
+ Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+ if (it != pimpl_->infotab.end())
+ return it->second.lyxname;
return "black";
}
-void LColor::setColor(LColor::color col, string const & x11name)
+bool LColor::setColor(LColor::color col, string const & x11name)
{
- InfoTab::iterator iti = infotab.find(col);
- if (iti != infotab.end()) {
- (*iti).second.x11name = x11name;
- return;
+ Pimpl::InfoTab::iterator it = pimpl_->infotab.find(col);
+ if (it == pimpl_->infotab.end()) {
+ lyxerr << "Color " << col << " not found in database."
+ << std::endl;
+ return false;
}
- lyxerr << "LyX internal error: color and such.\n";
- Assert(false);
-}
-
-
-bool LColor::setColor(string const & lyxname, string const & x11name)
-{
- color col = getFromLyXName (lyxname);
// "inherit" is returned for colors not in the database
// (and anyway should not be redefined)
- if (col == inherit || col == ignore) {
- lyxerr << "Color " << lyxname << " is undefined or may not be"
- " redefined" << endl;
+ if (col == none || col == inherit || col == ignore) {
+ lyxerr << "Color " << getLyXName(col)
+ << " may not be redefined" << endl;
return false;
}
- setColor (col, x11name);
+
+ it->second.x11name = x11name;
return true;
}
+bool LColor::setColor(string const & lyxname, string const &x11name)
+{
+ string const lcname = ascii_lowercase(lyxname);
+ if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) {
+ lyxerr[Debug::GUI]
+ << "LColor::setColor: Unknown color \""
+ << lyxname << '"' << endl;
+ addColor(static_cast<color>(pimpl_->infotab.size()), lcname);
+ }
+
+ return setColor(static_cast<LColor::color>(pimpl_->transform[lcname]),
+ x11name);
+}
+
+
LColor::color LColor::getFromGUIName(string const & guiname) const
{
- InfoTab::const_iterator ici = infotab.begin();
- InfoTab::const_iterator end = infotab.end();
- for (; ici != end; ++ici) {
- if (!compare_no_case(_((*ici).second.guiname), guiname))
- return (*ici).first;
+ Pimpl::InfoTab::const_iterator it = pimpl_->infotab.begin();
+ Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end();
+ for (; it != end; ++it) {
+ if (!compare_ascii_no_case(_(it->second.guiname), guiname))
+ return static_cast<LColor::color>(it->first);
}
return LColor::inherit;
}
+void LColor::addColor(LColor::color c, string const & lyxname) const
+{
+ ColorEntry ce = { c, "", "", "", lyxname.c_str() };
+ pimpl_->fill(ce);
+}
+
+
LColor::color LColor::getFromLyXName(string const & lyxname) const
{
-
- InfoTab::const_iterator ici = infotab.begin();
- InfoTab::const_iterator end = infotab.end();
- for (; ici != end; ++ici) {
- if (!compare_no_case((*ici).second.lyxname, lyxname))
- return (*ici).first;
+ string const lcname = ascii_lowercase(lyxname);
+ if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) {
+ lyxerr << "LColor::getFromLyXName: Unknown color \""
+ << lyxname << '"' << endl;
+ return none;
}
- return LColor::inherit;
+
+ return static_cast<LColor::color>(pimpl_->transform[lcname]);
}
+
// The evil global LColor instance
LColor lcolor;
// An equally evil global system LColor instance
projects / lyx.git / blobdiff