X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=e5d683ec1855d3f089eaa19828926c7eff5a1017;hb=b4e609bd691b326756e802bb16524bb837b5a10e;hp=b98dd3b1b5419817322a15cbcd3b5adc4916b931;hpb=c8e04eb2f4aba52ae6b04c829dce4c1d6bbf867e;p=features.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index b98dd3b1b5..e5d683ec18 100644
--- 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,
@@ -252,6 +253,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 },
@@ -853,6 +855,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 +1284,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 +1731,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";
 }