-// -*- C++ -*-
/* This file is part of
* ======================================================
- *
+ *
* LyX, The Document Processor
- *
- * Copyright 1998-2000 The LyX Team
+ *
+ * Copyright 1998-2001 The LyX Team
*
*======================================================*/
{ cyan, N_("cyan"), "cyan", "cyan", "cyan" },
{ magenta, N_("magenta"), "magenta", "magenta", "magenta" },
{ yellow, N_("yellow"), "yellow", "yellow", "yellow" },
+ { cursor, N_("cursor"), "cursor", "black", "cursor" },
{ background, N_("background"), "background", "linen", "background" },
- { foreground, N_("foreground"), "foreground", "black", "foreground" },
+ { 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" },
+ { note, N_("note"), "note", "yellow", "note" },
{ notebg, N_("note background"), "notebg", "yellow", "notebg" },
- { noteframe, N_("note frame"), "noteframe", "black", "noteframe" },
{ 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_("inset frame"), "commandframe", "black", "commandframe" },
- { accent, N_("accent"), "accent", "black", "accent" },
- { accentbg, N_("accent background"), "accentbg", "offwhite", "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_("ert"), "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" },
+ { 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" },
- { tabularonoffline, N_("tabularonoff line"), "tabularonoffline",
+ { tabularonoffline, N_("tabular 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 }
}
-string LColor::getGUIName(LColor::color c) const
+string const LColor::getGUIName(LColor::color c) const
{
InfoTab::const_iterator ici = infotab.find(c);
if (ici != infotab.end())
- return _((*ici).second.guiname.c_str());
+ return _(ici->second.guiname);
return "none";
}
-string LColor::getX11Name(LColor::color c) const
+string const LColor::getX11Name(LColor::color c) const
{
InfoTab::const_iterator ici = infotab.find(c);
- if (ici != infotab.end())
- return (*ici).second.x11name;
+ if (ici != infotab.end())
+ return ici->second.x11name;
lyxerr << "LyX internal error: Missing color"
" entry in LColor.C for " << int(c) << '\n';
}
-string LColor::getLaTeXName(LColor::color c) const
+string const LColor::getLaTeXName(LColor::color c) const
{
InfoTab::const_iterator ici = infotab.find(c);
if (ici != infotab.end())
- return (*ici).second.latexname;
+ return ici->second.latexname;
return "black";
}
-string LColor::getLyXName(LColor::color c) const
+string const LColor::getLyXName(LColor::color c) const
{
InfoTab::const_iterator ici = infotab.find(c);
if (ici != infotab.end())
- return (*ici).second.lyxname;
+ return ici->second.lyxname;
return "black";
}
{
InfoTab::iterator iti = infotab.find(col);
if (iti != infotab.end()) {
- (*iti).second.x11name = x11name;
+ iti->second.x11name = x11name;
return;
}
lyxerr << "LyX internal error: color and such.\n";
- Assert(false);
+ lyx::Assert(false);
}
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;
+ if (!compare_no_case(_(ici->second.guiname), guiname))
+ return ici->first;
}
- return LColor::ignore;
+ return LColor::inherit;
}
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;
+ if (!compare_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
+LColor system_lcolor;
projects / lyx.git / blobdiff