X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=64258a8483cefd2c1dbce56e550b40713dc7d58a;hb=3a949b32f08ce4884906a9c5d47c4d7031c794b2;hp=00e63b895e9f02304b255c52989964bdde16a07d;hpb=affd6101bddb3afebad05e16f36e771c04b7b8e3;p=lyx.git

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 00e63b895e..64258a8483 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -107,7 +107,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
 		IL_DOCBOOKITEMWRAPPERTAG,
 		IL_DOCBOOKITEMWRAPPERTAGTYPE,
 		IL_DOCBOOKITEMWRAPPERATTR,
+		IL_DOCBOOKINNERTAG,
+		IL_DOCBOOKINNERTAGTYPE,
+		IL_DOCBOOKINNERATTR,
         IL_DOCBOOKNOFONTINSIDE,
+        IL_DOCBOOKRENDERASIMAGE,
 		IL_INTOC,
 		IL_ISTOCCAPTION,
 		IL_LABELFONT,
@@ -156,6 +160,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
 		{ "docbookargumentbeforemaintag", IL_DOCBOOKARGUMENTBEFOREMAINTAG },
 		{ "docbookattr", IL_DOCBOOKATTR },
 		{ "docbookininfo", IL_DOCBOOKININFO },
+		{ "docbookinnerattr", IL_DOCBOOKINNERATTR },
+		{ "docbookinnertag", IL_DOCBOOKINNERTAG },
+		{ "docbookinnertagtype", IL_DOCBOOKINNERTAGTYPE },
 		{ "docbookitemattr", IL_DOCBOOKITEMATTR },
 		{ "docbookitemtag", IL_DOCBOOKITEMTAG },
 		{ "docbookitemtagtype", IL_DOCBOOKITEMTAGTYPE },
@@ -164,6 +171,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
 		{ "docbookitemwrappertagtype", IL_DOCBOOKITEMWRAPPERTAGTYPE },
 		{ "docbooknofontinside", IL_DOCBOOKNOFONTINSIDE },
 		{ "docbooknotinpara", IL_DOCBOOKNOTINPARA },
+		{ "docbookrenderasimage", IL_DOCBOOKRENDERASIMAGE },
 		{ "docbooksection", IL_DOCBOOKSECTION },
 		{ "docbooktag", IL_DOCBOOKTAG },
 		{ "docbooktagtype", IL_DOCBOOKTAGTYPE },
@@ -521,6 +529,15 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
 		case IL_DOCBOOKTAGTYPE:
 			lex >> docbooktagtype_;
 			break;
+		case IL_DOCBOOKINNERTAG:
+			lex >> docbookinnertag_;
+			break;
+		case IL_DOCBOOKINNERATTR:
+			lex >> docbookinnerattr_;
+			break;
+		case IL_DOCBOOKINNERTAGTYPE:
+			lex >> docbookinnertagtype_;
+			break;
 		case IL_DOCBOOKININFO:
 			lex >> docbookininfo_;
 			break;
@@ -565,6 +582,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
 			break;
         case IL_DOCBOOKNOFONTINSIDE:
             lex >> docbooknofontinside_;
+            break;
+        case IL_DOCBOOKRENDERASIMAGE:
+            lex >> docbookrenderasimage_;
             break;
 		case IL_REQUIRES: {
 			lex.eatLine();
@@ -714,6 +734,14 @@ std::string InsetLayout::docbooktagtype() const
 }
 
 
+std::string InsetLayout::docbookinnertagtype() const
+{
+	if (docbookinnertagtype_ != "block" && docbookinnertagtype_ != "paragraph" && docbookinnertagtype_ != "inline")
+		docbookinnertagtype_ = "block";
+	return docbookinnertagtype_;
+}
+
+
 std::string InsetLayout::docbookwrappertagtype() const
 {
 	if (docbookwrappertagtype_ != "block" && docbookwrappertagtype_ != "paragraph" && docbookwrappertagtype_ != "inline")
@@ -770,8 +798,6 @@ void InsetLayout::readArgument(Lexer & lex)
 		} else if (tok == "menustring") {
 			lex.next();
 			arg.menustring = lex.getDocString();
-			if (arg.labelstring.empty())
-				arg.labelstring = arg.menustring;
 		} else if (tok == "mandatory") {
 			lex.next();
 			arg.mandatory = lex.getBool();