From: bobstayton <bobs@sagehill.net>
Date: Sat, 21 Jul 2018 20:06:33 +0000 (-0700)
Subject: fix issue #105 floatstyle attribute not supported in informal objects
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fheads%2Fbobs_bugfix_105;p=docbook-dsssl

fix issue #105 floatstyle attribute not supported in informal objects
---

diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index ed212b64b..115d74736 100644
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -122,6 +122,8 @@
 </xsl:template>
 
 <xsl:template name="informal.object">
+  <xsl:param name="pgwide"/>
+
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
@@ -130,26 +132,6 @@
     <xsl:call-template name="pi.dbfo_keep-together"/>
   </xsl:variable>
 
-  <!-- Some don't have a pgwide attribute, so may use a PI -->
-  <xsl:variable name="pgwide.pi">
-    <xsl:call-template name="pi.dbfo_pgwide"/>
-  </xsl:variable>
-
-  <xsl:variable name="pgwide">
-    <xsl:choose>
-      <xsl:when test="@pgwide">
-        <xsl:value-of select="@pgwide"/>
-      </xsl:when>
-      <xsl:when test="$pgwide.pi">
-        <xsl:value-of select="$pgwide.pi"/>
-      </xsl:when>
-      <!-- child element may set pgwide -->
-      <xsl:when test="*[@pgwide]">
-        <xsl:value-of select="*[@pgwide][1]/@pgwide"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
   <xsl:choose>
     <!-- informaltables have their own templates and 
          are not handled by formal.object -->
@@ -560,9 +542,16 @@
     </xsl:choose>
   </xsl:variable>
 
-  <!-- Equation doesn't have a pgwide attribute, so may use a PI -->
+  <!-- Equation only recently got a pgwide attribute, so may use a PI -->
   <xsl:variable name="pgwide">
-    <xsl:call-template name="pi.dbfo_pgwide"/>
+    <xsl:choose>
+      <xsl:when test="@pgwide != ''">
+        <xsl:value-of select="@pgwide"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="pi.dbfo_pgwide"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:variable>
 
   <xsl:variable name="equation">
@@ -609,20 +598,51 @@
 <xsl:template match="d:equation/d:title"></xsl:template>
 <xsl:template match="d:equation/d:titleabbrev"></xsl:template>
 
-<xsl:template match="d:informalfigure">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
+<xsl:template match="d:informalfigure | d:informalexample | d:informalequation">
+  <xsl:variable name="pgwide.pi">
+    <xsl:call-template name="pi.dbfo_pgwide"/>
+  </xsl:variable>
 
-<xsl:template match="d:informalexample">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
+  <xsl:variable name="pgwide">
+    <xsl:choose>
+      <xsl:when test="@pgwide">
+        <xsl:value-of select="@pgwide"/>
+      </xsl:when>
+      <xsl:when test="$pgwide.pi">
+        <xsl:value-of select="$pgwide.pi"/>
+      </xsl:when>
+      <!-- child element may set pgwide -->
+      <xsl:when test="*[@pgwide]">
+        <xsl:value-of select="*[@pgwide][1]/@pgwide"/>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:variable>
 
-<xsl:template match="d:informaltable/d:textobject"></xsl:template>
+  <xsl:variable name="iobject">
+    <xsl:call-template name="informal.object">
+      <xsl:with-param name="pgwide" select="$pgwide"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="floatstyle">
+    <xsl:call-template name="floatstyle"/>
+  </xsl:variable>
 
-<xsl:template match="d:informalequation">
-  <xsl:call-template name="informal.object"/>
+  <xsl:choose>
+    <xsl:when test="$floatstyle != ''">
+      <xsl:call-template name="floater">
+        <xsl:with-param name="position" select="$floatstyle"/>
+        <xsl:with-param name="content" select="$iobject"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:copy-of select="$iobject"/>
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
+<xsl:template match="d:informaltable/d:textobject"></xsl:template>
+
 <xsl:template name="floatstyle">
   <xsl:if test="(@float and @float != '0') or @floatstyle != ''">
     <xsl:choose>