LogUi.ui: string redundancy.

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 95d9cb944fe370561ce58b81124de472061c33fb..32f565297ee9a8ee4fd0354c2b12560374fc6e01 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -92,6 +92,15 @@ enum LayoutTags {
        LT_INNERTAG,
        LT_LABELTAG,
        LT_ITEMTAG,
+       LT_HTMLTAG,
+       LT_HTMLATTR,
+       LT_HTMLITEM,
+       LT_HTMLITEMATTR,
+       LT_HTMLLABEL,
+       LT_HTMLLABELATTR, 
+       LT_HTMLLABELFIRST,
+       LT_HTMLPREAMBLE,
+       LT_HTMLSTYLE,
        LT_INTITLE // keep this last!
 };
 
@@ -130,6 +139,7 @@ Layout::Layout()
        pass_thru = false;
        toclevel = NOT_IN_TOC;
        commanddepth = 0;
+       htmllabelfirst_ = false;
 }
 
 
@@ -152,6 +162,15 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                { "fill_top",       LT_FILL_TOP },
                { "font",           LT_FONT },
                { "freespacing",    LT_FREE_SPACING },
+               {       "htmlattr",       LT_HTMLATTR },
+               { "htmlitem",       LT_HTMLITEM },
+               { "htmlitemattr",   LT_HTMLITEMATTR },
+               { "htmllabel",      LT_HTMLLABEL },
+               { "htmllabelattr",  LT_HTMLLABELATTR },
+               { "htmllabelfirst", LT_HTMLLABELFIRST },
+               { "htmlpremable",   LT_HTMLPREAMBLE },
+               { "htmlstyle",      LT_HTMLSTYLE },
+               { "htmltag",        LT_HTMLTAG },
                { "innertag",       LT_INNERTAG },
                { "intitle",        LT_INTITLE },
                { "itemsep",        LT_ITEMSEP },
@@ -455,12 +474,49 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                        readSpacing(lex);
                        break;
 
-               case LT_REQUIRES:
+               case LT_REQUIRES: {
                        lex.eatLine();
                        vector<string> const req = 
                                getVectorFromString(lex.getString());
                        requires_.insert(req.begin(), req.end());
                        break;
+               }
+
+               case LT_HTMLTAG:
+                       lex >> htmltag_;
+                       break;
+       
+               case LT_HTMLATTR:
+                       lex >> htmlattr_;
+                       break;
+
+               case LT_HTMLITEM:
+                       lex >> htmlitem_;
+                       break;
+       
+               case LT_HTMLITEMATTR:
+                       lex >> htmlitemattr_;
+                       break;
+       
+               case LT_HTMLLABEL:
+                       lex >> htmllabel_;
+                       break;
+
+               case LT_HTMLLABELATTR: 
+                       lex >> htmllabelattr_;
+                       break;
+
+               case LT_HTMLLABELFIRST:
+                       lex >> htmllabelfirst_;
+                       break;
+                       
+               case LT_HTMLSTYLE:
+                       htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
+                       break;
+
+               case LT_HTMLPREAMBLE:
+                       htmlpreamble_ = from_utf8(lex.getLongString("EndPreamble"));
+                       break;
 
                }
        }