X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.C;h=d445f313b257639c36119a7046538d99eb14a8de;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=f3ed338277789715c683c4cdd72ddc765584d7bd;hpb=31b56dac8042735f75229ad480b3e98531c181ff;p=lyx.git

diff --git a/src/LColor.C b/src/LColor.C
index f3ed338277..d445f313b2 100644
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *	    Copyright 1998-2001 The LyX Team
  *
  *======================================================*/
@@ -62,29 +62,30 @@ LColor::LColor()
 	{ foreground, N_("text"), "foreground", "black", "foreground" },
 	{ selection, N_("selection"), "selection", "LightBlue", "selection" },
 	{ latex, N_("latex text"), "latex", "DarkRed", "latex" },
-	{ note, N_("note"), "note", "black", "note" },
+	{ note, N_("note"), "note", "yellow", "note" },
 	{ notebg, N_("note background"), "notebg", "yellow", "notebg" },
-	{ noteframe, N_("note frame"), "noteframe", "black", "noteframe" },
 	{ depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
 	{ language, N_("language"), "language", "Blue", "language" },
 	{ command, N_("command inset"), "command", "black", "command" },
-	{ commandbg, N_("command inset background"), "commandbg", "grey80", "commandbg" },
+	{ commandbg, N_("command inset background"), "commandbg", "azure", "commandbg" },
 	{ commandframe, N_("command inset frame"), "commandframe", "black", "commandframe" },
 	{ special, N_("special character"), "special", "RoyalBlue", "special" },
 	{ math, N_("math"), "math", "DarkBlue", "math" },
-	{ mathbg, N_("math background"), "mathbg", "AntiqueWhite", "mathbg" },
+	{ mathbg, N_("math background"), "mathbg", "linen", "mathbg" },
+	{ 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" },
 	{ collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" },
-	{ insetbg, N_("inset background"), "insetbg", "grey60", "insetbg" },
+	{ insetbg, N_("inset background"), "insetbg", "grey80", "insetbg" },
 	{ 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" },
-	{ vfillline, N_("vfill line"), "vfillline", "Brown", "vfillline" },
+	{ 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" },
@@ -92,11 +93,11 @@ LColor::LColor()
 	     "LightSteelBlue", "tabularonoffline" },
 	{ bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
 	{ pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
-	{ top, N_("top of button"), "top", "grey80", "top" },
-	{ bottom, N_("bottom of button"), "bottom", "grey40", "bottom" },
-	{ left, N_("left of button"), "left", "grey80", "left" },
-	{ right, N_("right of button"), "right", "grey40", "right" },
-	{ buttonbg, N_("button background"), "buttonbg", "grey60", "buttonbg" },
+	{ top, N_("top of button"), "top", "grey90", "top" },
+	{ bottom, N_("bottom of button"), "bottom", "grey60", "bottom" },
+	{ left, N_("left of button"), "left", "grey90", "left" },
+	{ right, N_("right of button"), "right", "grey60", "right" },
+	{ buttonbg, N_("button background"), "buttonbg", "grey80", "buttonbg" },
 	{ inherit, N_("inherit"), "inherit", "black", "inherit" },
 	{ ignore, N_("ignore"), "ignore", "black", "ignore" },
 	{ ignore, 0, 0, 0, 0 }
@@ -115,7 +116,7 @@ string const LColor::getGUIName(LColor::color c) const
 {
 	InfoTab::const_iterator ici = infotab.find(c);
 	if (ici != infotab.end())
-		return _((*ici).second.guiname);
+		return _(ici->second.guiname);
 
 	return "none";
 }
@@ -124,8 +125,8 @@ string const LColor::getGUIName(LColor::color c) const
 string const LColor::getX11Name(LColor::color c) const
 {
 	InfoTab::const_iterator ici = infotab.find(c);
-	if (ici != infotab.end()) 
-		return (*ici).second.x11name;
+	if (ici != infotab.end())
+		return ici->second.x11name;
 
 	lyxerr << "LyX internal error: Missing color"
 		" entry in LColor.C for " << int(c) << '\n';
@@ -138,7 +139,7 @@ string const LColor::getLaTeXName(LColor::color c) const
 {
 	InfoTab::const_iterator ici = infotab.find(c);
 	if (ici != infotab.end())
-		return (*ici).second.latexname;
+		return ici->second.latexname;
 	return "black";
 }
 
@@ -147,7 +148,7 @@ string const LColor::getLyXName(LColor::color c) const
 {
 	InfoTab::const_iterator ici = infotab.find(c);
 	if (ici != infotab.end())
-		return (*ici).second.lyxname;
+		return ici->second.lyxname;
 	return "black";
 }
 
@@ -156,7 +157,7 @@ void LColor::setColor(LColor::color col, string const & x11name)
 {
 	InfoTab::iterator iti = infotab.find(col);
 	if (iti != infotab.end()) {
-		(*iti).second.x11name = x11name;
+		iti->second.x11name = x11name;
 		return;
 	}
 	lyxerr << "LyX internal error: color and such.\n";
@@ -185,8 +186,8 @@ 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))
-			return (*ici).first;
+		if (!compare_no_case(_(ici->second.guiname), guiname))
+			return ici->first;
 	}
 	return LColor::inherit;
 }
@@ -194,12 +195,12 @@ LColor::color LColor::getFromGUIName(string const & guiname) const
 
 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))
-			return (*ici).first;
+		if (!compare_no_case(ici->second.lyxname, lyxname))
+			return ici->first;
 	}
 	return LColor::inherit;
 }