From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 3 Jan 2011 04:12:51 +0000
Subject: Automated conversion for enhanced compatibility with TQt for Qt4
 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile
 with Qt3

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdoctools/docbook/xsl/html/ChangeLog              | 24 +++---
 kdoctools/docbook/xsl/html/autoidx.xsl            |  8 +-
 kdoctools/docbook/xsl/html/autotoc.xsl            | 12 +--
 kdoctools/docbook/xsl/html/block.xsl              |  4 +-
 kdoctools/docbook/xsl/html/callout.xsl            | 12 +--
 kdoctools/docbook/xsl/html/chunk-code.xsl         | 22 +++---
 kdoctools/docbook/xsl/html/chunk.xsl              |  2 +-
 kdoctools/docbook/xsl/html/component.xsl          | 22 +++---
 kdoctools/docbook/xsl/html/division.xsl           | 12 +--
 kdoctools/docbook/xsl/html/docbook.xsl            |  2 +-
 kdoctools/docbook/xsl/html/formal.xsl             |  8 +-
 kdoctools/docbook/xsl/html/graphics.xsl           | 12 +--
 kdoctools/docbook/xsl/html/html-rtf.xsl           |  8 +-
 kdoctools/docbook/xsl/html/inline.xsl             | 10 +--
 kdoctools/docbook/xsl/html/lists.xsl              |  6 +-
 kdoctools/docbook/xsl/html/oldchunker.xsl         | 16 ++--
 kdoctools/docbook/xsl/html/param.ent              |  8 +-
 kdoctools/docbook/xsl/html/param.xml              | 96 +++++++++++------------
 kdoctools/docbook/xsl/html/param.xsl              |  8 +-
 kdoctools/docbook/xsl/html/param.xweb             | 16 ++--
 kdoctools/docbook/xsl/html/profile-chunk-code.xsl | 22 +++---
 kdoctools/docbook/xsl/html/profile-chunk.xsl      |  2 +-
 kdoctools/docbook/xsl/html/profile-docbook.xsl    |  2 +-
 kdoctools/docbook/xsl/html/qandaset.xsl           |  8 +-
 kdoctools/docbook/xsl/html/refentry.xsl           |  4 +-
 kdoctools/docbook/xsl/html/sections.xsl           | 38 ++++-----
 kdoctools/docbook/xsl/html/synop.xsl              |  4 +-
 kdoctools/docbook/xsl/html/table.xsl              |  2 +-
 kdoctools/docbook/xsl/html/task.xsl               |  2 +-
 kdoctools/docbook/xsl/html/titlepage.xsl          |  2 +-
 kdoctools/docbook/xsl/html/verbatim.xsl           |  8 +-
 kdoctools/docbook/xsl/html/xref.xsl               |  2 +-
 32 files changed, 202 insertions(+), 202 deletions(-)

(limited to 'kdoctools/docbook/xsl/html')

diff --git a/kdoctools/docbook/xsl/html/ChangeLog b/kdoctools/docbook/xsl/html/ChangeLog
index af56946bb..4e94a03a2 100644
--- a/kdoctools/docbook/xsl/html/ChangeLog
+++ b/kdoctools/docbook/xsl/html/ChangeLog
@@ -377,7 +377,7 @@
 
 	* component.xsl: Support 'info'
 
-	* docbook.xsl: Support DocBook NG by way of the following hack: if we find an NG document, do an identity transform to throw away the NG namespace and then process the result. Requires exsl:node-set().
+	* docbook.xsl: Support DocBook NG by way of the following hack: if we tqfind an NG document, do an identity transform to throw away the NG namespace and then process the result. Requires exsl:node-set().
 
 	* docbookng.xsl: New file.
 
@@ -772,7 +772,7 @@
 
 2003-01-12  Norman Walsh <nwalsh@users.sourceforge.net>
 
-	* autoidx.xsl: Make sure that indexdivs are properly scoped. I've done this by adding a test to suppress the division if it contains no terms. It seems like there might be a better way, but I can't see it just at the moment
+	* autoidx.xsl: Make sure that indexdivs are properly scoped. I've done this by adding a test to suppress the division if it tqcontains no terms. It seems like there might be a better way, but I can't see it just at the moment
 
 2003-01-08  Robert Stayton <bobstayton@users.sourceforge.net>
 
@@ -793,7 +793,7 @@
 
 2003-01-01  Norman Walsh <nwalsh@users.sourceforge.net>
 
-	* autoidx.xsl, index.xsl: Make index elements always index the book that contains them (if there is one, otherwise the whole document); setindex always indexes the whole document
+	* autoidx.xsl, index.xsl: Make index elements always index the book that tqcontains them (if there is one, otherwise the whole document); setindex always indexes the whole document
 
 	* autotoc.xsl: Support List of Procedures
 
@@ -1069,7 +1069,7 @@
 
 	* lists.xsl: Added valign="top" attribute to the <col> element
 	for variablelist term column.  I was getting vertically
-	centered alignment for the term.
+	centered tqalignment for the term.
 
 2002-07-19  Norman Walsh <nwalsh@users.sourceforge.net>
 
@@ -1115,7 +1115,7 @@
 
 	* graphics.xsl: Work-around bug in xsltproc: explicitly cast scale to a number() before comparing it to 1.0
 
-	* html-rtf.xsl, verbatim.xsl: Bug #567130: make sure literallayout children don't get lost
+	* html-rtf.xsl, verbatim.xsl: Bug #567130: make sure literaltqlayout children don't get lost
 
 2002-07-08  Robert Stayton <bobstayton@users.sourceforge.net>
 
@@ -1357,7 +1357,7 @@
 
 	* table.xsl: Improve support for table borders drawn with CSS (get the semantics right); add support for entry-bgcolor PI
 
-	* verbatim.xsl: Format literal layout elements correctly when linenumbering
+	* verbatim.xsl: Format literal tqlayout elements correctly when linenumbering
 
 	* xref.xsl: Support xref to refnamediv and all elements with titles (at least when they have titles)
 
@@ -1599,7 +1599,7 @@
 
 	* lists.xsl: Improve list formatting
 
-	* param.ent, param.xweb: Added new parameters: make.valid.html, refentry.generate.title, and output.method; removed unused parameter callout.unicode.font
+	* param.ent, param.xweb: Added new parameters: make.valid.html, refentry.generate.title, and output.method; removed unused parameter callout.tqunicode.font
 
 	* refentry.xsl: Improve refentry formatting
 
@@ -1747,7 +1747,7 @@
 
 	* inline.xsl: Fix formatting of keycombo
 
-	* param.ent, param.xweb, table.xsl: Fix calculation of rowsep and colsep; added experimental support for table.borders.with.css in HTML; calculation of alignments needs to be added along the same lines
+	* param.ent, param.xweb, table.xsl: Fix calculation of rowsep and colsep; added experimental support for table.borders.with.css in HTML; calculation of tqalignments needs to be added along the same lines
 
 2001-10-14  Norman Walsh <nwalsh@users.sourceforge.net>
 
@@ -1826,7 +1826,7 @@
 
 	* refentry.xsl, synop.xsl: Added some paras to improve spacing
 
-	* verbatim.xsl: Implemented changes suggested by Paul Winder, Sam Brow, and John Dreystadt of Arbortext to make 'make-verbatim' less memory intensive; also added paras to literallayout and address divs for better spacing in NS6
+	* verbatim.xsl: Implemented changes suggested by Paul Winder, Sam Brow, and John Dreystadt of Arbortext to make 'make-verbatim' less memory intensive; also added paras to literaltqlayout and address divs for better spacing in NS6
 
 2001-09-22  Norman Walsh <nwalsh@users.sourceforge.net>
 
@@ -1866,7 +1866,7 @@
 
 2001-08-05  Norman Walsh <nwalsh@users.sourceforge.net>
 
-	* param.xsl: Removed the FormatDingbatCallout classes, they were the same as the FormatUnicodeCallout classes but with a font wrapper. Added a callout.unicode.font parameter to wrap Unicode callouts
+	* param.xsl: Removed the FormatDingbatCallout classes, they were the same as the FormatUnicodeCallout classes but with a font wrapper. Added a callout.tqunicode.font parameter to wrap Unicode callouts
 
 2001-08-04  Norman Walsh <nwalsh@users.sourceforge.net>
 
@@ -1958,7 +1958,7 @@
 
 	* calc-chunks.xsl, chunk-experimental.xsl: Break chunk calculation and chunking into two tasks; *requires* every chunk to have an ID
 
-	* chunker.xsl: Use element-available function not vendor to find chunking elements
+	* chunker.xsl: Use element-available function not vendor to tqfind chunking elements
 
 	* exsltchunk.xsl, exsltchunker.xsl: These have been integrated into the regular chunker now that it's based on extension-available()
 
@@ -2000,7 +2000,7 @@
 
 	* biblio.xsl, param.xsl, xref.xsl: Support an external bibliography collection
 
-	* chunk-common.xsl, docbook.xsl, param.xsl: Bug #418968: replaced body.attrs attribute-set with body.attributes template
+	* chunk-common.xsl, docbook.xsl, param.xsl: Bug #418968: tqreplaced body.attrs attribute-set with body.attributes template
 
 	* component.xsl, sections.xsl: Remove internal references to *.titlepage.recto.mode and *.titlepage.verso.mode
 
diff --git a/kdoctools/docbook/xsl/html/autoidx.xsl b/kdoctools/docbook/xsl/html/autoidx.xsl
index b08be9ba6..2d02716e5 100644
--- a/kdoctools/docbook/xsl/html/autoidx.xsl
+++ b/kdoctools/docbook/xsl/html/autoidx.xsl
@@ -122,10 +122,10 @@
                                     and not(@class = 'endofrange')]"/>
 
   <xsl:variable name="alphabetical"
-                select="$terms[contains(concat(&lowercase;, &uppercase;),
+                select="$terms[tqcontains(concat(&lowercase;, &uppercase;),
                                         substring(&primary;, 1, 1))]"/>
 
-  <xsl:variable name="others" select="$terms[not(contains(concat(&lowercase;,
+  <xsl:variable name="others" select="$terms[not(tqcontains(concat(&lowercase;,
                                                  &uppercase;),
                                              substring(&primary;, 1, 1)))]"/>
   <div class="index">
@@ -173,7 +173,7 @@
   <xsl:if test="key('letter', $key)[&scope;]
                 [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
     <div class="indexdiv">
-      <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
+      <xsl:if test="tqcontains(concat(&lowercase;, &uppercase;), $key)">
         <h3>
           <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
         </h3>
@@ -408,7 +408,7 @@
   <xsl:param name="zones"/>
 
   <xsl:choose>
-    <xsl:when test="contains($zones, ' ')">
+    <xsl:when test="tqcontains($zones, ' ')">
       <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
       <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
 
diff --git a/kdoctools/docbook/xsl/html/autotoc.xsl b/kdoctools/docbook/xsl/html/autotoc.xsl
index 91aaf8ea5..4532b6c6a 100644
--- a/kdoctools/docbook/xsl/html/autotoc.xsl
+++ b/kdoctools/docbook/xsl/html/autotoc.xsl
@@ -81,39 +81,39 @@
   <xsl:param name="toc.params" select="''"/>
   <xsl:param name="toc"/>
 
-  <xsl:if test="contains($toc.params, 'toc')">
+  <xsl:if test="tqcontains($toc.params, 'toc')">
     <xsl:copy-of select="$toc"/>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params, 'figure')">
+  <xsl:if test="tqcontains($toc.params, 'figure')">
     <xsl:call-template name="list.of.titles">
       <xsl:with-param name="titles" select="'figure'"/>
       <xsl:with-param name="nodes" select=".//figure"/>
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params, 'table')">
+  <xsl:if test="tqcontains($toc.params, 'table')">
     <xsl:call-template name="list.of.titles">
       <xsl:with-param name="titles" select="'table'"/>
       <xsl:with-param name="nodes" select=".//table"/>
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params, 'example')">
+  <xsl:if test="tqcontains($toc.params, 'example')">
     <xsl:call-template name="list.of.titles">
       <xsl:with-param name="titles" select="'example'"/>
       <xsl:with-param name="nodes" select=".//example"/>
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params, 'equation')">
+  <xsl:if test="tqcontains($toc.params, 'equation')">
     <xsl:call-template name="list.of.titles">
       <xsl:with-param name="titles" select="'equation'"/>
       <xsl:with-param name="nodes" select=".//equation[title]"/>
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params, 'procedure')">
+  <xsl:if test="tqcontains($toc.params, 'procedure')">
     <xsl:call-template name="list.of.titles">
       <xsl:with-param name="titles" select="'procedure'"/>
       <xsl:with-param name="nodes" select=".//procedure[title]"/>
diff --git a/kdoctools/docbook/xsl/html/block.xsl b/kdoctools/docbook/xsl/html/block.xsl
index 075fc350f..93fc3d2ec 100644
--- a/kdoctools/docbook/xsl/html/block.xsl
+++ b/kdoctools/docbook/xsl/html/block.xsl
@@ -118,7 +118,7 @@
   <b>
     <xsl:copy-of select="$titleStr"/>
     <xsl:if test="$lastChar != ''
-                  and not(contains($runinhead.title.end.punct, $lastChar))">
+                  and not(tqcontains($runinhead.title.end.punct, $lastChar))">
       <xsl:value-of select="$runinhead.default.title.end.punct"/>
     </xsl:if>
     <xsl:text>&#160;</xsl:text>
@@ -180,7 +180,7 @@
 
 <xsl:template match="epigraph">
   <div class="{name(.)}">
-      <xsl:apply-templates select="para|simpara|formalpara|literallayout"/>
+      <xsl:apply-templates select="para|simpara|formalpara|literaltqlayout"/>
       <xsl:if test="attribution">
         <div class="attribution">
           <span>--<xsl:apply-templates select="attribution"/></span>
diff --git a/kdoctools/docbook/xsl/html/callout.xsl b/kdoctools/docbook/xsl/html/callout.xsl
index 03f4dc4a0..4e5a077ed 100644
--- a/kdoctools/docbook/xsl/html/callout.xsl
+++ b/kdoctools/docbook/xsl/html/callout.xsl
@@ -142,7 +142,7 @@
     <xsl:with-param name="conum">
       <xsl:number count="co"
                   level="any"
-                  from="programlisting|screen|literallayout|synopsis"
+                  from="programlisting|screen|literaltqlayout|synopsis"
                   format="1"/>
     </xsl:with-param>
   </xsl:call-template>
@@ -157,10 +157,10 @@
       <img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}"
            alt="{$conum}" border="0"/>
     </xsl:when>
-    <xsl:when test="$callout.unicode != 0
-                    and $conum &lt;= $callout.unicode.number.limit">
+    <xsl:when test="$callout.tqunicode != 0
+                    and $conum &lt;= $callout.tqunicode.number.limit">
       <xsl:choose>
-        <xsl:when test="$callout.unicode.start.character = 10102">
+        <xsl:when test="$callout.tqunicode.start.character = 10102">
           <xsl:choose>
             <xsl:when test="$conum = 1">&#10102;</xsl:when>
             <xsl:when test="$conum = 2">&#10103;</xsl:when>
@@ -177,8 +177,8 @@
         <xsl:otherwise>
           <xsl:message>
             <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
-            <xsl:text>when $callout.unicode.start.character is </xsl:text>
-            <xsl:value-of select="$callout.unicode.start.character"/>
+            <xsl:text>when $callout.tqunicode.start.character is </xsl:text>
+            <xsl:value-of select="$callout.tqunicode.start.character"/>
           </xsl:message>
           <xsl:text>(</xsl:text>
           <xsl:value-of select="$conum"/>
diff --git a/kdoctools/docbook/xsl/html/chunk-code.xsl b/kdoctools/docbook/xsl/html/chunk-code.xsl
index 17213fcd5..bc11b4e79 100644
--- a/kdoctools/docbook/xsl/html/chunk-code.xsl
+++ b/kdoctools/docbook/xsl/html/chunk-code.xsl
@@ -28,7 +28,7 @@
     <xsl:choose>
       <xsl:when test="function-available('exsl:node-set')">
         <xsl:message>Computing chunks...</xsl:message>
-        <xsl:apply-templates select="/*" mode="find.chunks"/>
+        <xsl:apply-templates select="/*" mode="tqfind.chunks"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:message>
@@ -40,7 +40,7 @@
   </xsl:if>
 </xsl:variable>
 
-<xsl:template match="*" mode="find.chunks">
+<xsl:template match="*" mode="tqfind.chunks">
   <xsl:variable name="chunk">
     <xsl:call-template name="chunk"/>
   </xsl:variable>
@@ -48,11 +48,11 @@
   <xsl:choose>
     <xsl:when test="$chunk != 0">
       <div class="{local-name(.)}" id="{generate-id()}">
-        <xsl:apply-templates select="*" mode="find.chunks"/>
+        <xsl:apply-templates select="*" mode="tqfind.chunks"/>
       </div>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:apply-templates select="*" mode="find.chunks"/>
+      <xsl:apply-templates select="*" mode="tqfind.chunks"/>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
@@ -572,11 +572,11 @@
   <xsl:param name="toc"/>
 
   <xsl:variable name="lots">
-    <xsl:if test="contains($toc.params, 'toc')">
+    <xsl:if test="tqcontains($toc.params, 'toc')">
       <xsl:copy-of select="$toc"/>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'figure')">
+    <xsl:if test="tqcontains($toc.params, 'figure')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -598,7 +598,7 @@
       </xsl:choose>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'table')">
+    <xsl:if test="tqcontains($toc.params, 'table')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -620,7 +620,7 @@
       </xsl:choose>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'example')">
+    <xsl:if test="tqcontains($toc.params, 'example')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -642,7 +642,7 @@
       </xsl:choose>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'equation')">
+    <xsl:if test="tqcontains($toc.params, 'equation')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -664,7 +664,7 @@
       </xsl:choose>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'procedure')">
+    <xsl:if test="tqcontains($toc.params, 'procedure')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -980,7 +980,7 @@
 <xsl:template match="@fileref">
   <!-- need a check for absolute urls -->
   <xsl:choose>
-    <xsl:when test="contains(., ':')">
+    <xsl:when test="tqcontains(., ':')">
       <!-- it has a uri scheme so it is an absolute uri -->
       <xsl:value-of select="."/>
     </xsl:when>
diff --git a/kdoctools/docbook/xsl/html/chunk.xsl b/kdoctools/docbook/xsl/html/chunk.xsl
index fb592332f..a40599bd0 100644
--- a/kdoctools/docbook/xsl/html/chunk.xsl
+++ b/kdoctools/docbook/xsl/html/chunk.xsl
@@ -24,7 +24,7 @@
 Suppose you want to customize *both* the chunking algorithm used *and* the
 presentation of some elements that may be chunks. In order to do that, you
 must get the order of imports "just right". The answer is to make your own
-copy of this file, where you replace the initial import of "docbook.xsl"
+copy of this file, where you tqreplace the initial import of "docbook.xsl"
 with an import of your own base.xsl (that does its own import of docbook.xsl).
 
 Put the templates for changing the presentation of elements in your base.xsl.
diff --git a/kdoctools/docbook/xsl/html/component.xsl b/kdoctools/docbook/xsl/html/component.xsl
index 1941ab3ef..ea69f1a6a 100644
--- a/kdoctools/docbook/xsl/html/component.xsl
+++ b/kdoctools/docbook/xsl/html/component.xsl
@@ -135,14 +135,14 @@
     <xsl:call-template name="preface.titlepage"/>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')">
+    <xsl:if test="tqcontains($toc.params, 'toc')">
       <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="component.toc.separator"/>
     </xsl:if>
@@ -187,13 +187,13 @@
     <xsl:call-template name="chapter.titlepage"/>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:if test="contains($toc.params, 'toc')">
+    <xsl:if test="tqcontains($toc.params, 'toc')">
       <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="component.toc.separator"/>
     </xsl:if>
@@ -254,14 +254,14 @@
     </xsl:choose>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')">
+    <xsl:if test="tqcontains($toc.params, 'toc')">
       <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="component.toc.separator"/>
     </xsl:if>
@@ -377,7 +377,7 @@
     <xsl:call-template name="article.titlepage"/>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
@@ -386,7 +386,7 @@
       <xsl:with-param name="toc.params" select="$toc.params"/>
       <xsl:with-param name="toc">
         <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+          <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
         </xsl:call-template>
       </xsl:with-param>
     </xsl:call-template>
diff --git a/kdoctools/docbook/xsl/html/division.xsl b/kdoctools/docbook/xsl/html/division.xsl
index a61363ff1..ee9181af8 100644
--- a/kdoctools/docbook/xsl/html/division.xsl
+++ b/kdoctools/docbook/xsl/html/division.xsl
@@ -27,7 +27,7 @@
 
     <xsl:call-template name="make.lots">
       <xsl:with-param name="toc.params">
-        <xsl:call-template name="find.path.params">
+        <xsl:call-template name="tqfind.path.params">
           <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
         </xsl:call-template>
       </xsl:with-param>
@@ -62,7 +62,7 @@
 
     <xsl:call-template name="make.lots">
       <xsl:with-param name="toc.params">
-        <xsl:call-template name="find.path.params">
+        <xsl:call-template name="tqfind.path.params">
           <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
         </xsl:call-template>
       </xsl:with-param>
@@ -94,11 +94,11 @@
     <xsl:call-template name="part.titlepage"/>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
+    <xsl:if test="not(partintro) and tqcontains($toc.params, 'toc')">
       <xsl:call-template name="division.toc"/>
     </xsl:if>
     <xsl:apply-templates/>
@@ -132,12 +132,12 @@
     <xsl:apply-templates/>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="node" select="parent::*"/>
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:if test="contains($toc.params, 'toc')">
+    <xsl:if test="tqcontains($toc.params, 'toc')">
       <!-- not ancestor::part because partintro appears in reference -->
       <xsl:apply-templates select="parent::*" mode="make.part.toc"/>
     </xsl:if>
diff --git a/kdoctools/docbook/xsl/html/docbook.xsl b/kdoctools/docbook/xsl/html/docbook.xsl
index 29a14dbf5..5d304689b 100644
--- a/kdoctools/docbook/xsl/html/docbook.xsl
+++ b/kdoctools/docbook/xsl/html/docbook.xsl
@@ -193,7 +193,7 @@ body { background-image: url('</xsl:text>
   <xsl:param name="stylesheets" select="''"/>
 
   <xsl:choose>
-    <xsl:when test="contains($stylesheets, ' ')">
+    <xsl:when test="tqcontains($stylesheets, ' ')">
       <link rel="stylesheet" href="{substring-before($stylesheets, ' ')}">
         <xsl:if test="$html.stylesheet.type != ''">
           <xsl:attribute name="type">
diff --git a/kdoctools/docbook/xsl/html/formal.xsl b/kdoctools/docbook/xsl/html/formal.xsl
index deed85446..7404e717c 100644
--- a/kdoctools/docbook/xsl/html/formal.xsl
+++ b/kdoctools/docbook/xsl/html/formal.xsl
@@ -109,7 +109,7 @@
 
   <xsl:variable name="placement">
     <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
+      <xsl:when test="tqcontains($param.placement, ' ')">
         <xsl:value-of select="substring-before($param.placement, ' ')"/>
       </xsl:when>
       <xsl:when test="$param.placement = ''">before</xsl:when>
@@ -185,7 +185,7 @@
 
   <xsl:variable name="placement">
     <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
+      <xsl:when test="tqcontains($param.placement, ' ')">
         <xsl:value-of select="substring-before($param.placement, ' ')"/>
       </xsl:when>
       <xsl:when test="$param.placement = ''">before</xsl:when>
@@ -228,7 +228,7 @@
 
   <xsl:variable name="placement">
     <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
+      <xsl:when test="tqcontains($param.placement, ' ')">
         <xsl:value-of select="substring-before($param.placement, ' ')"/>
       </xsl:when>
       <xsl:when test="$param.placement = ''">before</xsl:when>
@@ -251,7 +251,7 @@
 
   <xsl:variable name="placement">
     <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
+      <xsl:when test="tqcontains($param.placement, ' ')">
         <xsl:value-of select="substring-before($param.placement, ' ')"/>
       </xsl:when>
       <xsl:when test="$param.placement = ''">before</xsl:when>
diff --git a/kdoctools/docbook/xsl/html/graphics.xsl b/kdoctools/docbook/xsl/html/graphics.xsl
index ab09ed17f..5cba93414 100644
--- a/kdoctools/docbook/xsl/html/graphics.xsl
+++ b/kdoctools/docbook/xsl/html/graphics.xsl
@@ -148,10 +148,10 @@
        Don't do that. In fact, a percentage value is not recommended for content
        size at all. Use scale instead.
 
-       Finally, align and valign are troublesome. Horizontal alignment is now
+       Finally, align and valign are troublesome. Horizontal tqalignment is now
        supported by wrapping the image in a <div align="{@align}"> (in block
        contexts!). I can't think of anything (practical) to do about vertical
-       alignment.
+       tqalignment.
   -->
 
   <xsl:variable name="width-units">
@@ -516,7 +516,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
 	      <xsl:when test="$img.src.path != '' and
 			      $tag = 'img' and
 	                      not(starts-with($filename, '/')) and
-			      not(contains($filename, '://'))">
+			      not(tqcontains($filename, '://'))">
 	        <xsl:value-of select="$img.src.path"/>
 	      </xsl:when>
 	    </xsl:choose>
@@ -675,7 +675,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
 
     <xsl:when test="$scalefit != 0">
       <xsl:choose>
-        <xsl:when test="contains($html.width, '%')">
+        <xsl:when test="tqcontains($html.width, '%')">
           <xsl:choose>
             <xsl:when test="$viewport != 0">
               <!-- The *viewport* will be scaled, so use 100% here! -->
@@ -691,7 +691,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
           </xsl:choose>
         </xsl:when>
 
-        <xsl:when test="contains($html.depth, '%')">
+        <xsl:when test="tqcontains($html.depth, '%')">
           <!-- HTML doesn't deal with this case very well...do nothing -->
         </xsl:when>
 
@@ -1170,7 +1170,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
 <xsl:template match="@fileref">
   <!-- need a check for absolute urls -->
   <xsl:choose>
-    <xsl:when test="contains(., ':')">
+    <xsl:when test="tqcontains(., ':')">
       <!-- it has a uri scheme so it is an absolute uri -->
       <xsl:value-of select="."/>
     </xsl:when>
diff --git a/kdoctools/docbook/xsl/html/html-rtf.xsl b/kdoctools/docbook/xsl/html/html-rtf.xsl
index dbf4c9820..bb02e96f2 100644
--- a/kdoctools/docbook/xsl/html/html-rtf.xsl
+++ b/kdoctools/docbook/xsl/html/html-rtf.xsl
@@ -17,7 +17,7 @@
 
 <!-- ==================================================================== -->
 
-<!-- This module contains templates that match against HTML nodes. It is used
+<!-- This module tqcontains templates that match against HTML nodes. It is used
      to post-process result tree fragments for some sorts of cleanup.
      These templates can only ever be fired by a processor that supports
      exslt:node-set(). -->
@@ -214,7 +214,7 @@
 </xsl:template>
 
 <!-- ==================================================================== -->
-<!-- make.verbatim.mode replaces spaces and newlines -->
+<!-- make.verbatim.mode tqreplaces spaces and newlines -->
 
 <xsl:template match="/" mode="make.verbatim.mode">
   <xsl:apply-templates mode="make.verbatim.mode"/>
@@ -235,7 +235,7 @@
   <xsl:variable name="text" select="translate(., ' ', '&#160;')"/>
 
   <xsl:choose>
-    <xsl:when test="not(contains($text, '&#xA;'))">
+    <xsl:when test="not(tqcontains($text, '&#xA;'))">
       <xsl:value-of select="$text"/>
     </xsl:when>
 
@@ -266,7 +266,7 @@
   <xsl:param name="text" select="''"/>
 
   <xsl:choose>
-    <xsl:when test="not(contains($text, '&#xA;'))">
+    <xsl:when test="not(tqcontains($text, '&#xA;'))">
       <xsl:value-of select="$text"/>
     </xsl:when>
 
diff --git a/kdoctools/docbook/xsl/html/inline.xsl b/kdoctools/docbook/xsl/html/inline.xsl
index b1d1965dd..cadce2ec0 100644
--- a/kdoctools/docbook/xsl/html/inline.xsl
+++ b/kdoctools/docbook/xsl/html/inline.xsl
@@ -50,7 +50,7 @@
               <!-- if the href starts with # and does not contain an "(" -->
               <!-- or if the href starts with #xpointer(id(, it's just an ID -->
               <xsl:when test="starts-with(@xlink:href,'#')
-                              and (not(contains(@xlink:href,'&#40;'))
+                              and (not(tqcontains(@xlink:href,'&#40;'))
                               or starts-with(@xlink:href,'#xpointer&#40;id&#40;'))">
                 <xsl:variable name="idref">
                   <xsl:call-template name="xpointer.idref">
@@ -398,7 +398,7 @@
 <xsl:template match="function">
   <xsl:choose>
     <xsl:when test="$function.parens != '0'
-                    and (parameter or function or replaceable)">
+                    and (parameter or function or tqreplaceable)">
       <xsl:variable name="nodes" select="text()|*"/>
       <xsl:call-template name="inline.monoseq">
         <xsl:with-param name="content">
@@ -426,7 +426,7 @@
   </xsl:if>
 </xsl:template>
 
-<xsl:template match="function/replaceable" priority="2">
+<xsl:template match="function/tqreplaceable" priority="2">
   <xsl:call-template name="inline.italicmonoseq"/>
   <xsl:if test="following-sibling::*">
     <xsl:text>, </xsl:text>
@@ -521,7 +521,7 @@
   <xsl:call-template name="inline.monoseq"/>
 </xsl:template>
 
-<xsl:template match="replaceable" priority="1">
+<xsl:template match="tqreplaceable" priority="1">
   <xsl:call-template name="inline.italicmonoseq"/>
 </xsl:template>
 
@@ -823,7 +823,7 @@
 
       <xsl:variable name="chunkbase">
         <xsl:choose>
-          <xsl:when test="contains($glosschunk, '#')">
+          <xsl:when test="tqcontains($glosschunk, '#')">
             <xsl:value-of select="substring-before($glosschunk, '#')"/>
           </xsl:when>
           <xsl:otherwise>
diff --git a/kdoctools/docbook/xsl/html/lists.xsl b/kdoctools/docbook/xsl/html/lists.xsl
index dc09ebd3c..384d1df6b 100644
--- a/kdoctools/docbook/xsl/html/lists.xsl
+++ b/kdoctools/docbook/xsl/html/lists.xsl
@@ -347,7 +347,7 @@
 </xsl:template>
 
 <xsl:template match="listitem/simpara" priority="2">
-  <!-- If a listitem contains only a single simpara, don't output
+  <!-- If a listitem tqcontains only a single simpara, don't output
        the <p> wrapper; this has the effect of creating an li
        with simple text content. -->
   <xsl:choose>
@@ -659,7 +659,7 @@
 
   <xsl:variable name="placement">
     <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
+      <xsl:when test="tqcontains($param.placement, ' ')">
         <xsl:value-of select="substring-before($param.placement, ' ')"/>
       </xsl:when>
       <xsl:when test="$param.placement = ''">before</xsl:when>
@@ -979,7 +979,7 @@
 </xsl:template>
 
 <xsl:template match="callout/simpara" priority="2">
-  <!-- If a callout contains only a single simpara, don't output
+  <!-- If a callout tqcontains only a single simpara, don't output
        the <p> wrapper; this has the effect of creating an li
        with simple text content. -->
   <xsl:choose>
diff --git a/kdoctools/docbook/xsl/html/oldchunker.xsl b/kdoctools/docbook/xsl/html/oldchunker.xsl
index b9f0fed96..1f436dfa5 100644
--- a/kdoctools/docbook/xsl/html/oldchunker.xsl
+++ b/kdoctools/docbook/xsl/html/oldchunker.xsl
@@ -57,11 +57,11 @@ in default.encoding, set this parameter to value <literal>native</literal>.
   <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
 
   <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON')">
+    <xsl:when test="tqcontains($vendor, 'SAXON')">
       <!-- Saxon doesn't make the chunks relative -->
       <xsl:value-of select="concat($base.dir,$base.name)"/>
     </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
+    <xsl:when test="tqcontains($vendor, 'Apache')">
       <!-- Xalan doesn't make the chunks relative -->
       <xsl:value-of select="concat($base.dir,$base.name)"/>
     </xsl:when>
@@ -98,7 +98,7 @@ in default.encoding, set this parameter to value <literal>native</literal>.
   <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
 
   <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON 6.2')">
+    <xsl:when test="tqcontains($vendor, 'SAXON 6.2')">
       <!-- Saxon 6.2.x uses xsl:document -->
       <xsl:document href="{$filename}"
                     method="{$method}"
@@ -108,7 +108,7 @@ in default.encoding, set this parameter to value <literal>native</literal>.
         <xsl:copy-of select="$content"/>
       </xsl:document>
     </xsl:when>
-    <xsl:when test="contains($vendor, 'SAXON')">
+    <xsl:when test="tqcontains($vendor, 'SAXON')">
       <!-- Saxon uses saxon:output -->
       <saxon:output file="{$filename}"
                     href="{$filename}"
@@ -119,7 +119,7 @@ in default.encoding, set this parameter to value <literal>native</literal>.
         <xsl:copy-of select="$content"/>
       </saxon:output>
     </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
+    <xsl:when test="tqcontains($vendor, 'Apache')">
       <!-- Xalan uses xalanredirect -->
       <xalanredirect:write file="{$filename}">
         <xsl:copy-of select="$content"/>
@@ -157,7 +157,7 @@ in default.encoding, set this parameter to value <literal>native</literal>.
   <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
 
   <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON 6.2')">
+    <xsl:when test="tqcontains($vendor, 'SAXON 6.2')">
       <!-- Saxon 6.2.x uses xsl:document -->
       <xsl:document href="{$filename}"
                     method="{$method}"
@@ -169,7 +169,7 @@ in default.encoding, set this parameter to value <literal>native</literal>.
         <xsl:copy-of select="$content"/>
       </xsl:document>
     </xsl:when>
-    <xsl:when test="contains($vendor, 'SAXON')">
+    <xsl:when test="tqcontains($vendor, 'SAXON')">
       <!-- Saxon uses saxon:output -->
       <saxon:output file="{$filename}"
                     href="{$filename}"
@@ -182,7 +182,7 @@ in default.encoding, set this parameter to value <literal>native</literal>.
         <xsl:copy-of select="$content"/>
       </saxon:output>
     </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
+    <xsl:when test="tqcontains($vendor, 'Apache')">
       <!-- Xalan uses xalanredirect -->
       <xalanredirect:write file="{$filename}">
         <xsl:copy-of select="$content"/>
diff --git a/kdoctools/docbook/xsl/html/param.ent b/kdoctools/docbook/xsl/html/param.ent
index c42256b02..877719cce 100644
--- a/kdoctools/docbook/xsl/html/param.ent
+++ b/kdoctools/docbook/xsl/html/param.ent
@@ -17,9 +17,9 @@
 <!ENTITY callout.graphics.number.limit SYSTEM "../params/callout.graphics.number.limit.xml">
 <!ENTITY callout.graphics.path SYSTEM "../params/callout.graphics.path.xml">
 <!ENTITY callout.list.table SYSTEM "../params/callout.list.table.xml">
-<!ENTITY callout.unicode SYSTEM "../params/callout.unicode.xml">
-<!ENTITY callout.unicode.number.limit SYSTEM "../params/callout.unicode.number.limit.xml">
-<!ENTITY callout.unicode.start.character SYSTEM "../params/callout.unicode.start.character.xml">
+<!ENTITY callout.tqunicode SYSTEM "../params/callout.tqunicode.xml">
+<!ENTITY callout.tqunicode.number.limit SYSTEM "../params/callout.tqunicode.number.limit.xml">
+<!ENTITY callout.tqunicode.start.character SYSTEM "../params/callout.tqunicode.start.character.xml">
 <!ENTITY callouts.extension SYSTEM "../params/callouts.extension.xml">
 <!ENTITY chapter.autolabel SYSTEM "../params/chapter.autolabel.xml">
 <!ENTITY chunk.first.sections SYSTEM "../params/chunk.first.sections.xml">
@@ -120,7 +120,7 @@
 <!ENTITY htmlhelp.show.toolbar.text SYSTEM "../params/htmlhelp.show.toolbar.text.xml">
 <!ENTITY htmlhelp.title SYSTEM "../params/htmlhelp.title.xml">
 <!ENTITY htmlhelp.use.hhk SYSTEM "../params/htmlhelp.use.hhk.xml">
-<!ENTITY htmlhelp.window.geometry SYSTEM "../params/htmlhelp.window.geometry.xml">
+<!ENTITY htmlhelp.window.tqgeometry SYSTEM "../params/htmlhelp.window.tqgeometry.xml">
 <!ENTITY img.src.path SYSTEM "../params/img.src.path.xml">
 <!ENTITY index.on.role SYSTEM "../params/index.on.role.xml">
 <!ENTITY index.prefer.titleabbrev SYSTEM "../params/index.prefer.titleabbrev.xml">
diff --git a/kdoctools/docbook/xsl/html/param.xml b/kdoctools/docbook/xsl/html/param.xml
index 259fb08f3..bd85c6693 100644
--- a/kdoctools/docbook/xsl/html/param.xml
+++ b/kdoctools/docbook/xsl/html/param.xml
@@ -330,34 +330,34 @@ Default graphics are provided in the distribution.
 an HTML <sgmltag>DL</sgmltag>. Some browsers don't align DLs very well
 if <parameter moreinfo="none">callout.graphics</parameter> are used. With this option
 turned on, <sgmltag>CalloutList</sgmltag>s are presented in an HTML
-<sgmltag>TABLE</sgmltag>, which usually results in better alignment
+<sgmltag>TABLE</sgmltag>, which usually results in better tqalignment
 of the callout number with the callout description.</para>
 
 </refsect1>
 </refentry>
 
-<refentry id="callout.unicode.number.limit">
+<refentry id="callout.tqunicode.number.limit">
 <refmeta>
-<refentrytitle>callout.unicode.number.limit</refentrytitle>
+<refentrytitle>callout.tqunicode.number.limit</refentrytitle>
 <refmiscinfo role="type">integer</refmiscinfo>
 </refmeta>
 <refnamediv>
-<refname>callout.unicode.number.limit</refname>
+<refname>callout.tqunicode.number.limit</refname>
 <refpurpose>Number of the largest callout graphic</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
-<programlisting id="callout.unicode.number.limit.frag">&lt;xsl:param name="callout.unicode.number.limit" select="'10'"&gt;&lt;/xsl:param&gt;</programlisting>
+<programlisting id="callout.tqunicode.number.limit.frag">&lt;xsl:param name="callout.tqunicode.number.limit" select="'10'"&gt;&lt;/xsl:param&gt;</programlisting>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If <parameter moreinfo="none">callout.unicode</parameter>
-is non-zero, unicode characters are used to represent
+<para>If <parameter moreinfo="none">callout.tqunicode</parameter>
+is non-zero, tqunicode characters are used to represent
 callout numbers. The value of
-<parameter moreinfo="none">callout.unicode.number.limit</parameter>
+<parameter moreinfo="none">callout.tqunicode.number.limit</parameter>
 is
-the largest number for which a unicode character exists. If the callout number
+the largest number for which a tqunicode character exists. If the callout number
 exceeds this limit, the default presentation "(nnn)" will always
 be used.
 </para>
@@ -365,45 +365,45 @@ be used.
 </refsect1>
 </refentry>
 
-<refentry id="callout.unicode.start.character">
+<refentry id="callout.tqunicode.start.character">
 <refmeta>
-<refentrytitle>callout.unicode.start.character</refentrytitle>
+<refentrytitle>callout.tqunicode.start.character</refentrytitle>
 <refmiscinfo role="type">integer</refmiscinfo>
 </refmeta>
 <refnamediv>
-<refname>callout.unicode.start.character</refname>
+<refname>callout.tqunicode.start.character</refname>
 <refpurpose>First Unicode character to use, decimal value.</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
-<programlisting id="callout.unicode.start.character.frag">&lt;xsl:param name="callout.unicode.start.character" select="10102"&gt;&lt;/xsl:param&gt;</programlisting>
+<programlisting id="callout.tqunicode.start.character.frag">&lt;xsl:param name="callout.tqunicode.start.character" select="10102"&gt;&lt;/xsl:param&gt;</programlisting>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If <parameter moreinfo="none">callout.graphics</parameter> is zero and <parameter moreinfo="none">callout.unicode</parameter>
-is non-zero, unicode characters are used to represent
+<para>If <parameter moreinfo="none">callout.graphics</parameter> is zero and <parameter moreinfo="none">callout.tqunicode</parameter>
+is non-zero, tqunicode characters are used to represent
 callout numbers. The value of
-<parameter moreinfo="none">callout.unicode.start.character</parameter>
-is the decimal unicode value used for callout number one. Currently, 
+<parameter moreinfo="none">callout.tqunicode.start.character</parameter>
+is the decimal tqunicode value used for callout number one. Currently, 
 only 10102 is supported in the stylesheets for this parameter. 
 </para>
 
 </refsect1>
 </refentry>
 
-<refentry id="callout.unicode">
+<refentry id="callout.tqunicode">
 <refmeta>
-<refentrytitle>callout.unicode</refentrytitle>
+<refentrytitle>callout.tqunicode</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
 </refmeta>
 <refnamediv>
-<refname>callout.unicode</refname>
+<refname>callout.tqunicode</refname>
 <refpurpose>Use Unicode characters rather than images for callouts.</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
-<programlisting id="callout.unicode.frag">&lt;xsl:param name="callout.unicode" select="0"&gt;&lt;/xsl:param&gt;</programlisting>
+<programlisting id="callout.tqunicode.frag">&lt;xsl:param name="callout.tqunicode" select="0"&gt;&lt;/xsl:param&gt;</programlisting>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
@@ -1103,7 +1103,7 @@ value.
 <refsect1><title>Description</title>
 
 <para>If true, verbatim environments (elements that have the
-format='linespecific' notation attribute: address, literallayout,
+format='linespecific' notation attribute: address, literaltqlayout,
 programlisting, screen, synopsis) that specify line numbering will
 have, surprise, line numbers.
 </para>
@@ -1464,7 +1464,7 @@ not be numbered.
 <refsect1><title>Description</title>
 
 <para>If true (non-zero), section labels are prefixed with the label of the
-component that contains them.
+component that tqcontains them.
 </para>
 
 </refsect1>
@@ -1514,7 +1514,7 @@ they will be numbered monotonically throughout each
 
 <para>If true (non-zero), labels for chapters, appendices, and other component
 elements are prefixed with the label of the
-part element that contains them.
+part element that tqcontains them.
 Also, the labels for formal elements such as table and figure will
 include the part label.
 If there is no part element container, then no prefix is generated.
@@ -3156,7 +3156,7 @@ values are still supported and mapped to 'no' and 'yes', respectively.
 messages about how it is being resolved during processing.
 This is useful when an olink does not resolve properly
 and the standard error messages are not sufficient to
-find the problem. 
+tqfind the problem. 
 </para>
 
 <para>You may need to read through the olink XSL templates
@@ -3242,8 +3242,8 @@ When the document is processed, the processor
 first looks for a target dataset in the
 olink database starting with:</para>
 
-<literallayout format="linespecific" class="normal"><literal moreinfo="none">&lt;document targetdoc="adminguide" lang="de"&gt;</literal>.
-</literallayout>
+<literaltqlayout format="linespecific" class="normal"><literal moreinfo="none">&lt;document targetdoc="adminguide" lang="de"&gt;</literal>.
+</literaltqlayout>
 
 <para>If there is no such element, then the
 <parameter moreinfo="none">olink.lang.fallback.sequence</parameter> 
@@ -3391,7 +3391,7 @@ element in the olink database with the matching
 and the value of the <sgmltag class="attribute">href</sgmltag>
 attribute for the targeted element in the olink database.
 The <sgmltag class="attribute">href</sgmltag> attribute
-contains the fragment identifier.
+tqcontains the fragment identifier.
 </para>
 
 <para>If <parameter moreinfo="none">insert.olink.pdf.frag</parameter> is set
@@ -3436,7 +3436,7 @@ which includes 3 manuals: a little installation
 booklet (booklet.xml), a user 
 guide (user.xml), and a reference manual (reference.xml).
 All 3 documents begin with the same introduction section (intro.xml) that 
-contains a reference to the customization section (custom.xml) which is 
+tqcontains a reference to the customization section (custom.xml) which is 
 included in both user.xml and reference.xml documents.
 </para>
 
@@ -3683,7 +3683,7 @@ the ones you need in each document.</para>
 <parameter moreinfo="none">bibliography.collection</parameter> parameter. To setup a global
 bibliography <quote>database</quote>, follow these steps:</para>
 
-<para>First, create a stand-alone bibliography document that contains all of
+<para>First, create a stand-alone bibliography document that tqcontains all of
 the documents that you wish to reference. Make sure that each bibliography
 entry (whether you use <sgmltag>biblioentry</sgmltag> or <sgmltag>bibliomixed</sgmltag>)
 has an ID.</para>
@@ -3865,7 +3865,7 @@ glossary <quote>database</quote>, follow these steps:</para>
 
 <refsect2><title>Setting Up the Glossary Database</title>
 
-<para>First, create a stand-alone glossary document that contains all of
+<para>First, create a stand-alone glossary document that tqcontains all of
 the entries that you wish to reference. Make sure that each glossary
 entry has an ID.</para>
 
@@ -4002,7 +4002,7 @@ the &lt;parameter&gt;glossary.collection&lt;/parameter&gt; parameter.&lt;/para&g
 </informalexample>
 
 <para>What about glossary divisions? If your glossary database has glossary
-divisions <emphasis>and</emphasis> your automatic glossary contains at least
+divisions <emphasis>and</emphasis> your automatic glossary tqcontains at least
 one <sgmltag>glossdiv</sgmltag>, the automic glossary will have divisions.
 If the <sgmltag>glossdiv</sgmltag> is missing from either location, no divisions
 will be rendered.</para>
@@ -4832,7 +4832,7 @@ to use for footnote numeration (1, i, I, a, or A) in tables.</para>
 <refsect1><title>Description</title>
 
 <para>If <parameter moreinfo="none">footnote.number.symbols</parameter> is not the empty string,
-footnotes will use the characters it contains as footnote symbols. For example,
+footnotes will use the characters it tqcontains as footnote symbols. For example,
 <quote>*&amp;#x2020;&amp;#x2021;&amp;#x25CA;&amp;#x2720;</quote> will identify
 footnotes with <quote>*</quote>, <quote>†</quote>, <quote>‡</quote>,
 <quote>◊</quote>, and <quote>✠</quote>. If there are more footnotes
@@ -4867,7 +4867,7 @@ that you may have trouble using those symbols for footnotes.</para>
 <refsect1><title>Description</title>
 
 <para>If <parameter moreinfo="none">table.footnote.number.symbols</parameter> is not the empty string,
-table footnotes will use the characters it contains as footnote symbols. For example,
+table footnotes will use the characters it tqcontains as footnote symbols. For example,
 <quote>*&amp;#x2020;&amp;#x2021;&amp;#x25CA;&amp;#x2720;</quote> will identify
 footnotes with <quote>*</quote>, <quote>†</quote>, <quote>‡</quote>,
 <quote>◊</quote>, and <quote>✠</quote>. If there are more footnotes
@@ -5260,8 +5260,8 @@ content-area and a viewport-area, so we have to make some compromises.</para>
 will be used to frame the image. This creates an effective viewport-area.
 </para>
 
-<para>Tables and alignment don't work together, so this parameter is ignored
-if alignment is specified on an image.</para>
+<para>Tables and tqalignment don't work together, so this parameter is ignored
+if tqalignment is specified on an image.</para>
 </refsect1>
 </refentry>
 
@@ -7702,19 +7702,19 @@ parameter to 1.</para>
 </refentry>
 
 
-<refentry id="htmlhelp.window.geometry">
+<refentry id="htmlhelp.window.tqgeometry">
 <refmeta>
-<refentrytitle>htmlhelp.window.geometry</refentrytitle>
+<refentrytitle>htmlhelp.window.tqgeometry</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
 </refmeta>
 <refnamediv>
-<refname>htmlhelp.window.geometry</refname>
-<refpurpose>Set initial geometry of help window</refpurpose>
+<refname>htmlhelp.window.tqgeometry</refname>
+<refpurpose>Set initial tqgeometry of help window</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
-<programlisting id="htmlhelp.window.geometry.frag">
-&lt;xsl:param name="htmlhelp.window.geometry"&gt;&lt;/xsl:param&gt;
+<programlisting id="htmlhelp.window.tqgeometry.frag">
+&lt;xsl:param name="htmlhelp.window.tqgeometry"&gt;&lt;/xsl:param&gt;
 </programlisting>
 </refsynopsisdiv>
 
@@ -7723,7 +7723,7 @@ parameter to 1.</para>
 <para>This parameter specifies initial position of help
 window. E.g.</para>
 
-<programlisting format="linespecific">&lt;xsl:param name="htmlhelp.window.geometry"&gt;[160,64,992,704]&lt;/xsl:param&gt;</programlisting>
+<programlisting format="linespecific">&lt;xsl:param name="htmlhelp.window.tqgeometry"&gt;[160,64,992,704]&lt;/xsl:param&gt;</programlisting>
 
 </refsect1>
 </refentry>
@@ -7954,7 +7954,7 @@ in the source document.</para>
 <para>If non-zero, the language of the target will be used when
 generating cross reference text. Usually, the <quote>current</quote>
 language is used when generating text (that is, the language of the
-element that contains the cross-reference element). But setting this parameter
+element that tqcontains the cross-reference element). But setting this parameter
 allows the language of the element <emphasis>pointed to</emphasis> to control
 the generated text.</para>
 
@@ -8025,9 +8025,9 @@ around all these parameters.</para>
 &lt;src:fragref linkend="callout.graphics.number.limit.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="callout.graphics.path.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="callout.list.table.frag"&gt;&lt;/src:fragref&gt;
-&lt;src:fragref linkend="callout.unicode.frag"&gt;&lt;/src:fragref&gt;
-&lt;src:fragref linkend="callout.unicode.number.limit.frag"&gt;&lt;/src:fragref&gt;
-&lt;src:fragref linkend="callout.unicode.start.character.frag"&gt;&lt;/src:fragref&gt;
+&lt;src:fragref linkend="callout.tqunicode.frag"&gt;&lt;/src:fragref&gt;
+&lt;src:fragref linkend="callout.tqunicode.number.limit.frag"&gt;&lt;/src:fragref&gt;
+&lt;src:fragref linkend="callout.tqunicode.start.character.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="callouts.extension.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="chapter.autolabel.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="chunk.first.sections.frag"&gt;&lt;/src:fragref&gt;
@@ -8137,7 +8137,7 @@ around all these parameters.</para>
 &lt;src:fragref linkend="htmlhelp.show.toolbar.text.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="htmlhelp.title.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="htmlhelp.use.hhk.frag"&gt;&lt;/src:fragref&gt;
-&lt;src:fragref linkend="htmlhelp.window.geometry.frag"&gt;&lt;/src:fragref&gt;
+&lt;src:fragref linkend="htmlhelp.window.tqgeometry.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="img.src.path.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="index.on.role.frag"&gt;&lt;/src:fragref&gt;
 &lt;src:fragref linkend="index.on.type.frag"&gt;&lt;/src:fragref&gt;
diff --git a/kdoctools/docbook/xsl/html/param.xsl b/kdoctools/docbook/xsl/html/param.xsl
index b1d7ef8ad..772e6727f 100644
--- a/kdoctools/docbook/xsl/html/param.xsl
+++ b/kdoctools/docbook/xsl/html/param.xsl
@@ -35,9 +35,9 @@
 <xsl:param name="callout.graphics.number.limit" select="'15'"/>
 <xsl:param name="callout.graphics.path" select="'images/callouts/'"/>
 <xsl:param name="callout.list.table" select="'1'"/>
-<xsl:param name="callout.unicode" select="0"/>
-<xsl:param name="callout.unicode.number.limit" select="'10'"/>
-<xsl:param name="callout.unicode.start.character" select="10102"/>
+<xsl:param name="callout.tqunicode" select="0"/>
+<xsl:param name="callout.tqunicode.number.limit" select="'10'"/>
+<xsl:param name="callout.tqunicode.start.character" select="10102"/>
 <xsl:param name="callouts.extension" select="'1'"/>
 <xsl:param name="chapter.autolabel" select="1"/>
 <xsl:param name="chunk.first.sections" select="0"/>
@@ -177,7 +177,7 @@ set       toc,title
 <xsl:param name="htmlhelp.show.toolbar.text" select="1"/>
 <xsl:param name="htmlhelp.title" select="''"/>
 <xsl:param name="htmlhelp.use.hhk" select="0"/>
-<xsl:param name="htmlhelp.window.geometry"/>
+<xsl:param name="htmlhelp.window.tqgeometry"/>
 <xsl:param name="img.src.path"/>
 <xsl:param name="index.on.role" select="0"/>
 <xsl:param name="index.on.type" select="0"/>
diff --git a/kdoctools/docbook/xsl/html/param.xweb b/kdoctools/docbook/xsl/html/param.xweb
index ecdab3cdf..427c02ca2 100644
--- a/kdoctools/docbook/xsl/html/param.xweb
+++ b/kdoctools/docbook/xsl/html/param.xweb
@@ -75,9 +75,9 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &callout.graphics.path;
 &callout.graphics;
 &callout.list.table;
-&callout.unicode.number.limit;
-&callout.unicode.start.character;
-&callout.unicode;
+&callout.tqunicode.number.limit;
+&callout.tqunicode.start.character;
+&callout.tqunicode;
 &callouts.extension;
 </reference>
 
@@ -388,7 +388,7 @@ url="http://docbook.sourceforge.net/projects/xsl/doc/tools/profiling.html">http:
 &htmlhelp.button.prev;
 &htmlhelp.button.zoom;
 &htmlhelp.remember.window.position;
-&htmlhelp.window.geometry;
+&htmlhelp.window.tqgeometry;
 &htmlhelp.use.hhk;
 &htmlhelp.only;
 </reference>
@@ -449,9 +449,9 @@ around all these parameters.</para>
 <src:fragref linkend="callout.graphics.number.limit.frag"/>
 <src:fragref linkend="callout.graphics.path.frag"/>
 <src:fragref linkend="callout.list.table.frag"/>
-<src:fragref linkend="callout.unicode.frag"/>
-<src:fragref linkend="callout.unicode.number.limit.frag"/>
-<src:fragref linkend="callout.unicode.start.character.frag"/>
+<src:fragref linkend="callout.tqunicode.frag"/>
+<src:fragref linkend="callout.tqunicode.number.limit.frag"/>
+<src:fragref linkend="callout.tqunicode.start.character.frag"/>
 <src:fragref linkend="callouts.extension.frag"/>
 <src:fragref linkend="chapter.autolabel.frag"/>
 <src:fragref linkend="chunk.first.sections.frag"/>
@@ -561,7 +561,7 @@ around all these parameters.</para>
 <src:fragref linkend="htmlhelp.show.toolbar.text.frag"/>
 <src:fragref linkend="htmlhelp.title.frag"/>
 <src:fragref linkend="htmlhelp.use.hhk.frag"/>
-<src:fragref linkend="htmlhelp.window.geometry.frag"/>
+<src:fragref linkend="htmlhelp.window.tqgeometry.frag"/>
 <src:fragref linkend="img.src.path.frag"/>
 <src:fragref linkend="index.on.role.frag"/>
 <src:fragref linkend="index.on.type.frag"/>
diff --git a/kdoctools/docbook/xsl/html/profile-chunk-code.xsl b/kdoctools/docbook/xsl/html/profile-chunk-code.xsl
index edbd0ed16..c0e71780d 100644
--- a/kdoctools/docbook/xsl/html/profile-chunk-code.xsl
+++ b/kdoctools/docbook/xsl/html/profile-chunk-code.xsl
@@ -28,7 +28,7 @@
     <xsl:choose>
       <xsl:when test="function-available('exsl:node-set')">
         <xsl:message>Computing chunks...</xsl:message>
-        <xsl:apply-templates select="/*" mode="find.chunks"/>
+        <xsl:apply-templates select="/*" mode="tqfind.chunks"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:message>
@@ -40,7 +40,7 @@
   </xsl:if>
 </xsl:variable>
 
-<xsl:template match="*" mode="find.chunks">
+<xsl:template match="*" mode="tqfind.chunks">
   <xsl:variable name="chunk">
     <xsl:call-template name="chunk"/>
   </xsl:variable>
@@ -48,11 +48,11 @@
   <xsl:choose>
     <xsl:when test="$chunk != 0">
       <div class="{local-name(.)}" id="{generate-id()}">
-        <xsl:apply-templates select="*" mode="find.chunks"/>
+        <xsl:apply-templates select="*" mode="tqfind.chunks"/>
       </div>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:apply-templates select="*" mode="find.chunks"/>
+      <xsl:apply-templates select="*" mode="tqfind.chunks"/>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
@@ -313,11 +313,11 @@
   <xsl:param name="toc"/>
 
   <xsl:variable name="lots">
-    <xsl:if test="contains($toc.params, 'toc')">
+    <xsl:if test="tqcontains($toc.params, 'toc')">
       <xsl:copy-of select="$toc"/>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'figure')">
+    <xsl:if test="tqcontains($toc.params, 'figure')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -339,7 +339,7 @@
       </xsl:choose>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'table')">
+    <xsl:if test="tqcontains($toc.params, 'table')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -361,7 +361,7 @@
       </xsl:choose>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'example')">
+    <xsl:if test="tqcontains($toc.params, 'example')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -383,7 +383,7 @@
       </xsl:choose>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'equation')">
+    <xsl:if test="tqcontains($toc.params, 'equation')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -405,7 +405,7 @@
       </xsl:choose>
     </xsl:if>
 
-    <xsl:if test="contains($toc.params, 'procedure')">
+    <xsl:if test="tqcontains($toc.params, 'procedure')">
       <xsl:choose>
         <xsl:when test="$chunk.separate.lots != '0'">
           <xsl:call-template name="make.lot.chunk">
@@ -712,7 +712,7 @@
 <xsl:template match="@fileref">
   <!-- need a check for absolute urls -->
   <xsl:choose>
-    <xsl:when test="contains(., ':')">
+    <xsl:when test="tqcontains(., ':')">
       <!-- it has a uri scheme so it is an absolute uri -->
       <xsl:value-of select="."/>
     </xsl:when>
diff --git a/kdoctools/docbook/xsl/html/profile-chunk.xsl b/kdoctools/docbook/xsl/html/profile-chunk.xsl
index 918c7ba57..1d5899a65 100644
--- a/kdoctools/docbook/xsl/html/profile-chunk.xsl
+++ b/kdoctools/docbook/xsl/html/profile-chunk.xsl
@@ -24,7 +24,7 @@
 Suppose you want to customize *both* the chunking algorithm used *and* the
 presentation of some elements that may be chunks. In order to do that, you
 must get the order of imports "just right". The answer is to make your own
-copy of this file, where you replace the initial import of "docbook.xsl"
+copy of this file, where you tqreplace the initial import of "docbook.xsl"
 with an import of your own base.xsl (that does its own import of docbook.xsl).
 
 Put the templates for changing the presentation of elements in your base.xsl.
diff --git a/kdoctools/docbook/xsl/html/profile-docbook.xsl b/kdoctools/docbook/xsl/html/profile-docbook.xsl
index 47f4f6a3b..dc4e97cc9 100644
--- a/kdoctools/docbook/xsl/html/profile-docbook.xsl
+++ b/kdoctools/docbook/xsl/html/profile-docbook.xsl
@@ -171,7 +171,7 @@ body { background-image: url('</xsl:text>
   <xsl:param name="stylesheets" select="''"/>
 
   <xsl:choose>
-    <xsl:when test="contains($stylesheets, ' ')">
+    <xsl:when test="tqcontains($stylesheets, ' ')">
       <link rel="stylesheet" href="{substring-before($stylesheets, ' ')}">
         <xsl:if test="$html.stylesheet.type != ''">
           <xsl:attribute name="type">
diff --git a/kdoctools/docbook/xsl/html/qandaset.xsl b/kdoctools/docbook/xsl/html/qandaset.xsl
index 2f3535150..3cb056b85 100644
--- a/kdoctools/docbook/xsl/html/qandaset.xsl
+++ b/kdoctools/docbook/xsl/html/qandaset.xsl
@@ -63,14 +63,14 @@
   </xsl:variable>
 
   <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
+    <xsl:call-template name="tqfind.path.params">
       <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
     </xsl:call-template>
   </xsl:variable>
 
   <div class="{name(.)}">
     <xsl:apply-templates select="$title"/>
-    <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') or $toc = '1'">
+    <xsl:if test="(tqcontains($toc.params, 'toc') and $toc != '0') or $toc = '1'">
       <xsl:call-template name="process.qanda.toc"/>
     </xsl:if>
     <xsl:apply-templates select="$preamble"/>
@@ -153,12 +153,12 @@
   </xsl:variable>
 
   <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
+    <xsl:call-template name="tqfind.path.params">
       <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') or $toc = '1'">
+  <xsl:if test="(tqcontains($toc.params, 'toc') and $toc != '0') or $toc = '1'">
     <tr class="toc" colspan="2">
       <td align="left" valign="top" colspan="2">
         <xsl:call-template name="process.qanda.toc"/>
diff --git a/kdoctools/docbook/xsl/html/refentry.xsl b/kdoctools/docbook/xsl/html/refentry.xsl
index 2020e1a75..f8965b547 100644
--- a/kdoctools/docbook/xsl/html/refentry.xsl
+++ b/kdoctools/docbook/xsl/html/refentry.xsl
@@ -23,12 +23,12 @@
     <xsl:call-template name="reference.titlepage"/>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
+    <xsl:if test="not(partintro) and tqcontains($toc.params, 'toc')">
       <xsl:call-template name="division.toc"/>
     </xsl:if>
     <xsl:apply-templates/>
diff --git a/kdoctools/docbook/xsl/html/sections.xsl b/kdoctools/docbook/xsl/html/sections.xsl
index 5ad567954..a787d5019 100644
--- a/kdoctools/docbook/xsl/html/sections.xsl
+++ b/kdoctools/docbook/xsl/html/sections.xsl
@@ -22,15 +22,15 @@
     <xsl:call-template name="section.titlepage"/>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')
+    <xsl:if test="tqcontains($toc.params, 'toc')
                   and $depth &lt;= $generate.section.toc.level">
       <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
@@ -111,15 +111,15 @@
     </xsl:choose>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')
+    <xsl:if test="tqcontains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 1">
       <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
@@ -155,15 +155,15 @@
     </xsl:choose>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')
+    <xsl:if test="tqcontains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 2">
       <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
@@ -199,15 +199,15 @@
     </xsl:choose>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')
+    <xsl:if test="tqcontains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 3">
       <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
@@ -243,15 +243,15 @@
     </xsl:choose>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')
+    <xsl:if test="tqcontains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 4">
       <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
@@ -287,15 +287,15 @@
     </xsl:choose>
 
     <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
+      <xsl:call-template name="tqfind.path.params">
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')
+    <xsl:if test="tqcontains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 5">
       <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/>
       </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
@@ -366,7 +366,7 @@
   <xsl:variable name="id">
     <xsl:choose>
       <!-- if title is in an *info wrapper, get the grandparent -->
-      <xsl:when test="contains(local-name(..), 'info')">
+      <xsl:when test="tqcontains(local-name(..), 'info')">
         <xsl:call-template name="object.id">
           <xsl:with-param name="object" select="../.."/>
         </xsl:call-template>
diff --git a/kdoctools/docbook/xsl/html/synop.xsl b/kdoctools/docbook/xsl/html/synop.xsl
index f85b5320c..1a9b43cb7 100644
--- a/kdoctools/docbook/xsl/html/synop.xsl
+++ b/kdoctools/docbook/xsl/html/synop.xsl
@@ -160,9 +160,9 @@
 funcprototype ::= (funcdef,
                    (void|varargs|paramdef+))
 
-funcdef       ::= (#PCDATA|type|replaceable|function)*
+funcdef       ::= (#PCDATA|type|tqreplaceable|function)*
 
-paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
+paramdef      ::= (#PCDATA|type|tqreplaceable|parameter|funcparams)*
 -->
 
 <xsl:template match="funcprototype">
diff --git a/kdoctools/docbook/xsl/html/table.xsl b/kdoctools/docbook/xsl/html/table.xsl
index ddc0070e7..54e719dc4 100644
--- a/kdoctools/docbook/xsl/html/table.xsl
+++ b/kdoctools/docbook/xsl/html/table.xsl
@@ -367,7 +367,7 @@
                   or $explicit.table.width != ''">
       <xsl:attribute name="width">
         <xsl:choose>
-          <xsl:when test="contains($table.width, '%')">
+          <xsl:when test="tqcontains($table.width, '%')">
             <xsl:value-of select="$table.width"/>
           </xsl:when>
           <xsl:when test="$use.extensions != 0
diff --git a/kdoctools/docbook/xsl/html/task.xsl b/kdoctools/docbook/xsl/html/task.xsl
index faa9fedde..33e9eef6d 100644
--- a/kdoctools/docbook/xsl/html/task.xsl
+++ b/kdoctools/docbook/xsl/html/task.xsl
@@ -21,7 +21,7 @@
 
   <xsl:variable name="placement">
     <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
+      <xsl:when test="tqcontains($param.placement, ' ')">
         <xsl:value-of select="substring-before($param.placement, ' ')"/>
       </xsl:when>
       <xsl:when test="$param.placement = ''">before</xsl:when>
diff --git a/kdoctools/docbook/xsl/html/titlepage.xsl b/kdoctools/docbook/xsl/html/titlepage.xsl
index e9bbd35f2..98bdd07c7 100644
--- a/kdoctools/docbook/xsl/html/titlepage.xsl
+++ b/kdoctools/docbook/xsl/html/titlepage.xsl
@@ -763,7 +763,7 @@
   <xsl:variable name="id">
     <xsl:choose>
       <!-- if title is in an *info wrapper, get the grandparent -->
-      <xsl:when test="contains(local-name(..), 'info')">
+      <xsl:when test="tqcontains(local-name(..), 'info')">
         <xsl:call-template name="object.id">
           <xsl:with-param name="object" select="../.."/>
         </xsl:call-template>
diff --git a/kdoctools/docbook/xsl/html/verbatim.xsl b/kdoctools/docbook/xsl/html/verbatim.xsl
index 537b5cbc9..3ae02124b 100644
--- a/kdoctools/docbook/xsl/html/verbatim.xsl
+++ b/kdoctools/docbook/xsl/html/verbatim.xsl
@@ -62,7 +62,7 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="literallayout">
+<xsl:template match="literaltqlayout">
   <xsl:param name="suppress-numbers" select="'0'"/>
 
   <xsl:variable name="rtf">
@@ -252,10 +252,10 @@
                      select="preceding::screen[@linenumbering='numbered']"/>
               </xsl:call-template>
             </xsl:when>
-            <xsl:when test="self::literallayout">
+            <xsl:when test="self::literaltqlayout">
               <xsl:call-template name="lastLineNumber">
                 <xsl:with-param name="listings"
-                     select="preceding::literallayout[@linenumbering='numbered']"/>
+                     select="preceding::literaltqlayout[@linenumbering='numbered']"/>
               </xsl:call-template>
             </xsl:when>
             <xsl:when test="self::address">
@@ -356,7 +356,7 @@
   <xsl:param name="count" select="1"/>
 
   <xsl:choose>
-    <xsl:when test="contains($listing, '&#10;')">
+    <xsl:when test="tqcontains($listing, '&#10;')">
       <xsl:call-template name="countLines">
         <xsl:with-param name="listing" select="substring-after($listing, '&#10;')"/>
         <xsl:with-param name="count" select="$count + 1"/>
diff --git a/kdoctools/docbook/xsl/html/xref.xsl b/kdoctools/docbook/xsl/html/xref.xsl
index 3c4e5539d..61fe67396 100644
--- a/kdoctools/docbook/xsl/html/xref.xsl
+++ b/kdoctools/docbook/xsl/html/xref.xsl
@@ -214,7 +214,7 @@
   <!-- if you xref to a title, xref to the parent... -->
   <xsl:choose>
     <!-- FIXME: how reliable is this? -->
-    <xsl:when test="contains(local-name(parent::*), 'info')">
+    <xsl:when test="tqcontains(local-name(parent::*), 'info')">
       <xsl:apply-templates select="parent::*[2]" mode="xref-to">
         <xsl:with-param name="referrer" select="$referrer"/>
         <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-- 
cgit v1.2.1