read the Changelog

[features.git] / src / layout.h

diff --git a/src/layout.h b/src/layout.h
index 999d55cb26f3b0eee56b8908ccff7a8cad94a4f0..5aa994442eaa03ebc128f4669a6031cf020ea566 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -12,6 +12,8 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
+#include <vector>
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -20,7 +22,6 @@
 #include "lyxfont.h"
 #include "Spacing.h"
 
-#include <vector>
 
 /// Reads the style files
 extern void LyXSetStyle();
@@ -152,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. 
@@ -200,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 {
@@ -338,6 +342,9 @@ private:
        /// Label string. "Abstract", "Reference", "Caption"...
        string labelstring_;
 
+       ///
+       string endlabelstring_;
+
        /// Label string inside appendix. "Appendix", ...
        string labelstring_appendix_;
 
@@ -359,6 +366,7 @@ public:
        ///
        typedef LayoutList::size_type size_type;
        ///
+       explicit
        LyXTextClass (string const & = string(), 
                      string const & = string(), 
                      string const & = string());
@@ -499,7 +507,6 @@ private:
 };
 
 
-///
 inline
 void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
 {
@@ -508,19 +515,7 @@ void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
 
 
 ///
-inline
-std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p)
-{
-       switch (p) {
-       case LyXTextClass::OneSide:
-               os << "1";
-               break;
-       case LyXTextClass::TwoSides:
-               os << "2";
-               break;
-       }
-       return os;
-}
+std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
 
 
 ///