#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "debug.h"
#include "LColor.h"
#include "support/LAssert.h"
#include "gettext.h"
#include "support/lstrings.h"
+#include <map>
+
using std::endl;
-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;
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 = infotab[entry.lcolor];
+ in.guiname = entry.guiname;
+ in.latexname = entry.latexname;
+ in.x11name = entry.x11name;
+ in.lyxname = entry.lyxname;
+ }
+
+ ///
+ typedef std::map<LColor::color, information> InfoTab;
+ /// the table of color information
+ InfoTab infotab;
+};
+
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 text"), "latex", "DarkRed", "latex" },
+ { 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" },
{ 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" },
{ captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" },
{ collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },
{ insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },
{ error, N_("LaTeX error"), "error", "Red", "error" },
{ eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
- { appendixline, N_("appendix line"), "appendixline", "Brown", "appendixline" },
+ { 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_("tabular line"), "tabularline", "black",
+ { tabularline, N_("table line"), "tabularline", "black",
"tabularline" },
- { tabularonoffline, N_("tabular on/off 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" },
{ 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]);
}
+LColor::LColor(LColor const & c)
+ : pimpl_(new Pimpl(*c.pimpl_))
+{}
+
+
+LColor::~LColor()
+{
+ delete pimpl_;
+}
+
+
+void LColor::operator=(LColor const & c)
+{
+ LColor tmp(c);
+ std::swap(pimpl_, tmp.pimpl_);
+}
+
+
+
string const LColor::getGUIName(LColor::color c) const
{
- InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
+ Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
+ if (ici != pimpl_->infotab.end())
return _(ici->second.guiname);
-
return "none";
}
string const LColor::getX11Name(LColor::color c) const
{
- InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
+ Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
+ if (ici != pimpl_->infotab.end())
return ici->second.x11name;
lyxerr << "LyX internal error: Missing color"
string const LColor::getLaTeXName(LColor::color c) const
{
- InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
+ Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
+ if (ici != pimpl_->infotab.end())
return ici->second.latexname;
return "black";
}
string const LColor::getLyXName(LColor::color c) const
{
- InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
+ Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
+ if (ici != pimpl_->infotab.end())
return ici->second.lyxname;
return "black";
}
void LColor::setColor(LColor::color col, string const & x11name)
{
- InfoTab::iterator iti = infotab.find(col);
- if (iti != infotab.end()) {
+ Pimpl::InfoTab::iterator iti = pimpl_->infotab.find(col);
+ if (iti != pimpl_->infotab.end()) {
iti->second.x11name = x11name;
return;
}
bool LColor::setColor(string const & lyxname, string const & x11name)
{
- color col = getFromLyXName (lyxname);
+ color col = getFromLyXName(lyxname);
// "inherit" is returned for colors not in the database
// (and anyway should not be redefined)
LColor::color LColor::getFromGUIName(string const & guiname) const
{
- InfoTab::const_iterator ici = infotab.begin();
- InfoTab::const_iterator end = infotab.end();
+ Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.begin();
+ Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end();
for (; ici != end; ++ici) {
- if (!compare_no_case(_(ici->second.guiname), guiname))
+ if (!compare_ascii_no_case(_(ici->second.guiname), guiname))
return ici->first;
}
return LColor::inherit;
LColor::color LColor::getFromLyXName(string const & lyxname) const
{
-
- InfoTab::const_iterator ici = infotab.begin();
- InfoTab::const_iterator end = infotab.end();
+ Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.begin();
+ Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end();
for (; ici != end; ++ici) {
- if (!compare_no_case(ici->second.lyxname, lyxname))
+ if (!compare_ascii_no_case(ici->second.lyxname, lyxname))
return ici->first;
}
return LColor::inherit;
}
+
// The evil global LColor instance
LColor lcolor;
// An equally evil global system LColor instance
projects / lyx.git / blobdiff