-/* This file is part of
- * ======================================================
+/**
+ * \file LColor.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \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
*
- * Copyright 1998-2001 The LyX Team
- *
- *======================================================*/
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
#include "debug.h"
-#include "LColor.h"
-#include "support/LAssert.h"
#include "gettext.h"
+#include "LColor.h"
#include "support/lstrings.h"
#include <map>
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::ascii_lowercase;
using std::endl;
+using std::string;
namespace {
struct ColorEntry {
- LColor::color lcolor;
+ int lcolor;
char const * guiname;
char const * latexname;
char const * x11name;
}
-
-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
/// 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;
+ 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<LColor::color, information> InfoTab;
+ 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;
+
};
{ preview, N_("previewed snippet"), "preview", "black", "preview" },
{ note, N_("note"), "note", "yellow", "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" },
{ depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
{ language, N_("language"), "language", "Blue", "language" },
{ command, N_("command inset"), "command", "black", "command" },
LColor::~LColor()
-{
- delete pimpl_;
-}
+{}
-void LColor::operator=(LColor const & c)
+LColor & LColor::operator=(LColor tmp)
{
- LColor tmp(c);
- std::swap(pimpl_, tmp.pimpl_);
+ boost::swap(pimpl_, tmp.pimpl_);
+ 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);
+ 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) << '\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
{
- 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.latexname;
return "black";
}
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;
+ 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)
{
- Pimpl::InfoTab::iterator iti = pimpl_->infotab.find(col);
- if (iti != pimpl_->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
{
- Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.begin();
+ Pimpl::InfoTab::const_iterator it = 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 ici->first;
+ 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
{
- 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.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]);
}
projects / lyx.git / blobdiff