break;
case RC_PRINT_COMMAND:
- lexrc >> print_command;
+ if (lexrc.next(true)) {
+ print_command = lexrc.getString();
+ }
break;
case RC_PRINTEVENPAGEFLAG:
break;
case RC_PRINTTOFILE:
- print_to_file = os::internal_path(lexrc.getString());
+ if (lexrc.next()) {
+ print_to_file = os::internal_path(lexrc.getString());
+ }
break;
case RC_PRINTFILEEXTENSION:
break;
case RC_PRINTSPOOL_COMMAND:
- lexrc >> print_spool_command;
+ if (lexrc.next(true)) {
+ print_spool_command = lexrc.getString();
+ }
break;
case RC_PRINTSPOOL_PRINTERPREFIX:
break;
case RC_CHKTEX_COMMAND:
- lexrc >> chktex_command;
+ if (lexrc.next(true)) {
+ chktex_command = lexrc.getString();
+ }
break;
case RC_BIBTEX_COMMAND:
- lexrc >> bibtex_command;
+ if (lexrc.next(true)) {
+ bibtex_command = lexrc.getString();
+ }
break;
case RC_INDEX_COMMAND:
- lexrc >> index_command;
+ if (lexrc.next(true)) {
+ index_command = lexrc.getString();
+ }
break;
case RC_SCREEN_DPI:
case RC_USETEMPDIR:
if (lexrc.next())
- lyxerr << "Ignoring obsolete use_tempdir flag." << endl;
+ LYXERR0("Ignoring obsolete use_tempdir flag.");
break;
case RC_USELASTFILEPOS:
lexrc >> typewriter_font_foundry;
break;
- case RC_SET_COLOR:
- {
- string lyx_name, x11_name;
-
- if (lexrc.next()) {
- lyx_name = lexrc.getString();
- } else {
+ case RC_SET_COLOR: {
+ if (!lexrc.next()) {
lexrc.printError("Missing color tag.");
break;
}
+ string lyx_name = lexrc.getString();
- if (lexrc.next()) {
- x11_name = lexrc.getString();
- } else {
+ if (!lexrc.next()) {
lexrc.printError("Missing color name for color: `$$Token'");
break;
}
+ string x11_name = lexrc.getString();
ColorCode const col =
lcolor.getFromLyXName(lyx_name);
col == Color_ignore)
break;
- if (!lcolor.setColor(col, x11_name)) {
- lyxerr << "Bad lyxrc set_color for "
- << lyx_name << endl;
-
- }
+ if (!lcolor.setColor(col, x11_name))
+ LYXERR0("Bad lyxrc set_color for " << lyx_name);
break;
}
+
case RC_AUTOREGIONDELETE:
// Auto region delete defaults to true
lexrc >> auto_region_delete;
break;
case RC_PLAINTEXT_ROFF_COMMAND:
- lexrc >> plaintext_roff_command;
+ if (lexrc.next(true)) {
+ plaintext_roff_command = lexrc.getString();
+ }
break;
case RC_PLAINTEXT_LINELEN:
lexrc >> plaintext_linelen;
lexrc >> use_spell_lib;
break;
case RC_SPELL_COMMAND:
- lexrc >> isp_command;
+ if (lexrc.next(true))
+ isp_command = lexrc.getString();
break;
case RC_ACCEPT_COMPOUND:
lexrc >> isp_accept_compound;
case RC_COPIER: {
string fmt, command;
- lexrc >> fmt >> command;
+ if (lexrc.next())
+ fmt = lexrc.getString();
+ if (lexrc.next(true))
+ command = lexrc.getString();
setMover(fmt, command);
break;
}
case RC_CONVERTER: {
string from, to, command, flags;
- lexrc >> from >> to >> command >> flags;
+ if (lexrc.next())
+ from = lexrc.getString();
+ if (lexrc.next())
+ to = lexrc.getString();
+ if (lexrc.next(true))
+ command = lexrc.getString();
+ if (lexrc.next())
+ flags = lexrc.getString();
if (command.empty())
theConverters().erase(from, to);
else
string format, extension, prettyname, shortcut;
lexrc >> format >> extension >> prettyname >> shortcut;
string viewer, editor;
- lexrc >> viewer >> editor;
+ if (lexrc.next(true))
+ viewer = lexrc.getString();
+ if (lexrc.next(true))
+ editor = lexrc.getString();
string flags;
// Hack to ensure compatibility with versions older
// than 1.5.0
else if (flag == "vector")
flgs |= Format::vector;
else
- lyxerr << "Ignoring unknown flag `"
+ LYXERR0("Ignoring unknown flag `"
<< flag << "' for format `"
- << format << "'." << endl;
+ << format << "'.");
}
if (prettyname.empty()) {
if (theConverters().formatIsUsed(format))
- LYXERR0( "Can't delete format " << format);
+ LYXERR0("Can't delete format " << format);
else
formats.erase(format);
} else {
else {
preview = PREVIEW_OFF;
if (tmp != "false" && tmp != "off")
- lyxerr << "Unrecognized "
- "preview status \""
- << tmp << '\n' << endl;
+ LYXERR0("Unrecognized preview status \""
+ << tmp << '\n');
}
}
break;
};
+namespace {
+
+ // Escape \ and " so that LyXLex can read the string later
+ string escapeCommand(string const & str) {
+ return subst(subst(str , "\\", "\\\\"),
+ "\"", "\\\"");
+ }
+
+}
+
+
void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) const
{
LyXRCTags tag = RC_LAST;
}
if (tag == RC_LAST)
- os << "### This file is part of\n"
- << "### ========================================================\n"
- << "### LyX, The Document Processor\n"
- << "###\n"
- << "### Copyright 1995 Matthias Ettrich\n"
- << "### Copyright 1995-2007 The LyX Team.\n"
- << "###\n"
- << "### ========================================================\n"
- << "\n"
- << "# This file is written by LyX, if you want to make your own\n"
+ os << "# This file is written by LyX, if you want to make your own\n"
<< "# modifications you should do them from inside LyX and save\n"
<< "\n";
// Why the switch you might ask. It is a trick to ensure that all
- // the elements in the LyXRCTags enum is handled. As you can see
+ // the elements in the LyXRCTags enum are handled. As you can see
// there are no breaks at all. So it is just a huge fall-through.
// The nice thing is that we will get a warning from the compiler
// if we forget an element.
case RC_CHKTEX_COMMAND:
if (ignore_system_lyxrc ||
chktex_command != system_lyxrc.chktex_command) {
- os << "\\chktex_command \"" << chktex_command << "\"\n";
+ os << "\\chktex_command \"" << escapeCommand(chktex_command) << "\"\n";
}
if (tag != RC_LAST)
break;
case RC_BIBTEX_COMMAND:
if (ignore_system_lyxrc ||
bibtex_command != system_lyxrc.bibtex_command) {
- os << "\\bibtex_command \"" << bibtex_command << "\"\n";
+ os << "\\bibtex_command \"" << escapeCommand(bibtex_command) << "\"\n";
}
if (tag != RC_LAST)
break;
case RC_INDEX_COMMAND:
if (ignore_system_lyxrc ||
index_command != system_lyxrc.index_command) {
- os << "\\index_command \"" << index_command << "\"\n";
+ os << "\\index_command \"" << escapeCommand(index_command) << "\"\n";
}
if (tag != RC_LAST)
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));
- if (ignore_system_lyxrc ||
- col != system_lcolor.getX11Name(lc)) {
+ string const col = lcolor.getX11Name(lc);
+ if (ignore_system_lyxrc
+ || col != system_lcolor.getX11Name(lc)) {
os << "\\set_color \""
<< lcolor.getLyXName(lc) << "\" \""
<< col << "\"\n";
case RC_PRINT_COMMAND:
if (ignore_system_lyxrc ||
print_command != system_lyxrc.print_command) {
- os << "\\print_command \"" << print_command << "\"\n";
+ os << "\\print_command \"" << escapeCommand(print_command) << "\"\n";
}
if (tag != RC_LAST)
break;
case RC_PRINTSPOOL_COMMAND:
if (ignore_system_lyxrc ||
print_spool_command != system_lyxrc.print_spool_command) {
- os << "\\print_spool_command \"" << print_spool_command
+ os << "\\print_spool_command \"" << escapeCommand(print_spool_command)
<< "\"\n";
}
if (tag != RC_LAST)
case RC_PLAINTEXT_ROFF_COMMAND:
if (ignore_system_lyxrc ||
plaintext_roff_command != system_lyxrc.plaintext_roff_command) {
- os << "\\plaintext_roff_command \"" << plaintext_roff_command
+ os << "\\plaintext_roff_command \"" << escapeCommand(plaintext_roff_command)
<< "\"\n";
}
if (tag != RC_LAST)
case RC_SPELL_COMMAND:
if (ignore_system_lyxrc ||
isp_command != system_lyxrc.isp_command) {
- os << "\\spell_command \"" << isp_command << "\"\n";
+ os << "\\spell_command \"" << escapeCommand(isp_command) << "\"\n";
}
if (tag != RC_LAST)
break;
<< cit->extension() << "\" \""
<< cit->prettyname() << "\" \""
<< cit->shortcut() << "\" \""
- << cit->viewer() << "\" \""
- << cit->editor() << "\" \"";
+ << escapeCommand(cit->viewer()) << "\" \""
+ << escapeCommand(cit->editor()) << "\" \"";
vector<string> flags;
if (cit->documentFormat())
flags.push_back("document");
converter->flags != cit->flags)
os << "\\converter \"" << cit->from << "\" \""
<< cit->to << "\" \""
- << cit->command << "\" \""
+ << escapeCommand(cit->command) << "\" \""
<< cit->flags << "\"\n";
}
it->second.command();
os << "\\copier " << fmt
- << " \"" << command << "\"\n";
+ << " \"" << escapeCommand(command) << "\"\n";
}
}
if (tag != RC_LAST)
projects / lyx.git / blobdiff