#include "support/gettext.h"
#include "support/lstrings.h"
-#include <boost/assert.hpp>
+#include "support/lassert.h"
#include <map>
#include <cmath>
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", "yellow", "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_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
{ Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" },
{ Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" },
- { Color_deletedtext, N_("Deleted text"), "deletedtext", "red", "deletedtext" },
- { Color_addedtext, N_("Added text"), "addedtext", "blue", "addedtext" },
+ { Color_deletedtext, N_("Deleted text"), "deletedtext", "#ff0000", "deletedtext" },
+ { Color_addedtext, N_("Added text"), "addedtext", "#0000ff", "addedtext" },
{ Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
{ Color_topline, N_("top/bottom line"), "topline", "Brown", "topline" },
{ Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" },