#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "lyxlayout.h"
#include "lyxtextclass.h"
#include "lyxlex.h"
#include "support/lstrings.h"
+using namespace lyx::support;
+
using std::endl;
// The order of the LayoutTags enum is no more important. [asierra300396]
LT_MARGIN,
LT_BOTTOMSEP,
LT_COPYSTYLE,
+ LT_DEPENDSON,
LT_OBSOLETEDBY,
//LT_EMPTY,
LT_END,
LT_ENDLABELTYPE,
LT_LATEXNAME,
LT_LATEXPARAM,
+ LT_OPTARGS,
LT_LATEXTYPE,
+ LT_LATEXHEADER,
+ LT_LATEXFOOTER,
+ LT_LATEXPARAGRAPH,
LT_LEFTMARGIN,
LT_NEED_PROTECT,
LT_NEWLINE,
margintype = MARGIN_STATIC;
latextype = LATEX_PARAGRAPH;
intitle = false;
+ optionalargs = 0;
needprotect = false;
keepempty = false;
font = LyXFont(LyXFont::ALL_INHERIT);
newline_allowed = true;
free_spacing = false;
pass_thru = false;
+ is_environment = false;
}
{
// 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 },
+ { "align", LT_ALIGN },
+ { "alignpossible", LT_ALIGNPOSSIBLE },
+ { "bottomsep", LT_BOTTOMSEP },
+ { "copystyle", LT_COPYSTYLE },
+ { "dependson", LT_DEPENDSON },
+ { "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 },
+ { "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 },
+ { "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 },
- { "passthru", LT_PASS_THRU },
- { "preamble", LT_PREAMBLE },
- { "rightmargin", LT_RIGHTMARGIN },
- { "spacing", LT_SPACING },
- { "textfont", LT_TEXTFONT },
- { "topsep", LT_TOPSEP }
+ { "labelstringappendix", LT_LABELSTRING_APPENDIX },
+ { "labeltype", LT_LABELTYPE },
+ { "latexfooter", LT_LATEXFOOTER },
+ { "latexheader", LT_LATEXHEADER },
+ { "latexname", LT_LATEXNAME },
+ { "latexparagraph", LT_LATEXPARAGRAPH },
+ { "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 },
+ { "optionalargs", LT_OPTARGS },
+ { "parindent", LT_PARINDENT },
+ { "parsep", LT_PARSEP },
+ { "parskip", LT_PARSKIP },
+ { "passthru", LT_PASS_THRU },
+ { "preamble", LT_PREAMBLE },
+ { "rightmargin", LT_RIGHTMARGIN },
+ { "spacing", LT_SPACING },
+ { "textfont", LT_TEXTFONT },
+ { "topsep", LT_TOPSEP }
};
bool error = false;
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_MARGIN: // Margin style definition.
+ case LT_DEPENDSON:
+ if (lexrc.next()) {
+ depends_on_ = lexrc.getString();
+ }
+ break;
+
+ case LT_MARGIN: // margin style definition.
readMargin(lexrc);
break;
- case LT_LATEXTYPE: // Latex style definition.
+ case LT_LATEXTYPE: // LaTeX style definition.
readLatexType(lexrc);
break;
+ case LT_LATEXHEADER: // header for environments
+ lexrc.next();
+ latexheader = lexrc.getString();
+ break;
+
+ case LT_LATEXFOOTER: // footer for environments
+ lexrc.next();
+ latexfooter = lexrc.getString();
+ break;
+
+ case LT_LATEXPARAGRAPH:
+ lexrc.next();
+ latexparagraph = lexrc.getString();
+ break;
+
case LT_INTITLE:
intitle = lexrc.next() && lexrc.getInteger();
break;
+ case LT_OPTARGS:
+ if (lexrc.next()) {
+ optionalargs = lexrc.getInteger();
+ }
+ break;
+
case LT_NEED_PROTECT:
needprotect = lexrc.next() && lexrc.getInteger();
break;
case LT_LABELSTRING: // label string definition
if (lexrc.next())
- labelstring_ = lexrc.getString();
+ labelstring_ = trim(lexrc.getString());
break;
case LT_ENDLABELSTRING: // endlabel string definition
if (lexrc.next())
- endlabelstring_ = lexrc.getString();
+ endlabelstring_ = trim(lexrc.getString());
break;
case LT_LABELSTRING_APPENDIX: // label string appendix definition
if (lexrc.next())
- labelstring_appendix_ = lexrc.getString();
+ labelstring_appendix_ = trim(lexrc.getString());
break;
case LT_FREE_SPACING: // Allow for free spacing.
keyword_item labelTypeTags[] = {
{ "bibliography", LA_BIBLIO },
{ "centered_top_environment", LA_CENTERED_TOP_ENVIRONMENT },
- { "counter_chapter", LA_COUNTER_CHAPTER },
+ { "counter_chapter", LA_COUNTER_CHAPTER },
{ "counter_enumi", LA_COUNTER_ENUMI },
{ "counter_enumii", LA_COUNTER_ENUMII },
{ "counter_enumiii", LA_COUNTER_ENUMIII },
{ "sensitive", LA_SENSITIVE },
{ "static", LA_STATIC },
{ "top_environment", LA_TOP_ENVIRONMENT }
-};
+ };
pushpophelper pph(lexrc, labelTypeTags, LA_BIBLIO);
int le = lexrc.lex();
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;
{
return obsoleted_by_;
}
+
+
+string const & LyXLayout::depends_on() const
+{
+ return depends_on_;
+}
projects / lyx.git / blobdiff