Actually do the layout update

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 79a2e7bcc76e10025dcbbf69c87ae4fc9d59579d..b94696fa0c1953bdb470cc11aa1c1fd21ab5e707 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -129,6 +129,7 @@ enum LayoutTags {
        LT_DOCBOOKITEMINNERATTR,
        LT_DOCBOOKITEMINNERTAGTYPE,
        LT_DOCBOOKFORCEABSTRACTTAG,
+       LT_DOCBOOKNOFONTINSIDE,
        LT_INPREAMBLE,
        LT_HTMLTITLE,
        LT_SPELLCHECK,
@@ -141,6 +142,7 @@ enum LayoutTags {
        LT_TOGGLE_INDENT,
        LT_ADDTOTOC,
        LT_ISTOCCAPTION,
+       LT_HTMLINTOC,
        LT_INTITLE // keep this last!
 };
 
@@ -186,6 +188,7 @@ Layout::Layout()
        htmllabelfirst_ = false;
        htmlforcecss_ = false;
        htmltitle_ = false;
+       htmlintoc_ = true;
        docbookabstract_ = false;
        docbookwrappermergewithprevious_ = false;
        docbooksection_ = false;
@@ -252,6 +255,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                { "docbookitemwrapperattr",    LT_DOCBOOKITEMWRAPPERATTR },
                { "docbookitemwrappertag",     LT_DOCBOOKITEMWRAPPERTAG },
                { "docbookitemwrappertagtype", LT_DOCBOOKITEMWRAPPERTAGTYPE },
+               { "docbooknofontinside",       LT_DOCBOOKNOFONTINSIDE, },
                { "docbooksection",            LT_DOCBOOKSECTION },
                { "docbooksectiontag",         LT_DOCBOOKSECTIONTAG },
                { "docbooktag",                LT_DOCBOOKTAG },
@@ -268,6 +272,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                { "freespacing",    LT_FREE_SPACING },
                { "htmlattr",       LT_HTMLATTR },
                { "htmlforcecss",   LT_HTMLFORCECSS },
+               { "htmlintoc",      LT_HTMLINTOC },
                { "htmlitem",       LT_HTMLITEM },
                { "htmlitemattr",   LT_HTMLITEMATTR },
                { "htmllabel",      LT_HTMLLABEL },
@@ -701,6 +706,10 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                        break;
                }
 
+               case LT_HTMLINTOC:
+                       lex >> htmlintoc_;
+                       break;
+
                case LT_HTMLTAG:
                        lex >> htmltag_;
                        break;
@@ -805,11 +814,11 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                        lex >> docbooksectiontag_;
                        break;
 
-        case LT_DOCBOOKITEMWRAPPERTAG:
-            lex >> docbookitemwrappertag_;
-            break;
-
-        case LT_DOCBOOKITEMWRAPPERATTR:
+               case LT_DOCBOOKITEMWRAPPERTAG:
+                       lex >> docbookitemwrappertag_;
+                       break;
+       
+               case LT_DOCBOOKITEMWRAPPERATTR:
                        lex >> docbookitemwrapperattr_;
                        break;
 
@@ -853,6 +862,10 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                        lex >> docbookiteminnertagtype_;
                        break;
 
+        case LT_DOCBOOKNOFONTINSIDE:
+            lex >> docbooknofontinside_;
+            break;
+
                case LT_SPELLCHECK:
                        lex >> spellcheck;
                        break;
@@ -1278,6 +1291,12 @@ void Layout::readArgument(Lexer & lex, bool validating)
                } else if (tok == "docbooktagtype") {
                        lex.next();
                        arg.docbooktagtype = lex.getDocString();
+               } else if (tok == "docbookargumentaftermaintag") {
+                       lex.next();
+                       arg.docbookargumentaftermaintag = lex.getBool();
+               } else if (tok == "docbookargumentbeforemaintag") {
+                       lex.next();
+                       arg.docbookargumentbeforemaintag = lex.getBool();
                } else {
                        lex.printError("Unknown tag");
                        error = true;
@@ -1719,7 +1738,8 @@ void Layout::write(ostream & os) const
                os << "\tDocBookItemInnerTagType " << docbookiteminnertagtype_ << '\n';
        if(!docbookforceabstracttag_.empty())
                os << "\tDocBookForceAbstractTag " << docbookforceabstracttag_ << '\n';
-       os << "\tSpellcheck " << spellcheck << "\n"
+    os << "\tDocBookNoFontInside " << docbooknofontinside_ << "\n"
+             "\tSpellcheck " << spellcheck << "\n"
              "\tForceLocal " << forcelocal << "\n"
              "End\n";
 }