X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=d9933ce34e342e0611bb6a8b3974c5e875ec7401;hb=1b6ce0e827d58258e84ba2bf0754c6b273b123db;hp=b405dc49123f78340fb33fa532f171c96eda7c2c;hpb=74f56e261a991e8ed0c2910213c7713715b63027;p=lyx.git

diff --git a/src/Color.cpp b/src/Color.cpp
index b405dc4912..d9933ce34e 100644
--- 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;
 }
@@ -269,8 +269,8 @@ 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" },