X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flayout.C;h=bad3b274118812ec634e630be50b5cb6c8520857;hb=d5b3b6807a719bdc3510444b307a1d22a94c6876;hp=a90d2ecb493daf57d4e2d5930a01d9e66c3c999d;hpb=a040c0bc6f017d0591bbc7ad1aa590589dbc40ff;p=lyx.git diff --git a/src/layout.C b/src/layout.C index a90d2ecb49..bad3b27411 100644 --- a/src/layout.C +++ b/src/layout.C @@ -4,9 +4,10 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2000 The LyX Team. * - * ====================================================== */ + * ====================================================== + */ #include @@ -15,8 +16,6 @@ #endif #include -using std::make_pair; -using std::sort; #include "layout.h" #include "lyxlex.h" @@ -25,10 +24,19 @@ using std::sort; #include "debug.h" #include "gettext.h" #include "support/LAssert.h" +#include "support/lyxfunctional.h" + +using std::pair; +using std::make_pair; +using std::sort; +using std::endl; +using std::find_if; +using std::remove_if; // Global variable: textclass table. LyXTextClassList textclasslist; + // Reads the style files void LyXSetStyle() { @@ -47,136 +55,50 @@ void LyXSetStyle() // The order of the LayoutTags enum is no more important. [asierra300396] // Tags indexes. enum LayoutTags { - LT_ALIGN, LT_ALIGNPOSSIBLE, - LT_BLOCK, LT_MARGIN, - LT_BOTTOMSEP, LT_CENTER, LT_CENTERED_TOP_ENVIRONMENT, LT_COLUMNS, - LT_COPYSTYLE, LT_OBSOLETEDBY, - LT_COMMAND, LT_COUNTER_CHAPTER, LT_COUNTER_ENUMI, LT_COUNTER_ENUMII, - LT_COUNTER_ENUMIII, LT_COUNTER_ENUMIV, LT_COUNTER_PARAGRAPH, - LT_COUNTER_SECTION, LT_COUNTER_SUBPARAGRAPH, LT_COUNTER_SUBSECTION, - LT_COUNTER_SUBSUBSECTION, LT_DEFAULTFONT, LT_DYNAMIC, LT_EMPTY, - LT_END, LT_ENVIRONMENT, LT_ENVIRONMENT_DEFAULT, - LT_FANCYHDR, LT_FILL_BOTTOM, LT_FILL_TOP, LT_FIRST_COUNTER, - LT_FIRST_DYNAMIC, LT_FONT, LT_FREE_SPACING, LT_HEADINGS, LT_INPUT, - LT_ITEM_ENVIRONMENT, LT_ITEMSEP, LT_KEEPEMPTY, - LT_LABEL_BOTTOMSEP, LT_LABELFONT, LT_TEXTFONT, - LT_LABELINDENT, LT_LABELSEP, LT_LABELSTRING, - LT_LABELSTRING_APPENDIX, LT_LABELTYPE, - LT_LATEXNAME, LT_LATEXPARAM, LT_LATEXTYPE, LT_LAYOUT, LT_LEFT, - LT_LEFTMARGIN, - LT_LIST_ENVIRONMENT , LT_MANUAL, LT_MAXCOUNTER, - LT_NEED_PROTECT, LT_NEWLINE, - LT_NEXTNOINDENT, LT_NO_LABEL, LT_NOSTYLE, - LT_PAGESTYLE, LT_PARAGRAPH, - LT_PARINDENT, LT_PARSEP, LT_PARSKIP, LT_PLAIN, LT_PREAMBLE, - LT_PROVIDESAMSMATH, LT_PROVIDESMAKEIDX, LT_PROVIDESURL, LT_RIGHT, - LT_RIGHT_ADDRESS_BOX, LT_RIGHTMARGIN, LT_SENSITIVE, LT_SIDES, - LT_SPACING, LT_SPACING_SINGLE, LT_SPACING_ONEHALF, - LT_SPACING_DOUBLE, LT_OTHER, LT_CLASSOPTIONS, LT_FONTSIZE, - LT_STATIC, LT_STYLE, LT_TOP_ENVIRONMENT, LT_TOPSEP, LT_BIBLIO, - LT_INTITLE, LT_SECNUMDEPTH, LT_TOCDEPTH, - LT_OUTPUTTYPE, LT_OTLATEX, LT_OTLINUXDOC, LT_OTDOCBOOK, LT_OTLITERATE -}; - - -// This table is sorted alphabetically [asierra 30March96] -static keyword_item layoutTags[] = { - { "align", LT_ALIGN }, - { "alignpossible", LT_ALIGNPOSSIBLE }, - { "bibliography", LT_BIBLIO }, - { "block", LT_BLOCK }, - { "bottomsep", LT_BOTTOMSEP }, - { "center", LT_CENTER }, - { "centered_top_environment", LT_CENTERED_TOP_ENVIRONMENT }, - { "classoptions", LT_CLASSOPTIONS }, - { "columns", LT_COLUMNS }, - { "command", LT_COMMAND }, - { "copystyle", LT_COPYSTYLE }, - { "counter_chapter", LT_COUNTER_CHAPTER }, - { "counter_enumi", LT_COUNTER_ENUMI }, - { "counter_enumii", LT_COUNTER_ENUMII }, - { "counter_enumiii", LT_COUNTER_ENUMIII }, - { "counter_enumiv", LT_COUNTER_ENUMIV }, - { "counter_paragraph", LT_COUNTER_PARAGRAPH }, - { "counter_section", LT_COUNTER_SECTION }, - { "counter_subparagraph", LT_COUNTER_SUBPARAGRAPH }, - { "counter_subsection", LT_COUNTER_SUBSECTION }, - { "counter_subsubsection", LT_COUNTER_SUBSUBSECTION }, - { "defaultfont", LT_DEFAULTFONT }, - { "docbook", LT_OTDOCBOOK }, - { "double", LT_SPACING_DOUBLE }, - { "dynamic", LT_DYNAMIC }, - { "empty", LT_EMPTY }, - { "end", LT_END }, - { "environment", LT_ENVIRONMENT }, - { "environment_default", LT_ENVIRONMENT_DEFAULT }, - { "fancyhdr", LT_FANCYHDR }, - { "fill_bottom", LT_FILL_BOTTOM }, - { "fill_top", LT_FILL_TOP }, - { "first_counter", LT_FIRST_COUNTER }, - { "first_dynamic", LT_FIRST_DYNAMIC }, - { "font", LT_FONT }, - { "fontsize", LT_FONTSIZE }, - { "freespacing", LT_FREE_SPACING }, - { "headings", LT_HEADINGS }, - { "input", LT_INPUT }, - { "intitle", LT_INTITLE }, - { "item_environment", LT_ITEM_ENVIRONMENT }, - { "itemsep", LT_ITEMSEP }, - { "keepempty", LT_KEEPEMPTY }, - { "labelbottomsep", LT_LABEL_BOTTOMSEP }, - { "labelfont", LT_LABELFONT }, - { "labelindent", LT_LABELINDENT }, - { "labelsep", LT_LABELSEP }, - { "labelstring", LT_LABELSTRING }, - { "labelstringappendix", LT_LABELSTRING_APPENDIX }, - { "labeltype", LT_LABELTYPE }, - { "latex", LT_OTLATEX }, - { "latexname", LT_LATEXNAME }, - { "latexparam", LT_LATEXPARAM }, //arrae970411 - { "latextype", LT_LATEXTYPE }, - { "layout", LT_LAYOUT }, - { "left", LT_LEFT }, - { "leftmargin", LT_LEFTMARGIN }, - { "linuxdoc", LT_OTLINUXDOC }, - { "list_environment", LT_LIST_ENVIRONMENT }, - { "literate", LT_OTLITERATE }, - { "manual", LT_MANUAL }, - { "margin", LT_MARGIN }, - { "maxcounter", LT_MAXCOUNTER }, - { "needprotect", LT_NEED_PROTECT }, - { "newline", LT_NEWLINE }, - { "nextnoindent", LT_NEXTNOINDENT }, - { "no_label", LT_NO_LABEL }, - { "nostyle", LT_NOSTYLE }, - { "obsoletedby", LT_OBSOLETEDBY }, - { "onehalf", LT_SPACING_ONEHALF }, - { "other", LT_OTHER }, - { "outputtype", LT_OUTPUTTYPE }, - { "pagestyle", LT_PAGESTYLE }, - { "paragraph", LT_PARAGRAPH }, - { "parindent", LT_PARINDENT }, - { "parsep", LT_PARSEP }, - { "parskip", LT_PARSKIP }, - { "plain", LT_PLAIN }, - { "preamble", LT_PREAMBLE }, - { "providesamsmath", LT_PROVIDESAMSMATH }, - { "providesmakeidx", LT_PROVIDESMAKEIDX }, - { "providesurl", LT_PROVIDESURL }, - { "right", LT_RIGHT }, - { "right_address_box", LT_RIGHT_ADDRESS_BOX }, - { "rightmargin", LT_RIGHTMARGIN }, - { "secnumdepth", LT_SECNUMDEPTH }, - { "sensitive", LT_SENSITIVE }, - { "sides", LT_SIDES }, - { "single", LT_SPACING_SINGLE }, - { "spacing", LT_SPACING }, - { "static", LT_STATIC }, - { "style", LT_STYLE }, - { "textfont", LT_TEXTFONT }, - { "tocdepth", LT_TOCDEPTH }, - { "top_environment", LT_TOP_ENVIRONMENT }, - { "topsep", LT_TOPSEP } + LT_ALIGN = 1, + LT_ALIGNPOSSIBLE, + LT_MARGIN, + LT_BOTTOMSEP, + LT_COPYSTYLE, + LT_OBSOLETEDBY, + //LT_EMPTY, + LT_END, + //LT_ENVIRONMENT_DEFAULT, + //LT_FANCYHDR, + LT_FILL_BOTTOM, + LT_FILL_TOP, + //LT_FIRST_COUNTER, + LT_FONT, + LT_FREE_SPACING, + //LT_HEADINGS, + LT_ITEMSEP, + LT_KEEPEMPTY, + LT_LABEL_BOTTOMSEP, + LT_LABELFONT, + LT_TEXTFONT, + LT_LABELINDENT, + LT_LABELSEP, + LT_LABELSTRING, + LT_LABELSTRING_APPENDIX, + LT_LABELTYPE, + LT_ENDLABELSTRING, + LT_ENDLABELTYPE, + LT_LATEXNAME, + LT_LATEXPARAM, + LT_LATEXTYPE, + LT_LEFTMARGIN, + LT_NEED_PROTECT, + LT_NEWLINE, + LT_NEXTNOINDENT, + LT_PARINDENT, + LT_PARSEP, + LT_PARSKIP, + //LT_PLAIN, + LT_PREAMBLE, + LT_RIGHTMARGIN, + LT_SPACING, + LT_TOPSEP, + LT_INTITLE }; @@ -204,6 +126,7 @@ LyXLayout::LyXLayout () align = LYX_ALIGN_BLOCK; alignpossible = LYX_ALIGN_BLOCK; labeltype = LABEL_NO_LABEL; + endlabeltype = END_LABEL_NO_LABEL; // Should or should not. That is the question. // spacing.set(Spacing::OneHalf); fill_top = false; @@ -216,21 +139,66 @@ LyXLayout::LyXLayout () // Reads a layout definition from file bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass) { + // This table is sorted alphabetically [asierra 30March96] + keyword_item layoutTags[] = { + { "align", LT_ALIGN }, + { "alignpossible", LT_ALIGNPOSSIBLE }, + { "bottomsep", LT_BOTTOMSEP }, + { "copystyle", LT_COPYSTYLE }, + { "end", LT_END }, + { "endlabelstring", LT_ENDLABELSTRING }, + { "endlabeltype", LT_ENDLABELTYPE }, + { "fill_bottom", LT_FILL_BOTTOM }, + { "fill_top", LT_FILL_TOP }, + { "font", LT_FONT }, + { "freespacing", LT_FREE_SPACING }, + { "intitle", LT_INTITLE }, + { "itemsep", LT_ITEMSEP }, + { "keepempty", LT_KEEPEMPTY }, + { "labelbottomsep", LT_LABEL_BOTTOMSEP }, + { "labelfont", LT_LABELFONT }, + { "labelindent", LT_LABELINDENT }, + { "labelsep", LT_LABELSEP }, + { "labelstring", LT_LABELSTRING }, + { "labelstringappendix", LT_LABELSTRING_APPENDIX }, + { "labeltype", LT_LABELTYPE }, + { "latexname", LT_LATEXNAME }, + { "latexparam", LT_LATEXPARAM }, + { "latextype", LT_LATEXTYPE }, + { "leftmargin", LT_LEFTMARGIN }, + { "margin", LT_MARGIN }, + { "needprotect", LT_NEED_PROTECT }, + { "newline", LT_NEWLINE }, + { "nextnoindent", LT_NEXTNOINDENT }, + { "obsoletedby", LT_OBSOLETEDBY }, + { "parindent", LT_PARINDENT }, + { "parsep", LT_PARSEP }, + { "parskip", LT_PARSKIP }, + { "preamble", LT_PREAMBLE }, + { "rightmargin", LT_RIGHTMARGIN }, + { "spacing", LT_SPACING }, + { "textfont", LT_TEXTFONT }, + { "topsep", LT_TOPSEP } + }; + bool error = false; bool finished = false; - + lexrc.pushTable(layoutTags, LT_INTITLE); // parse style section while (!finished && lexrc.IsOK() && !error) { - switch(lexrc.lex()) { - - case -2: - break; + int le = lexrc.lex(); + // See comment in lyxrc.C. + switch(le) { + case LyXLex::LEX_FEOF: + continue; - case -1: // parse error - lexrc.printError("Unknown tag `$$Token'"); + case LyXLex::LEX_UNDEF: // parse error + lexrc.printError("Unknown layout tag `$$Token'"); error = true; - break; - + continue; + default: break; + } + switch(static_cast(le)) { case LT_END: // end of structure finished = true; break; @@ -265,50 +233,11 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass) break; case LT_MARGIN: // Margin style definition. - - switch(lexrc.lex()) { - case LT_STATIC: - margintype = MARGIN_STATIC; - break; - case LT_MANUAL: - margintype = MARGIN_MANUAL; - break; - case LT_DYNAMIC: - margintype = MARGIN_DYNAMIC; - break; - case LT_FIRST_DYNAMIC: - margintype = MARGIN_FIRST_DYNAMIC; - break; - case LT_RIGHT_ADDRESS_BOX: - margintype = MARGIN_RIGHT_ADDRESS_BOX; - break; - default: - lexrc.printError("Unknown margin type `$$Token'"); - break; - } + readMargin(lexrc); break; case LT_LATEXTYPE: // Latex style definition. - switch (lexrc.lex()) { - case LT_PARAGRAPH: - latextype= LATEX_PARAGRAPH; - break; - case LT_COMMAND: - latextype= LATEX_COMMAND; - break; - case LT_ENVIRONMENT: - latextype= LATEX_ENVIRONMENT; - break; - case LT_ITEM_ENVIRONMENT: - latextype= LATEX_ITEM_ENVIRONMENT; - break; - case LT_LIST_ENVIRONMENT: - latextype= LATEX_LIST_ENVIRONMENT; - break; - default: - lexrc.printError("Unknown latextype `$$Token'"); - break; - } + readLatexType(lexrc); break; case LT_INTITLE: @@ -358,63 +287,13 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass) break; case LT_LABELTYPE: - switch (lexrc.lex()) { - case LT_NO_LABEL: - labeltype = LABEL_NO_LABEL; - break; - case LT_MANUAL: - labeltype = LABEL_MANUAL; - break; - case LT_TOP_ENVIRONMENT: - labeltype = LABEL_TOP_ENVIRONMENT; - break; - case LT_CENTERED_TOP_ENVIRONMENT: - labeltype = LABEL_CENTERED_TOP_ENVIRONMENT; - break; - case LT_STATIC: - labeltype = LABEL_STATIC; - break; - case LT_SENSITIVE: - labeltype = LABEL_SENSITIVE; - break; - case LT_COUNTER_CHAPTER: - labeltype = LABEL_COUNTER_CHAPTER; - break; - case LT_COUNTER_SECTION: - labeltype = LABEL_COUNTER_SECTION; - break; - case LT_COUNTER_SUBSECTION: - labeltype = LABEL_COUNTER_SUBSECTION; - break; - case LT_COUNTER_SUBSUBSECTION: - labeltype = LABEL_COUNTER_SUBSUBSECTION; - break; - case LT_COUNTER_PARAGRAPH: - labeltype = LABEL_COUNTER_PARAGRAPH; - break; - case LT_COUNTER_SUBPARAGRAPH: - labeltype = LABEL_COUNTER_SUBPARAGRAPH; - break; - case LT_COUNTER_ENUMI: - labeltype = LABEL_COUNTER_ENUMI; - break; - case LT_COUNTER_ENUMII: - labeltype = LABEL_COUNTER_ENUMII; - break; - case LT_COUNTER_ENUMIII: - labeltype = LABEL_COUNTER_ENUMIII; - break; - case LT_COUNTER_ENUMIV: - labeltype = LABEL_COUNTER_ENUMIV; - break; - case LT_BIBLIO: - labeltype = LABEL_BIBLIO; - break; - default: - lexrc.printError("Unknown labeltype `$$Token'"); - } + readLabelType(lexrc); break; + case LT_ENDLABELTYPE: + readEndLabelType(lexrc); + break; + case LT_LEFTMARGIN: // left margin type if (lexrc.next()) leftmargin = lexrc.GetString(); @@ -487,61 +366,22 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass) break; case LT_ALIGN: // paragraph align - switch (lexrc.lex()) { - case LT_BLOCK: - align = LYX_ALIGN_BLOCK; - break; - case LT_LEFT: - align = LYX_ALIGN_LEFT; - break; - case LT_RIGHT: - align = LYX_ALIGN_RIGHT; - break; - case LT_CENTER: - align = LYX_ALIGN_CENTER; - break; - case LT_LAYOUT: - align = LYX_ALIGN_LAYOUT; - break; - default: - lexrc.printError("Unknown alignment `$$Token'"); - } + readAlign(lexrc); break; - case LT_ALIGNPOSSIBLE: // paragraph allowed align - { alignpossible = LYX_ALIGN_NONE; - - int lineno = lexrc.GetLineNo(); - do { - switch (lexrc.lex()) { - case LT_BLOCK: - alignpossible |= LYX_ALIGN_BLOCK; - break; - case LT_LEFT: - alignpossible |= LYX_ALIGN_LEFT; - break; - case LT_RIGHT: - alignpossible |= LYX_ALIGN_RIGHT; - break; - case LT_CENTER: - alignpossible |= LYX_ALIGN_CENTER; - break; - case LT_LAYOUT: - alignpossible |= LYX_ALIGN_LAYOUT; - break; - default: - lexrc.printError("Unknown alignment `$$Token'"); - - } - } while (lineno == lexrc.GetLineNo()); - break; - } + readAlignPossible(lexrc); + break; case LT_LABELSTRING: // label string definition if (lexrc.next()) labelstring_ = lexrc.GetString(); break; + case LT_ENDLABELSTRING: // endlabel string definition + if (lexrc.next()) + endlabelstring_ = lexrc.GetString(); + break; + case LT_LABELSTRING_APPENDIX: // label string appendix definition if (lexrc.next()) labelstring_appendix_ = lexrc.GetString(); @@ -553,33 +393,344 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass) break; case LT_SPACING: // setspace.sty - switch(lexrc.lex()) { - case LT_SPACING_SINGLE: - spacing.set(Spacing::Single); - break; - case LT_SPACING_ONEHALF: - spacing.set(Spacing::Onehalf); - break; - case LT_SPACING_DOUBLE: - spacing.set(Spacing::Double); - break; - case LT_OTHER: - lexrc.next(); - spacing.set(Spacing::Other, lexrc.GetFloat()); - break; - default: - lexrc.printError("Unknown spacing `$$Token'"); - } + readSpacing(lexrc); break; - default: /* context error */ - lexrc.printError("Tag `$$Token' is not " - "allowed in layout"); - error = true; + } + } + lexrc.popTable(); + return error; +} + + +enum AlignTags { + AT_BLOCK = 1, + AT_LEFT, + AT_RIGHT, + AT_CENTER, + AT_LAYOUT +}; + + +void LyXLayout::readAlign(LyXLex & lexrc) +{ + keyword_item alignTags[] = { + { "block", AT_BLOCK }, + { "center", AT_CENTER }, + { "layout", AT_LAYOUT }, + { "left", AT_LEFT }, + { "right", AT_RIGHT } + }; + + pushpophelper pph(lexrc, alignTags, AT_LAYOUT); + int le = lexrc.lex(); + switch (le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown alignment `$$Token'"); + return; + default: break; + }; + switch(static_cast(le)) { + case AT_BLOCK: + align = LYX_ALIGN_BLOCK; + break; + case AT_LEFT: + align = LYX_ALIGN_LEFT; + break; + case AT_RIGHT: + align = LYX_ALIGN_RIGHT; + break; + case AT_CENTER: + align = LYX_ALIGN_CENTER; + break; + case AT_LAYOUT: + align = LYX_ALIGN_LAYOUT; + break; + } +} + + +void LyXLayout::readAlignPossible(LyXLex & lexrc) +{ + keyword_item alignTags[] = { + { "block", AT_BLOCK }, + { "center", AT_CENTER }, + { "layout", AT_LAYOUT }, + { "left", AT_LEFT }, + { "right", AT_RIGHT } + }; + + lexrc.pushTable(alignTags, AT_LAYOUT); + alignpossible = LYX_ALIGN_NONE; + int lineno = lexrc.GetLineNo(); + do { + int le = lexrc.lex(); + switch (le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown alignment `$$Token'"); + continue; + default: break; + }; + switch (static_cast(le)) { + case AT_BLOCK: + alignpossible |= LYX_ALIGN_BLOCK; + break; + case AT_LEFT: + alignpossible |= LYX_ALIGN_LEFT; + break; + case AT_RIGHT: + alignpossible |= LYX_ALIGN_RIGHT; + break; + case AT_CENTER: + alignpossible |= LYX_ALIGN_CENTER; + break; + case AT_LAYOUT: + alignpossible |= LYX_ALIGN_LAYOUT; break; } + } while (lineno == lexrc.GetLineNo()); + lexrc.popTable(); +} + + +enum LabelTypeTags { + LA_NO_LABEL = 1, + LA_MANUAL, + LA_TOP_ENVIRONMENT, + LA_CENTERED_TOP_ENVIRONMENT, + LA_STATIC, + LA_SENSITIVE, + LA_COUNTER_CHAPTER, + LA_COUNTER_SECTION, + LA_COUNTER_SUBSECTION, + LA_COUNTER_SUBSUBSECTION, + LA_COUNTER_PARAGRAPH, + LA_COUNTER_SUBPARAGRAPH, + LA_COUNTER_ENUMI, + LA_COUNTER_ENUMII, + LA_COUNTER_ENUMIII, + LA_COUNTER_ENUMIV, + LA_BIBLIO +}; + + +void LyXLayout::readLabelType(LyXLex & lexrc) +{ + keyword_item labelTypeTags[] = { + { "bibliography", LA_BIBLIO }, + { "centered_top_environment", LA_CENTERED_TOP_ENVIRONMENT }, + { "counter_chapter", LA_COUNTER_CHAPTER }, + { "counter_enumi", LA_COUNTER_ENUMI }, + { "counter_enumii", LA_COUNTER_ENUMII }, + { "counter_enumiii", LA_COUNTER_ENUMIII }, + { "counter_enumiv", LA_COUNTER_ENUMIV }, + { "counter_paragraph", LA_COUNTER_PARAGRAPH }, + { "counter_section", LA_COUNTER_SECTION }, + { "counter_subparagraph", LA_COUNTER_SUBPARAGRAPH }, + { "counter_subsection", LA_COUNTER_SUBSECTION }, + { "counter_subsubsection", LA_COUNTER_SUBSUBSECTION }, + { "manual", LA_MANUAL }, + { "no_label", LA_NO_LABEL }, + { "sensitive", LA_SENSITIVE }, + { "static", LA_STATIC }, + { "top_environment", LA_TOP_ENVIRONMENT } +}; + + pushpophelper pph(lexrc, labelTypeTags, LA_BIBLIO); + int le = lexrc.lex(); + switch (le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown labeltype tag `$$Token'"); + return; + default: break; + } + switch (static_cast(le)) { + case LA_NO_LABEL: + labeltype = LABEL_NO_LABEL; + break; + case LA_MANUAL: + labeltype = LABEL_MANUAL; + break; + case LA_TOP_ENVIRONMENT: + labeltype = LABEL_TOP_ENVIRONMENT; + break; + case LA_CENTERED_TOP_ENVIRONMENT: + labeltype = LABEL_CENTERED_TOP_ENVIRONMENT; + break; + case LA_STATIC: + labeltype = LABEL_STATIC; + break; + case LA_SENSITIVE: + labeltype = LABEL_SENSITIVE; + break; + case LA_COUNTER_CHAPTER: + labeltype = LABEL_COUNTER_CHAPTER; + break; + case LA_COUNTER_SECTION: + labeltype = LABEL_COUNTER_SECTION; + break; + case LA_COUNTER_SUBSECTION: + labeltype = LABEL_COUNTER_SUBSECTION; + break; + case LA_COUNTER_SUBSUBSECTION: + labeltype = LABEL_COUNTER_SUBSUBSECTION; + break; + case LA_COUNTER_PARAGRAPH: + labeltype = LABEL_COUNTER_PARAGRAPH; + break; + case LA_COUNTER_SUBPARAGRAPH: + labeltype = LABEL_COUNTER_SUBPARAGRAPH; + break; + case LA_COUNTER_ENUMI: + labeltype = LABEL_COUNTER_ENUMI; + break; + case LA_COUNTER_ENUMII: + labeltype = LABEL_COUNTER_ENUMII; + break; + case LA_COUNTER_ENUMIII: + labeltype = LABEL_COUNTER_ENUMIII; + break; + case LA_COUNTER_ENUMIV: + labeltype = LABEL_COUNTER_ENUMIV; + break; + case LA_BIBLIO: + labeltype = LABEL_BIBLIO; + break; } +} - return error; +static keyword_item endlabelTypeTags[] = { + { "box", END_LABEL_BOX }, + { "filled_box", END_LABEL_FILLED_BOX }, + { "no_label", END_LABEL_NO_LABEL }, + { "static", END_LABEL_STATIC } +}; + +void LyXLayout::readEndLabelType(LyXLex & lexrc) +{ + pushpophelper pph(lexrc, endlabelTypeTags, + END_LABEL_ENUM_LAST-END_LABEL_ENUM_FIRST+1); + int le = lexrc.lex(); + switch(le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown labeltype tag `$$Token'"); + break; + case END_LABEL_STATIC: + case END_LABEL_BOX: + case END_LABEL_FILLED_BOX: + case END_LABEL_NO_LABEL: + endlabeltype = static_cast(le); + break; + default: + lyxerr << "Unhandled value " << le + << " in LyXLayout::readEndLabelType." << endl; + break; + } +} + + +void LyXLayout::readMargin(LyXLex & lexrc) +{ + keyword_item marginTags[] = { + { "dynamic", MARGIN_DYNAMIC }, + { "first_dynamic", MARGIN_FIRST_DYNAMIC }, + { "manual", MARGIN_MANUAL }, + { "right_address_box", MARGIN_RIGHT_ADDRESS_BOX }, + { "static", MARGIN_STATIC } + }; + + pushpophelper pph(lexrc, marginTags, MARGIN_RIGHT_ADDRESS_BOX); + + int le = lexrc.lex(); + switch(le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown margin type tag `$$Token'"); + return; + case MARGIN_STATIC: + case MARGIN_MANUAL: + case MARGIN_DYNAMIC: + case MARGIN_FIRST_DYNAMIC: + case MARGIN_RIGHT_ADDRESS_BOX: + margintype = static_cast(le); + break; + default: + lyxerr << "Unhandled value " << le + << " in LyXLayout::readMargin." << endl; + break; + } +} + + +void LyXLayout::readLatexType(LyXLex & lexrc) +{ + keyword_item latexTypeTags[] = { + { "command", LATEX_COMMAND }, + { "environment", LATEX_ENVIRONMENT }, + { "item_environment", LATEX_ITEM_ENVIRONMENT }, + { "list_environment", LATEX_LIST_ENVIRONMENT }, + { "paragraph", LATEX_PARAGRAPH } + }; + + pushpophelper pph(lexrc, latexTypeTags, LATEX_LIST_ENVIRONMENT); + int le = lexrc.lex(); + switch (le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown latextype tag `$$Token'"); + return; + case LATEX_PARAGRAPH: + case LATEX_COMMAND: + case LATEX_ENVIRONMENT: + case LATEX_ITEM_ENVIRONMENT: + case LATEX_LIST_ENVIRONMENT: + latextype = static_cast(le); + break; + default: + lyxerr << "Unhandled value " << le + << " in LyXLayout::readLatexType." << endl; + break; + } +} + + +enum SpacingTags { + ST_SPACING_SINGLE = 1, + ST_SPACING_ONEHALF, + ST_SPACING_DOUBLE, + ST_OTHER +}; + + +void LyXLayout::readSpacing(LyXLex & lexrc) +{ + keyword_item spacingTags[] = { + {"double", ST_SPACING_DOUBLE }, + {"onehalf", ST_SPACING_ONEHALF }, + {"other", ST_OTHER }, + {"single", ST_SPACING_SINGLE } + }; + + pushpophelper pph(lexrc, spacingTags, ST_OTHER); + int le = lexrc.lex(); + switch(le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown spacing token `$$Token'"); + return; + default: break; + } + switch(static_cast(le)) { + case ST_SPACING_SINGLE: + spacing.set(Spacing::Single); + break; + case ST_SPACING_ONEHALF: + spacing.set(Spacing::Onehalf); + break; + case ST_SPACING_DOUBLE: + spacing.set(Spacing::Double); + break; + case ST_OTHER: + lexrc.next(); + spacing.set(Spacing::Other, lexrc.GetFloat()); + break; + } } @@ -620,9 +771,52 @@ bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay) } +enum TextClassTags { + TC_OUTPUTTYPE = 1, + TC_INPUT, + TC_STYLE, + TC_NOSTYLE, + TC_COLUMNS, + TC_SIDES, + TC_PAGESTYLE, + TC_DEFAULTFONT, + TC_MAXCOUNTER, + TC_SECNUMDEPTH, + TC_TOCDEPTH, + TC_CLASSOPTIONS, + TC_PREAMBLE, + TC_PROVIDESAMSMATH, + TC_PROVIDESMAKEIDX, + TC_PROVIDESURL, + TC_LEFTMARGIN, + TC_RIGHTMARGIN +}; + + // Reads a textclass structure from file. bool LyXTextClass::Read(string const & filename, bool merge) { + keyword_item textClassTags[] = { + { "classoptions", TC_CLASSOPTIONS }, + { "columns", TC_COLUMNS }, + { "defaultfont", TC_DEFAULTFONT }, + { "input", TC_INPUT }, + { "leftmargin", TC_LEFTMARGIN }, + { "maxcounter", TC_MAXCOUNTER }, + { "nostyle", TC_NOSTYLE }, + { "outputtype", TC_OUTPUTTYPE }, + { "pagestyle", TC_PAGESTYLE }, + { "preamble", TC_PREAMBLE }, + { "providesamsmath", TC_PROVIDESAMSMATH }, + { "providesmakeidx", TC_PROVIDESMAKEIDX }, + { "providesurl", TC_PROVIDESURL }, + { "rightmargin", TC_RIGHTMARGIN }, + { "secnumdepth", TC_SECNUMDEPTH }, + { "sides", TC_SIDES }, + { "style", TC_STYLE }, + { "tocdepth", TC_TOCDEPTH } + }; + if (!merge) lyxerr[Debug::TCLASS] << "Reading textclass " << MakeDisplayPath(filename) @@ -632,7 +826,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) << MakeDisplayPath(filename) << endl; - LyXLex lexrc(layoutTags, sizeof(layoutTags)/sizeof(keyword_item)); + LyXLex lexrc(textClassTags, TC_RIGHTMARGIN); bool error = false; lexrc.setFile(filename); @@ -640,36 +834,23 @@ bool LyXTextClass::Read(string const & filename, bool merge) // parsing while (lexrc.IsOK() && !error) { - switch(lexrc.lex()) { - case -2: - break; + int le = lexrc.lex(); + switch(le) { + case LyXLex::LEX_FEOF: + continue; - case -1: - lexrc.printError("Unknown tag `$$Token'"); + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown TextClass tag `$$Token'"); error = true; - break; - - case LT_OUTPUTTYPE: // output type definition - switch(lexrc.lex()) { - case LT_OTLATEX: - outputType_ = LATEX; - break; - case LT_OTLINUXDOC: - outputType_ = LINUXDOC; - break; - case LT_OTDOCBOOK: - outputType_ = DOCBOOK; - break; - case LT_OTLITERATE: - outputType_ = LITERATE; - break; - default: - lexrc.printError("Unknown output type `$$Token'"); - break; - } + continue; + default: break; + } + switch(static_cast(le)) { + case TC_OUTPUTTYPE: // output type definition + readOutputType(lexrc); break; - case LT_INPUT: // Include file + case TC_INPUT: // Include file if (lexrc.next()) { string tmp = LibFileSearch("layouts", lexrc.GetString(), @@ -683,7 +864,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) } break; - case LT_STYLE: + case TC_STYLE: if (lexrc.next()) { string name = subst(lexrc.GetString(), '_', ' '); @@ -692,7 +873,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) error = do_readStyle(lexrc, lay); } else { LyXLayout lay; - lay.name(name); + lay.setName(name); if (!(error = do_readStyle(lexrc, lay))) layoutlist.push_back(lay); } @@ -703,7 +884,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) } break; - case LT_NOSTYLE: + case TC_NOSTYLE: if (lexrc.next()) { string style = subst(lexrc.GetString(), '_', ' '); @@ -713,12 +894,12 @@ bool LyXTextClass::Read(string const & filename, bool merge) } break; - case LT_COLUMNS: + case TC_COLUMNS: if (lexrc.next()) columns_ = lexrc.GetInteger(); break; - case LT_SIDES: + case TC_SIDES: if (lexrc.next()) { switch(lexrc.GetInteger()) { case 1: sides_ = OneSide; break; @@ -733,124 +914,67 @@ bool LyXTextClass::Read(string const & filename, bool merge) } break; - case LT_PAGESTYLE: + case TC_PAGESTYLE: lexrc.next(); pagestyle_ = strip(lexrc.GetString()); break; - case LT_DEFAULTFONT: + case TC_DEFAULTFONT: defaultfont_.lyxRead(lexrc); if (!defaultfont_.resolved()) { lexrc.printError("Warning: defaultfont should " "be fully instantiated!"); - defaultfont_.realize(LyXFont::ALL_SANE); + defaultfont_.realize(LyXFont(LyXFont::ALL_SANE)); } break; - case LT_MAXCOUNTER: - switch (lexrc.lex()) { - case LT_COUNTER_CHAPTER: - maxcounter_ = LABEL_COUNTER_CHAPTER; - break; - case LT_COUNTER_SECTION: - maxcounter_ = LABEL_COUNTER_SECTION; - break; - case LT_COUNTER_SUBSECTION: - maxcounter_ = LABEL_COUNTER_SUBSECTION; - break; - case LT_COUNTER_SUBSUBSECTION: - maxcounter_ = LABEL_COUNTER_SUBSUBSECTION; - break; - case LT_COUNTER_PARAGRAPH: - maxcounter_ = LABEL_COUNTER_PARAGRAPH; - break; - case LT_COUNTER_SUBPARAGRAPH: - maxcounter_ = LABEL_COUNTER_SUBPARAGRAPH; - break; - case LT_COUNTER_ENUMI: - maxcounter_ = LABEL_COUNTER_ENUMI; - break; - case LT_COUNTER_ENUMII: - maxcounter_ = LABEL_COUNTER_ENUMII; - break; - case LT_COUNTER_ENUMIII: - maxcounter_ = LABEL_COUNTER_ENUMIII; - break; - case LT_COUNTER_ENUMIV: - maxcounter_ = LABEL_COUNTER_ENUMIV; - break; - } + case TC_MAXCOUNTER: + readMaxCounter(lexrc); break; - case LT_SECNUMDEPTH: + case TC_SECNUMDEPTH: lexrc.next(); secnumdepth_ = lexrc.GetInteger(); break; - case LT_TOCDEPTH: + case TC_TOCDEPTH: lexrc.next(); tocdepth_ = lexrc.GetInteger(); break; // First step to support options - case LT_CLASSOPTIONS: - { - bool getout = true; - while (getout && lexrc.IsOK()) { - switch (lexrc.lex()) { - case LT_FONTSIZE: - lexrc.next(); - opt_fontsize_ = strip(lexrc.GetString()); - break; - case LT_PAGESTYLE: - lexrc.next(); - opt_pagestyle_ = strip(lexrc.GetString()); - break; - case LT_OTHER: - lexrc.next(); - options_ = lexrc.GetString(); - break; - case LT_END: getout = false; break; - default: - lexrc.printError("Out of context tag `$$Token'"); - break; - } - } + case TC_CLASSOPTIONS: + readClassOptions(lexrc); break; - } - case LT_PREAMBLE: + case TC_PREAMBLE: preamble_ = lexrc.getLongString("EndPreamble"); break; - case LT_PROVIDESAMSMATH: + case TC_PROVIDESAMSMATH: if (lexrc.next() && lexrc.GetInteger()) provides_ |= amsmath; break; - case LT_PROVIDESMAKEIDX: + case TC_PROVIDESMAKEIDX: if (lexrc.next() && lexrc.GetInteger()) provides_ |= makeidx; break; - case LT_PROVIDESURL: + case TC_PROVIDESURL: if (lexrc.next() && lexrc.GetInteger()) provides_ = url; break; - case LT_LEFTMARGIN: // left margin type + case TC_LEFTMARGIN: // left margin type if (lexrc.next()) leftmargin_ = lexrc.GetString(); break; - case LT_RIGHTMARGIN: // right margin type + case TC_RIGHTMARGIN: // right margin type if (lexrc.next()) rightmargin_ = lexrc.GetString(); break; - - default: - lexrc.printError("Out of context tag `$$Token'"); - break; } } @@ -867,51 +991,197 @@ bool LyXTextClass::Read(string const & filename, bool merge) } -bool LyXTextClass::hasLayout(string const & name) const +void LyXTextClass::readOutputType(LyXLex & lexrc) { - for (LayoutList::const_iterator cit = layoutlist.begin(); - cit != layoutlist.end(); ++cit) { - if ((*cit).name() == name) - return true; + keyword_item outputTypeTags[] = { + { "docbook", DOCBOOK }, + { "latex", LATEX }, + { "linuxdoc", LINUXDOC }, + { "literate", LITERATE } + }; + + pushpophelper pph(lexrc, outputTypeTags, LITERATE); + + int le = lexrc.lex(); + switch(le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown output type `$$Token'"); + return; + case LATEX: + case LINUXDOC: + case DOCBOOK: + case LITERATE: + outputType_ = static_cast(le); + break; + default: + lyxerr << "Unhandled value " << le + << " in LyXTextClass::readOutputType." << endl; + + break; } - return false; } -LyXLayout const & LyXTextClass::GetLayout (string const & name) const +enum MaxCounterTags { + MC_COUNTER_CHAPTER = 1, + MC_COUNTER_SECTION, + MC_COUNTER_SUBSECTION, + MC_COUNTER_SUBSUBSECTION, + MC_COUNTER_PARAGRAPH, + MC_COUNTER_SUBPARAGRAPH, + MC_COUNTER_ENUMI, + MC_COUNTER_ENUMII, + MC_COUNTER_ENUMIII, + MC_COUNTER_ENUMIV +}; + + +void LyXTextClass::readMaxCounter(LyXLex & lexrc) { - for (LayoutList::const_iterator cit = layoutlist.begin(); - cit != layoutlist.end(); ++cit) { - if ((*cit).name() == name) - return (*cit); + keyword_item maxCounterTags[] = { + {"counter_chapter", MC_COUNTER_CHAPTER }, + {"counter_enumi", MC_COUNTER_ENUMI }, + {"counter_enumii", MC_COUNTER_ENUMII }, + {"counter_enumiii", MC_COUNTER_ENUMIII }, + {"counter_enumiv", MC_COUNTER_ENUMIV }, + {"counter_paragraph", MC_COUNTER_PARAGRAPH }, + {"counter_section", MC_COUNTER_SECTION }, + {"counter_subparagraph", MC_COUNTER_SUBPARAGRAPH }, + {"counter_subsection", MC_COUNTER_SUBSECTION }, + {"counter_subsubsection", MC_COUNTER_SUBSUBSECTION } + }; + + pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV); + int le = lexrc.lex(); + switch(le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown MaxCounter tag `$$Token'"); + return; + default: break; + } + switch (static_cast(le)) { + case MC_COUNTER_CHAPTER: + maxcounter_ = LABEL_COUNTER_CHAPTER; + break; + case MC_COUNTER_SECTION: + maxcounter_ = LABEL_COUNTER_SECTION; + break; + case MC_COUNTER_SUBSECTION: + maxcounter_ = LABEL_COUNTER_SUBSECTION; + break; + case MC_COUNTER_SUBSUBSECTION: + maxcounter_ = LABEL_COUNTER_SUBSUBSECTION; + break; + case MC_COUNTER_PARAGRAPH: + maxcounter_ = LABEL_COUNTER_PARAGRAPH; + break; + case MC_COUNTER_SUBPARAGRAPH: + maxcounter_ = LABEL_COUNTER_SUBPARAGRAPH; + break; + case MC_COUNTER_ENUMI: + maxcounter_ = LABEL_COUNTER_ENUMI; + break; + case MC_COUNTER_ENUMII: + maxcounter_ = LABEL_COUNTER_ENUMII; + break; + case MC_COUNTER_ENUMIII: + maxcounter_ = LABEL_COUNTER_ENUMIII; + break; + case MC_COUNTER_ENUMIV: + maxcounter_ = LABEL_COUNTER_ENUMIV; + break; } - Assert(false); // we actually require the name to exist. - return layoutlist.front(); } -LyXLayout & LyXTextClass::GetLayout(string const & name) +enum ClassOptionsTags { + CO_FONTSIZE = 1, + CO_PAGESTYLE, + CO_OTHER, + CO_END +}; + + +void LyXTextClass::readClassOptions(LyXLex & lexrc) { - for (LayoutList::iterator it = layoutlist.begin(); - it != layoutlist.end(); ++it) { - if ((*it).name() == name) - return (*it); + keyword_item classOptionsTags[] = { + {"end", CO_END }, + {"fontsize", CO_FONTSIZE }, + {"other", CO_OTHER }, + {"pagestyle", CO_PAGESTYLE } + }; + + lexrc.pushTable(classOptionsTags, CO_END); + bool getout = false; + while (!getout && lexrc.IsOK()) { + int le = lexrc.lex(); + switch (le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown ClassOption tag `$$Token'"); + continue; + default: break; + } + switch (static_cast(le)) { + case CO_FONTSIZE: + lexrc.next(); + opt_fontsize_ = strip(lexrc.GetString()); + break; + case CO_PAGESTYLE: + lexrc.next(); + opt_pagestyle_ = strip(lexrc.GetString()); + break; + case CO_OTHER: + lexrc.next(); + options_ = lexrc.GetString(); + break; + case CO_END: + getout = true; + break; + } } - Assert(false); // we actually require the name to exist. - return layoutlist.front(); + lexrc.popTable(); } -bool LyXTextClass::delete_layout (string const & name) +bool LyXTextClass::hasLayout(string const & name) const { - for(LayoutList::iterator it = layoutlist.begin(); - it != layoutlist.end(); ++it) { - if ((*it).name() == name) { - layoutlist.erase(it); - return true; - } - } - return false; + return find_if(layoutlist.begin(), layoutlist.end(), + compare_memfun(&LyXLayout::name, name)) + != layoutlist.end(); +} + + +LyXLayout const & LyXTextClass::GetLayout (string const & name) const +{ + LayoutList::const_iterator cit = + find_if(layoutlist.begin(), + layoutlist.end(), + compare_memfun(&LyXLayout::name, name)); + Assert(cit != layoutlist.end()); // we require the name to exist + return (*cit); +} + + +LyXLayout & LyXTextClass::GetLayout(string const & name) +{ + LayoutList::iterator it = + find_if(layoutlist.begin(), + layoutlist.end(), + compare_memfun(&LyXLayout::name, name)); + Assert(it != layoutlist.end()); // we require the name to exist + return (*it); +} + + +bool LyXTextClass::delete_layout(string const & name) +{ + LayoutList::iterator it = + remove_if(layoutlist.begin(), layoutlist.end(), + compare_memfun(&LyXLayout::name, name)); + LayoutList::iterator end = layoutlist.end(); + bool const ret = (it != end); + layoutlist.erase(it, end); + return ret; } @@ -921,7 +1191,7 @@ void LyXTextClass::load() if (loaded) return; // Read style-file - string real_file = LibFileSearch("layouts", name_, "layout"); + string const real_file = LibFileSearch("layouts", name_, "layout"); if (Read(real_file)) { lyxerr << "Error reading `" @@ -937,22 +1207,22 @@ void LyXTextClass::load() ////////////////////////////////////////// // Gets textclass number from name -pair +pair const LyXTextClassList::NumberOfClass(string const & textclass) const { - for (ClassList::const_iterator cit = classlist.begin(); - cit != classlist.end(); ++cit) { - if ((*cit).name() == textclass) - return make_pair(true, cit - classlist.begin()); - } - return make_pair(false, 0); + ClassList::const_iterator cit = + find_if(classlist.begin(), classlist.end(), + compare_memfun(&LyXTextClass::name, textclass)); + return cit != classlist.end() ? + make_pair(true, size_type(cit - classlist.begin())) : + make_pair(false, size_type(0)); } // Gets layout structure from style number and textclass number LyXLayout const & -LyXTextClassList::Style(LyXTextClassList::ClassList::size_type textclass, - LyXTextClass::LayoutList::size_type layout) const +LyXTextClassList::Style(LyXTextClassList::size_type textclass, + LyXTextClass::size_type layout) const { classlist[textclass].load(); if (layout < classlist[textclass].numLayouts()) @@ -962,8 +1232,9 @@ LyXTextClassList::Style(LyXTextClassList::ClassList::size_type textclass, // Gets layout number from name and textclass number -pair -LyXTextClassList::NumberOfLayout(LyXTextClassList::ClassList::size_type textclass, string const & name) const +pair const +LyXTextClassList::NumberOfLayout(LyXTextClassList::size_type textclass, + string const & name) const { classlist[textclass].load(); for(unsigned int i = 0; i < classlist[textclass].numLayouts(); ++i) { @@ -971,83 +1242,67 @@ LyXTextClassList::NumberOfLayout(LyXTextClassList::ClassList::size_type textclas return make_pair(true, i); } if (name == "dummy") - return make_pair(true, LYX_DUMMY_LAYOUT); - return make_pair(false, 0); // not found + return make_pair(true, LyXTextClassList::size_type(LYX_DUMMY_LAYOUT)); + return make_pair(false, LyXTextClass::size_type(0)); // not found } // Gets a layout (style) name from layout number and textclass number string const & -LyXTextClassList::NameOfLayout(LyXTextClassList::ClassList::size_type textclass, - LyXTextClass::LayoutList::size_type layout) const +LyXTextClassList::NameOfLayout(LyXTextClassList::size_type textclass, + LyXTextClass::size_type layout) const { static string dummy("dummy"); - static string end("@@end@@"); classlist[textclass].load(); if (layout < classlist[textclass].numLayouts()) return classlist[textclass][layout].name(); - else if (layout == LYX_DUMMY_LAYOUT) - return dummy; - else - return end; + return dummy; } // Gets a textclass name from number string const & -LyXTextClassList::NameOfClass(LyXTextClassList::ClassList::size_type number) const +LyXTextClassList::NameOfClass(LyXTextClassList::size_type number) const { static string dummy("dummy"); - static string end("@@end@@"); if (classlist.size() == 0) { - if (number == 0) return dummy; - else return end; + return dummy; } - if (number < classlist.size()) - return classlist[number].name(); - else - return end; + Assert(number < classlist.size()); + return classlist[number].name(); } // Gets a textclass latexname from number string const & -LyXTextClassList::LatexnameOfClass(LyXTextClassList::ClassList::size_type number) const +LyXTextClassList::LatexnameOfClass(LyXTextClassList::size_type number) const { static string dummy("dummy"); - static string end("@@end@@"); classlist[number].load(); if (classlist.size() == 0) { - if (number == 0) return dummy; - else return end; + return dummy; } - if (number < classlist.size()) - return classlist[number].latexname(); - else - return end; + Assert(number < classlist.size()); + return classlist[number].latexname(); } // Gets a textclass description from number string const & -LyXTextClassList::DescOfClass(LyXTextClassList::ClassList::size_type number) const +LyXTextClassList::DescOfClass(LyXTextClassList::size_type number) const { static string dummy("dummy"); - static string end("@@end@@"); if (classlist.size() == 0) { - if (number == 0) return dummy; - else return end; + return dummy; } - if (number < classlist.size()) - return classlist[number].description(); - else - return end; + Assert(number < classlist.size()); + return classlist[number].description(); } // Gets a textclass structure from number LyXTextClass const & -LyXTextClassList::TextClass(LyXTextClassList::ClassList::size_type textclass) const +LyXTextClassList::TextClass(LyXTextClassList::size_type textclass) const { classlist[textclass].load(); if (textclass < classlist.size()) @@ -1077,8 +1332,8 @@ bool LyXTextClassList::Read () { LyXLex lex(0, 0); string real_file = LibFileSearch("", "textclass.lst"); - lyxerr[Debug::TCLASS] << "Reading textclasses from " - << real_file << endl; + lyxerr[Debug::TCLASS] << "Reading textclasses from `" + << real_file << "'" << endl; if (real_file.empty()) { lyxerr << "LyXTextClassList::Read: unable to find " @@ -1092,21 +1347,29 @@ bool LyXTextClassList::Read () // This causes LyX to end... Not a desirable behaviour. Lgb // What do you propose? That the user gets a file dialog // and is allowed to hunt for the file? (Asger) + // more that we have a layout for minimal.cls statically + // compiled in... (Lgb) } - lex.setFile(real_file); + if (!lex.setFile(real_file)) { + lyxerr << "LyXTextClassList::Read: " + "lyxlex was not able to set file: " + << real_file << endl; + } if (!lex.IsOK()) { lyxerr << "LyXTextClassList::Read: unable to open " "textclass file `" << MakeDisplayPath(real_file, 1000) - << "\'\nCheck your installation. LyX can't continue." + << "'\nCheck your installation. LyX can't continue." << endl; return false; } bool finished = false; string fname, clname, desc; // Parse config-file + lyxerr[Debug::TCLASS] << "Starting parsing of textclass.lst" << endl; while (lex.IsOK() && !finished) { + lyxerr[Debug::TCLASS] << "\tline by line" << endl; switch (lex.lex()) { case LyXLex::LEX_FEOF: finished = true; @@ -1136,9 +1399,10 @@ bool LyXTextClassList::Read () } } } - + lyxerr[Debug::TCLASS] << "End of parsing of textclass.lst" << endl; + if (classlist.size() == 0) { - lyxerr << "LyXTextClassList::Read: no textclass found!" + lyxerr << "LyXTextClassList::Read: no textclasses found!" << endl; WriteAlert(_("LyX wasn't able to find any layout description!"), _("Check the contents of the file \"textclass.lst\""), @@ -1155,7 +1419,7 @@ bool LyXTextClassList::Read () Returns false if this fails */ bool -LyXTextClassList::Load (LyXTextClassList::ClassList::size_type number) const +LyXTextClassList::Load (LyXTextClassList::size_type number) const { bool result = true; if (number < classlist.size()) { @@ -1168,3 +1432,18 @@ LyXTextClassList::Load (LyXTextClassList::ClassList::size_type number) const } return result; } + + +std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p) +{ + switch (p) { + case LyXTextClass::OneSide: + os << "1"; + break; + case LyXTextClass::TwoSides: + os << "2"; + break; + } + return os; +} +