Fix bug #7106: iterator out of range while copying multi-row math.

[lyx.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index e71dd6e51b1dfefbf3978f1dfe374cfdb2da0a35..8e4940a4fc884f9a794d40eaf50562badc03861f 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -154,6 +154,7 @@ ColorSet::ColorSet()
        char const * grey80 = "#cccccc";
        //char const * grey90 = "#e5e5e5";
        //  ColorCode, gui, latex, x11, lyx
+       // Warning: several of these entries are overridden in GuiApplication constructor
        static ColorEntry const items[] = {
        { Color_none, N_("none"), "none", "black", "none" },
        { Color_black, N_("black"), "black", "black", "black" },
@@ -181,6 +182,7 @@ ColorSet::ColorSet()
        { Color_commentlabel, N_("comment label"), "comment", "magenta", "comment" },
        { Color_commentbg, N_("comment background"), "commentbg", "linen", "commentbg" },
        { Color_greyedoutlabel, N_("greyedout inset label"), "greyedout", "#ff0080", "greyedout" },
+       { Color_greyedouttext, N_("greyedout inset text"), "greyedouttext", grey80, "greyedouttext" },
        { Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" },
        { Color_phantomtext, N_("phantom inset text"), "phantomtext", "#7f7f7f", "phantomtext" },
        { Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
@@ -211,7 +213,6 @@ ColorSet::ColorSet()
        { 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" },
        { Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" },
@@ -229,7 +230,6 @@ ColorSet::ColorSet()
        { Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
        { Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" },
        { 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" },
        { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline",
             "LightSteelBlue", "tabularonoffline" },
@@ -240,8 +240,9 @@ ColorSet::ColorSet()
        { Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" },
        { Color_buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" },
        { Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", grey80, "paragraphmarker"},
+       { Color_previewframe, N_("preview frame"), "previewframe", "black", "previewframe"},
        { Color_inherit, N_("inherit"), "inherit", "black", "inherit" },
-       { Color_regexpframe, N_("regexp frame"), "regexpframe", "green", "regexpframe" },
+       { Color_regexpframe, N_("regexp frame"), "green", "green", "green" },
        { Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
        { Color_ignore, 0, 0, 0, 0 }
        };