Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / layout.h

diff --git a/src/layout.h b/src/layout.h
index f29ebb2572af29ea635f69e9ea31c525f1da9386..641aad24c5506a7ace3b23ebaec2dda24474a55d 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -22,7 +22,6 @@
 #include "lyxfont.h"
 #include "Spacing.h"
 
-
 /// Reads the style files
 extern void LyXSetStyle();
 
@@ -33,11 +32,14 @@ enum { // no good name for this
        ///
        LYX_LAYOUT_DEFAULT = 99
 };
+
+
 // Could this cause confusion that both DUMMY_LAYOUT and  LAYOUT_DEFAULT has
 // the same value? (Lgb)
 ///
 #define LYX_DUMMY_LAYOUT 99
 
+
 /// The different output types
 enum OutputType {
         ///
@@ -140,9 +142,7 @@ enum LYX_LABEL_TYPES {
        ///
        LABEL_COUNTER_ENUMIII,
        ///
-       LABEL_COUNTER_ENUMIV,
-       ///
-       LABEL_FIRST_COUNTER = LABEL_COUNTER_CHAPTER
+       LABEL_COUNTER_ENUMIV
 };
 
 enum LYX_END_LABEL_TYPES {
@@ -153,9 +153,11 @@ enum LYX_END_LABEL_TYPES {
        ///
        END_LABEL_FILLED_BOX,
        ///
+       END_LABEL_STATIC,
+       ///
        END_LABEL_ENUM_FIRST = END_LABEL_NO_LABEL,
        ///
-       END_LABEL_ENUM_LAST = END_LABEL_FILLED_BOX
+       END_LABEL_ENUM_LAST = END_LABEL_STATIC
 };
                
 /* Fix labels are printed flushright, manual labels flushleft. 
@@ -201,6 +203,7 @@ public:
        string const & obsoleted_by() const { return obsoleted_by_; }
        string const & latexname() const { return latexname_; }
        string const & labelstring() const { return labelstring_; }
+       string const & endlabelstring() const { return endlabelstring_; }
        string const & preamble() const { return preamble_; }
        string const & latexparam() const { return latexparam_; }
        string const & labelstring_appendix() const {
@@ -339,6 +342,9 @@ private:
        /// Label string. "Abstract", "Reference", "Caption"...
        string labelstring_;
 
+       ///
+       string endlabelstring_;
+
        /// Label string inside appendix. "Appendix", ...
        string labelstring_appendix_;
 
@@ -501,7 +507,6 @@ private:
 };
 
 
-///
 inline
 void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
 {