From: Thibaut Cuvelier <tcuvelier@lyx.org>
Date: Fri, 9 Dec 2022 01:48:52 +0000 (+0100)
Subject: XHTML: support NONE as item tag when no item tag should be output.
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5b7fbb419010b574b2e7886739bd939bc2d6f07a;p=features.git

XHTML: support NONE as item tag when no item tag should be output.

This patch mimics a similar feature for DocBook (albeit not as pervasive).
---

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 4418f28c77..f01b0b8e62 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -212,27 +212,33 @@ inline void closeLabelTag(XMLStream & xs, Layout const & lay)
 
 inline void openItemTag(XMLStream & xs, Layout const & lay)
 {
-	xs << xml::StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true);
+	if (lay.htmlitemtag() != "NONE") {
+		xs << xml::StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true);
+	}
 }
 
 
 void openItemTag(XMLStream & xs, Layout const & lay,
              ParagraphParameters const & params)
 {
-	// FIXME Are there other things we should handle here?
-	string const align = alignmentToCSS(params.align());
-	if (align.empty()) {
-		openItemTag(xs, lay);
-		return;
+	if (lay.htmlitemtag() != "NONE") {
+		// FIXME Are there other things we should handle here?
+		string const align = alignmentToCSS(params.align());
+		if (align.empty()) {
+			openItemTag(xs, lay);
+			return;
+		}
+		string attrs = lay.htmlGetAttrString() + " style='text-align: " + align + ";'";
+		xs << xml::StartTag(lay.htmlitemtag(), attrs);
 	}
-	string attrs = lay.htmlGetAttrString() + " style='text-align: " + align + ";'";
-	xs << xml::StartTag(lay.htmlitemtag(), attrs);
 }
 
 
 inline void closeItemTag(XMLStream & xs, Layout const & lay)
 {
-	xs << xml::EndTag(lay.htmlitemtag());
+	if (lay.htmlitemtag() != "NONE") {
+		xs << xml::EndTag(lay.htmlitemtag());
+	}
 }
 
 // end of convenience functions