#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "lyxlayout.h"
#include "lyxtextclass.h"
#include "lyxlex.h"
{ "alignpossible", LT_ALIGNPOSSIBLE },
{ "bottomsep", LT_BOTTOMSEP },
{ "copystyle", LT_COPYSTYLE },
- { "dependson", LT_DEPENDSON },
+ { "dependson", LT_DEPENDSON },
{ "end", LT_END },
{ "endlabelstring", LT_ENDLABELSTRING },
{ "endlabeltype", LT_ENDLABELTYPE },
if (obsoleted_by().empty())
obsoleted_by_ = style;
} else {
- lyxerr << "Cannot replace with unknown style `" << style << "'" << endl;
+ lyxerr << "Cannot replace with unknown style `" << style << '\'' << endl;
//lexrc.printError("Cannot replace with"
// " unknown style "
}
break;
- case LT_DEPENDSON:
+ case LT_DEPENDSON:
if (lexrc.next()) {
depends_on_ = lexrc.getString();
}
break;
case LT_OPTARGS:
- optionalargs = lexrc.next() && lexrc.getInteger();
+ if (lexrc.next()) {
+ optionalargs = lexrc.getInteger();
+ }
break;
case LT_NEED_PROTECT:
void LyXLayout::readLatexType(LyXLex & lexrc)
{
keyword_item latexTypeTags[] = {
+ { "bib_environment", LATEX_BIB_ENVIRONMENT },
{ "command", LATEX_COMMAND },
{ "environment", LATEX_ENVIRONMENT },
{ "item_environment", LATEX_ITEM_ENVIRONMENT },
case LATEX_COMMAND:
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
+ case LATEX_BIB_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
latextype = static_cast<LYX_LATEX_TYPES>(le);
break;