Point fix, earlier forgotten

[lyx.git] / src / lyxlayout.C

diff --git a/src/lyxlayout.C b/src/lyxlayout.C
index 0a95c43811397b8ab0be3de73fefdd4746959213..d1ddac4b741fdea6a89f0438f856e01fe81f4d18 100644 (file)
--- a/src/lyxlayout.C
+++ b/src/lyxlayout.C
@@ -1,20 +1,17 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxlayout.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author André Pönitz
  *
- *          Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxlayout.h"
 #include "lyxtextclass.h"
 #include "lyxlex.h"
@@ -22,6 +19,8 @@
 
 #include "support/lstrings.h"
 
+using namespace lyx::support;
+
 using std::endl;
 
 //  The order of the LayoutTags enum is no more important. [asierra300396]
@@ -61,6 +60,9 @@ enum LayoutTags {
        LT_LATEXPARAM,
        LT_OPTARGS,
        LT_LATEXTYPE,
+       LT_LATEXHEADER,
+       LT_LATEXFOOTER,
+       LT_LATEXPARAGRAPH,
        LT_LEFTMARGIN,
        LT_NEED_PROTECT,
        LT_NEWLINE,
@@ -109,6 +111,7 @@ LyXLayout::LyXLayout ()
        newline_allowed = true;
        free_spacing = false;
        pass_thru = false;
+       is_environment = false;
 }
 
 
@@ -139,7 +142,10 @@ 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 },
+               { "latexparagraph",             LT_LATEXPARAGRAPH },
                { "latexparam",         LT_LATEXPARAM },
                { "latextype",          LT_LATEXTYPE },
                { "leftmargin",         LT_LEFTMARGIN },
@@ -236,14 +242,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:    // 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;
@@ -384,17 +405,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.
@@ -533,7 +554,7 @@ void LyXLayout::readLabelType(LyXLex & lexrc)
        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 },
@@ -548,7 +569,7 @@ void LyXLayout::readLabelType(LyXLex & lexrc)
        { "sensitive",                LA_SENSITIVE },
        { "static",                   LA_STATIC },
        { "top_environment",          LA_TOP_ENVIRONMENT }
-};
+       };
 
        pushpophelper pph(lexrc, labelTypeTags, LA_BIBLIO);
        int le = lexrc.lex();
@@ -684,6 +705,7 @@ void LyXLayout::readMargin(LyXLex & lexrc)
 void LyXLayout::readLatexType(LyXLex & lexrc)
 {
        keyword_item latexTypeTags[] = {
+               { "bib_environment",  LATEX_BIB_ENVIRONMENT },
                { "command",          LATEX_COMMAND },
                { "environment",      LATEX_ENVIRONMENT },
                { "item_environment", LATEX_ITEM_ENVIRONMENT },
@@ -701,6 +723,7 @@ void LyXLayout::readLatexType(LyXLex & lexrc)
        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;