From be23de0a068c53ce60939a0312528474fe483b4c Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 28 Nov 2001 13:46:47 +0000
Subject: [PATCH] Use common pi-attribute template

---
 xsl/fo/pi.xsl   | 29 ++++-------------------------
 xsl/html/pi.xsl | 29 ++++-------------------------
 2 files changed, 8 insertions(+), 50 deletions(-)

diff --git a/xsl/fo/pi.xsl b/xsl/fo/pi.xsl
index 72c574ce5..77fb59307 100644
--- a/xsl/fo/pi.xsl
+++ b/xsl/fo/pi.xsl
@@ -20,32 +20,11 @@
 <xsl:template name="dbfo-attribute">
   <xsl:param name="pis" select="processing-instruction('dbfo')"/>
   <xsl:param name="attribute">filename</xsl:param>
-  <xsl:param name="count">1</xsl:param>
 
-  <xsl:choose>
-    <xsl:when test="$count>count($pis)">
-      <!-- not found -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="pi">
-        <xsl:value-of select="$pis[$count]"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="contains($pi,concat($attribute, '='))">
-          <xsl:variable name="rest" select="substring-after($pi,concat($attribute,'='))"/>
-          <xsl:variable name="quote" select="substring($rest,1,1)"/>
-          <xsl:value-of select="substring-before(substring($rest,2),$quote)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="dbfo-attribute">
-            <xsl:with-param name="pis" select="$pis"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-            <xsl:with-param name="count" select="$count + 1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:call-template name="pi-attribute">
+    <xsl:with-param name="pis" select="$pis"/>
+    <xsl:with-param name="attribute" select="$attribute"/>
+  </xsl:call-template>
 </xsl:template>
 
 <xsl:template name="dbfo-filename">
diff --git a/xsl/html/pi.xsl b/xsl/html/pi.xsl
index 0788b9796..d3da3d90c 100644
--- a/xsl/html/pi.xsl
+++ b/xsl/html/pi.xsl
@@ -28,32 +28,11 @@
 <xsl:template name="dbhtml-attribute">
   <xsl:param name="pis" select="processing-instruction('dbhtml')"/>
   <xsl:param name="attribute">filename</xsl:param>
-  <xsl:param name="count">1</xsl:param>
 
-  <xsl:choose>
-    <xsl:when test="$count &gt; count($pis)">
-      <!-- not found -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="pi">
-        <xsl:value-of select="$pis[$count]"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="contains($pi,concat($attribute, '='))">
-          <xsl:variable name="rest" select="substring-after($pi,concat($attribute,'='))"/>
-          <xsl:variable name="quote" select="substring($rest,1,1)"/>
-          <xsl:value-of select="substring-before(substring($rest,2),$quote)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="dbhtml-attribute">
-            <xsl:with-param name="pis" select="$pis"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-            <xsl:with-param name="count" select="$count + 1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:call-template name="pi-attribute">
+    <xsl:with-param name="pis" select="$pis"/>
+    <xsl:with-param name="attribute" select="$attribute"/>
+  </xsl:call-template>
 </xsl:template>
 
 <xsl:template name="dbhtml-filename">
-- 
2.40.0