whitespace + more read stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6502 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-03-14 12:08:15 +00:00
parent 6bc54517df
commit cb0bf142be

View File

@ -39,7 +39,6 @@ struct compare_name {
bool operator()(boost::shared_ptr<LyXLayout> const & c) bool operator()(boost::shared_ptr<LyXLayout> const & c)
{ {
//lyxerr << "comparing '" << name_ << "' to '" << c->name() << "'\n";
return c->name() == name_; return c->name() == name_;
} }
@ -166,6 +165,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
// parsing // parsing
while (lexrc.isOK() && !error) { while (lexrc.isOK() && !error) {
int le = lexrc.lex(); int le = lexrc.lex();
switch (le) { switch (le) {
case LyXLex::LEX_FEOF: case LyXLex::LEX_FEOF:
continue; continue;
@ -174,9 +174,13 @@ bool LyXTextClass::Read(string const & filename, bool merge)
lexrc.printError("Unknown TextClass tag `$$Token'"); lexrc.printError("Unknown TextClass tag `$$Token'");
error = true; error = true;
continue; continue;
default: break;
default:
break;
} }
switch (static_cast<TextClassTags>(le)) { switch (static_cast<TextClassTags>(le)) {
case TC_OUTPUTTYPE: // output type definition case TC_OUTPUTTYPE: // output type definition
readOutputType(lexrc); readOutputType(lexrc);
break; break;
@ -479,13 +483,16 @@ void LyXTextClass::readMaxCounter(LyXLex & lexrc)
}; };
pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV); pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV);
int le = lexrc.lex(); int le = lexrc.lex();
switch (le) { switch (le) {
case LyXLex::LEX_UNDEF: case LyXLex::LEX_UNDEF:
lexrc.printError("Unknown MaxCounter tag `$$Token'"); lexrc.printError("Unknown MaxCounter tag `$$Token'");
return; return;
default: break; default:
break;
} }
switch (static_cast<MaxCounterTags>(le)) { switch (static_cast<MaxCounterTags>(le)) {
case MC_COUNTER_CHAPTER: case MC_COUNTER_CHAPTER:
maxcounter_ = LABEL_COUNTER_CHAPTER; maxcounter_ = LABEL_COUNTER_CHAPTER;