From 9b5163477a15c6d39305bf33c38e9c1af96f438e Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 26 Oct 2012 17:42:03 +0000
Subject: [PATCH] Remove all passivetex code because it is obsolete.

---
 xsl/fo/admon.xsl     |  3 +-
 xsl/fo/autoidx.xsl   | 37 +++---------------------
 xsl/fo/autotoc.xsl   |  2 +-
 xsl/fo/callout.xsl   |  3 +-
 xsl/fo/component.xsl | 16 -----------
 xsl/fo/division.xsl  |  8 ------
 xsl/fo/docbook.xsl   |  1 -
 xsl/fo/graphics.xsl  |  9 +-----
 xsl/fo/htmltbl.xsl   |  3 +-
 xsl/fo/lists.xsl     | 48 ++++++-------------------------
 xsl/fo/math.xsl      | 67 +++++---------------------------------------
 xsl/fo/pagesetup.xsl |  2 +-
 xsl/fo/refentry.xsl  |  8 ------
 xsl/fo/sections.xsl  |  8 ------
 xsl/fo/spaces.xsl    | 21 +++-----------
 xsl/fo/table.xsl     |  3 +-
 16 files changed, 30 insertions(+), 209 deletions(-)

diff --git a/xsl/fo/admon.xsl b/xsl/fo/admon.xsl
index 9662ac5e0..51a82c2b7 100644
--- a/xsl/fo/admon.xsl
+++ b/xsl/fo/admon.xsl
@@ -46,8 +46,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0
-                    or $fop.extensions != 0
+    <xsl:when test="$fop.extensions != 0
                     or $arbortext.extensions != 0">
       <xsl:value-of select="$filename"/>
     </xsl:when>
diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index cdc2f0422..ef0b31820 100644
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -334,16 +334,7 @@
           </xsl:for-each>
         </xsl:variable>
 
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:copy-of select="$page-number-citations"/>
       </xsl:otherwise>
     </xsl:choose>
 
@@ -461,16 +452,7 @@
           </xsl:for-each>
         </xsl:variable>
 
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:copy-of select="$page-number-citations"/>
       </xsl:otherwise>
     </xsl:choose>
 
@@ -591,16 +573,7 @@
           </xsl:for-each>
         </xsl:variable>
 
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:copy-of select="$page-number-citations"/>
       </xsl:otherwise>
     </xsl:choose>
 
@@ -733,9 +706,7 @@
         <fo:page-number-citation ref-id="{$id}"/>
       </fo:basic-link>
 
-      <xsl:if test="$passivetex.extensions = '0'">
-        <xsl:copy-of select="$number.separator"/>
-      </xsl:if>
+      <xsl:copy-of select="$number.separator"/>
       <xsl:call-template name="reference">
         <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
         <xsl:with-param name="scope" select="$scope"/>
diff --git a/xsl/fo/autotoc.xsl b/xsl/fo/autotoc.xsl
index 04e44060f..bff10ee72 100644
--- a/xsl/fo/autotoc.xsl
+++ b/xsl/fo/autotoc.xsl
@@ -750,7 +750,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$fop.extensions != 0 or $passivetex.extensions != 0">
+    <xsl:when test="$fop.extensions != 0">
        <xsl:value-of select="concat($depth*$toc.indent.width, 'pt')"/>
     </xsl:when>
     <xsl:otherwise>
diff --git a/xsl/fo/callout.xsl b/xsl/fo/callout.xsl
index 85ec40fa2..025d4a536 100644
--- a/xsl/fo/callout.xsl
+++ b/xsl/fo/callout.xsl
@@ -143,8 +143,7 @@
                            width="{$callout.icon.size}">
         <xsl:attribute name="src">
           <xsl:choose>
-            <xsl:when test="$passivetex.extensions != 0
-                            or $fop.extensions != 0
+            <xsl:when test="$fop.extensions != 0
                             or $arbortext.extensions != 0">
               <xsl:value-of select="$filename"/>
             </xsl:when>
diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index 3a066326f..d68106073 100644
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -51,14 +51,6 @@
     </xsl:choose>
   </xsl:variable>
 
-  <xsl:if test="$passivetex.extensions != 0">
-    <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex"
-                    fotex-bookmark-level="2"
-                    fotex-bookmark-label="{$id}">
-      <xsl:value-of select="$titleabbrev"/>
-    </fotex:bookmark>
-  </xsl:if>
-
   <fo:block xsl:use-attribute-sets="component.title.properties">
     <xsl:if test="$pagewide != 0">
       <!-- Doesn't work to use 'all' here since not a child of fo:flow -->
@@ -721,14 +713,6 @@
       </xsl:attribute>
     </xsl:if>
 
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{count(ancestor::*)+2}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$titleabbrev"/>
-      </fotex:bookmark>
-    </xsl:if>
-
     <fo:block xsl:use-attribute-sets="article.appendix.title.properties">
       <fo:marker marker-class-name="section.head.marker">
         <xsl:choose>
diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index 4bdec7fac..484a3f8d0 100644
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -29,14 +29,6 @@
     </xsl:apply-templates>
   </xsl:variable>
 
-  <xsl:if test="$passivetex.extensions != 0">
-    <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex"
-                    fotex-bookmark-level="1"
-                    fotex-bookmark-label="{$id}">
-      <xsl:value-of select="$title"/>
-    </fotex:bookmark>
-  </xsl:if>
-
   <fo:block keep-with-next.within-column="always"
             hyphenate="false">
     <xsl:if test="$axf.extensions != 0">
diff --git a/xsl/fo/docbook.xsl b/xsl/fo/docbook.xsl
index 189401f96..5c41c245a 100644
--- a/xsl/fo/docbook.xsl
+++ b/xsl/fo/docbook.xsl
@@ -80,7 +80,6 @@
 
 <xsl:include href="fop.xsl"/>
 <xsl:include href="fop1.xsl"/>
-<xsl:include href="passivetex.xsl"/>
 <xsl:include href="xep.xsl"/>
 <xsl:include href="axf.xsl"/>
 <xsl:include href="ptc.xsl"/>
diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index 8d46c5c06..d04784a9c 100644
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -33,9 +33,6 @@
 <xsl:param name="graphic.notations">
   <!-- n.b. exactly one leading space, one trailing space, and one inter-word space -->
   <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:text> PNG PDF JPG JPEG linespecific </xsl:text>
-    </xsl:when>
     <xsl:when test="$fop1.extensions != 0">
       <xsl:text> BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific </xsl:text>
     </xsl:when>
@@ -62,9 +59,6 @@
 <xsl:param name="graphic.extensions">
   <!-- n.b. exactly one leading space, one trailing space, and one inter-word space -->
   <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:text> png pdf jpg jpeg </xsl:text>
-    </xsl:when>
     <xsl:when test="$fop1.extensions != 0">
       <xsl:text> bmp gif tif tiff svg png pdf jpg jpeg eps </xsl:text>
     </xsl:when>
@@ -787,8 +781,7 @@
   <xsl:param name="filename"/>
 
   <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0
-                    or $fop.extensions != 0">
+    <xsl:when test="$fop.extensions != 0">
       <xsl:value-of select="$filename"/>
     </xsl:when>
     <xsl:otherwise>
diff --git a/xsl/fo/htmltbl.xsl b/xsl/fo/htmltbl.xsl
index 6fb02c893..ebba71326 100644
--- a/xsl/fo/htmltbl.xsl
+++ b/xsl/fo/htmltbl.xsl
@@ -35,8 +35,7 @@
   <fo:table xsl:use-attribute-sets="table.table.properties">
     <xsl:choose>
       <xsl:when test="$fop.extensions != 0 or
-                      $fop1.extensions != 0 or
-                      $passivetex.extensions != 0">
+                      $fop1.extensions != 0">
         <xsl:attribute name="table-layout">fixed</xsl:attribute>
       </xsl:when>
     </xsl:choose>
diff --git a/xsl/fo/lists.xsl b/xsl/fo/lists.xsl
index 8f7b47137..87ba5f96b 100644
--- a/xsl/fo/lists.xsl
+++ b/xsl/fo/lists.xsl
@@ -136,17 +136,9 @@
       </fo:block>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <xsl:choose>
-        <!-- * work around broken passivetex list-item-body rendering -->
-        <xsl:when test="$passivetex.extensions = '1'">
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block>
-            <xsl:apply-templates/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
+      <fo:block>
+        <xsl:apply-templates/>
+      </fo:block>
     </fo:list-item-body>
   </xsl:variable>
 
@@ -385,15 +377,7 @@
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="@termlength"/>
-            <xsl:choose>
-              <!-- workaround for passivetex lack of support for non-constant expressions -->
-              <xsl:when test="$passivetex.extensions != 0">
-                <xsl:text>em</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>em * 0.60</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
+            <xsl:text>em * 0.60</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
@@ -402,15 +386,7 @@
           <xsl:with-param name="terms" select="varlistentry/term"/>
           <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
         </xsl:call-template>
-        <xsl:choose>
-          <!-- workaround for passivetex lack of support for non-constant expressions -->
-          <xsl:when test="$passivetex.extensions != 0">
-            <xsl:text>em</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>em * 0.60</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:text>em * 0.60</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
@@ -424,17 +400,9 @@
 
   <xsl:variable name="label-separation">1em</xsl:variable>
   <xsl:variable name="distance-between-starts">
-    <xsl:choose>
-      <!-- workaround for passivetex lack of support for non-constant expressions -->
-      <xsl:when test="$passivetex.extensions != 0">
-        <xsl:value-of select="$termlength"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$termlength"/>
-        <xsl:text>+</xsl:text>
-        <xsl:value-of select="$label-separation"/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:value-of select="$termlength"/>
+    <xsl:text>+</xsl:text>
+    <xsl:value-of select="$label-separation"/>
   </xsl:variable>
 
   <xsl:if test="title">
diff --git a/xsl/fo/math.xsl b/xsl/fo/math.xsl
index d7f66a695..1832283a1 100644
--- a/xsl/fo/math.xsl
+++ b/xsl/fo/math.xsl
@@ -16,18 +16,7 @@
      ******************************************************************** -->
 
 <xsl:template match="inlineequation">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-      <xsl:apply-templates select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']">
-        <xsl:with-param name="output.delims">
-          <xsl:call-template name="tex.math.output.delims"/>
-        </xsl:with-param>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:apply-templates/>
 </xsl:template>
 
 <xsl:template match="alt">
@@ -42,24 +31,12 @@
 <!-- "Support" for MathML -->
 
 <xsl:template match="mml:math" xmlns:mml="http://www.w3.org/1998/Math/MathML">
-  <xsl:choose>
-    <!-- * If user is using passivetex, we don't wrap the output in -->
-    <!-- * fo:instream-foreign-object (which passivetex doesn't support). -->
-    <xsl:when test="not($passivetex.extensions = 0)">
-      <xsl:copy>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates/>
-      </xsl:copy>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:instream-foreign-object>
-        <xsl:copy>
-          <xsl:copy-of select="@*"/>
-          <xsl:apply-templates/>
-        </xsl:copy>
-      </fo:instream-foreign-object>
-    </xsl:otherwise>
-  </xsl:choose>
+  <fo:instream-foreign-object>
+    <xsl:copy>
+      <xsl:copy-of select="@*"/>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </fo:instream-foreign-object>
 </xsl:template>
 
 <xsl:template match="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML">
@@ -80,17 +57,6 @@
 <xsl:template match="inlineequation/alt[@role='tex'] | 
                      inlineequation/inlinemediaobject/textobject[@role='tex']" priority="1">
   <xsl:param name="output.delims" select="1"/>
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:processing-instruction name="xmltex">
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$</xsl:text>
-      </xsl:if>
-      <xsl:value-of select="."/>
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$</xsl:text>
-      </xsl:if>
-    </xsl:processing-instruction>
-  </xsl:if>
 </xsl:template>
 
 <xsl:template match="equation/alt[@role='tex'] | informalequation/alt[@role='tex'] |
@@ -99,25 +65,6 @@
   <xsl:variable name="output.delims">
     <xsl:call-template name="tex.math.output.delims"/>
   </xsl:variable>
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:processing-instruction name="xmltex">
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$$</xsl:text>
-      </xsl:if>
-      <xsl:value-of select="."/>
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$$</xsl:text>
-      </xsl:if>
-    </xsl:processing-instruction>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="alt[@role='tex']">
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:message>
-      Your equation is misplaced. It should be in inlineequation, equation or informalequation.
-    </xsl:message>
-  </xsl:if>
 </xsl:template>
 
 <xsl:template name="tex.math.output.delims">
diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 8cd845e08..d2f2e0dd1 100644
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -3349,7 +3349,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$fop.extensions != 0 or $passivetex.extensions != 0">
+    <xsl:when test="$fop.extensions != 0">
       <!-- body.start.indent does not work well with these processors -->
     </xsl:when>
     <xsl:when test="starts-with($pageclass, 'body') or
diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index 2d9ceb071..004080925 100644
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -637,14 +637,6 @@
       </xsl:choose>
     </xsl:variable>
 
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{$level + 2 + $offset}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$title"/>
-      </fotex:bookmark>
-    </xsl:if>
-
     <xsl:if test="$axf.extensions != 0">
       <xsl:attribute name="axf:outline-level">
         <xsl:value-of select="count(ancestor::*)-1 + $offset"/>
diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 54d2bbe7e..691c7308e 100644
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -294,14 +294,6 @@
       </xsl:apply-templates>
     </xsl:variable>
 
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{$level + 2}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$marker.title"/>
-      </fotex:bookmark>
-    </xsl:if>
-
     <xsl:if test="$axf.extensions != 0">
       <xsl:attribute name="axf:outline-level">
         <xsl:value-of select="count(ancestor::*)-1"/>
diff --git a/xsl/fo/spaces.xsl b/xsl/fo/spaces.xsl
index 04759a4f0..be70a508a 100644
--- a/xsl/fo/spaces.xsl
+++ b/xsl/fo/spaces.xsl
@@ -12,23 +12,10 @@
      ******************************************************************** -->
 
 <xsl:template match="text()[namespace-uri(..) = '' or 
-		     namespace-uri(..) = 'http://docbook.org/ns/docbook']">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:call-template name="passivetex.dash.subst">
-        <xsl:with-param name="string">
-	  <xsl:call-template name="space.2000.subst">
-	    <xsl:with-param name="string" select="."/>
-	  </xsl:call-template>
-	</xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2000.subst">
-	<xsl:with-param name="string" select="."/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
+                     namespace-uri(..) = 'http://docbook.org/ns/docbook']">
+  <xsl:call-template name="space.2000.subst">
+    <xsl:with-param name="string" select="."/>
+  </xsl:call-template>
 </xsl:template>
 
 <xsl:param name="space.enquad.width">0.5em</xsl:param>   <!-- U+2000 -->
diff --git a/xsl/fo/table.xsl b/xsl/fo/table.xsl
index 2d3d01c98..55749e5de 100644
--- a/xsl/fo/table.xsl
+++ b/xsl/fo/table.xsl
@@ -202,8 +202,7 @@
   <xsl:param name="table.block"/>
   <xsl:choose>
     <xsl:when test="@orient='land' and 
-                    $fop.extensions = 0 and 
-                    $passivetex.extensions = 0" >
+                    $fop.extensions = 0" >
       <fo:block-container reference-orientation="90"
             padding="6pt"
             xsl:use-attribute-sets="list.block.spacing">
-- 
2.50.1