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;
}
-Color::Color(ColorCode base_color) : baseColor(base_color),
+Color::Color(ColorCode base_color) : baseColor(base_color),
mergeColor(Color_ignore)
{}
}
-bool Color::operator!=(Color const & color) const
+bool Color::operator!=(Color const & color) const
{
return baseColor != color.baseColor;
}
{ 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_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" },
- { Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
+ { Color_buttonframe, N_("button frame"), "buttonframe", "#dcd2c8", "buttonframe" },
{ 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"), "green", "green", "green" },
+ { Color_regexpframe, N_("regexp frame"), "regexpframe", "green", "regexpframe" },
{ Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
{ Color_ignore, 0, 0, 0, 0 }
};