Fix yet another thinko in the math grid paste code

[lyx.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index 5eda83442e5c75ba9457a96adb292d056a0d9595..d865765be93bcdca4505af8c26faef323a6b1194 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -90,7 +90,7 @@ RGBColor rgbFromHexName(string const & x11hexname)
 string const outputLaTeXColor(RGBColor const & color)
 {
        // this routine returns a LaTeX readable color string in the form
-       // "red, green, blue" where the colors are a number in the range 0-1 
+       // "red, green, blue" where the colors are a number in the range 0-1
        int red = color.r;
        int green = color.g;
        int blue = color.b;
@@ -152,7 +152,7 @@ RGBColor const RGBColorFromLaTeX(string const & color)
 }
 
 
-Color::Color(ColorCode base_color) : baseColor(base_color), 
+Color::Color(ColorCode base_color) : baseColor(base_color),
        mergeColor(Color_ignore)
 {}
 
@@ -163,7 +163,7 @@ bool Color::operator==(Color const & color) const
 }
 
 
-bool Color::operator!=(Color const & color) const      
+bool Color::operator!=(Color const & color) const
 {
        return baseColor != color.baseColor;
 }
@@ -254,6 +254,10 @@ ColorSet::ColorSet()
        { Color_command, N_("command inset"), "command", "black", "command" },
        { Color_commandbg, N_("command inset background"), "commandbg", "azure", "commandbg" },
        { Color_commandframe, N_("command inset frame"), "commandframe", "black", "commandframe" },
+       { Color_command_broken, N_("command inset (broken reference)"), "command", "white", "command_broken" },
+       { Color_buttonbg_broken, N_("button background (broken reference)"), "commandbg", "Red", "commandbg_broken" },
+       { Color_buttonframe_broken, N_("button frame (broken reference)"), "commandframe", "Red", "commandframe_broken" },
+       { Color_buttonhoverbg_broken, N_("button background (broken reference) under focus"), "buttonhoverbg", "#DB0B0B", "buttonhoverbg_broken" },
        { Color_special, N_("special character"), "special", "RoyalBlue", "special" },
        { Color_math, N_("math"), "math", "DarkBlue", "math" },
        { Color_mathbg, N_("math background"), "mathbg", "linen", "mathbg" },
@@ -269,26 +273,25 @@ 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_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },
-       { Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" },
+       { Color_collapsible, N_("collapsible inset text"), "collapsible", "DarkRed", "collapsible" },
+       { Color_collapsibleframe, N_("collapsible inset frame"), "collapsibleframe", "IndianRed", "collapsibleframe" },
        { Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" },
        { Color_insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },
        { Color_error, N_("LaTeX error"), "error", "Red", "error" },
        { 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", "#ff0000", "deletedtext" },
-       { Color_addedtext, N_("added text"), "addedtext", "#0000ff", "addedtext" },
-       { Color_changedtextauthor1, N_("changed text 1st author"), "changedtextauthor1", "#0000ff", "changedtextauthor1" },
-       { Color_changedtextauthor2, N_("changed text 2nd author"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" },
-       { Color_changedtextauthor3, N_("changed text 3rd author"), "changedtextauthor3", "#ff0000", "changedtextauthor3" },
-       { Color_changedtextauthor4, N_("changed text 4th author"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" },
-       { Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
-       { Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" },
+       { Color_deletedtext, N_("deleted text (output)"), "deletedtext", "#ff0000", "deletedtext" },
+       { Color_addedtext, N_("added text (output)"), "addedtext", "#0000ff", "addedtext" },
+       { Color_addedtextauthor1, N_("added text (workarea, 1st author)"), "changedtextauthor1", "#0000ff", "changedtextauthor1" },
+       { Color_addedtextauthor2, N_("added text (workarea, 2nd author)"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" },
+       { Color_addedtextauthor3, N_("added text (workarea, 3rd author)"), "changedtextauthor3", "#ff0000", "changedtextauthor3" },
+       { Color_addedtextauthor4, N_("added text (workarea, 4th author)"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" },
+       { Color_addedtextauthor5, N_("added text (workarea, 5th author)"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
+       { Color_deletedtextmodifier, N_("deleted text modifier (workarea)"), "deletedtextmodifier", "white", "deletedtextmodifier" },
        { Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
        { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" },
-       { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline",
-            "LightSteelBlue", "tabularonoffline" },
+       { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", "LightSteelBlue", "tabularonoffline" },
        { Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" },
        { Color_newpage, N_("new page"), "newpage", "Blue", "newpage" },
        { Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" },
@@ -298,9 +301,9 @@ ColorSet::ColorSet()
        { 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"), "green", "green", "green" },
+       { Color_regexpframe, N_("regexp frame"), "regexpframe", "green", "regexpframe" },
        { Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
-       { Color_ignore, 0, 0, 0, 0 }
+       { Color_ignore, nullptr, nullptr, nullptr, nullptr }
        };
 
        for (int i = 0; items[i].guiname; ++i)