diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 07:08:17 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 07:08:17 +0000 |
commit | 9f96d6383157631aa9a8d087b3966d47e7b06899 (patch) | |
tree | cb7b064cb0e329f8334d9bca1592af674d26ac4a /kdoctools/docbook | |
parent | 73a98149e76c195571c8b9b3ecd6753f204ccd97 (diff) | |
download | tdelibs-9f96d6383157631aa9a8d087b3966d47e7b06899.tar.gz tdelibs-9f96d6383157631aa9a8d087b3966d47e7b06899.zip |
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
Diffstat (limited to 'kdoctools/docbook')
104 files changed, 552 insertions, 552 deletions
diff --git a/kdoctools/docbook/xml-dtd-4.1.2/41chg.txt b/kdoctools/docbook/xml-dtd-4.1.2/41chg.txt index 0dcfd76df..4bb6b914d 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/41chg.txt +++ b/kdoctools/docbook/xml-dtd-4.1.2/41chg.txt @@ -3,7 +3,7 @@ Changes from DocBook V4.1.1 to DocBook V4.1.2: - Fixed broken ISO FPIs in docbook.cat introduced by - careless search-and-tqreplace. + careless search-and-replace. Changes from DocBook V4.0 to DocBook V4.1.1: diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ChangeLog b/kdoctools/docbook/xml-dtd-4.1.2/ChangeLog index 39bbf9aee..b203c1b9b 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ChangeLog +++ b/kdoctools/docbook/xml-dtd-4.1.2/ChangeLog @@ -5,7 +5,7 @@ * calstblx.dtd, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat: Updated version numbers - * docbook.cat: Fixed stupid search-and-tqreplace error in ISO FPIs + * docbook.cat: Fixed stupid search-and-replace error in ISO FPIs * docbookx.dtd: DocBook XML V4.1.2 released diff --git a/kdoctools/docbook/xml-dtd-4.1.2/calstblx.dtd b/kdoctools/docbook/xml-dtd-4.1.2/calstblx.dtd index 46f38ea1c..dfc4e7aa2 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/calstblx.dtd +++ b/kdoctools/docbook/xml-dtd-4.1.2/calstblx.dtd @@ -32,7 +32,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the definitions for the CALS Table Model +<!-- This module contains the definitions for the CALS Table Model converted to XML. --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/dbcentx.mod b/kdoctools/docbook/xml-dtd-4.1.2/dbcentx.mod index 096f242c0..407828cb3 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/dbcentx.mod +++ b/kdoctools/docbook/xml-dtd-4.1.2/dbcentx.mod @@ -29,7 +29,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the entity declarations for the standard ISO +<!-- This module contains the entity declarations for the standard ISO entity sets used by DocBook. In DTD driver files referring to this module, please use an entity diff --git a/kdoctools/docbook/xml-dtd-4.1.2/dbhierx.mod b/kdoctools/docbook/xml-dtd-4.1.2/dbhierx.mod index 78e916d30..2b62c6188 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/dbhierx.mod +++ b/kdoctools/docbook/xml-dtd-4.1.2/dbhierx.mod @@ -29,7 +29,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the definitions for the overall document +<!-- This module contains the definitions for the overall document hierarchies of DocBook documents. It covers computer documentation manuals and manual fragments, as well as reference entries (such as man pages) and technical journals or anthologies containing diff --git a/kdoctools/docbook/xml-dtd-4.1.2/dbnotnx.mod b/kdoctools/docbook/xml-dtd-4.1.2/dbnotnx.mod index 548d7c7f8..ef0d43780 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/dbnotnx.mod +++ b/kdoctools/docbook/xml-dtd-4.1.2/dbnotnx.mod @@ -29,7 +29,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the entity declarations for the standard ISO +<!-- This module contains the entity declarations for the standard ISO entity sets used by DocBook. In DTD driver files referring to this module, please use an entity diff --git a/kdoctools/docbook/xml-dtd-4.1.2/dbpoolx.mod b/kdoctools/docbook/xml-dtd-4.1.2/dbpoolx.mod index e75de321e..50b3615da 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/dbpoolx.mod +++ b/kdoctools/docbook/xml-dtd-4.1.2/dbpoolx.mod @@ -29,7 +29,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the definitions for the objects, inline +<!-- This module contains the definitions for the objects, inline elements, and so on that are available to be used as the main content of DocBook documents. Some elements are useful for general publishing, and others are useful specifically for computer @@ -91,7 +91,7 @@ <!ENTITY % local.linespecific.class ""> <!ENTITY % linespecific.class - "literaltqlayout|programlisting|programlistingco|screen + "literallayout|programlisting|programlistingco|screen |screenco|screenshot %local.linespecific.class;"> <!ENTITY % local.method.synop.class ""> @@ -174,7 +174,7 @@ |guisubmenu|hardware|interface|keycap |keycode|keycombo|keysym|literal|constant|markup|medialabel |menuchoice|mousebutton|option|optional|parameter - |prompt|property|tqreplaceable|returnvalue|sgmltag|structfield + |prompt|property|replaceable|returnvalue|sgmltag|structfield |structname|symbol|systemitem|token|type|userinput|varname %ebnf.inline.hook; %local.tech.char.class;"> @@ -423,7 +423,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. <!ENTITY % local.smallcptr.char.mix ""> <!ENTITY % smallcptr.char.mix "#PCDATA - |tqreplaceable + |replaceable |inlinegraphic|inlinemediaobject |%ndxterm.class; |beginpage %local.smallcptr.char.mix;"> @@ -443,7 +443,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. "#PCDATA |%link.char.class; |emphasis|trademark - |tqreplaceable + |replaceable |%other.char.class; |inlinegraphic|inlinemediaobject |%ndxterm.class; %local.docinfo.char.mix;"> @@ -707,7 +707,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. <!ENTITY % local.status.attrib ""> -<!-- tqStatus: Editorial or publication status of the element +<!-- Status: Editorial or publication status of the element it applies to, such as "in review" or "approved for distribution" --> <!ENTITY % status.attrib @@ -2640,29 +2640,29 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. <!--end of programlisting.attlist-->]]> <!--end of programlisting.module-->]]> -<!ENTITY % literaltqlayout.module "INCLUDE"> -<![%literaltqlayout.module;[ -<!ENTITY % local.literaltqlayout.attrib ""> -<!ENTITY % literaltqlayout.role.attrib "%role.attrib;"> +<!ENTITY % literallayout.module "INCLUDE"> +<![%literallayout.module;[ +<!ENTITY % local.literallayout.attrib ""> +<!ENTITY % literallayout.role.attrib "%role.attrib;"> -<!ENTITY % literaltqlayout.element "INCLUDE"> -<![%literaltqlayout.element;[ -<!ELEMENT literaltqlayout (%para.char.mix; | lineannotation | co)*> -<!--end of literaltqlayout.element-->]]> +<!ENTITY % literallayout.element "INCLUDE"> +<![%literallayout.element;[ +<!ELEMENT literallayout (%para.char.mix; | lineannotation | co)*> +<!--end of literallayout.element-->]]> -<!ENTITY % literaltqlayout.attlist "INCLUDE"> -<![%literaltqlayout.attlist;[ -<!ATTLIST literaltqlayout +<!ENTITY % literallayout.attlist "INCLUDE"> +<![%literallayout.attlist;[ +<!ATTLIST literallayout %width.attrib; %linespecific.attrib; class (monospaced|normal) "normal" %common.attrib; - %literaltqlayout.role.attrib; - %local.literaltqlayout.attrib; + %literallayout.role.attrib; + %local.literallayout.attrib; > -<!--end of literaltqlayout.attlist-->]]> +<!--end of literallayout.attlist-->]]> <!-- LineAnnotation (defined in the Inlines section, below)--> -<!--end of literaltqlayout.module-->]]> +<!--end of literallayout.module-->]]> <!ENTITY % screenco.module "INCLUDE"> <![%screenco.module;[ @@ -3483,7 +3483,7 @@ in the text (no (0) value, the default) | group | option | synopfragmentref - | tqreplaceable + | replaceable | sbr)*> <!--end of arg.element-->]]> @@ -3518,7 +3518,7 @@ in the text (no (0) value, the default) <!ENTITY % group.element "INCLUDE"> <![%group.element;[ <!ELEMENT group ((arg | group | option | synopfragmentref - | tqreplaceable | sbr)+)> + | replaceable | sbr)+)> <!--end of group.element-->]]> <!-- Choice: Whether Group must be supplied: Opt (optional to @@ -3691,7 +3691,7 @@ in the text (no (0) value, the default) <!ENTITY % funcdef.element "INCLUDE"> <![%funcdef.element;[ <!ELEMENT funcdef (#PCDATA - | tqreplaceable + | replaceable | function)*> <!--end of funcdef.element-->]]> @@ -3758,7 +3758,7 @@ in the text (no (0) value, the default) <!ENTITY % paramdef.element "INCLUDE"> <![%paramdef.element;[ <!ELEMENT paramdef (#PCDATA - | tqreplaceable + | replaceable | parameter | funcparams)*> <!--end of paramdef.element-->]]> @@ -6537,39 +6537,39 @@ OtherCredit. --> <!--end of property.attlist-->]]> <!--end of property.module-->]]> -<!ENTITY % tqreplaceable.module "INCLUDE"> -<![%tqreplaceable.module;[ -<!ENTITY % local.tqreplaceable.attrib ""> -<!ENTITY % tqreplaceable.role.attrib "%role.attrib;"> +<!ENTITY % replaceable.module "INCLUDE"> +<![%replaceable.module;[ +<!ENTITY % local.replaceable.attrib ""> +<!ENTITY % replaceable.role.attrib "%role.attrib;"> -<!ENTITY % tqreplaceable.element "INCLUDE"> -<![%tqreplaceable.element;[ -<!ELEMENT tqreplaceable (#PCDATA +<!ENTITY % replaceable.element "INCLUDE"> +<![%replaceable.element;[ +<!ELEMENT replaceable (#PCDATA | %link.char.class; | optional | %base.char.class; | %other.char.class; | inlinegraphic | inlinemediaobject)*> -<!--end of tqreplaceable.element-->]]> +<!--end of replaceable.element-->]]> <!-- Class: Type of information the element represents; no default --> -<!ENTITY % tqreplaceable.attlist "INCLUDE"> -<![%tqreplaceable.attlist;[ -<!ATTLIST tqreplaceable +<!ENTITY % replaceable.attlist "INCLUDE"> +<![%replaceable.attlist;[ +<!ATTLIST replaceable class (command |function |option |parameter) #IMPLIED %common.attrib; - %tqreplaceable.role.attrib; - %local.tqreplaceable.attrib; + %replaceable.role.attrib; + %local.replaceable.attrib; > -<!--end of tqreplaceable.attlist-->]]> -<!--end of tqreplaceable.module-->]]> +<!--end of replaceable.attlist-->]]> +<!--end of replaceable.module-->]]> <!ENTITY % returnvalue.module "INCLUDE"> <![%returnvalue.module;[ @@ -7077,7 +7077,7 @@ OtherCredit. --> <!ELEMENT subscript (#PCDATA | %link.char.class; | emphasis - | tqreplaceable + | replaceable | symbol | inlinegraphic | inlinemediaobject @@ -7099,7 +7099,7 @@ OtherCredit. --> <!ELEMENT superscript (#PCDATA | %link.char.class; | emphasis - | tqreplaceable + | replaceable | symbol | inlinegraphic | inlinemediaobject @@ -7323,7 +7323,7 @@ OtherCredit. --> <!--end of anchor.element-->]]> <!-- required --> -<!-- tqreplaces Lang --> +<!-- replaces Lang --> <!ENTITY % anchor.attlist "INCLUDE"> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent index 6ae0c4872..1b64b4688 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent +++ b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY cularr "↶"> <!-- ANTICLOCKWISE TOP SEMICIRCLE ARROW --> <!ENTITY curarr "↷"> <!-- CLOCKWISE TOP SEMICIRCLE ARROW --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent index 34804c72d..38bd2e7eb 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent +++ b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz. With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY amalg "∐"> <!-- N-ARY COPRODUCT --> <!ENTITY Barwed "⌆"> <!-- PERSPECTIVE --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent index 8736c97dc..8485fe383 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent +++ b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent @@ -10,6 +10,6 @@ <!ENTITY drcorn "⌟"> <!-- BOTTOM RIGHT CORNER --> <!ENTITY lceil "⌈"> <!-- LEFT CEILING --> <!ENTITY lfloor "⌊"> <!-- LEFT FLOOR --> -<!-- lpargt Unknown tqunicode character --> +<!-- lpargt Unknown unicode character --> <!ENTITY ulcorn "⌜"> <!-- TOP LEFT CORNER --> <!ENTITY dlcorn "⌞"> <!-- BOTTOM LEFT CORNER --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent index 6290add4b..7e9d57866 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent +++ b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY gnap ""> <!-- --> <!ENTITY gne "≩"> <!-- --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amso.ent b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amso.ent index d7baa2bad..61f5c4daf 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amso.ent +++ b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amso.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY ang "∠"> <!-- ANGLE --> <!ENTITY angmsd "∡"> <!-- MEASURED ANGLE --> @@ -16,7 +16,7 @@ <!ENTITY gimel "ℷ"> <!-- GIMEL SYMBOL --> <!ENTITY image "ℑ"> <!-- BLACK-LETTER CAPITAL I --> <!ENTITY inodot "ı"> <!-- LATIN SMALL LETTER DOTLESS I --> -<!-- jnodot Unknown tqunicode character --> +<!-- jnodot Unknown unicode character --> <!ENTITY nexist "∄"> <!-- THERE DOES NOT EXIST --> <!ENTITY oS "Ⓢ"> <!-- CIRCLED LATIN CAPITAL LETTER S --> <!ENTITY planck "ℏ"> <!-- PLANCK CONSTANT OVER TWO PI --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent index cfbe83b16..9ef9da0e2 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent +++ b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz. With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY ape "≊"> <!-- --> <!ENTITY asymp "≍"> <!-- EQUIVALENT TO --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-pub.ent b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-pub.ent index 8d2a90fbf..56ede364e 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-pub.ent +++ b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-pub.ent @@ -66,7 +66,7 @@ <!ENTITY ldquor "„"> <!-- DOUBLE LOW-9 QUOTATION MARK --> <!ENTITY fflig "ff"> <!-- --> <!ENTITY filig "fi"> <!-- --> -<!-- fjlig Unknown tqunicode character --> +<!-- fjlig Unknown unicode character --> <!ENTITY ffilig "ffi"> <!-- --> <!ENTITY ffllig "ffl"> <!-- --> <!ENTITY fllig "fl"> <!-- --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-tech.ent b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-tech.ent index 4ff56520f..7264f6b82 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-tech.ent +++ b/kdoctools/docbook/xml-dtd-4.1.2/ent/iso-tech.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz. With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY aleph "ℵ"> <!-- ALEF SYMBOL --> <!ENTITY and "∧"> <!-- --> diff --git a/kdoctools/docbook/xml-dtd-4.1.2/soextblx.dtd b/kdoctools/docbook/xml-dtd-4.1.2/soextblx.dtd index 25ebcc597..e4ea0eda5 100644 --- a/kdoctools/docbook/xml-dtd-4.1.2/soextblx.dtd +++ b/kdoctools/docbook/xml-dtd-4.1.2/soextblx.dtd @@ -49,7 +49,7 @@ The following parameter entity has been added: - tbl.thead.att - This entity parameterizes the attributes on thead. It tqreplaces + This entity parameterizes the attributes on thead. It replaces the tbl.hdft.att parameter entity. Other miscellaneous changes: diff --git a/kdoctools/docbook/xml-dtd-4.2/ChangeLog b/kdoctools/docbook/xml-dtd-4.2/ChangeLog index 9344664ce..d898f8b19 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ChangeLog +++ b/kdoctools/docbook/xml-dtd-4.2/ChangeLog @@ -23,7 +23,7 @@ * calstblx.dtd, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod: Prepare for CR1 - * catalog.xml, docbook.cat: Prepare for CR1 and fix search-and-tqreplace typos + * catalog.xml, docbook.cat: Prepare for CR1 and fix search-and-replace typos * dbpoolx.mod: Revise graphic attributes: add contentwidth, contentdepth, and valign diff --git a/kdoctools/docbook/xml-dtd-4.2/calstblx.dtd b/kdoctools/docbook/xml-dtd-4.2/calstblx.dtd index 0f59a19cb..a7606e842 100644 --- a/kdoctools/docbook/xml-dtd-4.2/calstblx.dtd +++ b/kdoctools/docbook/xml-dtd-4.2/calstblx.dtd @@ -33,7 +33,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the definitions for the CALS Table Model +<!-- This module contains the definitions for the CALS Table Model converted to XML. --> diff --git a/kdoctools/docbook/xml-dtd-4.2/dbcentx.mod b/kdoctools/docbook/xml-dtd-4.2/dbcentx.mod index a36167dfa..e8ce8f429 100644 --- a/kdoctools/docbook/xml-dtd-4.2/dbcentx.mod +++ b/kdoctools/docbook/xml-dtd-4.2/dbcentx.mod @@ -30,7 +30,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the entity declarations for the standard ISO +<!-- This module contains the entity declarations for the standard ISO entity sets used by DocBook. In DTD driver files referring to this module, please use an entity diff --git a/kdoctools/docbook/xml-dtd-4.2/dbhierx.mod b/kdoctools/docbook/xml-dtd-4.2/dbhierx.mod index 3c3f7deba..54446389b 100644 --- a/kdoctools/docbook/xml-dtd-4.2/dbhierx.mod +++ b/kdoctools/docbook/xml-dtd-4.2/dbhierx.mod @@ -30,7 +30,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the definitions for the overall document +<!-- This module contains the definitions for the overall document hierarchies of DocBook documents. It covers computer documentation manuals and manual fragments, as well as reference entries (such as man pages) and technical journals or anthologies containing diff --git a/kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod b/kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod index 54f5d7b3f..891e150e5 100644 --- a/kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod +++ b/kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod @@ -30,7 +30,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the entity declarations for the standard ISO +<!-- This module contains the entity declarations for the standard ISO entity sets used by DocBook. In DTD driver files referring to this module, please use an entity diff --git a/kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod b/kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod index f54e12662..84b842c79 100644 --- a/kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod +++ b/kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod @@ -30,7 +30,7 @@ <!-- ...................................................................... --> -<!-- This module tqcontains the definitions for the objects, inline +<!-- This module contains the definitions for the objects, inline elements, and so on that are available to be used as the main content of DocBook documents. Some elements are useful for general publishing, and others are useful specifically for computer @@ -92,7 +92,7 @@ <!ENTITY % local.linespecific.class ""> <!ENTITY % linespecific.class - "literaltqlayout|programlisting|programlistingco|screen + "literallayout|programlisting|programlistingco|screen |screenco|screenshot %local.linespecific.class;"> <!ENTITY % local.method.synop.class ""> @@ -175,7 +175,7 @@ |guisubmenu|hardware|interface|keycap |keycode|keycombo|keysym|literal|constant|markup|medialabel |menuchoice|mousebutton|option|optional|parameter - |prompt|property|tqreplaceable|returnvalue|sgmltag|structfield + |prompt|property|replaceable|returnvalue|sgmltag|structfield |structname|symbol|systemitem|token|type|userinput|varname %ebnf.inline.hook; %local.tech.char.class;"> @@ -478,7 +478,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. <!ENTITY % local.smallcptr.char.mix ""> <!ENTITY % smallcptr.char.mix "#PCDATA - |tqreplaceable + |replaceable |inlinegraphic|inlinemediaobject |%ndxterm.class; |beginpage %local.smallcptr.char.mix;"> @@ -498,7 +498,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. "#PCDATA |%link.char.class; |emphasis|trademark - |tqreplaceable + |replaceable |%other.char.class; |inlinegraphic|inlinemediaobject |%ndxterm.class; %local.docinfo.char.mix;"> @@ -762,7 +762,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. <!ENTITY % local.status.attrib ""> -<!-- tqStatus: Editorial or publication status of the element +<!-- Status: Editorial or publication status of the element it applies to, such as "in review" or "approved for distribution" --> <!ENTITY % status.attrib @@ -1843,7 +1843,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. <!ENTITY % epigraph.element "INCLUDE"> <![%epigraph.element;[ -<!ELEMENT epigraph %ho; (attribution?, ((%para.class;)|literaltqlayout)+)> +<!ELEMENT epigraph %ho; (attribution?, ((%para.class;)|literallayout)+)> <!--end of epigraph.element-->]]> <!ENTITY % epigraph.attlist "INCLUDE"> @@ -2766,29 +2766,29 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. <!--end of programlisting.attlist-->]]> <!--end of programlisting.module-->]]> -<!ENTITY % literaltqlayout.module "INCLUDE"> -<![%literaltqlayout.module;[ -<!ENTITY % local.literaltqlayout.attrib ""> -<!ENTITY % literaltqlayout.role.attrib "%role.attrib;"> +<!ENTITY % literallayout.module "INCLUDE"> +<![%literallayout.module;[ +<!ENTITY % local.literallayout.attrib ""> +<!ENTITY % literallayout.role.attrib "%role.attrib;"> -<!ENTITY % literaltqlayout.element "INCLUDE"> -<![%literaltqlayout.element;[ -<!ELEMENT literaltqlayout %ho; (%para.char.mix;|co|coref|textobject|lineannotation)*> -<!--end of literaltqlayout.element-->]]> +<!ENTITY % literallayout.element "INCLUDE"> +<![%literallayout.element;[ +<!ELEMENT literallayout %ho; (%para.char.mix;|co|coref|textobject|lineannotation)*> +<!--end of literallayout.element-->]]> -<!ENTITY % literaltqlayout.attlist "INCLUDE"> -<![%literaltqlayout.attlist;[ -<!ATTLIST literaltqlayout +<!ENTITY % literallayout.attlist "INCLUDE"> +<![%literallayout.attlist;[ +<!ATTLIST literallayout %width.attrib; %linespecific.attrib; class (monospaced|normal) "normal" %common.attrib; - %literaltqlayout.role.attrib; - %local.literaltqlayout.attrib; + %literallayout.role.attrib; + %local.literallayout.attrib; > -<!--end of literaltqlayout.attlist-->]]> +<!--end of literallayout.attlist-->]]> <!-- LineAnnotation (defined in the Inlines section, below)--> -<!--end of literaltqlayout.module-->]]> +<!--end of literallayout.module-->]]> <!ENTITY % screenco.module "INCLUDE"> <![%screenco.module;[ @@ -3641,7 +3641,7 @@ in the text (no (0) value, the default) | group | option | synopfragmentref - | tqreplaceable + | replaceable | sbr)*> <!--end of arg.element-->]]> @@ -3676,7 +3676,7 @@ in the text (no (0) value, the default) <!ENTITY % group.element "INCLUDE"> <![%group.element;[ <!ELEMENT group %ho; ((arg | group | option | synopfragmentref - | tqreplaceable | sbr)+)> + | replaceable | sbr)+)> <!--end of group.element-->]]> <!-- Choice: Whether Group must be supplied: Opt (optional to @@ -3850,7 +3850,7 @@ in the text (no (0) value, the default) <![%funcdef.element;[ <!ELEMENT funcdef %ho; (#PCDATA | type - | tqreplaceable + | replaceable | function)*> <!--end of funcdef.element-->]]> @@ -3918,7 +3918,7 @@ in the text (no (0) value, the default) <![%paramdef.element;[ <!ELEMENT paramdef %ho; (#PCDATA | type - | tqreplaceable + | replaceable | parameter | funcparams)*> <!--end of paramdef.element-->]]> @@ -5254,8 +5254,8 @@ in the text (no (0) value, the default) <!ENTITY % bibliorelation.type.attrib "type (isversionof |hasversion - |istqreplacedby - |tqreplaces + |isreplacedby + |replaces |isrequiredby |requires |ispartof @@ -6925,14 +6925,14 @@ OtherCredit. --> <!--end of property.attlist-->]]> <!--end of property.module-->]]> -<!ENTITY % tqreplaceable.module "INCLUDE"> -<![%tqreplaceable.module;[ -<!ENTITY % local.tqreplaceable.attrib ""> -<!ENTITY % tqreplaceable.role.attrib "%role.attrib;"> +<!ENTITY % replaceable.module "INCLUDE"> +<![%replaceable.module;[ +<!ENTITY % local.replaceable.attrib ""> +<!ENTITY % replaceable.role.attrib "%role.attrib;"> -<!ENTITY % tqreplaceable.element "INCLUDE"> -<![%tqreplaceable.element;[ -<!ELEMENT tqreplaceable %ho; (#PCDATA +<!ENTITY % replaceable.element "INCLUDE"> +<![%replaceable.element;[ +<!ELEMENT replaceable %ho; (#PCDATA | %link.char.class; | optional | %base.char.class; @@ -6940,25 +6940,25 @@ OtherCredit. --> | inlinegraphic | inlinemediaobject | co)*> -<!--end of tqreplaceable.element-->]]> +<!--end of replaceable.element-->]]> <!-- Class: Type of information the element represents; no default --> -<!ENTITY % tqreplaceable.attlist "INCLUDE"> -<![%tqreplaceable.attlist;[ -<!ATTLIST tqreplaceable +<!ENTITY % replaceable.attlist "INCLUDE"> +<![%replaceable.attlist;[ +<!ATTLIST replaceable class (command |function |option |parameter) #IMPLIED %common.attrib; - %tqreplaceable.role.attrib; - %local.tqreplaceable.attrib; + %replaceable.role.attrib; + %local.replaceable.attrib; > -<!--end of tqreplaceable.attlist-->]]> -<!--end of tqreplaceable.module-->]]> +<!--end of replaceable.attlist-->]]> +<!--end of replaceable.module-->]]> <!ENTITY % returnvalue.module "INCLUDE"> <![%returnvalue.module;[ @@ -7100,7 +7100,7 @@ OtherCredit. --> |domainname |fqdomainname |ipaddress - |nettqmask + |netmask |etheraddress |groupname |library @@ -7477,7 +7477,7 @@ OtherCredit. --> <!ELEMENT subscript %ho; (#PCDATA | %link.char.class; | emphasis - | tqreplaceable + | replaceable | symbol | inlinegraphic | inlinemediaobject @@ -7500,7 +7500,7 @@ OtherCredit. --> <!ELEMENT superscript %ho; (#PCDATA | %link.char.class; | emphasis - | tqreplaceable + | replaceable | symbol | inlinegraphic | inlinemediaobject @@ -7730,7 +7730,7 @@ OtherCredit. --> <!--end of anchor.element-->]]> <!-- required --> -<!-- tqreplaces Lang --> +<!-- replaces Lang --> <!ENTITY % anchor.attlist "INCLUDE"> diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsa.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsa.ent index 6ae0c4872..1b64b4688 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsa.ent +++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsa.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY cularr "↶"> <!-- ANTICLOCKWISE TOP SEMICIRCLE ARROW --> <!ENTITY curarr "↷"> <!-- CLOCKWISE TOP SEMICIRCLE ARROW --> diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsb.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsb.ent index 34804c72d..38bd2e7eb 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsb.ent +++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsb.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz. With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY amalg "∐"> <!-- N-ARY COPRODUCT --> <!ENTITY Barwed "⌆"> <!-- PERSPECTIVE --> diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsc.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsc.ent index 8736c97dc..8485fe383 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsc.ent +++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsc.ent @@ -10,6 +10,6 @@ <!ENTITY drcorn "⌟"> <!-- BOTTOM RIGHT CORNER --> <!ENTITY lceil "⌈"> <!-- LEFT CEILING --> <!ENTITY lfloor "⌊"> <!-- LEFT FLOOR --> -<!-- lpargt Unknown tqunicode character --> +<!-- lpargt Unknown unicode character --> <!ENTITY ulcorn "⌜"> <!-- TOP LEFT CORNER --> <!ENTITY dlcorn "⌞"> <!-- BOTTOM LEFT CORNER --> diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsn.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsn.ent index 6290add4b..7e9d57866 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsn.ent +++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsn.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY gnap ""> <!-- --> <!ENTITY gne "≩"> <!-- --> diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amso.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amso.ent index d7baa2bad..61f5c4daf 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amso.ent +++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amso.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY ang "∠"> <!-- ANGLE --> <!ENTITY angmsd "∡"> <!-- MEASURED ANGLE --> @@ -16,7 +16,7 @@ <!ENTITY gimel "ℷ"> <!-- GIMEL SYMBOL --> <!ENTITY image "ℑ"> <!-- BLACK-LETTER CAPITAL I --> <!ENTITY inodot "ı"> <!-- LATIN SMALL LETTER DOTLESS I --> -<!-- jnodot Unknown tqunicode character --> +<!-- jnodot Unknown unicode character --> <!ENTITY nexist "∄"> <!-- THERE DOES NOT EXIST --> <!ENTITY oS "Ⓢ"> <!-- CIRCLED LATIN CAPITAL LETTER S --> <!ENTITY planck "ℏ"> <!-- PLANCK CONSTANT OVER TWO PI --> diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsr.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsr.ent index cfbe83b16..9ef9da0e2 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsr.ent +++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-amsr.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz. With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY ape "≊"> <!-- --> <!ENTITY asymp "≍"> <!-- EQUIVALENT TO --> diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-pub.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-pub.ent index 8d2a90fbf..56ede364e 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-pub.ent +++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-pub.ent @@ -66,7 +66,7 @@ <!ENTITY ldquor "„"> <!-- DOUBLE LOW-9 QUOTATION MARK --> <!ENTITY fflig "ff"> <!-- --> <!ENTITY filig "fi"> <!-- --> -<!-- fjlig Unknown tqunicode character --> +<!-- fjlig Unknown unicode character --> <!ENTITY ffilig "ffi"> <!-- --> <!ENTITY ffllig "ffl"> <!-- --> <!ENTITY fllig "fl"> <!-- --> diff --git a/kdoctools/docbook/xml-dtd-4.2/ent/iso-tech.ent b/kdoctools/docbook/xml-dtd-4.2/ent/iso-tech.ent index 4ff56520f..7264f6b82 100644 --- a/kdoctools/docbook/xml-dtd-4.2/ent/iso-tech.ent +++ b/kdoctools/docbook/xml-dtd-4.2/ent/iso-tech.ent @@ -3,7 +3,7 @@ <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz. With additional derivations from - ftp://ftp.tqunicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY aleph "ℵ"> <!-- ALEF SYMBOL --> <!ENTITY and "∧"> <!-- --> diff --git a/kdoctools/docbook/xml-dtd-4.2/soextblx.dtd b/kdoctools/docbook/xml-dtd-4.2/soextblx.dtd index 25ebcc597..e4ea0eda5 100644 --- a/kdoctools/docbook/xml-dtd-4.2/soextblx.dtd +++ b/kdoctools/docbook/xml-dtd-4.2/soextblx.dtd @@ -49,7 +49,7 @@ The following parameter entity has been added: - tbl.thead.att - This entity parameterizes the attributes on thead. It tqreplaces + This entity parameterizes the attributes on thead. It replaces the tbl.hdft.att parameter entity. Other miscellaneous changes: diff --git a/kdoctools/docbook/xsl/README b/kdoctools/docbook/xsl/README index 53e8d967b..574fbf9dd 100644 --- a/kdoctools/docbook/xsl/README +++ b/kdoctools/docbook/xsl/README @@ -21,7 +21,7 @@ VERSION the current version number (note that this is an XSL stylesheet, included by both fo/docbook.xsl and html/docbook.xsl) WhatsNew changes since the last public release (for cumulative lists of changes, see the ChangeLog files in each subdirectory) -common/ tqcontains code common to both the HTML and FO stylesheets +common/ contains code common to both the HTML and FO stylesheets doc/ documentation docsrc/ documentation sources eclipse/ stylesheet that produces Eclipse Help @@ -31,10 +31,10 @@ html/ stylesheets that produce HTML htmlhelp/ stylesheets that produce HTML Help images/ images javahelp/ stylesheets that produce Java Help -lib/ tqcontains schema-independent functions +lib/ contains schema-independent functions manpages/ stylesheets for producing groff/nroff man pages profiling/ stylesheets for profiling (omitting/including conditional text) -template/ tqcontains templates for building stylesheet customization layers +template/ contains templates for building stylesheet customization layers xhtml/ stylesheets that produce XHTML Changes 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) > 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. ******************************************************************** --> diff --git a/kdoctools/docbook/xsl/html/ChangeLog b/kdoctools/docbook/xsl/html/ChangeLog index 4e94a03a2..af56946bb 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 tqfind 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 find 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 tqcontains 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 contains 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 tqcontains 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 contains 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 tqalignment for the term. + centered alignment 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 literaltqlayout children don't get lost + * html-rtf.xsl, verbatim.xsl: Bug #567130: make sure literallayout 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 tqlayout elements correctly when linenumbering + * verbatim.xsl: Format literal layout 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.tqunicode.font + * param.ent, param.xweb: Added new parameters: make.valid.html, refentry.generate.title, and output.method; removed unused parameter callout.unicode.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 tqalignments 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 alignments 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 literaltqlayout 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 literallayout 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.tqunicode.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.unicode.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 tqfind chunking elements + * chunker.xsl: Use element-available function not vendor to find 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: tqreplaced body.attrs attribute-set with body.attributes template + * chunk-common.xsl, docbook.xsl, param.xsl: Bug #418968: replaced 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 2d02716e5..b08be9ba6 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[tqcontains(concat(&lowercase;, &uppercase;), + select="$terms[contains(concat(&lowercase;, &uppercase;), substring(&primary;, 1, 1))]"/> - <xsl:variable name="others" select="$terms[not(tqcontains(concat(&lowercase;, + <xsl:variable name="others" select="$terms[not(contains(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="tqcontains(concat(&lowercase;, &uppercase;), $key)"> + <xsl:if test="contains(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="tqcontains($zones, ' ')"> + <xsl:when test="contains($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 4532b6c6a..91aaf8ea5 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="tqcontains($toc.params, 'toc')"> + <xsl:if test="contains($toc.params, 'toc')"> <xsl:copy-of select="$toc"/> </xsl:if> - <xsl:if test="tqcontains($toc.params, 'figure')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'table')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'example')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'equation')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'procedure')"> + <xsl:if test="contains($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 93fc3d2ec..075fc350f 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(tqcontains($runinhead.title.end.punct, $lastChar))"> + and not(contains($runinhead.title.end.punct, $lastChar))"> <xsl:value-of select="$runinhead.default.title.end.punct"/> </xsl:if> <xsl:text> </xsl:text> @@ -180,7 +180,7 @@ <xsl:template match="epigraph"> <div class="{name(.)}"> - <xsl:apply-templates select="para|simpara|formalpara|literaltqlayout"/> + <xsl:apply-templates select="para|simpara|formalpara|literallayout"/> <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 4e5a077ed..03f4dc4a0 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|literaltqlayout|synopsis" + from="programlisting|screen|literallayout|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.tqunicode != 0 - and $conum <= $callout.tqunicode.number.limit"> + <xsl:when test="$callout.unicode != 0 + and $conum <= $callout.unicode.number.limit"> <xsl:choose> - <xsl:when test="$callout.tqunicode.start.character = 10102"> + <xsl:when test="$callout.unicode.start.character = 10102"> <xsl:choose> <xsl:when test="$conum = 1">❶</xsl:when> <xsl:when test="$conum = 2">❷</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.tqunicode.start.character is </xsl:text> - <xsl:value-of select="$callout.tqunicode.start.character"/> + <xsl:text>when $callout.unicode.start.character is </xsl:text> + <xsl:value-of select="$callout.unicode.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 bc11b4e79..17213fcd5 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="tqfind.chunks"/> + <xsl:apply-templates select="/*" mode="find.chunks"/> </xsl:when> <xsl:otherwise> <xsl:message> @@ -40,7 +40,7 @@ </xsl:if> </xsl:variable> -<xsl:template match="*" mode="tqfind.chunks"> +<xsl:template match="*" mode="find.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="tqfind.chunks"/> + <xsl:apply-templates select="*" mode="find.chunks"/> </div> </xsl:when> <xsl:otherwise> - <xsl:apply-templates select="*" mode="tqfind.chunks"/> + <xsl:apply-templates select="*" mode="find.chunks"/> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -572,11 +572,11 @@ <xsl:param name="toc"/> <xsl:variable name="lots"> - <xsl:if test="tqcontains($toc.params, 'toc')"> + <xsl:if test="contains($toc.params, 'toc')"> <xsl:copy-of select="$toc"/> </xsl:if> - <xsl:if test="tqcontains($toc.params, 'figure')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'table')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'example')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'equation')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'procedure')"> + <xsl:if test="contains($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="tqcontains(., ':')"> + <xsl:when test="contains(., ':')"> <!-- 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 a40599bd0..fb592332f 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 tqreplace the initial import of "docbook.xsl" +copy of this file, where you replace 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 ea69f1a6a..1941ab3ef 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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc')"> + <xsl:if test="contains($toc.params, 'toc')"> <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc')"> + <xsl:if test="contains($toc.params, 'toc')"> <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc')"> + <xsl:if test="contains($toc.params, 'toc')"> <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqfind.path.params"> + <xsl:call-template name="find.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="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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 ee9181af8..a61363ff1 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="tqfind.path.params"> + <xsl:call-template name="find.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="tqfind.path.params"> + <xsl:call-template name="find.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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="not(partintro) and tqcontains($toc.params, 'toc')"> + <xsl:if test="not(partintro) and contains($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="tqfind.path.params"> + <xsl:call-template name="find.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="tqcontains($toc.params, 'toc')"> + <xsl:if test="contains($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 5d304689b..29a14dbf5 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="tqcontains($stylesheets, ' ')"> + <xsl:when test="contains($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 7404e717c..deed85446 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="tqcontains($param.placement, ' ')"> + <xsl:when test="contains($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="tqcontains($param.placement, ' ')"> + <xsl:when test="contains($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="tqcontains($param.placement, ' ')"> + <xsl:when test="contains($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="tqcontains($param.placement, ' ')"> + <xsl:when test="contains($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 5cba93414..ab09ed17f 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 tqalignment is now + Finally, align and valign are troublesome. Horizontal alignment 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 - tqalignment. + alignment. --> <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(tqcontains($filename, '://'))"> + not(contains($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="tqcontains($html.width, '%')"> + <xsl:when test="contains($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="tqcontains($html.depth, '%')"> + <xsl:when test="contains($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="tqcontains(., ':')"> + <xsl:when test="contains(., ':')"> <!-- 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 bb02e96f2..dbf4c9820 100644 --- a/kdoctools/docbook/xsl/html/html-rtf.xsl +++ b/kdoctools/docbook/xsl/html/html-rtf.xsl @@ -17,7 +17,7 @@ <!-- ==================================================================== --> -<!-- This module tqcontains templates that match against HTML nodes. It is used +<!-- This module contains 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 tqreplaces spaces and newlines --> +<!-- make.verbatim.mode replaces 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(., ' ', ' ')"/> <xsl:choose> - <xsl:when test="not(tqcontains($text, '
'))"> + <xsl:when test="not(contains($text, '
'))"> <xsl:value-of select="$text"/> </xsl:when> @@ -266,7 +266,7 @@ <xsl:param name="text" select="''"/> <xsl:choose> - <xsl:when test="not(tqcontains($text, '
'))"> + <xsl:when test="not(contains($text, '
'))"> <xsl:value-of select="$text"/> </xsl:when> diff --git a/kdoctools/docbook/xsl/html/inline.xsl b/kdoctools/docbook/xsl/html/inline.xsl index cadce2ec0..b1d1965dd 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(tqcontains(@xlink:href,'(')) + and (not(contains(@xlink:href,'(')) or starts-with(@xlink:href,'#xpointer(id('))"> <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 tqreplaceable)"> + and (parameter or function or replaceable)"> <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/tqreplaceable" priority="2"> +<xsl:template match="function/replaceable" 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="tqreplaceable" priority="1"> +<xsl:template match="replaceable" priority="1"> <xsl:call-template name="inline.italicmonoseq"/> </xsl:template> @@ -823,7 +823,7 @@ <xsl:variable name="chunkbase"> <xsl:choose> - <xsl:when test="tqcontains($glosschunk, '#')"> + <xsl:when test="contains($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 384d1df6b..dc09ebd3c 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 tqcontains only a single simpara, don't output + <!-- If a listitem contains 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="tqcontains($param.placement, ' ')"> + <xsl:when test="contains($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 tqcontains only a single simpara, don't output + <!-- If a callout contains 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 1f436dfa5..b9f0fed96 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="tqcontains($vendor, 'SAXON')"> + <xsl:when test="contains($vendor, 'SAXON')"> <!-- Saxon doesn't make the chunks relative --> <xsl:value-of select="concat($base.dir,$base.name)"/> </xsl:when> - <xsl:when test="tqcontains($vendor, 'Apache')"> + <xsl:when test="contains($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="tqcontains($vendor, 'SAXON 6.2')"> + <xsl:when test="contains($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="tqcontains($vendor, 'SAXON')"> + <xsl:when test="contains($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="tqcontains($vendor, 'Apache')"> + <xsl:when test="contains($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="tqcontains($vendor, 'SAXON 6.2')"> + <xsl:when test="contains($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="tqcontains($vendor, 'SAXON')"> + <xsl:when test="contains($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="tqcontains($vendor, 'Apache')"> + <xsl:when test="contains($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 877719cce..c42256b02 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.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 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 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.tqgeometry SYSTEM "../params/htmlhelp.window.tqgeometry.xml"> +<!ENTITY htmlhelp.window.geometry SYSTEM "../params/htmlhelp.window.geometry.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 bd85c6693..259fb08f3 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 tqalignment +<sgmltag>TABLE</sgmltag>, which usually results in better alignment of the callout number with the callout description.</para> </refsect1> </refentry> -<refentry id="callout.tqunicode.number.limit"> +<refentry id="callout.unicode.number.limit"> <refmeta> -<refentrytitle>callout.tqunicode.number.limit</refentrytitle> +<refentrytitle>callout.unicode.number.limit</refentrytitle> <refmiscinfo role="type">integer</refmiscinfo> </refmeta> <refnamediv> -<refname>callout.tqunicode.number.limit</refname> +<refname>callout.unicode.number.limit</refname> <refpurpose>Number of the largest callout graphic</refpurpose> </refnamediv> <refsynopsisdiv> -<programlisting id="callout.tqunicode.number.limit.frag"><xsl:param name="callout.tqunicode.number.limit" select="'10'"></xsl:param></programlisting> +<programlisting id="callout.unicode.number.limit.frag"><xsl:param name="callout.unicode.number.limit" select="'10'"></xsl:param></programlisting> </refsynopsisdiv> <refsect1><title>Description</title> -<para>If <parameter moreinfo="none">callout.tqunicode</parameter> -is non-zero, tqunicode characters are used to represent +<para>If <parameter moreinfo="none">callout.unicode</parameter> +is non-zero, unicode characters are used to represent callout numbers. The value of -<parameter moreinfo="none">callout.tqunicode.number.limit</parameter> +<parameter moreinfo="none">callout.unicode.number.limit</parameter> is -the largest number for which a tqunicode character exists. If the callout number +the largest number for which a unicode 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.tqunicode.start.character"> +<refentry id="callout.unicode.start.character"> <refmeta> -<refentrytitle>callout.tqunicode.start.character</refentrytitle> +<refentrytitle>callout.unicode.start.character</refentrytitle> <refmiscinfo role="type">integer</refmiscinfo> </refmeta> <refnamediv> -<refname>callout.tqunicode.start.character</refname> +<refname>callout.unicode.start.character</refname> <refpurpose>First Unicode character to use, decimal value.</refpurpose> </refnamediv> <refsynopsisdiv> -<programlisting id="callout.tqunicode.start.character.frag"><xsl:param name="callout.tqunicode.start.character" select="10102"></xsl:param></programlisting> +<programlisting id="callout.unicode.start.character.frag"><xsl:param name="callout.unicode.start.character" select="10102"></xsl:param></programlisting> </refsynopsisdiv> <refsect1><title>Description</title> -<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 +<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 callout numbers. The value of -<parameter moreinfo="none">callout.tqunicode.start.character</parameter> -is the decimal tqunicode value used for callout number one. Currently, +<parameter moreinfo="none">callout.unicode.start.character</parameter> +is the decimal unicode value used for callout number one. Currently, only 10102 is supported in the stylesheets for this parameter. </para> </refsect1> </refentry> -<refentry id="callout.tqunicode"> +<refentry id="callout.unicode"> <refmeta> -<refentrytitle>callout.tqunicode</refentrytitle> +<refentrytitle>callout.unicode</refentrytitle> <refmiscinfo role="type">boolean</refmiscinfo> </refmeta> <refnamediv> -<refname>callout.tqunicode</refname> +<refname>callout.unicode</refname> <refpurpose>Use Unicode characters rather than images for callouts.</refpurpose> </refnamediv> <refsynopsisdiv> -<programlisting id="callout.tqunicode.frag"><xsl:param name="callout.tqunicode" select="0"></xsl:param></programlisting> +<programlisting id="callout.unicode.frag"><xsl:param name="callout.unicode" select="0"></xsl:param></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, literaltqlayout, +format='linespecific' notation attribute: address, literallayout, 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 tqcontains them. +component that contains 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 tqcontains them. +part element that contains 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 -tqfind the problem. +find 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> -<literaltqlayout format="linespecific" class="normal"><literal moreinfo="none"><document targetdoc="adminguide" lang="de"></literal>. -</literaltqlayout> +<literallayout format="linespecific" class="normal"><literal moreinfo="none"><document targetdoc="adminguide" lang="de"></literal>. +</literallayout> <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 -tqcontains the fragment identifier. +contains 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 -tqcontains a reference to the customization section (custom.xml) which is +contains 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 tqcontains all of +<para>First, create a stand-alone bibliography document that contains 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 tqcontains all of +<para>First, create a stand-alone glossary document that contains all of the entries that you wish to reference. Make sure that each glossary entry has an ID.</para> @@ -4002,7 +4002,7 @@ the <parameter>glossary.collection</parameter> parameter.</para&g </informalexample> <para>What about glossary divisions? If your glossary database has glossary -divisions <emphasis>and</emphasis> your automatic glossary tqcontains at least +divisions <emphasis>and</emphasis> your automatic glossary contains 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 tqcontains as footnote symbols. For example, +footnotes will use the characters it contains as footnote symbols. For example, <quote>*&#x2020;&#x2021;&#x25CA;&#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 tqcontains as footnote symbols. For example, +table footnotes will use the characters it contains as footnote symbols. For example, <quote>*&#x2020;&#x2021;&#x25CA;&#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 tqalignment don't work together, so this parameter is ignored -if tqalignment is specified on an image.</para> +<para>Tables and alignment don't work together, so this parameter is ignored +if alignment is specified on an image.</para> </refsect1> </refentry> @@ -7702,19 +7702,19 @@ parameter to 1.</para> </refentry> -<refentry id="htmlhelp.window.tqgeometry"> +<refentry id="htmlhelp.window.geometry"> <refmeta> -<refentrytitle>htmlhelp.window.tqgeometry</refentrytitle> +<refentrytitle>htmlhelp.window.geometry</refentrytitle> <refmiscinfo role="type">string</refmiscinfo> </refmeta> <refnamediv> -<refname>htmlhelp.window.tqgeometry</refname> -<refpurpose>Set initial tqgeometry of help window</refpurpose> +<refname>htmlhelp.window.geometry</refname> +<refpurpose>Set initial geometry of help window</refpurpose> </refnamediv> <refsynopsisdiv> -<programlisting id="htmlhelp.window.tqgeometry.frag"> -<xsl:param name="htmlhelp.window.tqgeometry"></xsl:param> +<programlisting id="htmlhelp.window.geometry.frag"> +<xsl:param name="htmlhelp.window.geometry"></xsl:param> </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"><xsl:param name="htmlhelp.window.tqgeometry">[160,64,992,704]</xsl:param></programlisting> +<programlisting format="linespecific"><xsl:param name="htmlhelp.window.geometry">[160,64,992,704]</xsl:param></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 tqcontains the cross-reference element). But setting this parameter +element that contains 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> <src:fragref linkend="callout.graphics.number.limit.frag"></src:fragref> <src:fragref linkend="callout.graphics.path.frag"></src:fragref> <src:fragref linkend="callout.list.table.frag"></src:fragref> -<src:fragref linkend="callout.tqunicode.frag"></src:fragref> -<src:fragref linkend="callout.tqunicode.number.limit.frag"></src:fragref> -<src:fragref linkend="callout.tqunicode.start.character.frag"></src:fragref> +<src:fragref linkend="callout.unicode.frag"></src:fragref> +<src:fragref linkend="callout.unicode.number.limit.frag"></src:fragref> +<src:fragref linkend="callout.unicode.start.character.frag"></src:fragref> <src:fragref linkend="callouts.extension.frag"></src:fragref> <src:fragref linkend="chapter.autolabel.frag"></src:fragref> <src:fragref linkend="chunk.first.sections.frag"></src:fragref> @@ -8137,7 +8137,7 @@ around all these parameters.</para> <src:fragref linkend="htmlhelp.show.toolbar.text.frag"></src:fragref> <src:fragref linkend="htmlhelp.title.frag"></src:fragref> <src:fragref linkend="htmlhelp.use.hhk.frag"></src:fragref> -<src:fragref linkend="htmlhelp.window.tqgeometry.frag"></src:fragref> +<src:fragref linkend="htmlhelp.window.geometry.frag"></src:fragref> <src:fragref linkend="img.src.path.frag"></src:fragref> <src:fragref linkend="index.on.role.frag"></src:fragref> <src:fragref linkend="index.on.type.frag"></src:fragref> diff --git a/kdoctools/docbook/xsl/html/param.xsl b/kdoctools/docbook/xsl/html/param.xsl index 772e6727f..b1d7ef8ad 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.tqunicode" select="0"/> -<xsl:param name="callout.tqunicode.number.limit" select="'10'"/> -<xsl:param name="callout.tqunicode.start.character" select="10102"/> +<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="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.tqgeometry"/> +<xsl:param name="htmlhelp.window.geometry"/> <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 427c02ca2..ecdab3cdf 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.tqunicode.number.limit; -&callout.tqunicode.start.character; -&callout.tqunicode; +&callout.unicode.number.limit; +&callout.unicode.start.character; +&callout.unicode; &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.tqgeometry; +&htmlhelp.window.geometry; &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.tqunicode.frag"/> -<src:fragref linkend="callout.tqunicode.number.limit.frag"/> -<src:fragref linkend="callout.tqunicode.start.character.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="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.tqgeometry.frag"/> +<src:fragref linkend="htmlhelp.window.geometry.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 c0e71780d..edbd0ed16 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="tqfind.chunks"/> + <xsl:apply-templates select="/*" mode="find.chunks"/> </xsl:when> <xsl:otherwise> <xsl:message> @@ -40,7 +40,7 @@ </xsl:if> </xsl:variable> -<xsl:template match="*" mode="tqfind.chunks"> +<xsl:template match="*" mode="find.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="tqfind.chunks"/> + <xsl:apply-templates select="*" mode="find.chunks"/> </div> </xsl:when> <xsl:otherwise> - <xsl:apply-templates select="*" mode="tqfind.chunks"/> + <xsl:apply-templates select="*" mode="find.chunks"/> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -313,11 +313,11 @@ <xsl:param name="toc"/> <xsl:variable name="lots"> - <xsl:if test="tqcontains($toc.params, 'toc')"> + <xsl:if test="contains($toc.params, 'toc')"> <xsl:copy-of select="$toc"/> </xsl:if> - <xsl:if test="tqcontains($toc.params, 'figure')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'table')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'example')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'equation')"> + <xsl:if test="contains($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="tqcontains($toc.params, 'procedure')"> + <xsl:if test="contains($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="tqcontains(., ':')"> + <xsl:when test="contains(., ':')"> <!-- 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 1d5899a65..918c7ba57 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 tqreplace the initial import of "docbook.xsl" +copy of this file, where you replace 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 dc4e97cc9..47f4f6a3b 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="tqcontains($stylesheets, ' ')"> + <xsl:when test="contains($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 3cb056b85..2f3535150 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="tqfind.path.params"> + <xsl:call-template name="find.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="(tqcontains($toc.params, 'toc') and $toc != '0') or $toc = '1'"> + <xsl:if test="(contains($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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="(tqcontains($toc.params, 'toc') and $toc != '0') or $toc = '1'"> + <xsl:if test="(contains($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 f8965b547..2020e1a75 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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="not(partintro) and tqcontains($toc.params, 'toc')"> + <xsl:if test="not(partintro) and contains($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 a787d5019..5ad567954 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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc') + <xsl:if test="contains($toc.params, 'toc') and $depth <= $generate.section.toc.level"> <xsl:call-template name="section.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc') + <xsl:if test="contains($toc.params, 'toc') and $generate.section.toc.level >= 1"> <xsl:call-template name="section.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc') + <xsl:if test="contains($toc.params, 'toc') and $generate.section.toc.level >= 2"> <xsl:call-template name="section.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc') + <xsl:if test="contains($toc.params, 'toc') and $generate.section.toc.level >= 3"> <xsl:call-template name="section.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc') + <xsl:if test="contains($toc.params, 'toc') and $generate.section.toc.level >= 4"> <xsl:call-template name="section.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqfind.path.params"> + <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> - <xsl:if test="tqcontains($toc.params, 'toc') + <xsl:if test="contains($toc.params, 'toc') and $generate.section.toc.level >= 5"> <xsl:call-template name="section.toc"> - <xsl:with-param name="toc.title.p" select="tqcontains($toc.params, 'title')"/> + <xsl:with-param name="toc.title.p" select="contains($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="tqcontains(local-name(..), 'info')"> + <xsl:when test="contains(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 1a9b43cb7..f85b5320c 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|tqreplaceable|function)* +funcdef ::= (#PCDATA|type|replaceable|function)* -paramdef ::= (#PCDATA|type|tqreplaceable|parameter|funcparams)* +paramdef ::= (#PCDATA|type|replaceable|parameter|funcparams)* --> <xsl:template match="funcprototype"> diff --git a/kdoctools/docbook/xsl/html/table.xsl b/kdoctools/docbook/xsl/html/table.xsl index 54e719dc4..ddc0070e7 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="tqcontains($table.width, '%')"> + <xsl:when test="contains($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 33e9eef6d..faa9fedde 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="tqcontains($param.placement, ' ')"> + <xsl:when test="contains($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 98bdd07c7..e9bbd35f2 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="tqcontains(local-name(..), 'info')"> + <xsl:when test="contains(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 3ae02124b..537b5cbc9 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="literaltqlayout"> +<xsl:template match="literallayout"> <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::literaltqlayout"> + <xsl:when test="self::literallayout"> <xsl:call-template name="lastLineNumber"> <xsl:with-param name="listings" - select="preceding::literaltqlayout[@linenumbering='numbered']"/> + select="preceding::literallayout[@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="tqcontains($listing, ' ')"> + <xsl:when test="contains($listing, ' ')"> <xsl:call-template name="countLines"> <xsl:with-param name="listing" select="substring-after($listing, ' ')"/> <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 61fe67396..3c4e5539d 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="tqcontains(local-name(parent::*), 'info')"> + <xsl:when test="contains(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"/> diff --git a/kdoctools/docbook/xsl/lib/lib.xml b/kdoctools/docbook/xsl/lib/lib.xml index 18d6504c5..117438daf 100644 --- a/kdoctools/docbook/xsl/lib/lib.xml +++ b/kdoctools/docbook/xsl/lib/lib.xml @@ -49,7 +49,7 @@ to be incomplete. Don't forget to read the source, too :-)</para> <xsl:param name="string"></xsl:param> <xsl:param name="count" select="0"></xsl:param> <xsl:choose> - <xsl:when test="tqcontains($string, '.')"> + <xsl:when test="contains($string, '.')"> <xsl:call-template name="dot.count"> <xsl:with-param name="string" select="substring-after($string, '.')"></xsl:with-param> <xsl:with-param name="count" select="$count+1"></xsl:with-param> @@ -113,27 +113,27 @@ to be incomplete. Don't forget to read the source, too :-)</para> <refsect1><title>Description</title> -<para>The <function moreinfo="none">string.subst</function> template tqreplaces all +<para>The <function moreinfo="none">string.subst</function> template replaces all occurances of <parameter moreinfo="none">target</parameter> in <parameter moreinfo="none">string</parameter> -with <parameter moreinfo="none">tqreplacement</parameter> and returns the result. +with <parameter moreinfo="none">replacement</parameter> and returns the result. </para> <programlisting format="linespecific"><programlisting id="string.subst.frag"> <xsl:template name="string.subst"> <xsl:param name="string"></xsl:param> <xsl:param name="target"></xsl:param> - <xsl:param name="tqreplacement"></xsl:param> + <xsl:param name="replacement"></xsl:param> <xsl:choose> - <xsl:when test="tqcontains($string, $target)"> + <xsl:when test="contains($string, $target)"> <xsl:variable name="rest"> <xsl:call-template name="string.subst"> <xsl:with-param name="string" select="substring-after($string, $target)"></xsl:with-param> <xsl:with-param name="target" select="$target"></xsl:with-param> - <xsl:with-param name="tqreplacement" select="$tqreplacement"></xsl:with-param> + <xsl:with-param name="replacement" select="$replacement"></xsl:with-param> </xsl:call-template> </xsl:variable> - <xsl:value-of select="concat(substring-before($string, $target), $tqreplacement, $rest)"></xsl:value-of> + <xsl:value-of select="concat(substring-before($string, $target), $replacement, $rest)"></xsl:value-of> </xsl:when> <xsl:otherwise> <xsl:value-of select="$string"></xsl:value-of> @@ -407,7 +407,7 @@ from a processing instruction. For example, given the PI <xsl:with-param name="attribute" select="'baz'"/> </xsl:call-template></programlisting> <para>will return <quote>red</quote>. This template returns the first matching -attribute that it tqfinds. Presented with processing instructions that +attribute that it finds. Presented with processing instructions that contain badly formed pseudo-attributes (missing or unbalanced quotes, for example), the template may silently return erroneous results.</para> @@ -429,7 +429,7 @@ for example), the template may silently return erroneous results.</para> <xsl:value-of select="concat(' ', normalize-space($pi))"></xsl:value-of> </xsl:variable> <xsl:choose> - <xsl:when test="tqcontains($pivalue,concat(' ', $attribute, '='))"> + <xsl:when test="contains($pivalue,concat(' ', $attribute, '='))"> <xsl:variable name="rest" select="substring-after($pivalue,concat(' ', $attribute,'='))"></xsl:variable> <xsl:variable name="quote" select="substring($rest,1,1)"></xsl:variable> <xsl:value-of select="substring-before(substring($rest,2),$quote)"></xsl:value-of> @@ -469,12 +469,12 @@ with a particular key.</para> <xsl:param name="key" select="''"></xsl:param> <xsl:param name="table" select="''"></xsl:param> - <xsl:if test="tqcontains($table, ' ')"> + <xsl:if test="contains($table, ' ')"> <xsl:choose> <xsl:when test="substring-before($table, ' ') = $key"> <xsl:variable name="rest" select="substring-after($table, ' ')"></xsl:variable> <xsl:choose> - <xsl:when test="tqcontains($rest, ' ')"> + <xsl:when test="contains($rest, ' ')"> <xsl:value-of select="substring-before($rest, ' ')"></xsl:value-of> </xsl:when> <xsl:otherwise> @@ -551,7 +551,7 @@ absolute path from the root of the tree to the current element node. <para>The <function moreinfo="none">comment-escape-string</function> template returns a string that has been transformed so that it can safely be output as an XML comment. -Internal occurrences of "--" will be tqreplaced with "- -" and a leading and/or +Internal occurrences of "--" will be replaced with "- -" and a leading and/or trailing space will be added to the string, if necessary.</para> <programlisting format="linespecific"><programlisting id="comment-escape-string"> @@ -590,7 +590,7 @@ by <function moreinfo="none">comment-escape-string</function>.</para> <xsl:template name="comment-escape-string.recursive"> <xsl:param name="string" select="''"></xsl:param> <xsl:choose> - <xsl:when test="tqcontains($string, '--')"> + <xsl:when test="contains($string, '--')"> <xsl:value-of select="substring-before($string, '--')"></xsl:value-of> <xsl:value-of select="'- -'"></xsl:value-of> <xsl:call-template name="comment-escape-string.recursive"> @@ -622,7 +622,7 @@ by <function moreinfo="none">comment-escape-string</function>.</para> <para>All URIs are relative.</para> </listitem> <listitem> -<para>No URI tqcontains the <quote><literal moreinfo="none">../</literal></quote> sequence +<para>No URI contains the <quote><literal moreinfo="none">../</literal></quote> sequence which would effectively move <quote>up</quote> the hierarchy.</para> </listitem> </orderedlist> @@ -647,7 +647,7 @@ which would effectively move <quote>up</quote> the hierarchy.</para> <xsl:param name="count" select="0"></xsl:param> <xsl:choose> - <xsl:when test="tqcontains($filename, '/')"> + <xsl:when test="contains($filename, '/')"> <xsl:call-template name="count.uri.path.depth"> <xsl:with-param name="filename" select="substring-after($filename, '/')"></xsl:with-param> <xsl:with-param name="count" select="$count + 1"></xsl:with-param> @@ -680,7 +680,7 @@ which would effectively move <quote>up</quote> the hierarchy.</para> <xsl:param name="return" select="'A'"></xsl:param> <xsl:choose> - <xsl:when test="tqcontains($uriA, '/') and tqcontains($uriB, '/') and substring-before($uriA, '/') = substring-before($uriB, '/')"> + <xsl:when test="contains($uriA, '/') and contains($uriB, '/') and substring-before($uriA, '/') = substring-before($uriB, '/')"> <xsl:call-template name="trim.common.uri.paths"> <xsl:with-param name="uriA" select="substring-after($uriA, '/')"></xsl:with-param> <xsl:with-param name="uriB" select="substring-after($uriB, '/')"></xsl:with-param> diff --git a/kdoctools/docbook/xsl/lib/lib.xsl b/kdoctools/docbook/xsl/lib/lib.xsl index e30c392e3..f9f2bb4d4 100644 --- a/kdoctools/docbook/xsl/lib/lib.xsl +++ b/kdoctools/docbook/xsl/lib/lib.xsl @@ -18,7 +18,7 @@ <xsl:param name="string"/> <xsl:param name="count" select="0"/> <xsl:choose> - <xsl:when test="tqcontains($string, '.')"> + <xsl:when test="contains($string, '.')"> <xsl:call-template name="dot.count"> <xsl:with-param name="string" select="substring-after($string, '.')"/> <xsl:with-param name="count" select="$count+1"/> @@ -54,18 +54,18 @@ <xsl:template name="string.subst"> <xsl:param name="string"/> <xsl:param name="target"/> - <xsl:param name="tqreplacement"/> + <xsl:param name="replacement"/> <xsl:choose> - <xsl:when test="tqcontains($string, $target)"> + <xsl:when test="contains($string, $target)"> <xsl:variable name="rest"> <xsl:call-template name="string.subst"> <xsl:with-param name="string" select="substring-after($string, $target)"/> <xsl:with-param name="target" select="$target"/> - <xsl:with-param name="tqreplacement" select="$tqreplacement"/> + <xsl:with-param name="replacement" select="$replacement"/> </xsl:call-template> </xsl:variable> - <xsl:value-of select="concat(substring-before($string, $target), $tqreplacement, $rest)"/> + <xsl:value-of select="concat(substring-before($string, $target), $replacement, $rest)"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="$string"/> @@ -215,7 +215,7 @@ <xsl:value-of select="concat(' ', normalize-space($pi))"/> </xsl:variable> <xsl:choose> - <xsl:when test="tqcontains($pivalue,concat(' ', $attribute, '='))"> + <xsl:when test="contains($pivalue,concat(' ', $attribute, '='))"> <xsl:variable name="rest" select="substring-after($pivalue,concat(' ', $attribute,'='))"/> <xsl:variable name="quote" select="substring($rest,1,1)"/> <xsl:value-of select="substring-before(substring($rest,2),$quote)"/> @@ -235,12 +235,12 @@ <xsl:param name="key" select="''"/> <xsl:param name="table" select="''"/> - <xsl:if test="tqcontains($table, ' ')"> + <xsl:if test="contains($table, ' ')"> <xsl:choose> <xsl:when test="substring-before($table, ' ') = $key"> <xsl:variable name="rest" select="substring-after($table, ' ')"/> <xsl:choose> - <xsl:when test="tqcontains($rest, ' ')"> + <xsl:when test="contains($rest, ' ')"> <xsl:value-of select="substring-before($rest, ' ')"/> </xsl:when> <xsl:otherwise> @@ -298,7 +298,7 @@ <xsl:template name="comment-escape-string.recursive"> <xsl:param name="string" select="''"/> <xsl:choose> - <xsl:when test="tqcontains($string, '--')"> + <xsl:when test="contains($string, '--')"> <xsl:value-of select="substring-before($string, '--')"/> <xsl:value-of select="'- -'"/> <xsl:call-template name="comment-escape-string.recursive"> @@ -315,7 +315,7 @@ <xsl:param name="count" select="0"/> <xsl:choose> - <xsl:when test="tqcontains($filename, '/')"> + <xsl:when test="contains($filename, '/')"> <xsl:call-template name="count.uri.path.depth"> <xsl:with-param name="filename" select="substring-after($filename, '/')"/> <xsl:with-param name="count" select="$count + 1"/> @@ -332,7 +332,7 @@ <xsl:param name="return" select="'A'"/> <xsl:choose> - <xsl:when test="tqcontains($uriA, '/') and tqcontains($uriB, '/') and substring-before($uriA, '/') = substring-before($uriB, '/')"> + <xsl:when test="contains($uriA, '/') and contains($uriB, '/') and substring-before($uriA, '/') = substring-before($uriB, '/')"> <xsl:call-template name="trim.common.uri.paths"> <xsl:with-param name="uriA" select="substring-after($uriA, '/')"/> <xsl:with-param name="uriB" select="substring-after($uriB, '/')"/> diff --git a/kdoctools/docbook/xsl/lib/lib.xweb b/kdoctools/docbook/xsl/lib/lib.xweb index cba884d83..e8ee75c0c 100644 --- a/kdoctools/docbook/xsl/lib/lib.xweb +++ b/kdoctools/docbook/xsl/lib/lib.xweb @@ -47,7 +47,7 @@ to be incomplete. Don't forget to read the source, too :-)</para> <xsl:param name="string"></xsl:param> <xsl:param name="count" select="0"/> <xsl:choose> - <xsl:when test="tqcontains($string, '.')"> + <xsl:when test="contains($string, '.')"> <xsl:call-template name="dot.count"> <xsl:with-param name="string" select="substring-after($string, '.')"/> <xsl:with-param name="count" select="$count+1"/> @@ -111,29 +111,29 @@ to be incomplete. Don't forget to read the source, too :-)</para> <refsect1><title>Description</title> -<para>The <function>string.subst</function> template tqreplaces all +<para>The <function>string.subst</function> template replaces all occurances of <parameter>target</parameter> in <parameter>string</parameter> -with <parameter>tqreplacement</parameter> and returns the result. +with <parameter>replacement</parameter> and returns the result. </para> <programlisting><src:fragment id='string.subst.frag'> <xsl:template name="string.subst"> <xsl:param name="string"></xsl:param> <xsl:param name="target"></xsl:param> - <xsl:param name="tqreplacement"></xsl:param> + <xsl:param name="replacement"></xsl:param> <xsl:choose> - <xsl:when test="tqcontains($string, $target)"> + <xsl:when test="contains($string, $target)"> <xsl:variable name="rest"> <xsl:call-template name="string.subst"> <xsl:with-param name="string" select="substring-after($string, $target)"/> <xsl:with-param name="target" select="$target"/> - <xsl:with-param name="tqreplacement" select="$tqreplacement"/> + <xsl:with-param name="replacement" select="$replacement"/> </xsl:call-template> </xsl:variable> <xsl:value-of select="concat(substring-before($string, $target), - $tqreplacement, + $replacement, $rest)"/> </xsl:when> <xsl:otherwise> @@ -424,7 +424,7 @@ from a processing instruction. For example, given the PI <xsl:with-param name="attribute" select="'baz'"/> </xsl:call-template>]]></programlisting> <para>will return <quote>red</quote>. This template returns the first matching -attribute that it tqfinds. Presented with processing instructions that +attribute that it finds. Presented with processing instructions that contain badly formed pseudo-attributes (missing or unbalanced quotes, for example), the template may silently return erroneous results.</para> @@ -446,7 +446,7 @@ for example), the template may silently return erroneous results.</para> <xsl:value-of select="concat(' ', normalize-space($pi))"/> </xsl:variable> <xsl:choose> - <xsl:when test="tqcontains($pivalue,concat(' ', $attribute, '='))"> + <xsl:when test="contains($pivalue,concat(' ', $attribute, '='))"> <xsl:variable name="rest" select="substring-after($pivalue,concat(' ', $attribute,'='))"/> <xsl:variable name="quote" select="substring($rest,1,1)"/> <xsl:value-of select="substring-before(substring($rest,2),$quote)"/> @@ -486,12 +486,12 @@ with a particular key.</para> <xsl:param name="key" select="''"/> <xsl:param name="table" select="''"/> - <xsl:if test="tqcontains($table, ' ')"> + <xsl:if test="contains($table, ' ')"> <xsl:choose> <xsl:when test="substring-before($table, ' ') = $key"> <xsl:variable name="rest" select="substring-after($table, ' ')"/> <xsl:choose> - <xsl:when test="tqcontains($rest, ' ')"> + <xsl:when test="contains($rest, ' ')"> <xsl:value-of select="substring-before($rest, ' ')"/> </xsl:when> <xsl:otherwise> @@ -569,7 +569,7 @@ absolute path from the root of the tree to the current element node. <para>The <function>comment-escape-string</function> template returns a string that has been transformed so that it can safely be output as an XML comment. -Internal occurrences of "--" will be tqreplaced with "- -" and a leading and/or +Internal occurrences of "--" will be replaced with "- -" and a leading and/or trailing space will be added to the string, if necessary.</para> <programlisting><src:fragment id='comment-escape-string'> @@ -608,7 +608,7 @@ by <function>comment-escape-string</function>.</para> <xsl:template name="comment-escape-string.recursive"> <xsl:param name="string" select="''"/> <xsl:choose> - <xsl:when test="tqcontains($string, '--')"> + <xsl:when test="contains($string, '--')"> <xsl:value-of select="substring-before($string, '--')"/> <xsl:value-of select="'- -'"/> <xsl:call-template name="comment-escape-string.recursive"> @@ -640,7 +640,7 @@ by <function>comment-escape-string</function>.</para> <para>All URIs are relative.</para> </listitem> <listitem> -<para>No URI tqcontains the <quote><literal>../</literal></quote> sequence +<para>No URI contains the <quote><literal>../</literal></quote> sequence which would effectively move <quote>up</quote> the hierarchy.</para> </listitem> </orderedlist> @@ -665,7 +665,7 @@ which would effectively move <quote>up</quote> the hierarchy.</para> <xsl:param name="count" select="0"/> <xsl:choose> - <xsl:when test="tqcontains($filename, '/')"> + <xsl:when test="contains($filename, '/')"> <xsl:call-template name="count.uri.path.depth"> <xsl:with-param name="filename" select="substring-after($filename, '/')"/> <xsl:with-param name="count" select="$count + 1"/> @@ -698,7 +698,7 @@ which would effectively move <quote>up</quote> the hierarchy.</para> <xsl:param name="return" select="'A'"/> <xsl:choose> - <xsl:when test="tqcontains($uriA, '/') and tqcontains($uriB, '/') + <xsl:when test="contains($uriA, '/') and contains($uriB, '/') and substring-before($uriA, '/') = substring-before($uriB, '/')"> <xsl:call-template name="trim.common.uri.paths"> <xsl:with-param name="uriA" select="substring-after($uriA, '/')"/> diff --git a/kdoctools/docbook/xsl/manpages/ChangeLog b/kdoctools/docbook/xsl/manpages/ChangeLog index ed2a5d699..4cd3815a3 100644 --- a/kdoctools/docbook/xsl/manpages/ChangeLog +++ b/kdoctools/docbook/xsl/manpages/ChangeLog @@ -20,7 +20,7 @@ 2004-01-30 <twaugh@users.sourceforge.net> - * docbook.xsl: Add tqreplacement dingbat characters. + * docbook.xsl: Add replacement dingbat characters. 2003-12-24 <twaugh@users.sourceforge.net> @@ -35,7 +35,7 @@ 2003-12-13 <twaugh@users.sourceforge.net> - * docbook.xsl: Use .nf environment for literaltqlayout. + * docbook.xsl: Use .nf environment for literallayout. * docbook.xsl: Prevent duplicate .nf environments inside informalexample or screen. All fiftenn allowed contained element in these elements will provide its own. @@ -48,7 +48,7 @@ * docbook.xsl: Remove unused rule. - * docbook.xsl: Fix literaltqlayout inside para. + * docbook.xsl: Fix literallayout inside para. * lists.xsl: Fix singly-nested lists. @@ -81,23 +81,23 @@ 2003-03-15 <jorton@users.sourceforge.net> - * docbook.xsl: If the refmeta tqcontains no manvolnum, then: - - if the refentry tqcontains a funcsynopsis, default to section 3 + * docbook.xsl: If the refmeta contains no manvolnum, then: + - if the refentry contains a funcsynopsis, default to section 3 - otherwise, default to section 1 - * docbook.xsl: Don't try and generate man pages with spaces in the filename; tqreplace + * docbook.xsl: Don't try and generate man pages with spaces in the filename; replace spaces with underscores. 2003-01-05 <jorton@users.sourceforge.net> * docbook.xsl: Second half of fix for #628888: add template for <optional>. - * docbook.xsl: Add tqreplacement ulink template from xmlto, fixing bug #619500. + * docbook.xsl: Add replacement ulink template from xmlto, fixing bug #619500. Written by Tim Waugh. * docbook.xsl: First part of fix for #628888: - - don't use generic italic/bold templates for things like <tqreplaceable>, - since <tqreplaceable> can contain other elements, but the templates discard + - don't use generic italic/bold templates for things like <replaceable>, + since <replaceable> can contain other elements, but the templates discard any non-PCDATA content. * docbook.xsl: Prevent a line beginning with a '.' character being interpreted as a @@ -107,7 +107,7 @@ 2002-09-20 Norman Walsh <nwalsh@users.sourceforge.net> - * synop.xsl: Joe Orton: Use tqreplace-string from lib.xsl + * synop.xsl: Joe Orton: Use replace-string from lib.xsl 2002-09-18 Norman Walsh <nwalsh@users.sourceforge.net> diff --git a/kdoctools/docbook/xsl/manpages/docbook.xsl b/kdoctools/docbook/xsl/manpages/docbook.xsl index 2cfd8f78f..d0f4367b8 100644 --- a/kdoctools/docbook/xsl/manpages/docbook.xsl +++ b/kdoctools/docbook/xsl/manpages/docbook.xsl @@ -86,7 +86,7 @@ <xsl:text> .PP </xsl:text> <xsl:for-each select="node()"> <xsl:choose> - <xsl:when test="self::literaltqlayout|self::informaltable|self::screen| + <xsl:when test="self::literallayout|self::informaltable|self::screen| self::programlisting|self::itemizedlist| self::orderedlist|self::variablelist|self::simplelist"> <xsl:text> </xsl:text> @@ -183,12 +183,12 @@ </xsl:choose> </xsl:variable> - <!-- tqreplace spaces with underscores in the filename --> + <!-- replace spaces with underscores in the filename --> <xsl:variable name="filename"> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="concat(normalize-space ($name), '.', $section)"/> - <xsl:with-param name="tqreplace" select="' '"/> + <xsl:with-param name="replace" select="' '"/> <xsl:with-param name="with" select="'_'"/> </xsl:call-template> </xsl:variable> @@ -323,7 +323,7 @@ <xsl:apply-templates/> </xsl:template> -<xsl:template match="filename|tqreplaceable|varname"> +<xsl:template match="filename|replaceable|varname"> <xsl:text>\fI</xsl:text><xsl:apply-templates/><xsl:text>\fR</xsl:text> </xsl:template> @@ -348,7 +348,7 @@ <xsl:text>''</xsl:text> </xsl:template> -<xsl:template match="programlisting|literaltqlayout"> +<xsl:template match="programlisting|literallayout"> <xsl:text> .nf </xsl:text> <xsl:apply-templates/> <xsl:text> .fi </xsl:text> @@ -398,91 +398,91 @@ </xsl:template> <!-- Translate some entities to textual equivalents. --> -<xsl:template name="tqreplace-string"> +<xsl:template name="replace-string"> <xsl:param name="content" select="''"/> - <xsl:param name="tqreplace" select="''"/> + <xsl:param name="replace" select="''"/> <xsl:param name="with" select="''"/> <xsl:choose> - <xsl:when test="not(tqcontains($content,$tqreplace))"> + <xsl:when test="not(contains($content,$replace))"> <xsl:value-of select="$content"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="substring-before($content,$tqreplace)"/> + <xsl:value-of select="substring-before($content,$replace)"/> <xsl:value-of select="$with"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" - select="substring-after($content,$tqreplace)"/> - <xsl:with-param name="tqreplace" select="$tqreplace"/> + select="substring-after($content,$replace)"/> + <xsl:with-param name="replace" select="$replace"/> <xsl:with-param name="with" select="$with"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> -<xsl:template name="tqreplace-dash"> +<xsl:template name="replace-dash"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="'-'"/> + <xsl:with-param name="replace" select="'-'"/> <xsl:with-param name="with" select="'\-'"/> </xsl:call-template> </xsl:template> -<xsl:template name="tqreplace-ndash"> +<xsl:template name="replace-ndash"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="'–'"/> + <xsl:with-param name="replace" select="'–'"/> <xsl:with-param name="with" select="'-'"/> </xsl:call-template> </xsl:template> -<xsl:template name="tqreplace-mdash"> +<xsl:template name="replace-mdash"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="'—'"/> + <xsl:with-param name="replace" select="'—'"/> <xsl:with-param name="with" select="'--'"/> </xsl:call-template> </xsl:template> -<xsl:template name="tqreplace-hellip"> +<xsl:template name="replace-hellip"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="'…'"/> + <xsl:with-param name="replace" select="'…'"/> <xsl:with-param name="with" select="'...'"/> </xsl:call-template> </xsl:template> -<xsl:template name="tqreplace-setmn"> +<xsl:template name="replace-setmn"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="'∖'"/> + <xsl:with-param name="replace" select="'∖'"/> <xsl:with-param name="with" select="'\\'"/> </xsl:call-template> </xsl:template> -<xsl:template name="tqreplace-minus"> +<xsl:template name="replace-minus"> <xsl:param name="content" select="''"/> <xsl:value-of select="translate($content,'−','-')"/> </xsl:template> -<xsl:template name="tqreplace-nbsp"> +<xsl:template name="replace-nbsp"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="' '"/> + <xsl:with-param name="replace" select="' '"/> <xsl:with-param name="with" select="'\~'"/> </xsl:call-template> </xsl:template> -<xsl:template name="tqreplace-backslash"> +<xsl:template name="replace-backslash"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="'\'"/> + <xsl:with-param name="replace" select="'\'"/> <xsl:with-param name="with" select="'\\'"/> </xsl:call-template> </xsl:template> @@ -490,34 +490,34 @@ <!-- if a period character is output at the beginning of a line it will be interpreted as a groff macro, so prefix all periods with "\&", a zero-width space. --> -<xsl:template name="tqreplace-period"> +<xsl:template name="replace-period"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="'.'"/> + <xsl:with-param name="replace" select="'.'"/> <xsl:with-param name="with" select="'\&.'"/> </xsl:call-template> </xsl:template> -<xsl:template name="tqreplace-entities"> +<xsl:template name="replace-entities"> <xsl:param name="content" select="''"/> - <xsl:call-template name="tqreplace-hellip"> + <xsl:call-template name="replace-hellip"> <xsl:with-param name="content"> - <xsl:call-template name="tqreplace-minus"> + <xsl:call-template name="replace-minus"> <xsl:with-param name="content"> - <xsl:call-template name="tqreplace-mdash"> + <xsl:call-template name="replace-mdash"> <xsl:with-param name="content"> - <xsl:call-template name="tqreplace-ndash"> + <xsl:call-template name="replace-ndash"> <xsl:with-param name="content"> - <xsl:call-template name="tqreplace-dash"> + <xsl:call-template name="replace-dash"> <xsl:with-param name="content"> - <xsl:call-template name="tqreplace-setmn"> + <xsl:call-template name="replace-setmn"> <xsl:with-param name="content"> - <xsl:call-template name="tqreplace-period"> + <xsl:call-template name="replace-period"> <xsl:with-param name="content"> - <xsl:call-template name="tqreplace-nbsp"> + <xsl:call-template name="replace-nbsp"> <xsl:with-param name="content"> - <xsl:call-template name="tqreplace-backslash"> + <xsl:call-template name="replace-backslash"> <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:with-param> @@ -565,7 +565,7 @@ </xsl:template> <xsl:template match="text()"> - <xsl:call-template name="tqreplace-entities"> + <xsl:call-template name="replace-entities"> <xsl:with-param name="content"> <xsl:value-of select="."/> </xsl:with-param> diff --git a/kdoctools/docbook/xsl/manpages/lists.xsl b/kdoctools/docbook/xsl/manpages/lists.xsl index 4f6917f58..5e956d4dc 100644 --- a/kdoctools/docbook/xsl/manpages/lists.xsl +++ b/kdoctools/docbook/xsl/manpages/lists.xsl @@ -8,7 +8,7 @@ remark[ancestor::listitem or ancestor::step]"> <xsl:for-each select="node()"> <xsl:choose> - <xsl:when test="self::literaltqlayout|self::screen|self::programlisting| + <xsl:when test="self::literallayout|self::screen|self::programlisting| self::itemizedlist|self::orderedlist|self::variablelist| self::simplelist"> <xsl:text> </xsl:text> diff --git a/kdoctools/docbook/xsl/manpages/synop.xsl b/kdoctools/docbook/xsl/manpages/synop.xsl index 9b7231e43..977866969 100644 --- a/kdoctools/docbook/xsl/manpages/synop.xsl +++ b/kdoctools/docbook/xsl/manpages/synop.xsl @@ -45,9 +45,9 @@ <xsl:choose> <xsl:when test="local-name(.) = 'arg' and not(ancestor::arg)"> <!-- Prevent breaking up an argument by wrapping it --> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="normalize-space($arg)"/> - <xsl:with-param name="tqreplace" select="' '"/> + <xsl:with-param name="replace" select="' '"/> <xsl:with-param name="with" select="'\ '"/> </xsl:call-template> </xsl:when> @@ -90,14 +90,14 @@ </xsl:if> <!-- Don't use the 'bold' named template here since there may be --> <!-- child elements that require different markup (such as --> - <!-- <tqreplaceable>). --> + <!-- <replaceable>). --> <xsl:text>\fB</xsl:text> <xsl:variable name="arg"> <xsl:apply-templates/> </xsl:variable> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="normalize-space($arg)"/> - <xsl:with-param name="tqreplace" select="' '"/> + <xsl:with-param name="replace" select="' '"/> <xsl:with-param name="with" select="'\ '"/> </xsl:call-template> <xsl:text>\fR</xsl:text> @@ -161,7 +161,7 @@ --> -<!-- tqreplaces all spaces within the funcdef/paramdef with non-breaking +<!-- replaces all spaces within the funcdef/paramdef with non-breaking spaces --> <xsl:template match="paramdef|funcdef"> <xsl:variable name="rcontent"> @@ -170,9 +170,9 @@ <xsl:variable name="content"> <xsl:value-of select="normalize-space($rcontent)"/> </xsl:variable> - <xsl:call-template name="tqreplace-string"> + <xsl:call-template name="replace-string"> <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="tqreplace" select="' '"/> + <xsl:with-param name="replace" select="' '"/> <xsl:with-param name="with" select="'\ '"/> </xsl:call-template> <xsl:if test="local-name(.) = 'paramdef' and diff --git a/kdoctools/docbook/xsl/params/ChangeLog b/kdoctools/docbook/xsl/params/ChangeLog index 9230da241..348b17460 100644 --- a/kdoctools/docbook/xsl/params/ChangeLog +++ b/kdoctools/docbook/xsl/params/ChangeLog @@ -34,8 +34,8 @@ 2004-10-21 Michael Smith <xmldoc@users.sourceforge.net> - * admon.textlabel.xml, article.appendix.title.properties.xml, htmlhelp.display.progress.xml, htmlhelp.enhanced.decompilation.xml, htmlhelp.hhc.width.xml, htmlhelp.hhp.windows.xml, htmlhelp.remember.window.position.xml, htmlhelp.show.toolbar.text.xml, htmlhelp.window.tqgeometry.xml, index.preferred.page.properties.xml, manifest.in.base.dir.xml, qanda.title.properties.xml, textdata.default.encoding.xml: - Bug #865551 (release 1.64.1 tqcontains executable xml files) + * admon.textlabel.xml, article.appendix.title.properties.xml, htmlhelp.display.progress.xml, htmlhelp.enhanced.decompilation.xml, htmlhelp.hhc.width.xml, htmlhelp.hhp.windows.xml, htmlhelp.remember.window.position.xml, htmlhelp.show.toolbar.text.xml, htmlhelp.window.geometry.xml, index.preferred.page.properties.xml, manifest.in.base.dir.xml, qanda.title.properties.xml, textdata.default.encoding.xml: + Bug #865551 (release 1.64.1 contains executable xml files) Changed perms to 644 & added newline to end of each to force commit @@ -167,7 +167,7 @@ 2003-11-29 Jirka Kosek <kosek@users.sourceforge.net> - * htmlhelp.display.progress.xml, htmlhelp.enhanced.decompilation.xml, htmlhelp.hhc.width.xml, htmlhelp.hhp.windows.xml, htmlhelp.remember.window.position.xml, htmlhelp.show.toolbar.text.xml, htmlhelp.window.tqgeometry.xml: + * htmlhelp.display.progress.xml, htmlhelp.enhanced.decompilation.xml, htmlhelp.hhc.width.xml, htmlhelp.hhp.windows.xml, htmlhelp.remember.window.position.xml, htmlhelp.show.toolbar.text.xml, htmlhelp.window.geometry.xml: New file. 2003-11-25 Robert Stayton <bobstayton@users.sourceforge.net> @@ -603,7 +603,7 @@ 2002-05-24 <dcramer@users.sourceforge.net> - * callout.tqunicode.number.limit.xml, callout.tqunicode.start.character.xml: + * callout.unicode.number.limit.xml, callout.unicode.start.character.xml: Updating docs. 2002-05-23 Norman Walsh <nwalsh@users.sourceforge.net> @@ -787,12 +787,12 @@ 2001-11-09 Norman Walsh <nwalsh@users.sourceforge.net> - * admon.graphics.extension.xml, admon.graphics.path.xml, admon.graphics.xml, admon.style.xml, admonition.title.properties.xml, tqalignment.xml, annotate.toc.xml, appendix.autolabel.xml, arbortext.extensions.xml, author.othername.in.middle.xml, autotoc.label.separator.xml, base.dir.xml, biblioentry.item.separator.xml, bibliography.collection.xml, body.font.family.xml, body.font.master.xml, body.font.size.xml, body.margin.bottom.xml, body.margin.top.xml, bridgehead.in.toc.xml, callout.defaultcolumn.xml, callout.graphics.extension.xml, callout.graphics.number.limit.xml, callout.graphics.path.xml, callout.graphics.xml, callout.list.table.xml, callout.tqunicode.font.xml, callout.tqunicode.number.limit.xml, callout.tqunicode.start.character.xml, callout.tqunicode.xml, callouts.extension.xml, chapter.autolabel.xml, chunk.datafile.xml, chunk.first.sections.xml, chunk.sections.xml, citerefentry.link.xml, column.count.xml, component.title.properties.xml, css.decoration.xml, default.encoding.xml, default.table.width.xml, default.units.xml, dingbat.font.family.xml, double.sided.xml, ebnf.table.bgcolor.xml, ebnf.table.border.xml, emphasis.propagates.style.xml, footnote.font.size.xml, fop.extensions.xml, formal.object.properties.xml, formal.procedures.xml, formal.title.properties.xml, format.variablelist.as.list.xml, funcsynopsis.decoration.xml, funcsynopsis.style.xml, function.parens.xml, generate.appendix.toc.xml, generate.article.toc.xml, generate.book.equation.lot.xml, generate.book.example.lot.xml, generate.book.figure.lot.xml, generate.book.table.lot.xml, generate.book.toc.xml, generate.chapter.toc.xml, generate.component.toc.xml, generate.division.equation.lot.xml, generate.division.example.lot.xml, generate.division.figure.lot.xml, generate.division.table.lot.xml, generate.division.toc.xml, generate.index.xml, generate.legalnotice.link.xml, generate.part.toc.xml, generate.preface.toc.xml, generate.qandadiv.toc.xml, generate.qandaset.toc.xml, generate.reference.toc.xml, generate.section.toc.level.xml, generate.section.toc.xml, generate.set.toc.xml, graphic.default.extension.xml, html.base.xml, html.ext.xml, html.longdesc.link.xml, html.longdesc.xml, html.stylesheet.type.xml, html.stylesheet.xml, htmlhelp.autolabel.xml, htmlhelp.chm.xml, htmlhelp.encoding.xml, htmlhelp.enumerate.images.xml, htmlhelp.hhc.xml, htmlhelp.hhp.tail.xml, htmlhelp.hhp.xml, hyphenate.xml, inherit.keywords.xml, insert.xref.page.number.xml, label.from.part.xml, linenumbering.everyNth.xml, linenumbering.extension.xml, linenumbering.separator.xml, linenumbering.width.xml, link.mailto.url.xml, list.block.spacing.xml, list.item.spacing.xml, make.single.year.ranges.xml, make.year.ranges.xml, monospace.font.family.xml, monospace.verbatim.properties.xml, navig.graphics.extension.xml, navig.graphics.path.xml, navig.graphics.xml, navig.showtitles.xml, nominal.table.width.xml, normal.para.spacing.xml, olink.fragid.xml, olink.outline.ext.xml, olink.pubid.xml, olink.resolver.xml, olink.sysid.xml, page.height.portrait.xml, page.height.xml, page.margin.bottom.xml, page.margin.inner.xml, page.margin.outer.xml, page.margin.top.xml, page.orientation.xml, page.width.portrait.xml, page.width.xml, paper.type.xml, part.autolabel.xml, passivetex.extensions.xml, phrase.propagates.style.xml, preface.autolabel.xml, process.empty.source.toc.xml, process.source.toc.xml, qanda.defaultlabel.xml, qanda.inherit.numeration.xml, qandadiv.autolabel.xml, refentry.generate.name.xml, refentry.separator.xml, refentry.xref.manvolnum.xml, region.after.extent.xml, region.before.extent.xml, root.filename.xml, rootid.xml, runinhead.default.title.end.punct.xml, runinhead.title.end.punct.xml, sans.font.family.xml, saxon.callouts.xml, saxon.character.representation.xml, saxon.linenumbering.xml, saxon.tablecolumns.xml, section.autolabel.xml, section.label.includes.component.label.xml, shade.verbatim.style.xml, shade.verbatim.xml, show.comments.xml, show.revisionflag.xml, spacing.paras.xml, stylesheet.result.type.xml, suppress.navigation.xml, table.border.color.xml, table.border.padding.xml, table.border.style.xml, table.border.thickness.xml, table.borders.with.css.xml, table.entry.padding.xml, tablecolumns.extension.xml, template.xml, textinsert.extension.xml, title.font.family.xml, title.margin.left.xml, toc.list.type.xml, toc.margin.properties.xml, toc.section.depth.xml, ulink.target.xml, use.extensions.xml, use.id.as.filename.xml, use.id.function.xml, using.chunker.xml, verbatim.properties.xml, xep.extensions.xml, xref.properties.xml: + * admon.graphics.extension.xml, admon.graphics.path.xml, admon.graphics.xml, admon.style.xml, admonition.title.properties.xml, alignment.xml, annotate.toc.xml, appendix.autolabel.xml, arbortext.extensions.xml, author.othername.in.middle.xml, autotoc.label.separator.xml, base.dir.xml, biblioentry.item.separator.xml, bibliography.collection.xml, body.font.family.xml, body.font.master.xml, body.font.size.xml, body.margin.bottom.xml, body.margin.top.xml, bridgehead.in.toc.xml, callout.defaultcolumn.xml, callout.graphics.extension.xml, callout.graphics.number.limit.xml, callout.graphics.path.xml, callout.graphics.xml, callout.list.table.xml, callout.unicode.font.xml, callout.unicode.number.limit.xml, callout.unicode.start.character.xml, callout.unicode.xml, callouts.extension.xml, chapter.autolabel.xml, chunk.datafile.xml, chunk.first.sections.xml, chunk.sections.xml, citerefentry.link.xml, column.count.xml, component.title.properties.xml, css.decoration.xml, default.encoding.xml, default.table.width.xml, default.units.xml, dingbat.font.family.xml, double.sided.xml, ebnf.table.bgcolor.xml, ebnf.table.border.xml, emphasis.propagates.style.xml, footnote.font.size.xml, fop.extensions.xml, formal.object.properties.xml, formal.procedures.xml, formal.title.properties.xml, format.variablelist.as.list.xml, funcsynopsis.decoration.xml, funcsynopsis.style.xml, function.parens.xml, generate.appendix.toc.xml, generate.article.toc.xml, generate.book.equation.lot.xml, generate.book.example.lot.xml, generate.book.figure.lot.xml, generate.book.table.lot.xml, generate.book.toc.xml, generate.chapter.toc.xml, generate.component.toc.xml, generate.division.equation.lot.xml, generate.division.example.lot.xml, generate.division.figure.lot.xml, generate.division.table.lot.xml, generate.division.toc.xml, generate.index.xml, generate.legalnotice.link.xml, generate.part.toc.xml, generate.preface.toc.xml, generate.qandadiv.toc.xml, generate.qandaset.toc.xml, generate.reference.toc.xml, generate.section.toc.level.xml, generate.section.toc.xml, generate.set.toc.xml, graphic.default.extension.xml, html.base.xml, html.ext.xml, html.longdesc.link.xml, html.longdesc.xml, html.stylesheet.type.xml, html.stylesheet.xml, htmlhelp.autolabel.xml, htmlhelp.chm.xml, htmlhelp.encoding.xml, htmlhelp.enumerate.images.xml, htmlhelp.hhc.xml, htmlhelp.hhp.tail.xml, htmlhelp.hhp.xml, hyphenate.xml, inherit.keywords.xml, insert.xref.page.number.xml, label.from.part.xml, linenumbering.everyNth.xml, linenumbering.extension.xml, linenumbering.separator.xml, linenumbering.width.xml, link.mailto.url.xml, list.block.spacing.xml, list.item.spacing.xml, make.single.year.ranges.xml, make.year.ranges.xml, monospace.font.family.xml, monospace.verbatim.properties.xml, navig.graphics.extension.xml, navig.graphics.path.xml, navig.graphics.xml, navig.showtitles.xml, nominal.table.width.xml, normal.para.spacing.xml, olink.fragid.xml, olink.outline.ext.xml, olink.pubid.xml, olink.resolver.xml, olink.sysid.xml, page.height.portrait.xml, page.height.xml, page.margin.bottom.xml, page.margin.inner.xml, page.margin.outer.xml, page.margin.top.xml, page.orientation.xml, page.width.portrait.xml, page.width.xml, paper.type.xml, part.autolabel.xml, passivetex.extensions.xml, phrase.propagates.style.xml, preface.autolabel.xml, process.empty.source.toc.xml, process.source.toc.xml, qanda.defaultlabel.xml, qanda.inherit.numeration.xml, qandadiv.autolabel.xml, refentry.generate.name.xml, refentry.separator.xml, refentry.xref.manvolnum.xml, region.after.extent.xml, region.before.extent.xml, root.filename.xml, rootid.xml, runinhead.default.title.end.punct.xml, runinhead.title.end.punct.xml, sans.font.family.xml, saxon.callouts.xml, saxon.character.representation.xml, saxon.linenumbering.xml, saxon.tablecolumns.xml, section.autolabel.xml, section.label.includes.component.label.xml, shade.verbatim.style.xml, shade.verbatim.xml, show.comments.xml, show.revisionflag.xml, spacing.paras.xml, stylesheet.result.type.xml, suppress.navigation.xml, table.border.color.xml, table.border.padding.xml, table.border.style.xml, table.border.thickness.xml, table.borders.with.css.xml, table.entry.padding.xml, tablecolumns.extension.xml, template.xml, textinsert.extension.xml, title.font.family.xml, title.margin.left.xml, toc.list.type.xml, toc.margin.properties.xml, toc.section.depth.xml, ulink.target.xml, use.extensions.xml, use.id.as.filename.xml, use.id.function.xml, using.chunker.xml, verbatim.properties.xml, xep.extensions.xml, xref.properties.xml: Move the obvious ID value from the src:fragment to the refentry in parameter reference pages 2001-11-06 Norman Walsh <nwalsh@users.sourceforge.net> - * admonition.title.properties.xml, autotoc.label.separator.xml, body.margin.top.xml, callout.tqunicode.xml, component.title.properties.xml, formal.object.properties.xml, formal.title.properties.xml, generate.appendix.toc.xml, generate.article.toc.xml, generate.book.equation.lot.xml, generate.book.example.lot.xml, generate.book.figure.lot.xml, generate.book.table.lot.xml, generate.book.toc.xml, generate.chapter.toc.xml, generate.index.xml, generate.part.toc.xml, generate.preface.toc.xml, generate.reference.toc.xml, generate.set.toc.xml, list.block.spacing.xml, list.item.spacing.xml, monospace.verbatim.properties.xml: + * admonition.title.properties.xml, autotoc.label.separator.xml, body.margin.top.xml, callout.unicode.xml, component.title.properties.xml, formal.object.properties.xml, formal.title.properties.xml, generate.appendix.toc.xml, generate.article.toc.xml, generate.book.equation.lot.xml, generate.book.example.lot.xml, generate.book.figure.lot.xml, generate.book.table.lot.xml, generate.book.toc.xml, generate.chapter.toc.xml, generate.index.xml, generate.part.toc.xml, generate.preface.toc.xml, generate.reference.toc.xml, generate.set.toc.xml, list.block.spacing.xml, list.item.spacing.xml, monospace.verbatim.properties.xml: Documentation improvements from Dave Pawson 2001-11-06 Robert Stayton <bobstayton@users.sourceforge.net> @@ -825,6 +825,6 @@ 2001-10-07 Norman Walsh <nwalsh@users.sourceforge.net> - * admon.graphics.extension.xml, admon.graphics.path.xml, admon.graphics.xml, admon.style.xml, admonition.title.properties.xml, tqalignment.xml, annotate.toc.xml, appendix.autolabel.xml, arbortext.extensions.xml, author.othername.in.middle.xml, autotoc.label.separator.xml, base.dir.xml, biblioentry.item.separator.xml, bibliography.collection.xml, body.font.family.xml, body.font.master.xml, body.font.size.xml, body.margin.bottom.xml, body.margin.top.xml, bridgehead.in.toc.xml, callout.defaultcolumn.xml, callout.graphics.extension.xml, callout.graphics.number.limit.xml, callout.graphics.path.xml, callout.graphics.xml, callout.list.table.xml, callout.tqunicode.font.xml, callout.tqunicode.number.limit.xml, callout.tqunicode.start.character.xml, callout.tqunicode.xml, callouts.extension.xml, chapter.autolabel.xml, chunk.datafile.xml, chunk.first.sections.xml, chunk.sections.xml, citerefentry.link.xml, column.count.xml, component.title.properties.xml, css.decoration.xml, default.encoding.xml, default.table.width.xml, default.units.xml, dingbat.font.family.xml, double.sided.xml, ebnf.table.bgcolor.xml, ebnf.table.border.xml, emphasis.propagates.style.xml, footnote.font.size.xml, fop.extensions.xml, formal.object.properties.xml, formal.procedures.xml, formal.title.properties.xml, format.variablelist.as.list.xml, funcsynopsis.decoration.xml, funcsynopsis.style.xml, function.parens.xml, generate.appendix.toc.xml, generate.article.toc.xml, generate.book.equation.lot.xml, generate.book.example.lot.xml, generate.book.figure.lot.xml, generate.book.table.lot.xml, generate.book.toc.xml, generate.chapter.toc.xml, generate.component.toc.xml, generate.division.equation.lot.xml, generate.division.example.lot.xml, generate.division.figure.lot.xml, generate.division.table.lot.xml, generate.division.toc.xml, generate.index.xml, generate.legalnotice.link.xml, generate.part.toc.xml, generate.preface.toc.xml, generate.qandadiv.toc.xml, generate.qandaset.toc.xml, generate.reference.toc.xml, generate.section.toc.level.xml, generate.section.toc.xml, generate.set.toc.xml, graphic.default.extension.xml, html.base.xml, html.ext.xml, html.stylesheet.type.xml, html.stylesheet.xml, hyphenate.xml, inherit.keywords.xml, insert.xref.page.number.xml, label.from.part.xml, linenumbering.everyNth.xml, linenumbering.extension.xml, linenumbering.separator.xml, linenumbering.width.xml, link.mailto.url.xml, list.block.spacing.xml, list.item.spacing.xml, make.single.year.ranges.xml, make.year.ranges.xml, monospace.font.family.xml, monospace.verbatim.properties.xml, nominal.table.width.xml, normal.para.spacing.xml, olink.fragid.xml, olink.outline.ext.xml, olink.pubid.xml, olink.resolver.xml, olink.sysid.xml, page.height.portrait.xml, page.height.xml, page.margin.bottom.xml, page.margin.inner.xml, page.margin.outer.xml, page.margin.top.xml, page.orientation.xml, page.width.portrait.xml, page.width.xml, paper.type.xml, part.autolabel.xml, passivetex.extensions.xml, phrase.propagates.style.xml, preface.autolabel.xml, process.empty.source.toc.xml, process.source.toc.xml, qanda.defaultlabel.xml, qanda.inherit.numeration.xml, qandadiv.autolabel.xml, refentry.generate.name.xml, refentry.separator.xml, refentry.xref.manvolnum.xml, region.after.extent.xml, region.before.extent.xml, root.filename.xml, rootid.xml, runinhead.default.title.end.punct.xml, runinhead.title.end.punct.xml, sans.font.family.xml, saxon.callouts.xml, saxon.character.representation.xml, saxon.linenumbering.xml, saxon.tablecolumns.xml, section.autolabel.xml, section.label.includes.component.label.xml, shade.verbatim.style.xml, shade.verbatim.xml, show.comments.xml, show.revisionflag.xml, spacing.paras.xml, stylesheet.result.type.xml, suppress.navigation.xml, tablecolumns.extension.xml, template.xml, textinsert.extension.xml, title.font.family.xml, toc.list.type.xml, toc.margin.properties.xml, toc.section.depth.xml, ulink.target.xml, use.extensions.xml, use.id.as.filename.xml, use.id.function.xml, using.chunker.xml, verbatim.properties.xml, xep.extensions.xml, xref.properties.xml: + * admon.graphics.extension.xml, admon.graphics.path.xml, admon.graphics.xml, admon.style.xml, admonition.title.properties.xml, alignment.xml, annotate.toc.xml, appendix.autolabel.xml, arbortext.extensions.xml, author.othername.in.middle.xml, autotoc.label.separator.xml, base.dir.xml, biblioentry.item.separator.xml, bibliography.collection.xml, body.font.family.xml, body.font.master.xml, body.font.size.xml, body.margin.bottom.xml, body.margin.top.xml, bridgehead.in.toc.xml, callout.defaultcolumn.xml, callout.graphics.extension.xml, callout.graphics.number.limit.xml, callout.graphics.path.xml, callout.graphics.xml, callout.list.table.xml, callout.unicode.font.xml, callout.unicode.number.limit.xml, callout.unicode.start.character.xml, callout.unicode.xml, callouts.extension.xml, chapter.autolabel.xml, chunk.datafile.xml, chunk.first.sections.xml, chunk.sections.xml, citerefentry.link.xml, column.count.xml, component.title.properties.xml, css.decoration.xml, default.encoding.xml, default.table.width.xml, default.units.xml, dingbat.font.family.xml, double.sided.xml, ebnf.table.bgcolor.xml, ebnf.table.border.xml, emphasis.propagates.style.xml, footnote.font.size.xml, fop.extensions.xml, formal.object.properties.xml, formal.procedures.xml, formal.title.properties.xml, format.variablelist.as.list.xml, funcsynopsis.decoration.xml, funcsynopsis.style.xml, function.parens.xml, generate.appendix.toc.xml, generate.article.toc.xml, generate.book.equation.lot.xml, generate.book.example.lot.xml, generate.book.figure.lot.xml, generate.book.table.lot.xml, generate.book.toc.xml, generate.chapter.toc.xml, generate.component.toc.xml, generate.division.equation.lot.xml, generate.division.example.lot.xml, generate.division.figure.lot.xml, generate.division.table.lot.xml, generate.division.toc.xml, generate.index.xml, generate.legalnotice.link.xml, generate.part.toc.xml, generate.preface.toc.xml, generate.qandadiv.toc.xml, generate.qandaset.toc.xml, generate.reference.toc.xml, generate.section.toc.level.xml, generate.section.toc.xml, generate.set.toc.xml, graphic.default.extension.xml, html.base.xml, html.ext.xml, html.stylesheet.type.xml, html.stylesheet.xml, hyphenate.xml, inherit.keywords.xml, insert.xref.page.number.xml, label.from.part.xml, linenumbering.everyNth.xml, linenumbering.extension.xml, linenumbering.separator.xml, linenumbering.width.xml, link.mailto.url.xml, list.block.spacing.xml, list.item.spacing.xml, make.single.year.ranges.xml, make.year.ranges.xml, monospace.font.family.xml, monospace.verbatim.properties.xml, nominal.table.width.xml, normal.para.spacing.xml, olink.fragid.xml, olink.outline.ext.xml, olink.pubid.xml, olink.resolver.xml, olink.sysid.xml, page.height.portrait.xml, page.height.xml, page.margin.bottom.xml, page.margin.inner.xml, page.margin.outer.xml, page.margin.top.xml, page.orientation.xml, page.width.portrait.xml, page.width.xml, paper.type.xml, part.autolabel.xml, passivetex.extensions.xml, phrase.propagates.style.xml, preface.autolabel.xml, process.empty.source.toc.xml, process.source.toc.xml, qanda.defaultlabel.xml, qanda.inherit.numeration.xml, qandadiv.autolabel.xml, refentry.generate.name.xml, refentry.separator.xml, refentry.xref.manvolnum.xml, region.after.extent.xml, region.before.extent.xml, root.filename.xml, rootid.xml, runinhead.default.title.end.punct.xml, runinhead.title.end.punct.xml, sans.font.family.xml, saxon.callouts.xml, saxon.character.representation.xml, saxon.linenumbering.xml, saxon.tablecolumns.xml, section.autolabel.xml, section.label.includes.component.label.xml, shade.verbatim.style.xml, shade.verbatim.xml, show.comments.xml, show.revisionflag.xml, spacing.paras.xml, stylesheet.result.type.xml, suppress.navigation.xml, tablecolumns.extension.xml, template.xml, textinsert.extension.xml, title.font.family.xml, toc.list.type.xml, toc.margin.properties.xml, toc.section.depth.xml, ulink.target.xml, use.extensions.xml, use.id.as.filename.xml, use.id.function.xml, using.chunker.xml, verbatim.properties.xml, xep.extensions.xml, xref.properties.xml: New file. diff --git a/kdoctools/docbook/xsl/params/alignment.xml b/kdoctools/docbook/xsl/params/alignment.xml index f60c84d08..ab304dcf6 100644 --- a/kdoctools/docbook/xsl/params/alignment.xml +++ b/kdoctools/docbook/xsl/params/alignment.xml @@ -1,20 +1,20 @@ -<refentry id="tqalignment"> +<refentry id="alignment"> <refmeta> -<refentrytitle>tqalignment</refentrytitle> +<refentrytitle>alignment</refentrytitle> </refmeta> <refnamediv> -<refname>tqalignment</refname> -<refpurpose>Specify the default text tqalignment</refpurpose> +<refname>alignment</refname> +<refpurpose>Specify the default text alignment</refpurpose> </refnamediv> <refsynopsisdiv> -<src:fragment id='tqalignment.frag'><xsl:param name="tqalignment">justify</xsl:param></src:fragment> +<src:fragment id='alignment.frag'><xsl:param name="alignment">justify</xsl:param></src:fragment> </refsynopsisdiv> <refsect1><title>Description</title> -<para>The default text tqalignment is used for most body text. +<para>The default text alignment is used for most body text. </para> </refsect1> diff --git a/kdoctools/docbook/xsl/params/bibliography.collection.xml b/kdoctools/docbook/xsl/params/bibliography.collection.xml index d451dfb57..2e69e7ddd 100644 --- a/kdoctools/docbook/xsl/params/bibliography.collection.xml +++ b/kdoctools/docbook/xsl/params/bibliography.collection.xml @@ -23,7 +23,7 @@ the ones you need in each document.</para> <parameter>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 tqcontains all of +<para>First, create a stand-alone bibliography document that contains 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> diff --git a/kdoctools/docbook/xsl/params/callout.list.table.xml b/kdoctools/docbook/xsl/params/callout.list.table.xml index d8b5ad545..bbfcb7aca 100644 --- a/kdoctools/docbook/xsl/params/callout.list.table.xml +++ b/kdoctools/docbook/xsl/params/callout.list.table.xml @@ -18,7 +18,7 @@ an HTML <sgmltag>DL</sgmltag>. Some browsers don't align DLs very well if <parameter>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 tqalignment +<sgmltag>TABLE</sgmltag>, which usually results in better alignment of the callout number with the callout description.</para> </refsect1> diff --git a/kdoctools/docbook/xsl/params/callout.unicode.font.xml b/kdoctools/docbook/xsl/params/callout.unicode.font.xml index 855b5343d..efcbdd08d 100644 --- a/kdoctools/docbook/xsl/params/callout.unicode.font.xml +++ b/kdoctools/docbook/xsl/params/callout.unicode.font.xml @@ -1,15 +1,15 @@ -<refentry id="callout.tqunicode.font"> +<refentry id="callout.unicode.font"> <refmeta> -<refentrytitle>callout.tqunicode.font</refentrytitle> +<refentrytitle>callout.unicode.font</refentrytitle> </refmeta> <refnamediv> -<refname>callout.tqunicode.font</refname> +<refname>callout.unicode.font</refname> <refpurpose>Specify a font for Unicode glyphs</refpurpose> </refnamediv> <refsynopsisdiv> -<src:fragment id='callout.tqunicode.font.frag'><xsl:param name="callout.tqunicode.font" select="'ZapfDingbats'"/></src:fragment> +<src:fragment id='callout.unicode.font.frag'><xsl:param name="callout.unicode.font" select="'ZapfDingbats'"/></src:fragment> </refsynopsisdiv> <refsect1><title>Description</title> diff --git a/kdoctools/docbook/xsl/params/callout.unicode.number.limit.xml b/kdoctools/docbook/xsl/params/callout.unicode.number.limit.xml index c3d8e94d7..f02ae3dfe 100644 --- a/kdoctools/docbook/xsl/params/callout.unicode.number.limit.xml +++ b/kdoctools/docbook/xsl/params/callout.unicode.number.limit.xml @@ -1,25 +1,25 @@ -<refentry id="callout.tqunicode.number.limit"> +<refentry id="callout.unicode.number.limit"> <refmeta> -<refentrytitle>callout.tqunicode.number.limit</refentrytitle> +<refentrytitle>callout.unicode.number.limit</refentrytitle> <refmiscinfo role="type">integer</refmiscinfo> </refmeta> <refnamediv> -<refname>callout.tqunicode.number.limit</refname> +<refname>callout.unicode.number.limit</refname> <refpurpose>Number of the largest callout graphic</refpurpose> </refnamediv> <refsynopsisdiv> -<src:fragment id='callout.tqunicode.number.limit.frag'><xsl:param name="callout.tqunicode.number.limit" select="'10'"/></src:fragment> +<src:fragment id='callout.unicode.number.limit.frag'><xsl:param name="callout.unicode.number.limit" select="'10'"/></src:fragment> </refsynopsisdiv> <refsect1><title>Description</title> -<para>If <parameter>callout.tqunicode</parameter> -is non-zero, tqunicode characters are used to represent +<para>If <parameter>callout.unicode</parameter> +is non-zero, unicode characters are used to represent callout numbers. The value of -<parameter>callout.tqunicode.number.limit</parameter> +<parameter>callout.unicode.number.limit</parameter> is -the largest number for which a tqunicode character exists. If the callout number +the largest number for which a unicode character exists. If the callout number exceeds this limit, the default presentation "(nnn)" will always be used. </para> diff --git a/kdoctools/docbook/xsl/params/callout.unicode.start.character.xml b/kdoctools/docbook/xsl/params/callout.unicode.start.character.xml index 4a721984b..6423eb5f9 100644 --- a/kdoctools/docbook/xsl/params/callout.unicode.start.character.xml +++ b/kdoctools/docbook/xsl/params/callout.unicode.start.character.xml @@ -1,24 +1,24 @@ -<refentry id="callout.tqunicode.start.character"> +<refentry id="callout.unicode.start.character"> <refmeta> -<refentrytitle>callout.tqunicode.start.character</refentrytitle> +<refentrytitle>callout.unicode.start.character</refentrytitle> <refmiscinfo role="type">integer</refmiscinfo> </refmeta> <refnamediv> -<refname>callout.tqunicode.start.character</refname> +<refname>callout.unicode.start.character</refname> <refpurpose>First Unicode character to use, decimal value.</refpurpose> </refnamediv> <refsynopsisdiv> -<src:fragment id='callout.tqunicode.start.character.frag'><xsl:param name="callout.tqunicode.start.character" select="10102"/></src:fragment> +<src:fragment id='callout.unicode.start.character.frag'><xsl:param name="callout.unicode.start.character" select="10102"/></src:fragment> </refsynopsisdiv> <refsect1><title>Description</title> -<para>If <parameter>callout.graphics</parameter> is zero and <parameter>callout.tqunicode</parameter> -is non-zero, tqunicode characters are used to represent +<para>If <parameter>callout.graphics</parameter> is zero and <parameter>callout.unicode</parameter> +is non-zero, unicode characters are used to represent callout numbers. The value of -<parameter>callout.tqunicode.start.character</parameter> -is the decimal tqunicode value used for callout number one. Currently, +<parameter>callout.unicode.start.character</parameter> +is the decimal unicode value used for callout number one. Currently, only 10102 is supported in the stylesheets for this parameter. </para> diff --git a/kdoctools/docbook/xsl/params/callout.unicode.xml b/kdoctools/docbook/xsl/params/callout.unicode.xml index 9255e603b..f0a00b06d 100644 --- a/kdoctools/docbook/xsl/params/callout.unicode.xml +++ b/kdoctools/docbook/xsl/params/callout.unicode.xml @@ -1,15 +1,15 @@ -<refentry id="callout.tqunicode"> +<refentry id="callout.unicode"> <refmeta> -<refentrytitle>callout.tqunicode</refentrytitle> +<refentrytitle>callout.unicode</refentrytitle> <refmiscinfo role="type">boolean</refmiscinfo> </refmeta> <refnamediv> -<refname>callout.tqunicode</refname> +<refname>callout.unicode</refname> <refpurpose>Use Unicode characters rather than images for callouts.</refpurpose> </refnamediv> <refsynopsisdiv> -<src:fragment id='callout.tqunicode.frag'><xsl:param name="callout.tqunicode" select="0"/></src:fragment> +<src:fragment id='callout.unicode.frag'><xsl:param name="callout.unicode" select="0"/></src:fragment> </refsynopsisdiv> <refsect1><title>Description</title> diff --git a/kdoctools/docbook/xsl/params/component.label.includes.part.label.xml b/kdoctools/docbook/xsl/params/component.label.includes.part.label.xml index 627830f9b..eef3eae10 100644 --- a/kdoctools/docbook/xsl/params/component.label.includes.part.label.xml +++ b/kdoctools/docbook/xsl/params/component.label.includes.part.label.xml @@ -16,7 +16,7 @@ <para>If true (non-zero), labels for chapters, appendices, and other component elements are prefixed with the label of the -part element that tqcontains them. +part element that contains 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. diff --git a/kdoctools/docbook/xsl/params/footnote.number.symbols.xml b/kdoctools/docbook/xsl/params/footnote.number.symbols.xml index 184b76b49..f02351177 100644 --- a/kdoctools/docbook/xsl/params/footnote.number.symbols.xml +++ b/kdoctools/docbook/xsl/params/footnote.number.symbols.xml @@ -17,7 +17,7 @@ <refsect1><title>Description</title> <para>If <parameter>footnote.number.symbols</parameter> is not the empty string, -footnotes will use the characters it tqcontains as footnote symbols. For example, +footnotes will use the characters it contains as footnote symbols. For example, <quote>*&#x2020;&#x2021;&#x25CA;&#x2720;</quote> will identify footnotes with <quote>*</quote>, <quote>†</quote>, <quote>‡</quote>, <quote>◊</quote>, and <quote>✠</quote>. If there are more footnotes diff --git a/kdoctools/docbook/xsl/params/glossary.collection.xml b/kdoctools/docbook/xsl/params/glossary.collection.xml index da0c635bf..eb26556ce 100644 --- a/kdoctools/docbook/xsl/params/glossary.collection.xml +++ b/kdoctools/docbook/xsl/params/glossary.collection.xml @@ -28,7 +28,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 tqcontains all of +<para>First, create a stand-alone glossary document that contains all of the entries that you wish to reference. Make sure that each glossary entry has an ID.</para> @@ -165,7 +165,7 @@ the <parameter>glossary.collection</parameter> parameter.</para> </informalexample> <para>What about glossary divisions? If your glossary database has glossary -divisions <emphasis>and</emphasis> your automatic glossary tqcontains at least +divisions <emphasis>and</emphasis> your automatic glossary contains 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> diff --git a/kdoctools/docbook/xsl/params/htmlhelp.window.geometry.xml b/kdoctools/docbook/xsl/params/htmlhelp.window.geometry.xml index 0ba52e843..e0742b10d 100644 --- a/kdoctools/docbook/xsl/params/htmlhelp.window.geometry.xml +++ b/kdoctools/docbook/xsl/params/htmlhelp.window.geometry.xml @@ -1,16 +1,16 @@ -<refentry id="htmlhelp.window.tqgeometry"> +<refentry id="htmlhelp.window.geometry"> <refmeta> -<refentrytitle>htmlhelp.window.tqgeometry</refentrytitle> +<refentrytitle>htmlhelp.window.geometry</refentrytitle> <refmiscinfo role="type">string</refmiscinfo> </refmeta> <refnamediv> -<refname>htmlhelp.window.tqgeometry</refname> -<refpurpose>Set initial tqgeometry of help window</refpurpose> +<refname>htmlhelp.window.geometry</refname> +<refpurpose>Set initial geometry of help window</refpurpose> </refnamediv> <refsynopsisdiv> -<src:fragment id='htmlhelp.window.tqgeometry.frag'> -<xsl:param name="htmlhelp.window.tqgeometry"/> +<src:fragment id='htmlhelp.window.geometry.frag'> +<xsl:param name="htmlhelp.window.geometry"/> </src:fragment> </refsynopsisdiv> @@ -19,7 +19,7 @@ <para>This parameter specifies initial position of help window. E.g.</para> -<programlisting><![CDATA[<xsl:param name="htmlhelp.window.tqgeometry">[160,64,992,704]</xsl:param>]]></programlisting> +<programlisting><![CDATA[<xsl:param name="htmlhelp.window.geometry">[160,64,992,704]</xsl:param>]]></programlisting> </refsect1> </refentry> diff --git a/kdoctools/docbook/xsl/params/hyphenate.verbatim.xml b/kdoctools/docbook/xsl/params/hyphenate.verbatim.xml index 7af2b08f3..35b295ebc 100644 --- a/kdoctools/docbook/xsl/params/hyphenate.verbatim.xml +++ b/kdoctools/docbook/xsl/params/hyphenate.verbatim.xml @@ -33,8 +33,8 @@ attribute set:</para> </xsl:attribute-set>]]></programlisting> <para>For a list of arrows available in Unicode see <ulink -url="http://www.tqunicode.org/charts/PDF/U2190.pdf"/> and <ulink -url="http://www.tqunicode.org/charts/PDF/U2900.pdf"/> and make sure that +url="http://www.unicode.org/charts/PDF/U2190.pdf"/> and <ulink +url="http://www.unicode.org/charts/PDF/U2900.pdf"/> and make sure that selected character is available in the font you are using for verbatim environments.</para> diff --git a/kdoctools/docbook/xsl/params/insert.olink.pdf.frag.xml b/kdoctools/docbook/xsl/params/insert.olink.pdf.frag.xml index 13ba7a1ab..8939f2798 100644 --- a/kdoctools/docbook/xsl/params/insert.olink.pdf.frag.xml +++ b/kdoctools/docbook/xsl/params/insert.olink.pdf.frag.xml @@ -45,7 +45,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 -tqcontains the fragment identifier. +contains the fragment identifier. </para> <para>If <parameter>insert.olink.pdf.frag</parameter> is set diff --git a/kdoctools/docbook/xsl/params/l10n.gentext.use.xref.language.xml b/kdoctools/docbook/xsl/params/l10n.gentext.use.xref.language.xml index 22043e9e3..5554de082 100644 --- a/kdoctools/docbook/xsl/params/l10n.gentext.use.xref.language.xml +++ b/kdoctools/docbook/xsl/params/l10n.gentext.use.xref.language.xml @@ -19,7 +19,7 @@ <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 tqcontains the cross-reference element). But setting this parameter +element that contains the cross-reference element). But setting this parameter allows the language of the element <emphasis>pointed to</emphasis> to control the generated text.</para> diff --git a/kdoctools/docbook/xsl/params/linenumbering.extension.xml b/kdoctools/docbook/xsl/params/linenumbering.extension.xml index 7d348e91d..b9322dd1e 100644 --- a/kdoctools/docbook/xsl/params/linenumbering.extension.xml +++ b/kdoctools/docbook/xsl/params/linenumbering.extension.xml @@ -15,7 +15,7 @@ <refsect1><title>Description</title> <para>If true, verbatim environments (elements that have the -format='linespecific' notation attribute: address, literaltqlayout, +format='linespecific' notation attribute: address, literallayout, programlisting, screen, synopsis) that specify line numbering will have, surprise, line numbers. </para> diff --git a/kdoctools/docbook/xsl/params/make.graphic.viewport.xml b/kdoctools/docbook/xsl/params/make.graphic.viewport.xml index 1c1219ba4..1d3a25b50 100644 --- a/kdoctools/docbook/xsl/params/make.graphic.viewport.xml +++ b/kdoctools/docbook/xsl/params/make.graphic.viewport.xml @@ -24,7 +24,7 @@ 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 tqalignment don't work together, so this parameter is ignored -if tqalignment is specified on an image.</para> +<para>Tables and alignment don't work together, so this parameter is ignored +if alignment is specified on an image.</para> </refsect1> </refentry> diff --git a/kdoctools/docbook/xsl/params/olink.debug.xml b/kdoctools/docbook/xsl/params/olink.debug.xml index 5f4e2c109..318920a58 100644 --- a/kdoctools/docbook/xsl/params/olink.debug.xml +++ b/kdoctools/docbook/xsl/params/olink.debug.xml @@ -20,7 +20,7 @@ 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 -tqfind the problem. +find the problem. </para> <para>You may need to read through the olink XSL templates diff --git a/kdoctools/docbook/xsl/params/olink.lang.fallback.sequence.xml b/kdoctools/docbook/xsl/params/olink.lang.fallback.sequence.xml index 2b56c73ad..b7aea9eef 100644 --- a/kdoctools/docbook/xsl/params/olink.lang.fallback.sequence.xml +++ b/kdoctools/docbook/xsl/params/olink.lang.fallback.sequence.xml @@ -50,8 +50,8 @@ When the document is processed, the processor first looks for a target dataset in the olink database starting with:</para> -<literaltqlayout><literal><document targetdoc="adminguide" lang="de"></literal>. -</literaltqlayout> +<literallayout><literal><document targetdoc="adminguide" lang="de"></literal>. +</literallayout> <para>If there is no such element, then the <parameter>olink.lang.fallback.sequence</parameter> diff --git a/kdoctools/docbook/xsl/params/prefer.internal.olink.xml b/kdoctools/docbook/xsl/params/prefer.internal.olink.xml index ce59918d8..86c2fe3f0 100644 --- a/kdoctools/docbook/xsl/params/prefer.internal.olink.xml +++ b/kdoctools/docbook/xsl/params/prefer.internal.olink.xml @@ -26,7 +26,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 -tqcontains a reference to the customization section (custom.xml) which is +contains a reference to the customization section (custom.xml) which is included in both user.xml and reference.xml documents. </para> diff --git a/kdoctools/docbook/xsl/params/refentry.title.properties.xml b/kdoctools/docbook/xsl/params/refentry.title.properties.xml index 114072b4d..2ae97e035 100644 --- a/kdoctools/docbook/xsl/params/refentry.title.properties.xml +++ b/kdoctools/docbook/xsl/params/refentry.title.properties.xml @@ -34,7 +34,7 @@ <para>Formatting properties applied to refentry titles, including refnamediv, refsect1 through 3, and refsection. The font size is supplied by the appropriate -<parameter>section.level<tqreplaceable>X</tqreplaceable>.title.properties</parameter> +<parameter>section.level<replaceable>X</replaceable>.title.properties</parameter> attribute-set, computed from its location in the section hierarchy. </para> diff --git a/kdoctools/docbook/xsl/params/root.properties.xml b/kdoctools/docbook/xsl/params/root.properties.xml index 75490ad5d..6424412c0 100644 --- a/kdoctools/docbook/xsl/params/root.properties.xml +++ b/kdoctools/docbook/xsl/params/root.properties.xml @@ -18,7 +18,7 @@ <xsl:value-of select="$body.font.size"/> </xsl:attribute> <xsl:attribute name="text-align"> - <xsl:value-of select="$tqalignment"/> + <xsl:value-of select="$alignment"/> </xsl:attribute> <xsl:attribute name="line-height"> <xsl:value-of select="$line-height"/> diff --git a/kdoctools/docbook/xsl/params/saxon.linenumbering.xml b/kdoctools/docbook/xsl/params/saxon.linenumbering.xml index 53a3e9472..8b3d5578c 100644 --- a/kdoctools/docbook/xsl/params/saxon.linenumbering.xml +++ b/kdoctools/docbook/xsl/params/saxon.linenumbering.xml @@ -15,7 +15,7 @@ <refsect1><title>Description</title> <para>If true, verbatim environments (elements that have the -format='linespecific' notation attribute: address, literaltqlayout, +format='linespecific' notation attribute: address, literallayout, programlisting, screen, synopsis) that specify line numbering will have, surprise, line numbers. </para> diff --git a/kdoctools/docbook/xsl/params/section.label.includes.component.label.xml b/kdoctools/docbook/xsl/params/section.label.includes.component.label.xml index 6cd4d184a..124d233ea 100644 --- a/kdoctools/docbook/xsl/params/section.label.includes.component.label.xml +++ b/kdoctools/docbook/xsl/params/section.label.includes.component.label.xml @@ -15,7 +15,7 @@ <refsect1><title>Description</title> <para>If true (non-zero), section labels are prefixed with the label of the -component that tqcontains them. +component that contains them. </para> </refsect1> diff --git a/kdoctools/docbook/xsl/params/table.footnote.number.symbols.xml b/kdoctools/docbook/xsl/params/table.footnote.number.symbols.xml index 04d4548e5..d8004cfd8 100644 --- a/kdoctools/docbook/xsl/params/table.footnote.number.symbols.xml +++ b/kdoctools/docbook/xsl/params/table.footnote.number.symbols.xml @@ -17,7 +17,7 @@ <refsect1><title>Description</title> <para>If <parameter>table.footnote.number.symbols</parameter> is not the empty string, -table footnotes will use the characters it tqcontains as footnote symbols. For example, +table footnotes will use the characters it contains as footnote symbols. For example, <quote>*&#x2020;&#x2021;&#x25CA;&#x2720;</quote> will identify footnotes with <quote>*</quote>, <quote>†</quote>, <quote>‡</quote>, <quote>◊</quote>, and <quote>✠</quote>. If there are more footnotes diff --git a/kdoctools/docbook/xsl/params/use.id.function.xml b/kdoctools/docbook/xsl/params/use.id.function.xml index 38b18c696..b9ceb5890 100644 --- a/kdoctools/docbook/xsl/params/use.id.function.xml +++ b/kdoctools/docbook/xsl/params/use.id.function.xml @@ -5,7 +5,7 @@ </refmeta> <refnamediv> <refname>use.id.function</refname> -<refpurpose>Use the XPath id() function to tqfind link targets?</refpurpose> +<refpurpose>Use the XPath id() function to find link targets?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -15,7 +15,7 @@ <refsect1><title>Description</title> <para>If 1, the stylesheets use the <function>id()</function> function -to tqfind the targets of cross reference elements. This is more +to find the targets of cross reference elements. This is more efficient, but only works if your XSLT processor implements the <function>id()</function> function, naturally.</para> <para>THIS PARAMETER IS NOT SUPPORTED. IT IS ALWAYS ASSUMED TO BE 1. diff --git a/kdoctools/docbook/xsl/params/variablelist.max.termlength.xml b/kdoctools/docbook/xsl/params/variablelist.max.termlength.xml index 0079d9adf..8cad72df7 100644 --- a/kdoctools/docbook/xsl/params/variablelist.max.termlength.xml +++ b/kdoctools/docbook/xsl/params/variablelist.max.termlength.xml @@ -25,7 +25,7 @@ attribute on the <sgmltag>variablelist</sgmltag> element. <para> The computation counts characters in the <sgmltag>term</sgmltag> elements in the list -to tqfind the longest term. However, some terms are very long +to find the longest term. However, some terms are very long and would produce extreme indents. This parameter lets you set a maximum character count. Any terms longer than the maximum would line wrap. The default value is 24. |