Alfredo's second patch

[lyx.git] / src / LColor.C

diff --git a/src/LColor.C b/src/LColor.C
index d445f313b257639c36119a7046538d99eb14a8de..698b5653233f6e7ee64eccda51e98f68dfb12afa 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -9,12 +9,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <X11/Xlib.h>
-
 #include "debug.h"
 #include "LColor.h"
 #include "support/LAssert.h"
@@ -61,7 +55,8 @@ LColor::LColor()
        { background, N_("background"), "background", "linen", "background" },
        { foreground, N_("text"), "foreground", "black", "foreground" },
        { selection, N_("selection"), "selection", "LightBlue", "selection" },
-       { latex, N_("latex text"), "latex", "DarkRed", "latex" },
+       { latex, N_("LaTeX text"), "latex", "DarkRed", "latex" },
+       { preview, N_("previewed snippet"), "preview", "black", "preview" },
        { note, N_("note"), "note", "yellow", "note" },
        { notebg, N_("note background"), "notebg", "yellow", "notebg" },
        { depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
@@ -75,7 +70,6 @@ LColor::LColor()
        { 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" },
        { captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" },
        { collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },
@@ -84,12 +78,15 @@ LColor::LColor()
        { insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },
        { error, N_("LaTeX error"), "error", "Red", "error" },
        { eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
-       { appendixline, N_("appendix line"), "appendixline", "Brown", "appendixline" },
+       { appendix, N_("appendix marker"), "appendix", "Brown", "appendix" },
+       { changebar, N_("change bar"), "changebar", "Blue", "changebar" },
+       { strikeout, N_("Deleted text"), "strikeout", "Red", "strikeout" },
+       { newtext, N_("Added text"), "newtext", "Blue", "newtext" },
        { added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
        { topline, N_("top/bottom line"), "topline", "Brown", "topline" },
-       { tabularline, N_("tabular line"), "tabularline", "black",
+       { tabularline, N_("table line"), "tabularline", "black",
             "tabularline" },
-       { tabularonoffline, N_("tabular on/off line"), "tabularonoffline",
+       { tabularonoffline, N_("table on/off line"), "tabularonoffline",
             "LightSteelBlue", "tabularonoffline" },
        { bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
        { pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
@@ -186,7 +183,7 @@ LColor::color LColor::getFromGUIName(string const & guiname) const
        InfoTab::const_iterator ici = infotab.begin();
        InfoTab::const_iterator end = infotab.end();
        for (; ici != end; ++ici) {
-               if (!compare_no_case(_(ici->second.guiname), guiname))
+               if (!compare_ascii_no_case(_(ici->second.guiname), guiname))
                        return ici->first;
        }
        return LColor::inherit;
@@ -199,7 +196,7 @@ 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))
+               if (!compare_ascii_no_case(ici->second.lyxname, lyxname))
                        return ici->first;
        }
        return LColor::inherit;