DocBook: floats can no more override DocBookTag.

This lead to a quite subtle bug. The major problem is that float tags
depend on whether the LyX float has a title (formal) or nor (informal).
This information cannot be encoded in the layout format as easily as a
simple DocBookTag.
This commit is contained in:
Thibaut Cuvelier 2020-09-03 00:23:31 +02:00
parent 08a58242c1
commit 40f4da3c9f
3 changed files with 3 additions and 3 deletions

View File

@ -30,7 +30,7 @@ Floating::Floating(string const & type, string const & placement,
string const & listName, std::string const & listCmd,
string const & refPrefix, std::string const & allowedplacement,
string const & htmlTag, string const & htmlAttrib,
docstring const & htmlStyle, string const & docbookTag,
docstring const & htmlStyle,
string const & docbookAttr, string const & docbookTagType,
string const & required, bool usesfloat, bool ispredefined,
bool allowswide, bool allowssideways)

View File

@ -37,7 +37,7 @@ public:
std::string const & listName, std::string const & listCmd,
std::string const & refPrefix, std::string const & allowedplacement,
std::string const & htmlType, std::string const & htmlClass,
docstring const & htmlStyle, std::string const & docbookTag,
docstring const & htmlStyle,
std::string const & docbookAttr, std::string const & docbookTagType,
std::string const & required, bool usesfloat, bool isprefined,
bool allowswide, bool allowssideways);

View File

@ -1574,7 +1574,7 @@ bool TextClass::readFloat(Lexer & lexrc)
}
Floating fl(type, placement, ext, within, style, name,
listname, listcommand, refprefix, allowed_placement,
htmltag, htmlattr, htmlstyle, docbooktag, docbookattr,
htmltag, htmlattr, htmlstyle, docbookattr,
docbooktagtype, required, usesfloat, ispredefined,
allowswide, allowssideways);
floatlist_.newFloat(fl);