Imported Upstream version 1.79.2upstream/1.79.2

1 files changed, 19 insertions, 24 deletions

diff --git a/xhtml/callout.xsl b/xhtml/callout.xsl
index 3b28148..bf9589c 100644
--- a/xhtml/callout.xsl
+++ b/xhtml/callout.xsl
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt d" version="1.0">
 
 <!-- ********************************************************************
-     $Id: callout.xsl 9305 2012-04-27 21:50:53Z bobstayton $
-     ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     See ../README or http://cdn.docbook.org/release/xsl/current/ for
      copyright and other information.
 
      ******************************************************************** -->
 
 <lxslt:component prefix="xverb" functions="insertCallouts"/>
 
-<xsl:template match="programlistingco|screenco">
-  <xsl:variable name="verbatim" select="programlisting|screen"/>
+<xsl:template match="d:programlistingco|d:screenco">
+  <xsl:variable name="verbatim" select="d:programlisting|d:screen"/>
 
   <xsl:choose>
     <xsl:when test="$use.extensions != '0'                     and $callouts.extension != '0'">
@@ -29,10 +24,10 @@
       <xsl:variable name="rtf-with-callouts">
         <xsl:choose>
           <xsl:when test="function-available('sverb:insertCallouts')">
-            <xsl:copy-of select="sverb:insertCallouts(areaspec,$rtf)"/>
+            <xsl:copy-of select="sverb:insertCallouts(d:areaspec,$rtf)"/>
           </xsl:when>
           <xsl:when test="function-available('xverb:insertCallouts')">
-            <xsl:copy-of select="xverb:insertCallouts(areaspec,$rtf)"/>
+            <xsl:copy-of select="xverb:insertCallouts(d:areaspec,$rtf)"/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:message terminate="yes">
@@ -49,9 +44,9 @@
             <xsl:call-template name="id.attribute"/>
             <xsl:call-template name="number.rtf.lines">
               <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
-              <xsl:with-param name="pi.context" select="programlisting|screen"/>
+              <xsl:with-param name="pi.context" select="d:programlisting|d:screen"/>
             </xsl:call-template>
-            <xsl:apply-templates select="calloutlist"/>
+            <xsl:apply-templates select="d:calloutlist"/>
           </div>
         </xsl:when>
         <xsl:otherwise>
@@ -59,7 +54,7 @@
             <xsl:call-template name="common.html.attributes"/>
             <xsl:call-template name="id.attribute"/>
             <xsl:copy-of select="$rtf-with-callouts"/>
-            <xsl:apply-templates select="calloutlist"/>
+            <xsl:apply-templates select="d:calloutlist"/>
           </div>
         </xsl:otherwise>
       </xsl:choose>
@@ -74,18 +69,18 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="areaspec|areaset|area">
+<xsl:template match="d:areaspec|d:areaset|d:area">
 </xsl:template>
 
-<xsl:template match="areaset" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
+<xsl:template match="d:areaset" mode="conumber">
+  <xsl:number count="d:area|d:areaset" format="1"/>
 </xsl:template>
 
-<xsl:template match="area" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
+<xsl:template match="d:area" mode="conumber">
+  <xsl:number count="d:area|d:areaset" format="1"/>
 </xsl:template>
 
-<xsl:template match="co" name="co">
+<xsl:template match="d:co" name="co">
   <!-- Support a single linkend in HTML -->
   <xsl:variable name="targets" select="key('id', @linkends)"/>
   <xsl:variable name="target" select="$targets[1]"/>
@@ -130,7 +125,7 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="coref">
+<xsl:template match="d:coref">
   <!-- tricky; this relies on the fact that we can process the "co" that's -->
   <!-- "over there" as if it were "right here" -->
 
@@ -154,10 +149,10 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="co" mode="callout-bug">
+<xsl:template match="d:co" mode="callout-bug">
   <xsl:call-template name="callout-bug">
     <xsl:with-param name="conum">
-      <xsl:number count="co" level="any" from="programlisting|screen|literallayout|synopsis" format="1"/>
+      <xsl:number count="d:co" level="any" from="d:programlisting|d:screen|d:literallayout|d:synopsis" format="1"/>
     </xsl:with-param>
   </xsl:call-template>
 </xsl:template>
@@ -206,4 +201,4 @@
   </xsl:choose>
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file