#include <map>
using lyx::support::compare_ascii_no_case;
+using lyx::support::ascii_lowercase;
using std::endl;
using std::string;
{}
-void LColor::operator=(LColor const & c)
+LColor & LColor::operator=(LColor tmp)
{
- LColor tmp(c);
boost::swap(pimpl_, tmp.pimpl_);
+ return *this;
}
<< " may not be redefined" << endl;
return false;
}
-
+
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
{
Pimpl::InfoTab::const_iterator it = pimpl_->infotab.begin();
LColor::color LColor::getFromLyXName(string const & lyxname) const
{
- if (pimpl_->transform.find(lyxname) == pimpl_->transform.end())
- addColor(static_cast<color>(pimpl_->infotab.size()), lyxname);
+ string const lcname = ascii_lowercase(lyxname);
+ if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) {
+ lyxerr << "LColor::getFromLyXName: Unknown color \""
+ << lyxname << '"' << endl;
+ return none;
+ }
- return static_cast<LColor::color>(pimpl_->transform[lyxname]);
+ return static_cast<LColor::color>(pimpl_->transform[lcname]);
}