Repair accidental damage to meinproc/docbook caused by prior commit

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211188 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 46 insertions, 46 deletions

diff --git a/kdoctools/docbook/xsl/common/ChangeLog b/kdoctools/docbook/xsl/common/ChangeLog
index 30e0ac23c..345318102 100644
--- a/kdoctools/docbook/xsl/common/ChangeLog
+++ b/kdoctools/docbook/xsl/common/ChangeLog
@@ -285,7 +285,7 @@
 
 	* common.xsl: Don't use SVG graphics if use.svg=0
 
-	* table.xsl: Support template to tqfind out if there are more columns in the current row of a table
+	* table.xsl: Support template to find out if there are more columns in the current row of a table
 
 2003-04-05  Robert Stayton <bobstayton@users.sourceforge.net>
 
@@ -613,7 +613,7 @@
 
 	* .cvsignore, Makefile, l10n.xml: Added Ukranian
 
-	* 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
+	* 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
 
 2001-10-14  Norman Walsh <nwalsh@users.sourceforge.net>
 
@@ -672,9 +672,9 @@
 	back to the two-letter lang code if a longer lang
 	does not have a <lang>.xml localization file.
 	And it falls back to the default lang if it can't
-	tqfind that either.
+	find that either.
 	
-	Also fixed a bug for tqfinding the lang attribute.
+	Also fixed a bug for finding the lang attribute.
 	It was using the last() function, but in an
 	ancestor-or-self node set you want the first ancestor
 	(closest) with a lang value.
diff --git a/kdoctools/docbook/xsl/common/common.xsl b/kdoctools/docbook/xsl/common/common.xsl
index fe7f70b66..77721da8d 100644
--- a/kdoctools/docbook/xsl/common/common.xsl
+++ b/kdoctools/docbook/xsl/common/common.xsl
@@ -12,7 +12,7 @@
      See ../README or http://nwalsh.com/docbook/xsl/ for copyright
      and other information.
 
-     This file tqcontains general templates common to both the HTML and FO
+     This file contains general templates common to both the HTML and FO
      versions of the DocBook stylesheets.
      ******************************************************************** -->
 
@@ -673,7 +673,7 @@ Defaults to the context node.</para>
   <xsl:variable name="subst">%g</xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="tqcontains($string, $subst)">
+    <xsl:when test="contains($string, $subst)">
       <xsl:value-of select="substring-before($string, $subst)"/>
       <xsl:call-template name="gentext.element.name">
         <xsl:with-param name="element.name" select="name($target)"/>
@@ -696,7 +696,7 @@ Defaults to the context node.</para>
   <xsl:variable name="subst">%t</xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="tqcontains($string, $subst)">
+    <xsl:when test="contains($string, $subst)">
       <xsl:call-template name="xref.g.subst">
         <xsl:with-param name="string"
                         select="substring-before($string, $subst)"/>
@@ -726,7 +726,7 @@ Defaults to the context node.</para>
   <xsl:variable name="subst">%n</xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="tqcontains($string, $subst)">
+    <xsl:when test="contains($string, $subst)">
       <xsl:call-template name="xref.t.subst">
         <xsl:with-param name="string"
                         select="substring-before($string, $subst)"/>
@@ -960,7 +960,7 @@ recursive process.</para>
     
         <xsl:variable name="useobject">
           <xsl:choose>
-            <!-- The phrase is used only when tqcontains TeX Math and output is FO -->
+            <!-- The phrase is used only when contains TeX Math and output is FO -->
             <xsl:when test="name($object)='textobject' and $object/phrase
                             and $object/@role='tex' and $stylesheet.result.type = 'fo'
                             and $tex.math.in.alt != ''">
@@ -1233,7 +1233,7 @@ pointed to by the link is one of the elements listed in
     <xsl:variable name="target" select="$targets[1]"/>
 
     <xsl:if test="count($target) &gt; 0">
-      <xsl:if test="not(tqcontains(concat(' ', $element-list, ' '), name($target)))">
+      <xsl:if test="not(contains(concat(' ', $element-list, ' '), name($target)))">
         <xsl:message>
           <xsl:text>Error: linkend (</xsl:text>
           <xsl:value-of select="$linkend"/>
@@ -1614,7 +1614,7 @@ year range is <quote>1991-1992</quote> but discretely it's
 
 <!-- ====================================================================== -->
 
-<doc:template name="tqfind.path.params" xmlns="">
+<doc:template name="find.path.params" xmlns="">
 <refpurpose>Search in a table for the "best" match for the node</refpurpose>
 
 <refdescription>
@@ -1624,7 +1624,7 @@ node location.</para>
 </refdescription>
 </doc:template>
 
-<xsl:template name="tqfind.path.params">
+<xsl:template name="find.path.params">
   <xsl:param name="node" select="."/>
   <xsl:param name="table" select="''"/>
   <xsl:param name="location">
@@ -1644,8 +1644,8 @@ node location.</para>
     <xsl:when test="$value != ''">
       <xsl:value-of select="$value"/>
     </xsl:when>
-    <xsl:when test="tqcontains($location, '/')">
-      <xsl:call-template name="tqfind.path.params">
+    <xsl:when test="contains($location, '/')">
+      <xsl:call-template name="find.path.params">
         <xsl:with-param name="node" select="$node"/>
         <xsl:with-param name="table" select="$table"/>
         <xsl:with-param name="location" select="substring-after($location, '/')"/>
@@ -1731,7 +1731,7 @@ node location.</para>
         <xsl:with-param name="filename" select="substring-after($filename, '../')"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="tqcontains($filename, '/../')">
+    <xsl:when test="contains($filename, '/../')">
       <xsl:call-template name="strippath">
         <xsl:with-param name="filename">
           <xsl:call-template name="getdir">
@@ -1751,7 +1751,7 @@ node location.</para>
 
 <xsl:template name="getdir">
   <xsl:param name="filename" select="''"/>
-  <xsl:if test="tqcontains($filename, '/')">
+  <xsl:if test="contains($filename, '/')">
     <xsl:value-of select="substring-before($filename, '/')"/>
     <xsl:text>/</xsl:text>
     <xsl:call-template name="getdir">
diff --git a/kdoctools/docbook/xsl/common/gentext.xsl b/kdoctools/docbook/xsl/common/gentext.xsl
index a5197e584..0562f388e 100644
--- a/kdoctools/docbook/xsl/common/gentext.xsl
+++ b/kdoctools/docbook/xsl/common/gentext.xsl
@@ -433,7 +433,7 @@
   <xsl:param name="verbose"/>
 
   <xsl:choose>
-    <xsl:when test="tqcontains($template, '%')">
+    <xsl:when test="contains($template, '%')">
       <xsl:value-of select="substring-before($template, '%')"/>
       <xsl:variable name="candidate"
              select="substring(substring-after($template, '%'), 1, 1)"/>
@@ -604,13 +604,13 @@
 
   <xsl:variable name="labeltype">
     <xsl:choose>
-      <xsl:when test="tqcontains($parts, 'labelnumber')">
+      <xsl:when test="contains($parts, 'labelnumber')">
          <xsl:text>labelnumber</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'labelname')">
+      <xsl:when test="contains($parts, 'labelname')">
          <xsl:text>labelname</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'label')">
+      <xsl:when test="contains($parts, 'label')">
          <xsl:text>label</xsl:text>
       </xsl:when>
     </xsl:choose>
@@ -618,10 +618,10 @@
 
   <xsl:variable name="titletype">
     <xsl:choose>
-      <xsl:when test="tqcontains($parts, 'quotedtitle')">
+      <xsl:when test="contains($parts, 'quotedtitle')">
          <xsl:text>quotedtitle</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'title')">
+      <xsl:when test="contains($parts, 'title')">
          <xsl:text>title</xsl:text>
       </xsl:when>
     </xsl:choose>
@@ -637,19 +637,19 @@
                       local-name($referrer) != 'olink'">
         <!-- suppress page numbers -->
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'nopage')">
+      <xsl:when test="contains($parts, 'nopage')">
          <xsl:text>nopage</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'pagenumber')">
+      <xsl:when test="contains($parts, 'pagenumber')">
          <xsl:text>pagenumber</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'pageabbrev')">
+      <xsl:when test="contains($parts, 'pageabbrev')">
          <xsl:text>pageabbrev</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'Page')">
+      <xsl:when test="contains($parts, 'Page')">
          <xsl:text>Page</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'page')">
+      <xsl:when test="contains($parts, 'page')">
          <xsl:text>page</xsl:text>
       </xsl:when>
     </xsl:choose>
@@ -662,13 +662,13 @@
                       local-name($referrer) = 'olink'">
         <!-- suppress docname -->
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'nodocname')">
+      <xsl:when test="contains($parts, 'nodocname')">
          <xsl:text>nodocname</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'docnamelong')">
+      <xsl:when test="contains($parts, 'docnamelong')">
          <xsl:text>docnamelong</xsl:text>
       </xsl:when>
-      <xsl:when test="tqcontains($parts, 'docname')">
+      <xsl:when test="contains($parts, 'docname')">
          <xsl:text>docname</xsl:text>
       </xsl:when>
     </xsl:choose>
diff --git a/kdoctools/docbook/xsl/common/l10n.xsl b/kdoctools/docbook/xsl/common/l10n.xsl
index 14aca83e2..4a9657473 100644
--- a/kdoctools/docbook/xsl/common/l10n.xsl
+++ b/kdoctools/docbook/xsl/common/l10n.xsl
@@ -12,7 +12,7 @@
      See ../README or http://nwalsh.com/docbook/xsl/ for copyright
      and other information.
 
-     This file tqcontains localization templates (for internationalization)
+     This file contains localization templates (for internationalization)
      ******************************************************************** -->
 
 <xsl:param name="l10n.xml" select="document('../common/l10n.xml')"/>
@@ -71,7 +71,7 @@
 
   <xsl:variable name="adjusted.language">
     <xsl:choose>
-      <xsl:when test="tqcontains($language,'-')">
+      <xsl:when test="contains($language,'-')">
         <xsl:value-of select="substring-before($language,'-')"/>
         <xsl:text>_</xsl:text>
         <xsl:value-of select="substring-after($language,'-')"/>
@@ -360,7 +360,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:choose>
-        <xsl:when test="tqcontains($name, '/')">
+        <xsl:when test="contains($name, '/')">
           <xsl:call-template name="gentext.template">
             <xsl:with-param name="context" select="$context"/>
             <xsl:with-param name="name" select="substring-after($name, '/')"/>
@@ -430,7 +430,7 @@ in the context named "</xsl:text>
     <xsl:when test="$template.node/@text">1</xsl:when>
     <xsl:otherwise>
       <xsl:choose>
-        <xsl:when test="tqcontains($name, '/')">
+        <xsl:when test="contains($name, '/')">
           <xsl:call-template name="gentext.template.exists">
             <xsl:with-param name="context" select="$context"/>
             <xsl:with-param name="name" select="substring-after($name, '/')"/>
diff --git a/kdoctools/docbook/xsl/common/olink.xsl b/kdoctools/docbook/xsl/common/olink.xsl
index 91aead5aa..22dae4e1c 100644
--- a/kdoctools/docbook/xsl/common/olink.xsl
+++ b/kdoctools/docbook/xsl/common/olink.xsl
@@ -58,7 +58,7 @@
       </xsl:call-template>
     </xsl:variable>
   
-    <!-- Recurse through the languages until you tqfind a match -->
+    <!-- Recurse through the languages until you find a match -->
     <xsl:call-template name="select.olink.key.in.lang">
       <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
       <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
@@ -394,7 +394,7 @@
   <xsl:param name="fallback.index" select="1"/>
   <xsl:param name="olink.fallback.sequence" select="''"/>
 
-  <!-- recurse backwards to tqfind the lang matching the index -->
+  <!-- recurse backwards to find the lang matching the index -->
   <xsl:variable name="firstlang" 
                 select="substring-before($olink.fallback.sequence, ' ')"/>
   <xsl:variable name="rest" 
@@ -598,10 +598,10 @@
       <xsl:choose>
         <xsl:when test="$xrefstyle != '' and
                         starts-with(normalize-space($xrefstyle), 'select:') and
-                        (tqcontains($xrefstyle, 'nodocname') or
-                        tqcontains($xrefstyle, 'nopage')) and
-                        not(tqcontains($xrefstyle, 'title')) and
-                        not(tqcontains($xrefstyle, 'label'))"> 
+                        (contains($xrefstyle, 'nodocname') or
+                        contains($xrefstyle, 'nopage')) and
+                        not(contains($xrefstyle, 'title')) and
+                        not(contains($xrefstyle, 'label'))"> 
           <xsl:value-of select="$xref.text"/>
         </xsl:when>
         <xsl:when test="$xrefstyle != ''">
@@ -947,8 +947,8 @@
     </xsl:when>
     <xsl:when test="not(starts-with(normalize-space($xrefstyle),
                         'select:') 
-                and (tqcontains($xrefstyle, 'page')
-                     or tqcontains($xrefstyle, 'Page')))
+                and (contains($xrefstyle, 'page')
+                     or contains($xrefstyle, 'Page')))
                 and $current.docid != '' 
                 and $current.docid != $targetdoc
                 and $insert.olink.page.number = 'yes' ">
@@ -1012,7 +1012,7 @@
   </xsl:variable>
 
   <xsl:if test="not(starts-with(normalize-space($xrefstyle), 'select:') 
-              and (tqcontains($xrefstyle, 'docname')))
+              and (contains($xrefstyle, 'docname')))
               and ($olink.doctitle = 'yes' or $olink.doctitle = '1')
               and $current.docid != '' 
               and $current.docid != $targetdoc
@@ -1050,8 +1050,8 @@
 
   <xsl:if test="not(starts-with(normalize-space($xrefstyle),
                     'select:') != '' 
-                and (tqcontains($xrefstyle, 'page')
-                     or tqcontains($xrefstyle, 'Page')))
+                and (contains($xrefstyle, 'page')
+                     or contains($xrefstyle, 'Page')))
                 and ( $insert.xref.page.number = 'yes' 
                    or $insert.xref.page.number = '1')
                 or local-name($target) = 'para'">
diff --git a/kdoctools/docbook/xsl/common/pi.xsl b/kdoctools/docbook/xsl/common/pi.xsl
index 9540f3ed2..3a4efd72f 100644
--- a/kdoctools/docbook/xsl/common/pi.xsl
+++ b/kdoctools/docbook/xsl/common/pi.xsl
@@ -14,7 +14,7 @@
      See ../README or http://nwalsh.com/docbook/xsl/ for copyright
      and other information.
 
-     This file tqcontains general templates for processing processing
+     This file contains general templates for processing processing
      instructions common to both the HTML and FO versions of the
      DocBook stylesheets.
      ******************************************************************** -->