anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 02:28:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XML: add tag-type information in XML tags. It is not yet used.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-11-18 05:29:26 +01:00
parent f426e458c4
commit 0fe3d05344
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/xml.h
View File

@ -174,23 +174,23 @@ struct EndFontTag;
struct StartTag struct StartTag
{ {
/// ///
explicit StartTag(std::string const & tag) : tag_(from_ascii(tag)), keepempty_(false) {} explicit StartTag(std::string const & tag) : tag_(from_ascii(tag)), keepempty_(false), tagtype_("none") {}
/// ///
explicit StartTag(docstring const & tag) : tag_(tag), keepempty_(false) {} explicit StartTag(docstring const & tag) : tag_(tag), keepempty_(false), tagtype_("none") {}
/// ///
explicit StartTag(docstring const & tag, docstring const & attr, explicit StartTag(docstring const & tag, docstring const & attr,
bool keepempty = false) bool keepempty = false, std::string const & tagtype = "none")
: tag_(tag), attr_(attr), keepempty_(keepempty) {} : tag_(tag), attr_(attr), keepempty_(keepempty), tagtype_(tagtype) {}
/// ///
explicit StartTag(std::string const & tag, std::string const & attr, explicit StartTag(std::string const & tag, std::string const & attr,
bool keepempty = false) bool keepempty = false, std::string const & tagtype = "none")
: tag_(from_ascii(tag)), attr_(from_utf8(attr)), keepempty_(keepempty) {} : tag_(from_ascii(tag)), attr_(from_utf8(attr)), keepempty_(keepempty), tagtype_(tagtype) {}
/// ///
explicit StartTag(std::string const & tag, docstring const & attr, explicit StartTag(std::string const & tag, docstring const & attr,
bool keepempty = false) bool keepempty = false, std::string const & tagtype = "none")
: tag_(from_ascii(tag)), attr_(attr), keepempty_(keepempty) {} : tag_(from_ascii(tag)), attr_(attr), keepempty_(keepempty), tagtype_(tagtype) {}
/// ///
virtual ~StartTag() {} virtual ~StartTag() = default;
/// <tag_ attr_> /// <tag_ attr_>
virtual docstring writeTag() const; virtual docstring writeTag() const;
/// </tag_> /// </tag_>
@ -212,6 +212,8 @@ struct StartTag
/// whether to keep things like "<tag></tag>" or discard them /// whether to keep things like "<tag></tag>" or discard them
/// you would want this for td, e.g, but maybe not for a div /// you would want this for td, e.g, but maybe not for a div
bool keepempty_; bool keepempty_;
/// Type of tag for new-line behaviour. Either "paragraph", "inline", "block", or "none" (default).
std::string tagtype_;
}; };
@ -219,11 +221,13 @@ struct StartTag
struct EndTag struct EndTag
{ {
/// ///
explicit EndTag(std::string const & tag) : tag_(from_ascii(tag)) {} explicit EndTag(std::string const & tag, std::string const & tagtype = "none")
: tag_(from_ascii(tag)), tagtype_(tagtype) {}
/// ///
explicit EndTag(docstring const & tag) : tag_(tag) {} explicit EndTag(docstring const & tag, std::string const & tagtype = "none")
: tag_(tag), tagtype_(tagtype) {}
/// ///
virtual ~EndTag() {} virtual ~EndTag() = default;
/// </tag_> /// </tag_>
virtual docstring writeEndTag() const; virtual docstring writeEndTag() const;
/// ///
@ -233,9 +237,12 @@ struct EndTag
bool operator!=(StartTag const & rhs) const bool operator!=(StartTag const & rhs) const
{ return !(*this == rhs); } { return !(*this == rhs); }
/// ///
virtual EndFontTag const * asFontTag() const { return 0; } virtual EndFontTag const * asFontTag() const { return nullptr; }
/// ///
docstring tag_; docstring tag_;
/// Type of tag for new-line behaviour. Either "paragraph", "inline", "block", or "none" (default).
/// The value should match that of the corresponding xml::StartTag.
std::string tagtype_;
}; };
@ -246,30 +253,31 @@ struct CompTag
{ {
/// ///
explicit CompTag(std::string const & tag) explicit CompTag(std::string const & tag)
: tag_(from_utf8(tag)) {} : tag_(from_utf8(tag)), tagtype_("none") {}
/// ///
explicit CompTag(std::string const & tag, std::string const & attr) explicit CompTag(std::string const & tag, std::string const & attr, std::string const & tagtype = "none")
: tag_(from_utf8(tag)), attr_(from_utf8(attr)) {} : tag_(from_utf8(tag)), attr_(from_utf8(attr)), tagtype_(tagtype) {}
/// ///
explicit CompTag(std::string const & tag, docstring const & attr) explicit CompTag(std::string const & tag, docstring const & attr, std::string const & tagtype = "none")
: tag_(from_utf8(tag)), attr_(attr) {} : tag_(from_utf8(tag)), attr_(attr), tagtype_(tagtype) {}
/// <tag_ attr_ /> /// <tag_ attr_ />
docstring writeTag() const; docstring writeTag() const;
/// ///
docstring tag_; docstring tag_;
/// ///
docstring attr_; docstring attr_;
/// Type of tag for new-line behaviour. Either "paragraph", "inline", "block", or "none" (default).
std::string tagtype_;
}; };
/// A special case of StartTag, used exclusively for tags that wrap paragraphs. /// A special case of StartTag, used exclusively for tags that wrap paragraphs.
/// parid is only used for HTML output; XML is supposed to use attr for this.
struct ParTag : public StartTag struct ParTag : public StartTag
{ {
/// ///
explicit ParTag(std::string const & tag, const std::string & attr): StartTag(tag, from_utf8(attr)) {} explicit ParTag(std::string const & tag, const std::string & attr): StartTag(tag, from_utf8(attr)) {}
/// ///
~ParTag() {} ~ParTag() override = default;
}; };