lexrc.printError("Missing color tag.");
break;
}
- string lyx_name = lexrc.getString();
+ string const lyx_name = lexrc.getString();
if (!lexrc.next()) {
lexrc.printError("Missing color name for color: `$$Token'");
break;
}
- string x11_name = lexrc.getString();
+ string const x11_name = lexrc.getString();
ColorCode const col =
lcolor.getFromLyXName(lyx_name);
if (!lcolor.setColor(col, x11_name))
LYXERR0("Bad lyxrc set_color for " << lyx_name);
+ LYXERR(Debug::LYXRC, "Set " << lyx_name << "(" << col << ") to " << x11_name);
break;
}
if (lexrc.next()) {
string userdir = package().user_support().absFileName();
if (userdir.back() == '/')
- userdir = userdir.substr(0, userdir.size()-1);
- lyxpipes = subst(os::internal_path(lexrc.getString()), "$$User",
+ userdir.pop_back();
+ lyxpipes = subst(os::internal_path(lexrc.getString()), "$$UserDir",
userdir);
}
break;
case RC_SET_COLOR:
for (int i = 0; i < Color_ignore; ++i) {
ColorCode lc = static_cast<ColorCode>(i);
- string const col = lcolor.getX11Name(lc);
+ string const col = lcolor.getX11HexName(lc);
if (ignore_system_lyxrc
- || col != system_lcolor.getX11Name(lc)) {
+ || col != system_lcolor.getX11HexName(lc)) {
os << "\\set_color \""
<< lcolor.getLyXName(lc) << "\" \""
<< col << "\"\n";