#include "support/gettext.h"
#include "support/lstrings.h"
-#include <boost/assert.hpp>
+#include "support/lassert.h"
#include <map>
#include <cmath>
using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::ascii_lowercase;
struct ColorSet::ColorEntry {
ColorCode lcolor;
{
int val = 0;
istringstream is(str);
- is >> std::setbase(16) >> val;
+ is >> setbase(16) >> val;
return val;
}
{
ostringstream ostr;
- ostr << '#' << std::setbase(16) << std::setfill('0')
+ ostr << '#' << setbase(16) << setfill('0')
<< setw(2) << col.r
<< setw(2) << col.g
<< setw(2) << col.b;
RGBColor rgbFromHexName(string const & x11hexname)
{
RGBColor c;
- BOOST_ASSERT(x11hexname.size() == 7 && x11hexname[0] == '#');
+ LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#', /**/);
c.r = hexstrToInt(x11hexname.substr(1,2));
c.g = hexstrToInt(x11hexname.substr(3,2));
c.b = hexstrToInt(x11hexname.substr(5,2));
{ Color_background, N_("background"), "background", "linen", "background" },
{ Color_foreground, N_("text"), "foreground", "black", "foreground" },
{ Color_selection, N_("selection"), "selection", "LightBlue", "selection" },
+ { Color_selectiontext, N_("selected text"),
+ "selectiontext", "black", "selectiontext" },
{ Color_latex, N_("LaTeX text"), "latex", "DarkRed", "latex" },
+ { Color_inlinecompletion, N_("inline completion"),
+ "inlinecompletion", "grey60", "inlinecompletion" },
+ { Color_nonunique_inlinecompletion, N_("non-unique inline completion"),
+ "nonuniqueinlinecompletion", "grey80", "nonuniqueinlinecompletion" },
{ Color_preview, N_("previewed snippet"), "preview", "black", "preview" },
- { Color_note, N_("note"), "note", "blue", "note" },
+ { Color_notelabel, N_("note label"), "note", "yellow", "note" },
{ Color_notebg, N_("note background"), "notebg", "yellow", "notebg" },
- { Color_comment, N_("comment"), "comment", "magenta", "comment" },
+ { Color_commentlabel, N_("comment label"), "comment", "magenta", "comment" },
{ Color_commentbg, N_("comment background"), "commentbg", "linen", "commentbg" },
- { Color_greyedout, N_("greyedout inset"), "greyedout", "red", "greyedout" },
+ { Color_greyedoutlabel, N_("greyedout inset label"), "greyedout", "#ff0080", "greyedout" },
{ Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" },
{ Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
+ { Color_branchlabel, N_("branch label"), "branchlabel", "#c88000", "branchlabel" },
+ { Color_footlabel, N_("footnote label"), "footlabel", "#00aaff", "footlabel" },
+ { Color_indexlabel, N_("index label"), "indexlabel", "green", "indexlabel" },
+ { Color_marginlabel, N_("margin note label"), "marginlabel", "#aa55ff", "marginlabel" },
+ { Color_urllabel, N_("URL label"), "urllabel", "blue", "urllabel" },
+ { Color_urltext, N_("URL text"), "urltext", "blue", "urltext" },
{ Color_depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
{ Color_language, N_("language"), "language", "Blue", "language" },
{ Color_command, N_("command inset"), "command", "black", "command" },
{ Color_mathmacrohoverbg, N_("Math macro hovered background"), "mathmacrohoverbg", "#cdc3b8", "mathmacrohoverbg" },
{ Color_mathmacrolabel, N_("Math macro label"), "mathmacrolabel", "#a19992", "mathmacrolabel" },
{ Color_mathmacroframe, N_("Math macro frame"), "mathmacroframe", "#ede2d8", "mathmacroframe" },
- { Color_mathmacroblend, N_("Math macro blended out"), "mathmacroblend", "#000000", "mathmacroblend" },
+ { Color_mathmacroblend, N_("Math macro blended out"), "mathmacroblend", "black", "mathmacroblend" },
+ { Color_mathmacrooldarg, N_("Math macro old parameter"), "mathmacrooldarg", "grey80", "mathmacrooldarg" },
+ { Color_mathmacronewarg, N_("Math macro new parameter"), "mathmacronewarg", "black", "mathmacronewarg" },
{ Color_captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" },
{ Color_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },
{ Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" },
InfoTab::iterator it = infotab.find(col);
if (it == infotab.end()) {
lyxerr << "Color " << col << " not found in database."
- << std::endl;
+ << endl;
return false;
}