summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <akim@lrde.epita.fr>2013-11-26 16:23:52 +0100
committerAkim Demaille <akim@lrde.epita.fr>2013-11-26 16:28:22 +0100
commitbe29c71dd8867cca0c1aab4cf3ef9d4d4d0cb7b6 (patch)
treee73ebeb95d2306eabacc77341112dea250db84b0
parentd439985436e5a4a29930a24b9ceebe9dd9e71257 (diff)
downloadbison-be29c71dd8867cca0c1aab4cf3ef9d4d4d0cb7b6.tar.gz
xml: also use "%empty" with html output
* data/xslt/xml2xhtml.xsl: No longer issue an Epsilon, display as in dot and text formats.
-rw-r--r--NEWS5
-rw-r--r--data/xslt/xml2xhtml.xsl9
2 files changed, 7 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 98516886..1fa7d9b7 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,11 @@ GNU Bison NEWS
** 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
diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index d2cfed4c..c7c56887 100644
--- 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: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>
@@ -563,7 +558,7 @@
</xsl:template>
<xsl:template match="empty">
- <xsl:text> &#949;</xsl:text>
+ <xsl:text> %empty</xsl:text>
</xsl:template>
<xsl:template match="lookaheads">