Alfredo's second patch

[lyx.git] / src / lyxlayout.C

diff --git a/src/lyxlayout.C b/src/lyxlayout.C
index 2f815aa162851979c017da2dc9d0b58d699e989b..9aa7684798a7771fe60cec8aed48654290b3c293 100644 (file)
--- a/src/lyxlayout.C
+++ b/src/lyxlayout.C
@@ -57,6 +57,8 @@ enum LayoutTags {
        LT_LATEXPARAM,
        LT_OPTARGS,
        LT_LATEXTYPE,
+       LT_LATEXHEADER,
+       LT_LATEXFOOTER,
        LT_LEFTMARGIN,
        LT_NEED_PROTECT,
        LT_NEWLINE,
@@ -135,6 +137,8 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
                { "labelstring",        LT_LABELSTRING },
                { "labelstringappendix", LT_LABELSTRING_APPENDIX },
                { "labeltype",          LT_LABELTYPE },
+               { "latexfooter",                LT_LATEXFOOTER },
+               { "latexheader",                LT_LATEXHEADER },
                { "latexname",          LT_LATEXNAME },
                { "latexparam",         LT_LATEXPARAM },
                { "latextype",          LT_LATEXTYPE },
@@ -240,6 +244,16 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
                        readLatexType(lexrc);
                        break;
 
+               case LT_LATEXHEADER:    // Latex style definition.
+                       lexrc.next();
+                       latexheader = lexrc.getString();
+                       break;
+
+               case LT_LATEXFOOTER:    // Latex style definition.
+                       lexrc.next();
+                       latexfooter = lexrc.getString();
+                       break;
+
                case LT_INTITLE:
                        intitle = lexrc.next() && lexrc.getInteger();
                        break;
@@ -380,17 +394,17 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
 
                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.