X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=8dec223c8cdec8933a38c31f33f11b28f70d7f89;hb=0bd2978ac99d894ea876d38336192246537a0594;hp=01c4f1628657a1d07cac3af2fe11280e95efca97;hpb=1a054e45711f30dfdf197a4d2ead4b3365318208;p=features.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 01c4f16286..8dec223c8c 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -107,6 +107,9 @@ enum LayoutTags {
 	LT_DOCBOOKTAG,
 	LT_DOCBOOKATTR,
 	LT_DOCBOOKTAGTYPE,
+	LT_DOCBOOKINNERATTR,
+	LT_DOCBOOKINNERTAG,
+	LT_DOCBOOKINNERTAGTYPE,
 	LT_DOCBOOKININFO,
 	LT_DOCBOOKABSTRACT,
 	LT_DOCBOOKWRAPPERTAG,
@@ -234,6 +237,9 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
 		{ "docbookattr",               LT_DOCBOOKATTR },
 		{ "docbookforceabstracttag",   LT_DOCBOOKFORCEABSTRACTTAG },
 		{ "docbookininfo",             LT_DOCBOOKININFO },
+		{ "docbookinnerattr",          LT_DOCBOOKINNERATTR },
+		{ "docbookinnertag",           LT_DOCBOOKINNERTAG },
+		{ "docbookinnertagtype",       LT_DOCBOOKINNERTAGTYPE },
 		{ "docbookitemattr",           LT_DOCBOOKITEMATTR },
 		{ "docbookiteminnerattr",      LT_DOCBOOKITEMINNERATTR },
 		{ "docbookiteminnertag",       LT_DOCBOOKITEMINNERTAG },
@@ -750,6 +756,18 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
 			lex >> docbooktagtype_;
 			break;
 
+		case LT_DOCBOOKINNERTAG:
+			lex >> docbookinnertag_;
+			break;
+
+		case LT_DOCBOOKINNERATTR:
+			lex >> docbookinnerattr_;
+			break;
+
+		case LT_DOCBOOKINNERTAGTYPE:
+			lex >> docbookinnertagtype_;
+			break;
+
 		case LT_DOCBOOKFORCEABSTRACTTAG:
 			lex >> docbookforceabstracttag_;
 			break;
@@ -1638,6 +1656,12 @@ void Layout::write(ostream & os) const
 		os << "\tDocBookAttr \"" << docbookattr_ << "\"\n";
 	if(!docbooktagtype_.empty())
 		os << "\tDocBookTagType " << docbooktagtype_ << '\n';
+	if(!docbookinnertag_.empty())
+		os << "\tDocBookInnerTag " << docbookinnertag_ << '\n';
+	if(!docbookinnerattr_.empty())
+		os << "\tDocBookInnerAttr \"" << docbookinnerattr_ << "\"\n";
+	if(!docbookinnertagtype_.empty())
+		os << "\tDocBookInnerTagType " << docbookinnertagtype_ << '\n';
 	if(!docbookininfo_.empty())
 		os << "\tDocBookInInfo " << docbookininfo_ << '\n';
 	os << "\tDocBookAbstract " << docbookabstract_ << '\n';
@@ -1857,6 +1881,28 @@ string const & Layout::docbooktagtype() const
 }
 
 
+string const & Layout::docbookinnertag() const
+{
+	if (docbookinnertag_.empty())
+		docbookinnertag_ = "NONE";
+	return docbookinnertag_;
+}
+
+
+string const & Layout::docbookinnerattr() const
+{
+	return docbookinnerattr_;
+}
+
+
+string const & Layout::docbookinnertagtype() const
+{
+	if (!isValidTagType(docbookinnertagtype_))
+		docbookinnertagtype_ = "block";
+	return docbookinnertagtype_;
+}
+
+
 string const & Layout::docbookininfo() const
 {
 	// Indeed, a trilean. Only titles should be "maybe": otherwise, metadata is "always", content is "never".