Fix crash when running lyx -dbg insets -e ...

[lyx.git] / src / layout.C

diff --git a/src/layout.C b/src/layout.C
index 1c2069649fe0c6dbfce5cd3c658827151e159228..27efc567d46a80a833a3523a67c4f1122cc99b45 100644 (file)
--- a/src/layout.C
+++ b/src/layout.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *          Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ======================================================
  */
@@ -70,6 +70,7 @@ enum LayoutTags {
        //LT_FIRST_COUNTER,
        LT_FONT, 
        LT_FREE_SPACING, 
+       LT_PASS_THRU,
        //LT_HEADINGS,
        LT_ITEMSEP, 
        LT_KEEPEMPTY, 
@@ -133,6 +134,7 @@ LyXLayout::LyXLayout ()
        fill_bottom = false;
        newline_allowed = true;
        free_spacing = false;
+       pass_thru = false;
 }
 
 
@@ -174,6 +176,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
                { "parindent",                  LT_PARINDENT },
                { "parsep",                     LT_PARSEP },
                { "parskip",                    LT_PARSKIP },
+               { "passthru",                   LT_PASS_THRU },
                { "preamble",                   LT_PREAMBLE },
                { "rightmargin",                LT_RIGHTMARGIN },
                { "spacing",                    LT_SPACING },
@@ -392,6 +395,11 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
                                free_spacing = lexrc.GetInteger();
                        break;
 
+               case LT_PASS_THRU:      // Allow for pass thru.
+                       if (lexrc.next())
+                               pass_thru = lexrc.GetInteger();
+                       break;
+
                case LT_SPACING: // setspace.sty
                        readSpacing(lexrc);
                        break;
@@ -1258,7 +1266,7 @@ string const &
 LyXTextClassList::NameOfLayout(LyXTextClassList::size_type textclass,
                               LyXTextClass::size_type layout) const
 {
-       static string dummy("dummy");
+       static string const dummy("dummy");
        classlist[textclass].load();
        if (layout < classlist[textclass].numLayouts())
                return classlist[textclass][layout].name();
@@ -1270,7 +1278,7 @@ LyXTextClassList::NameOfLayout(LyXTextClassList::size_type textclass,
 string const &
 LyXTextClassList::NameOfClass(LyXTextClassList::size_type number) const
 {
-       static string dummy("dummy");
+       static string const dummy("dummy");
        if (classlist.size() == 0) {
                return dummy;
        }
@@ -1283,7 +1291,7 @@ LyXTextClassList::NameOfClass(LyXTextClassList::size_type number) const
 string const &
 LyXTextClassList::LatexnameOfClass(LyXTextClassList::size_type number) const
 {
-       static string dummy("dummy");
+       static string const dummy("dummy");
        classlist[number].load();
        if (classlist.size() == 0) {
                return dummy;
@@ -1297,7 +1305,7 @@ LyXTextClassList::LatexnameOfClass(LyXTextClassList::size_type number) const
 string const &
 LyXTextClassList::DescOfClass(LyXTextClassList::size_type number) const
 {
-       static string dummy("dummy");
+       static string const dummy("dummy");
        if (classlist.size() == 0) {
                return dummy;
        }