xml: also use "%empty" with html output

* data/xslt/xml2xhtml.xsl: No longer issue an Epsilon, display as in
dot and text formats.

diff --git a/NEWS b/NEWS
index 98516886b58d5645e0f126163fa8ac0948c8d048..1fa7d9b77583d43b08f57dc7314b9991f096f319 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,11 @@ GNU Bison NEWS
 
 ** Bug fixes
 
 
 ** Bug fixes
 

+*** %empty is used in reports
+
+  Empty right-hand sides are denoted by '%empty' in all the reports (text,
+  dot, XML and formats derived from it).
+

 *** YYERROR and variants
 
   When C++ variant support is enabled, an error triggered via YYERROR, but
 *** YYERROR and variants
 
   When C++ variant support is enabled, an error triggered via YYERROR, but

diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index d2cfed4ccd5f27dea43fc9c50437ef370da870ff..c7c56887f5bd592a10a2be952a5a4ef585d25eda 100644 (file)
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -532,12 +532,7 @@
       <xsl:text> </xsl:text>
       <span class="point">.</span>
     </xsl:if>
       <xsl:text> </xsl:text>
       <span class="point">.</span>
     </xsl:if>

-    <xsl:if test="$itemset = 'true' and name(.) != 'empty'">
-      <xsl:apply-templates select="."/>
-    </xsl:if>
-    <xsl:if test="$itemset != 'true'">
-      <xsl:apply-templates select="."/>
-    </xsl:if>
+    <xsl:apply-templates select="."/>

     <xsl:if test="position() = last() and position() = $point">
       <xsl:text> </xsl:text>
       <span class="point">.</span>
     <xsl:if test="position() = last() and position() = $point">
       <xsl:text> </xsl:text>
       <span class="point">.</span>


@@ -563,7 +558,7 @@
 </xsl:template>
 
 <xsl:template match="empty">
 </xsl:template>
 
 <xsl:template match="empty">

-  <xsl:text> &#949;</xsl:text>
+  <xsl:text> %empty</xsl:text>

 </xsl:template>
 
 <xsl:template match="lookaheads">
 </xsl:template>
 
 <xsl:template match="lookaheads">