[PATCH 11/17] XHTML export: Mildly sanitise bullet points

[andrew-libreoffice.org at pileofstuff.org]

From: Andrew Sayers <andrew-libreoffice.org at pileofstuff.org>

---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl   | 14 +++++++-------
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 46c0a7c..5df5cd4 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2014,13 +2014,15 @@
 										 The <html:span> represents the list item/header label (e.g. 1.A.III).
 										 We use CSS to make the <span> a block element, to set its width, and to float in the correct place -->
 									<xsl:element name="span">
-										<xsl:if test="$listLevelStyle/@text:style-name">
-											<xsl:attribute name="class">
+										<xsl:attribute name="class">
+											<xsl:text>bullet</xsl:text>
+											<xsl:if test="$listLevelStyle/@text:style-name">
+												<xsl:text> </xsl:text>
 												<xsl:value-of select="$listLevelStyle/@text:style-name"/>
-											</xsl:attribute>
-										</xsl:if>
+											</xsl:if>
+										</xsl:attribute>
 										<xsl:attribute name="style">
-											<xsl:text>display:block;float:</xsl:text>
+											<xsl:text>float:</xsl:text>
 											<!-- 2DO: Svante - copy this functionality for other used margin:left (in western country 'left') -->
 											<xsl:call-template name="getOppositeWritingDirection">
 												<xsl:with-param name="globalData" select="$globalData"/>
@@ -2046,9 +2048,7 @@
 													<xsl:apply-templates select="text:number" mode="listnumber"/>
 												</xsl:when>
 												<xsl:when test="name($listLevelStyle) = 'text:list-level-style-bullet'">
-													<xsl:value-of select="$listLevelStyle/@style:num-prefix"/>
 													<xsl:value-of select="$listLevelStyle/@text:bullet-char"/>
-													<xsl:value-of select="$listLevelStyle/@style:num-suffix"/>
 												</xsl:when>
 												<xsl:when test="name($listLevelStyle) = 'text:list-level-style-number'">
 													<xsl:value-of select="$listLevelStyle/@style:num-prefix"/>
diff --git filter/source/xslt/odf2xhtml/export/xhtml/header.xsl filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 98ee59b..f76c451 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -108,6 +108,8 @@
 	</xsl:text>
 <xsl:text>span.annotation_style_by_filter { font-size:95%; font-family:Arial; background-color:#fff000;  margin:0; border:0; padding:0;  }
 	</xsl:text>        
+<xsl:text>li span.bullet {display:block}
+</xsl:text>
 <xsl:text>* { margin:0;}
 	</xsl:text>
 			<xsl:call-template name="write-mapped-CSS-styles">
-- 
1.8.5.1