};
-int const FORMAT = 2;
+int const FORMAT = 3;
bool layout2layout(FileName const & filename, FileName const & tempfile)
<< ' ' << quoteName(tempfile.toFilesystemEncoding());
string const command_str = command.str();
- lyxerr[Debug::TCLASS] << "Running `" << command_str << '\'' << endl;
+ LYXERR(Debug::TCLASS) << "Running `" << command_str << '\'' << endl;
support::cmd_ret const ret =
support::runCommand(command_str);
bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
{
- lyxerr[Debug::TCLASS] << "Reading style " << lay.name() << endl;
+ LYXERR(Debug::TCLASS) << "Reading style " << lay.name() << endl;
if (!lay.read(lexrc, *this)) {
// Resolve fonts
lay.resfont = lay.font;
};
if (!merge)
- lyxerr[Debug::TCLASS] << "Reading textclass "
+ LYXERR(Debug::TCLASS) << "Reading textclass "
<< to_utf8(makeDisplayPath(filename.absFilename()))
<< endl;
else
- lyxerr[Debug::TCLASS] << "Reading input file "
+ LYXERR(Debug::TCLASS) << "Reading input file "
<< to_utf8(makeDisplayPath(filename.absFilename()))
<< endl;
}
if (format != FORMAT) {
- lyxerr[Debug::TCLASS] << "Converting layout file from format "
+ LYXERR(Debug::TCLASS) << "Converting layout file from format "
<< format << " to " << FORMAT << endl;
FileName const tempfile(support::tempName());
error = !layout2layout(filename, tempfile);
}
if (!merge) { // we are at top level here.
- lyxerr[Debug::TCLASS] << "Finished reading textclass "
+ LYXERR(Debug::TCLASS) << "Finished reading textclass "
<< to_utf8(makeDisplayPath(filename.absFilename()))
<< endl;
if (defaultlayout_.empty()) {
toclevel);
}
}
- lyxerr[Debug::TCLASS]
+ LYXERR(Debug::TCLASS)
<< "Minimum TocLevel is " << min_toclevel_
<< ", maximum is " << max_toclevel_ <<endl;
} else
- lyxerr[Debug::TCLASS] << "Finished reading input file "
+ LYXERR(Debug::TCLASS) << "Finished reading input file "
<< to_utf8(makeDisplayPath(filename.absFilename()))
<< endl;
switch (static_cast<CounterTags>(le)) {
case CT_NAME:
lexrc.next();
- name = lyx::from_ascii(lexrc.getString());
+ name = from_ascii(lexrc.getString());
break;
case CT_WITHIN:
lexrc.next();
- within = lyx::from_ascii(lexrc.getString());
- if (within == lyx::from_ascii("none"))
+ within = from_ascii(lexrc.getString());
+ if (within == "none")
within.erase();
break;
case CT_END: