(xsl:template match="item"): New.

[bison.git] / data / xslt / xml2xhtml.xsl

diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index 5648d14c43a4997121c0e72a338e35a4ce577fca..5aea6f1a87787c6d7838d56759f19f5858e38cd9 100644 (file)
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -365,7 +365,7 @@
   </h3>
   <xsl:text>&#10;&#10;</xsl:text>
   <p class="pre">
-    <xsl:apply-templates select="itemset/rule">
+    <xsl:apply-templates select="itemset/item">
       <xsl:with-param name="pad" select="$pad"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="actions/transitions">
@@ -420,12 +420,35 @@
   </xsl:if>
 </xsl:template>
 
+<xsl:template match="item">
+  <xsl:param name="pad"/>
+  <xsl:param name="prev-rule-number"
+            select="preceding-sibling::item[1]/@rule-number"/>
+  <xsl:apply-templates select="key('bison:ruleNumber', current()/@rule-number)">
+    <xsl:with-param name="itemset" select="'true'"/>
+    <xsl:with-param name="pad" select="$pad"/>
+    <xsl:with-param name="prev-lhs"
+                   select="key('bison:ruleNumber', $prev-rule-number)/lhs[text()]"/>
+    <xsl:with-param name="point" select="@point"/>
+    <xsl:with-param name="lookaheads">
+      <xsl:apply-templates select="lookaheads"/>
+    </xsl:with-param>
+  </xsl:apply-templates>
+</xsl:template>
+
 <xsl:template match="rule">
+  <xsl:param name="itemset"/>
   <xsl:param name="pad"/>
-  <xsl:if test="not(name(..) = 'itemset') and not(preceding-sibling::rule[1]/lhs[text()] = lhs[text()])">
+  <xsl:param name="prev-lhs"/>
+  <xsl:param name="point"/>
+  <xsl:param name="lookaheads"/>
+
+  <xsl:if test="$itemset != 'true'
+               and not(preceding-sibling::rule[1]/lhs[text()] = lhs[text()])">
     <xsl:text>&#10;</xsl:text>
   </xsl:if>
-  <xsl:if test="not(name(..) = 'itemset')">
+
+  <xsl:if test="$itemset != 'true'">
     <a>
       <xsl:attribute name="name">
        <xsl:value-of select="concat('rule_', @number)"/>
@@ -433,8 +456,9 @@
     </a>
   </xsl:if>
   <xsl:text>  </xsl:text>
+
   <xsl:choose>
-    <xsl:when test="name(..) = 'itemset'">
+    <xsl:when test="$itemset = 'true'">
       <a>
        <xsl:attribute name="href">
          <xsl:value-of select="concat('#rule_', @number)"/>
@@ -453,8 +477,17 @@
     </xsl:otherwise>
   </xsl:choose>
   <xsl:text> </xsl:text>
+
+  <!-- LHS -->
   <xsl:choose>
-    <xsl:when test="preceding-sibling::rule[1]/lhs[text()] = lhs[text()]">
+    <xsl:when test="$itemset != 'true'
+                   and preceding-sibling::rule[1]/lhs[text()] = lhs[text()]">
+      <xsl:call-template name="lpad">
+       <xsl:with-param name="str" select="'|'"/>
+       <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 2"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$itemset = 'true' and $prev-lhs = lhs[text()]">
       <xsl:call-template name="lpad">
        <xsl:with-param name="str" select="'|'"/>
        <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 2"/>
@@ -467,8 +500,28 @@
       <xsl:text> &#8594;</xsl:text>
     </xsl:otherwise>
   </xsl:choose>
-  <xsl:apply-templates select="rhs/symbol|rhs/point|rhs/empty"/>
-  <xsl:apply-templates select="lookaheads"/>
+
+  <!-- RHS -->
+  <xsl:for-each select="rhs/*">
+    <xsl:if test="position() = $point + 1">
+      <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:if test="position() = last() and position() = $point">
+      <xsl:text> </xsl:text>
+      <span class="point">.</span>
+    </xsl:if>
+  </xsl:for-each>
+  <xsl:if test="$lookaheads">
+    <xsl:value-of select="$lookaheads"/>
+  </xsl:if>
+
   <xsl:text>&#10;</xsl:text>
 </xsl:template>
 
@@ -484,11 +537,6 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="point">
-  <xsl:text> </xsl:text>
-  <span class="point">.</span>
-</xsl:template>
-
 <xsl:template match="empty">
   <xsl:text> &#949;</xsl:text>
 </xsl:template>
@@ -571,7 +619,7 @@
       </a>
       <xsl:text> (</xsl:text>
       <xsl:value-of
-         select="/bison-xml-report/grammar/rules/rule[@number = current()/@rule]/lhs[text()]"/>
+         select="key('bison:ruleNumber', current()/@rule)/lhs[text()]"/>
       <xsl:text>)</xsl:text>
     </xsl:otherwise>
   </xsl:choose>