X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlayout.C;h=fc691697f7c0abb7a19f9e020024aa32fa337f53;hb=2e57f2ff0ae7cd4a6efbf634ffe6d2f4379d9cfc;hp=9aa7684798a7771fe60cec8aed48654290b3c293;hpb=febdea3f88c251b503c30ef5cdb1c9c13d4a6825;p=lyx.git diff --git a/src/lyxlayout.C b/src/lyxlayout.C index 9aa7684798..fc691697f7 100644 --- a/src/lyxlayout.C +++ b/src/lyxlayout.C @@ -18,6 +18,8 @@ #include "support/lstrings.h" +using namespace lyx::support; + using std::endl; // The order of the LayoutTags enum is no more important. [asierra300396] @@ -59,6 +61,7 @@ enum LayoutTags { LT_LATEXTYPE, LT_LATEXHEADER, LT_LATEXFOOTER, + LT_LATEXPARAGRAPH, LT_LEFTMARGIN, LT_NEED_PROTECT, LT_NEWLINE, @@ -107,6 +110,7 @@ LyXLayout::LyXLayout () newline_allowed = true; free_spacing = false; pass_thru = false; + is_environment = false; } @@ -140,6 +144,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass) { "latexfooter", LT_LATEXFOOTER }, { "latexheader", LT_LATEXHEADER }, { "latexname", LT_LATEXNAME }, + { "latexparagraph", LT_LATEXPARAGRAPH }, { "latexparam", LT_LATEXPARAM }, { "latextype", LT_LATEXTYPE }, { "leftmargin", LT_LEFTMARGIN }, @@ -236,24 +241,29 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass) } break; - case LT_MARGIN: // Margin style definition. + 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: // Latex style definition. + case LT_LATEXHEADER: // header for environments lexrc.next(); latexheader = lexrc.getString(); break; - case LT_LATEXFOOTER: // Latex style definition. + 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;