#include <map>
using lyx::support::compare_ascii_no_case;
+using lyx::support::ascii_lowercase;
using std::endl;
using std::string;
namespace {
struct ColorEntry {
- int lcolor;
+ LColor::color lcolor;
char const * guiname;
char const * latexname;
char const * x11name;
}
-struct TransformEntry {
- char const * lyxname;
- int ncolor;
-};
-
-
-struct LColor::Pimpl {
+class LColor::Pimpl {
+public:
///
- struct information {
+ class information {
+ public:
/// the name as it appears in the GUI
string guiname;
/// the name used in LaTeX
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);
+ in.lyxname = entry.lyxname;
+ in.latexname = entry.latexname;
+ in.x11name = entry.x11name;
+ in.guiname = entry.guiname;
infotab[entry.lcolor] = in;
- transform[string(entry.lyxname)] = int(entry.lcolor);
+ lyxcolors[entry.lyxname] = entry.lcolor;
+ latexcolors[entry.latexname] = entry.lcolor;
}
///
- typedef std::map<int, information> InfoTab;
+ typedef std::map<LColor::color, 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;
+ typedef std::map<string, LColor::color> 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;
};
{}
-void LColor::operator=(LColor const & c)
+LColor & LColor::operator=(LColor tmp)
{
- LColor tmp(c);
boost::swap(pimpl_, tmp.pimpl_);
-}
-
-
-void LColor::fill(LColor::color c,
- string const & lyxname,
- string const & x11name,
- string const & latexname,
- string const & guiname)
-{
- ColorEntry ce;
- ce.lcolor = c;
- ce.guiname = guiname.c_str();
- ce.latexname = latexname.c_str();
- ce.x11name = x11name.c_str();
- ce.lyxname = lyxname.c_str();
- pimpl_->fill(ce);
+ return *this;
}
string const LColor::getGUIName(LColor::color c) const
{
- Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
- if (ici != pimpl_->infotab.end())
- return _(ici->second.guiname);
- return "none";
-}
-
-
-string const LColor::getGUIName(string const & s) const
-{
- Pimpl::Transform::const_iterator ici = pimpl_->transform.find(s);
- if (ici != pimpl_->transform.end()) {
- Pimpl::InfoTab::const_iterator
- it = pimpl_->infotab.find(ici->second);
- if (it != pimpl_->infotab.end())
- return it->second.guiname;
- }
+ 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
{
- Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
- if (ici != pimpl_->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) << endl;
- lyxerr << "Using black." << endl;
+ " entry in LColor.C for " << c << '\n'
+ << "Using black." << endl;
return "black";
}
-string const LColor::getX11Name(string const & s) const
+string const LColor::getLaTeXName(LColor::color c) const
{
- Pimpl::Transform::const_iterator ici = pimpl_->transform.find(s);
- if (ici != pimpl_->transform.end()) {
- Pimpl::InfoTab::const_iterator
- it = pimpl_->infotab.find(ici->second);
- if (it != pimpl_->infotab.end())
- return it->second.x11name;
- }
- lyxerr << "LyX internal error: Missing color"
- " entry in LColor.C for " << s << endl;
- lyxerr << "Using black." << endl;
+ Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+ if (it != pimpl_->infotab.end())
+ return it->second.latexname;
return "black";
}
-string const LColor::getLaTeXName(LColor::color c) const
+string const LColor::getLyXName(LColor::color c) const
{
- Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
- if (ici != pimpl_->infotab.end())
- return ici->second.latexname;
+ Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+ if (it != pimpl_->infotab.end())
+ return it->second.lyxname;
return "black";
}
-string const LColor::getLaTeXName(string const & s) const
+bool LColor::setColor(LColor::color col, string const & x11name)
{
- Pimpl::Transform::const_iterator ici = pimpl_->transform.find(s);
- if (ici != pimpl_->transform.end()) {
- Pimpl::InfoTab::const_iterator
- it = pimpl_->infotab.find(ici->second);
- if (it != pimpl_->infotab.end())
- return it->second.latexname;
+ Pimpl::InfoTab::iterator it = pimpl_->infotab.find(col);
+ if (it == pimpl_->infotab.end()) {
+ lyxerr << "Color " << col << " not found in database."
+ << std::endl;
+ return false;
}
- return "black";
-}
+ // "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;
+ return false;
+ }
-string const LColor::getLyXName(LColor::color c) const
-{
- Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
- if (ici != pimpl_->infotab.end())
- return ici->second.lyxname;
- return "black";
+ it->second.x11name = x11name;
+ return true;
}
-size_t LColor::size() const
+bool LColor::setColor(string const & lyxname, string const &x11name)
{
- return pimpl_->infotab.size();
+ string const lcname = ascii_lowercase(lyxname);
+ if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) {
+ lyxerr[Debug::GUI]
+ << "LColor::setColor: Unknown color \""
+ << lyxname << '"' << endl;
+ addColor(static_cast<color>(pimpl_->infotab.size()), lcname);
+ }
+
+ return setColor(pimpl_->lyxcolors[lcname], x11name);
}
-void LColor::setColor(LColor::color col, string const & x11name)
+LColor::color LColor::getFromGUIName(string const & guiname) const
{
- Pimpl::InfoTab::iterator iti = pimpl_->infotab.find(col);
- if (iti != pimpl_->infotab.end()) {
- iti->second.x11name = x11name;
- return;
+ 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 it->first;
}
- lyxerr << "LyX internal error: color and such." << endl;
- BOOST_ASSERT(false);
+ return LColor::inherit;
}
-bool LColor::setColor(string const & lyxname, string const & x11name)
+void LColor::addColor(LColor::color c, string const & lyxname) const
{
- 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;
- return false;
- }
- setColor(col, x11name);
- return true;
+ ColorEntry ce = { c, "", "", "", lyxname.c_str() };
+ pimpl_->fill(ce);
}
-LColor::color LColor::getFromGUIName(string const & guiname) const
+LColor::color LColor::getFromLyXName(string const & lyxname) const
{
- Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.begin();
- Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end();
- for (; ici != end; ++ici) {
- if (!compare_ascii_no_case(_(ici->second.guiname), guiname))
- return static_cast<LColor::color>(ici->first);
+ string const lcname = ascii_lowercase(lyxname);
+ if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) {
+ lyxerr << "LColor::getFromLyXName: Unknown color \""
+ << lyxname << '"' << endl;
+ return none;
}
- return LColor::inherit;
+
+ return pimpl_->lyxcolors[lcname];
}
-LColor::color LColor::getFromLyXName(string const & lyxname) const
+LColor::color LColor::getFromLaTeXName(string const & latexname) const
{
- return static_cast<LColor::color>(pimpl_->transform[lyxname]);
+ if (pimpl_->latexcolors.find(latexname) == pimpl_->latexcolors.end()) {
+ lyxerr << "LColor::getFromLaTeXName: Unknown color \""
+ << latexname << '"' << endl;
+ return none;
+ }
+
+ return pimpl_->latexcolors[latexname];
}