From: Norman Walsh <ndw@nwalsh.com>
Date: Mon, 2 Apr 2001 11:23:20 +0000 (+0000)
Subject: Added context information
X-Git-Tag: release/1.79.1~6^2~6659
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de538d77c1dd75c7737c2a56586b94103adca46e;p=docbook-dsssl

Added context information
---

diff --git a/gentext/locale/ca.xml b/gentext/locale/ca.xml
index 2f6527db4..c954af6b6 100644
--- a/gentext/locale/ca.xml
+++ b/gentext/locale/ca.xml
@@ -1,4 +1,23 @@
-<locale language="ca">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<!DOCTYPE locale [
+<!ENTITY % lat1 PUBLIC "-//ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
+                "../../xmlcharent/iso-lat1.ent">
+%lat1;
+]>
+<locale language="ca"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Resum"/>
 <gentext key="abstract" text="Resum"/>
@@ -157,11 +176,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/cs.xml b/gentext/locale/cs.xml
index 5794daf34..d45e6eb47 100644
--- a/gentext/locale/cs.xml
+++ b/gentext/locale/cs.xml
@@ -1,4 +1,18 @@
-<locale language="cs">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="cs"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Obsah"/>
 <gentext key="abstract" text="Obsah"/>
@@ -157,14 +171,197 @@
 <dingbat key="nestedendquote" text="&#x2018;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="figure" text="%n"/>
-<xref element="example" text="%n"/>
-<xref element="table" text="%n"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast"> <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/da.xml b/gentext/locale/da.xml
index 4659ccd66..7a0b883ba 100644
--- a/gentext/locale/da.xml
+++ b/gentext/locale/da.xml
@@ -1,4 +1,18 @@
-<locale language="da">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="da"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Abstract"/>
 <gentext key="abstract" text="Abstract"/>
@@ -157,11 +171,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/de.xml b/gentext/locale/de.xml
index f39df27fc..a0c194f09 100644
--- a/gentext/locale/de.xml
+++ b/gentext/locale/de.xml
@@ -1,4 +1,23 @@
-<locale language="de">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<!DOCTYPE locale [
+<!ENTITY % lat1 PUBLIC "-//ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
+                "../../xmlcharent/iso-lat1.ent">
+%lat1;
+]>
+<locale language="de"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <!--
   Contributions by: Michael Burschik, burschik@id-pro.de
@@ -160,11 +179,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast"> <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/el.xml b/gentext/locale/el.xml
index 3627bbc4c..6205beeb2 100644
--- a/gentext/locale/el.xml
+++ b/gentext/locale/el.xml
@@ -1,4 +1,18 @@
-<locale language="el">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="el"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="&#208;&#229;&#241;&#223;&#235;&#231;&#248;&#231;"/>
 <gentext key="abstract" text="&#208;&#229;&#241;&#223;&#235;&#231;&#248;&#231;"/>
@@ -155,11 +169,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/en.xml b/gentext/locale/en.xml
index fa613b492..d8c7a00c1 100644
--- a/gentext/locale/en.xml
+++ b/gentext/locale/en.xml
@@ -1,4 +1,16 @@
-<locale language="en">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="en"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Abstract"/>
 <gentext key="abstract" text="Abstract"/>
@@ -12,7 +24,6 @@
 <gentext key="Book" text="Book"/>
 <gentext key="book" text="Book"/>
 <gentext key="CAUTION" text="CAUTION"/>
-<gentext key="caution" text="CAUTION"/>
 <gentext key="Caution" text="Caution"/>
 <gentext key="caution" text="Caution"/>
 <gentext key="Chapter" text="Chapter"/>
@@ -37,11 +48,10 @@
 <gentext key="Glossary" text="Glossary"/>
 <gentext key="glossary" text="Glossary"/>
 <gentext key="IMPORTANT" text="IMPORTANT"/>
-<gentext key="important" text="IMPORTANT"/>
+<gentext key="important" text="Important"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Important"/>
-<gentext key="important" text="Important"/>
 <gentext key="Index" text="Index"/>
 <gentext key="index" text="Index"/>
 <gentext key="LegalNotice" text="Legal Notice"/>
@@ -53,7 +63,6 @@
 <gentext key="MsgOrig" text="Origin"/>
 <gentext key="msgorig" text="Origin"/>
 <gentext key="NOTE" text="NOTE"/>
-<gentext key="note" text="NOTE"/>
 <gentext key="Note" text="Note"/>
 <gentext key="note" text="Note"/>
 <gentext key="Part" text="Part"/>
@@ -92,13 +101,11 @@
 <gentext key="Sidebar" text=""/>
 <gentext key="Step" text="Step"/>
 <gentext key="TIP" text="TIP"/>
-<gentext key="tip" text="TIP"/>
 <gentext key="Table" text="Table"/>
 <gentext key="table" text="Table"/>
 <gentext key="Tip" text="Tip"/>
 <gentext key="tip" text="Tip"/>
 <gentext key="WARNING" text="WARNING"/>
-<gentext key="warning" text="WARNING"/>
 <gentext key="Warning" text="Warning"/>
 <gentext key="warning" text="Warning"/>
 <gentext key="appendix" text="appendix"/>
@@ -112,7 +119,6 @@
 <gentext key="sidebar" text="sidebar"/>
 <gentext key="step" text="step"/>
 <gentext key="Seealso" text="See also"/>
-<gentext key="seealso" text="See also"/>
 
 <gentext key="TableofContents" text="Table of Contents"/>
 <gentext key="tableofcontents" text="Table of Contents"/>
@@ -154,7 +160,7 @@
 <gentext key="nav-up" text="Up"/>
 <gentext key="nav-home" text="Home"/>
 
-<gentext key="the section called"       text="the section called"/>
+<gentext key="sectioncalled"       text="the section called"/>
 
 <gentext key="index symbols"            text="Symbols"/>
 
@@ -164,11 +170,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="bibliography" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/es.xml b/gentext/locale/es.xml
index 19cf2750c..2ddf4014e 100644
--- a/gentext/locale/es.xml
+++ b/gentext/locale/es.xml
@@ -1,4 +1,23 @@
-<locale language="es">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<!DOCTYPE locale [
+<!ENTITY % lat1 PUBLIC "-//ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
+                "../../xmlcharent/iso-lat1.ent">
+%lat1;
+]>
+<locale language="es"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Resumen"/>
 <gentext key="abstract" text="Resumen"/>
@@ -157,11 +176,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/et.xml b/gentext/locale/et.xml
index f8653b5c6..c75fab7d7 100644
--- a/gentext/locale/et.xml
+++ b/gentext/locale/et.xml
@@ -1,4 +1,18 @@
-<locale language="et">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="et"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="&#220;levaade"/>
 <gentext key="abstract" text="&#220;levaade"/> <!-- "&#220;levaade"-->
@@ -155,11 +169,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/fi.xml b/gentext/locale/fi.xml
index 50377ae32..419761433 100644
--- a/gentext/locale/fi.xml
+++ b/gentext/locale/fi.xml
@@ -1,4 +1,18 @@
-<locale language="fi">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="fi"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Lyhennelm&#228;"/>
 <gentext key="abstract" text="Lyhennelm&#228;"/>
@@ -155,11 +169,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/fr.xml b/gentext/locale/fr.xml
index c90cd429d..d5d9e5f54 100644
--- a/gentext/locale/fr.xml
+++ b/gentext/locale/fr.xml
@@ -1,4 +1,23 @@
-<locale language="fr">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<!DOCTYPE locale [
+<!ENTITY % lat1 PUBLIC "-//ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
+                "../../xmlcharent/iso-lat1.ent">
+%lat1;
+]>
+<locale language="fr"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="R&eacute;sum&eacute;"/>
 <gentext key="abstract" text="R&eacute;sum&eacute;"/>
@@ -162,11 +181,197 @@
 <dingbat key="nestedendquote" text="&#x00BB;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/hu.xml b/gentext/locale/hu.xml
index b12e82f39..a0705a355 100644
--- a/gentext/locale/hu.xml
+++ b/gentext/locale/hu.xml
@@ -1,4 +1,23 @@
-<locale language="hu">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<!DOCTYPE locale [
+<!ENTITY % lat1 PUBLIC "-//ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
+                "../../xmlcharent/iso-lat1.ent">
+%lat1;
+]>
+<locale language="hu"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Kivonat"/>
 <gentext key="abstract" text="Kivonat"/>
@@ -155,11 +174,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%n %g %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/id.xml b/gentext/locale/id.xml
index 56fbe6688..5ab49790b 100644
--- a/gentext/locale/id.xml
+++ b/gentext/locale/id.xml
@@ -1,4 +1,18 @@
-<locale language="id">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="id"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Abstrak"/>
 <gentext key="abstract" text="Abstrak"/>
@@ -155,11 +169,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/it.xml b/gentext/locale/it.xml
index 187792cbc..323c1bc62 100644
--- a/gentext/locale/it.xml
+++ b/gentext/locale/it.xml
@@ -1,4 +1,18 @@
-<locale language="it">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="it"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Estratto"/>
 <gentext key="abstract" text="Estratto"/>
@@ -167,11 +181,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/ja.xml b/gentext/locale/ja.xml
index babc569f9..2becca1a0 100644
--- a/gentext/locale/ja.xml
+++ b/gentext/locale/ja.xml
@@ -1,10 +1,20 @@
-<locale language="ja">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="ja"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<!--
-;; Contributors:
-;; Karl Critz, kcritz@mathworks.com, contributed the original dbl1ja.ent file
-;; Ralf Schleitzer, ralf.schleitzer@ixos.de
--->
+<doc:localeinfo xmlns="">
+<authorgroup>
+  <author><firstname>Karl</firstname><surname>Critz</surname>
+          <affiliation><address><email>kcritz@mathworks.com</email></address>
+          </affiliation>
+  </author>
+  <author><firstname>Ralf</firstname><surname>Schleitzer</surname>
+          <affiliation><address><email>ralf.schleitzer@ixos.de</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+</doc:localeinfo>
 
 <gentext key="Abstract" text="&#x6982;&#x8981;"/>
 <gentext key="abstract" text="&#x6982;&#x8981;"/>
@@ -164,11 +174,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/ko.xml b/gentext/locale/ko.xml
index cc151a26c..f88e00667 100644
--- a/gentext/locale/ko.xml
+++ b/gentext/locale/ko.xml
@@ -1,6 +1,16 @@
-<locale language="ko">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="ko"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<!-- ;; by Park Yong Joo (yongjoo@kldp.org) -->
+<doc:localeinfo xmlns="">
+<authorgroup>
+  <author><firstname>Park</firstname><surname>Yong Joo</surname>
+          <affiliation><address><email>yongjoo@kldp.org</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+</doc:localeinfo>
 
 <gentext key="Abstract" text="&#xCD08;&#xB85D;"/>
 <gentext key="abstract" text="&#xCD08;&#xB85D;"/>
@@ -157,11 +167,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/nl.xml b/gentext/locale/nl.xml
index 6a1327f79..ce4a0810e 100644
--- a/gentext/locale/nl.xml
+++ b/gentext/locale/nl.xml
@@ -1,4 +1,18 @@
-<locale language="nl">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="nl"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <!-- Updated by Frederik Fouvry, fouvry@sfs.nphil.uni-tuebingen.de -->
 <gentext key="Abstract" text="Samenvatting"/>
@@ -158,11 +172,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="bibliography" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/no.xml b/gentext/locale/no.xml
index 9044451c6..7c263fe4d 100644
--- a/gentext/locale/no.xml
+++ b/gentext/locale/no.xml
@@ -1,4 +1,23 @@
-<locale language="no">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<!DOCTYPE locale [
+<!ENTITY % lat1 PUBLIC "-//ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
+                "../../xmlcharent/iso-lat1.ent">
+%lat1;
+]>
+<locale language="no"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Abstract"/>
 <gentext key="abstract" text="Abstract"/>
@@ -155,11 +174,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/pl.xml b/gentext/locale/pl.xml
index 88ab64d4b..b8e34925c 100644
--- a/gentext/locale/pl.xml
+++ b/gentext/locale/pl.xml
@@ -1,4 +1,18 @@
-<locale language="pl">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="pl"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Abstrakt"/>
 <gentext key="abstract" text="Abstrakt"/>
@@ -155,11 +169,197 @@
 <dingbat key="nestedendquote" text="&#x00BB;"/>
 <dingbat key="bullet" text="&#2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/pt.xml b/gentext/locale/pt.xml
index 92b0e1889..c2709a456 100644
--- a/gentext/locale/pt.xml
+++ b/gentext/locale/pt.xml
@@ -1,4 +1,18 @@
-<locale language="pt">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="pt"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Resumo"/>
 <gentext key="abstract" text="Resumo"/>
@@ -157,11 +171,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/pt_br.xml b/gentext/locale/pt_br.xml
index 049643282..d8ed74933 100644
--- a/gentext/locale/pt_br.xml
+++ b/gentext/locale/pt_br.xml
@@ -1,4 +1,18 @@
-<locale language="pt_br">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="pt_br"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Resumo"/>
 <gentext key="abstract" text="Resumo"/>
@@ -157,11 +171,197 @@
 <dingbat key="nestedendquote"		text="&#x2019;"/>
 <dingbat key="bullet"			text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/ro.xml b/gentext/locale/ro.xml
index 23d9a44ac..5d974c9a0 100644
--- a/gentext/locale/ro.xml
+++ b/gentext/locale/ro.xml
@@ -1,4 +1,26 @@
-<locale language="ro">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<!DOCTYPE locale [
+<!ENTITY % lat1 PUBLIC "-//ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
+                "../../xmlcharent/iso-lat1.ent">
+%lat1;
+<!ENTITY % lat2 PUBLIC "-//ISO 8879-1986//ENTITIES Added Latin 2//EN//XML"
+                "../../xmlcharent/iso-lat2.ent">
+%lat2;
+]>
+<locale language="ro"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Rezumat"/>
 <gentext key="abstract" text="Rezumat"/>
@@ -161,11 +183,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/ru.xml b/gentext/locale/ru.xml
index 200c5df0c..42b757dfe 100644
--- a/gentext/locale/ru.xml
+++ b/gentext/locale/ru.xml
@@ -1,4 +1,23 @@
-<locale language="ru">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<!DOCTYPE locale [
+<!ENTITY % cyr1 PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+                "../../xmlcharent/iso-cyr1.ent">
+%cyr1;
+]>
+<locale language="ru"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="&Acy;&ncy;&ncy;&ocy;&tcy;&acy;&tscy;&icy;&yacy;"/>
 <gentext key="abstract" text="&Acy;&ncy;&ncy;&ocy;&tcy;&acy;&tscy;&icy;&yacy;"/>
@@ -191,11 +210,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/sk.xml b/gentext/locale/sk.xml
index 761f87ffa..1af59a5f3 100644
--- a/gentext/locale/sk.xml
+++ b/gentext/locale/sk.xml
@@ -1,4 +1,18 @@
-<locale language="sk">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="sk"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Obsah"/>
 <gentext key="abstract" text="Obsah"/>
@@ -155,11 +169,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/sl.xml b/gentext/locale/sl.xml
index 96c0abc72..1b55489b5 100644
--- a/gentext/locale/sl.xml
+++ b/gentext/locale/sl.xml
@@ -1,4 +1,18 @@
-<locale language="sl">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="sl"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Povzetek"/>
 <gentext key="abstract" text="Povzetek"/>
@@ -155,11 +169,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/sv.xml b/gentext/locale/sv.xml
index 4dd9e594b..16bd4dbf1 100644
--- a/gentext/locale/sv.xml
+++ b/gentext/locale/sv.xml
@@ -1,4 +1,18 @@
-<locale language="sv">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="sv"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="Sammanfattning"/>
 <gentext key="abstract" text="Sammanfattning"/>
@@ -157,11 +171,197 @@
 <dingbat key="nestedendquote" text="&#x2019;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/zh_cn.xml b/gentext/locale/zh_cn.xml
index a1a479a93..214f25595 100644
--- a/gentext/locale/zh_cn.xml
+++ b/gentext/locale/zh_cn.xml
@@ -1,4 +1,18 @@
-<locale language="zh_cn">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="zh_cn"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="Abstract" text="&#x6458;&#x8981;"/>
 <gentext key="abstract" text="&#x6458;&#x8981;"/> <!-- GB2312 "&#213;&#170;&#210;&#170;" -->
@@ -155,12 +169,197 @@
 <dingbat key="nestedendquote" text="'"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
-<xref element="appendix" text="%g %n"/>
-<xref element="chapter" text="%g %n"/>
-<xref element="dedication" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="bibliography" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>
diff --git a/gentext/locale/zh_tw.xml b/gentext/locale/zh_tw.xml
index 807b3fc96..7c81094f7 100644
--- a/gentext/locale/zh_tw.xml
+++ b/gentext/locale/zh_tw.xml
@@ -1,4 +1,18 @@
-<locale language="zh_tw">
+<?xml version='1.0'?>
+<!-- there is no doctype for these files, they are WF only -->
+<locale language="zh_tw"
+        xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
+
+<doc:localeinfo xmlns="">
+<!-- FIXME: list the real contributors
+<authorgroup>
+  <author><firstname>Norman</firstname><surname>Walsh</surname>
+          <affiliation><address><email>ndw@nwalsh.com</email></address>
+          </affiliation>
+  </author>
+</authorgroup>
+-->
+</doc:localeinfo>
 
 <gentext key="abstract"       text="&#x6458;&#x8981;"/>
 <gentext key="answer"         text="&#x7B54;&#xFF1A;"/>
@@ -88,12 +102,197 @@
 <dingbat key="nestedendquote"   text="'"/>
 <dingbat key="bullet"         text="&#x2022;"/>
 
-<xref element="appendix"      text="%g %n"/>
-<xref element="chapter"       text="%g %n"/>
-<xref element="dedication"    text="%t"/>
-<xref element="preface"       text="%t"/>
-<xref element="bibliography"  text="%t"/>
-<xref element="glossary"      text="%t"/>
-<xref element="index"         text="%t"/>
+<context name="title">
+
+<template name="abstract">%t</template>
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="authorblurb">%t</template>
+<template name="bibliodiv">%t</template>
+<template name="biblioentry">%t</template>
+<template name="bibliography">%t</template>
+<template name="bibliomixed">%t</template>
+<template name="bibliomset">%t</template>
+<template name="biblioset">%t</template>
+<template name="blockquote">%t</template>
+<template name="book">%t</template>
+<template name="calloutlist">%t</template>
+<template name="caution">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="equation"><Equation/> %n. %t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="formalpara">%t</template>
+<template name="glossary">%t</template>
+<template name="glossdiv">%t</template>
+<template name="important">%t</template>
+<template name="index">%t</template>
+<template name="indexdiv">%t</template>
+<template name="itemizedlist">%t</template>
+<template name="legalnotice">%t</template>
+<template name="lot">%t</template>
+<template name="msg">%t</template>
+<template name="msgexplan">%t</template>
+<template name="msgmain">%t</template>
+<template name="msgrel">%t</template>
+<template name="msgset">%t</template>
+<template name="msgsub">%t</template>
+<template name="note">%t</template>
+<template name="orderedlist">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="partintro">%t</template>
+<template name="preface">%t</template>
+<template name="procedure">%t</template>
+<template name="qandadiv">%t</template>
+<template name="qandaset">%t</template>
+<template name="reference">%t</template>
+<template name="refsect1">%t</template>
+<template name="refsect2">%t</template>
+<template name="refsect3">%t</template>
+<template name="refsynopsisdiv">%t</template>
+<template name="refsynopsisdivinfo">%t</template>
+<template name="segmentedlist">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="sidebar">%t</template>
+<template name="step">%t</template>
+<template name="table"><Table/> %n. %t</template>
+<template name="tip">%t</template>
+<template name="toc">%t</template>
+<template name="variablelist">%t</template>
+<template name="warning">%t</template>
+
+</context>
+
+<context name="section-title">
+
+<template name="sect1">%t</template>
+<template name="sect2">%t</template>
+<template name="sect3">%t</template>
+<template name="sect4">%t</template>
+<template name="sect5">%t</template>
+<template name="section">%t</template>
+<template name="simplesect">%t</template>
+
+</context>
+
+<context name="section-title-numbered">
+
+<template name="sect1">%n. %t</template>
+<template name="sect2">%n. %t</template>
+<template name="sect3">%n. %t</template>
+<template name="sect4">%n. %t</template>
+<template name="sect5">%n. %t</template>
+<template name="section">%n. %t</template>
+<template name="simplesect">%n. %t</template>
+
+</context>
+
+<context name="subtitle">
+
+<template name="appendix">%s</template>
+<template name="article">%s</template>
+<template name="bibliodiv">%s</template>
+<template name="biblioentry">%s</template>
+<template name="bibliography">%s</template>
+<template name="bibliomixed">%s</template>
+<template name="bibliomset">%s</template>
+<template name="biblioset">%s</template>
+<template name="book">%s</template>
+<template name="chapter">%s</template>
+<template name="colophon">%s</template>
+<template name="dedication">%s</template>
+<template name="glossary">%s</template>
+<template name="glossdiv">%s</template>
+<template name="index">%s</template>
+<template name="indexdiv">%s</template>
+<template name="lot">%s</template>
+<template name="part">%s</template>
+<template name="partintro">%s</template>
+<template name="preface">%s</template>
+<template name="refentry">%s</template>
+<template name="reference">%s</template>
+<template name="refsect1">%s</template>
+<template name="refsect2">%s</template>
+<template name="refsect3">%s</template>
+<template name="refsynopsisdiv">%s</template>
+<template name="sect1">%s</template>
+<template name="sect2">%s</template>
+<template name="sect3">%s</template>
+<template name="sect4">%s</template>
+<template name="sect5">%s</template>
+<template name="section">%s</template>
+<template name="set">%s</template>
+<template name="setindex">%s</template>
+<template name="sidebar">%s</template>
+<template name="simplesect">%s</template>
+<template name="toc">%s</template>
+
+</context>
+
+<context name="xref">
+
+<template name="appendix"><Appendix/> %n. %t</template>
+<template name="article">%t</template>
+<template name="bibliography">%t</template>
+<template name="book">%t</template>
+<template name="chapter"><Chapter/> %n. %t</template>
+<template name="colophon">%t</template>
+<template name="dedication">%t</template>
+<template name="example"><Example/> %n. %t</template>
+<template name="figure"><Figure/> %n. %t</template>
+<template name="glossary">%t</template>
+<template name="index">%t</template>
+<template name="part"><Part/> %n. %t</template>
+<template name="preface">%t</template>
+<template name="reference">%t</template>
+<template name="set">%t</template>
+<template name="setindex">%t</template>
+<template name="table"><Table/> %n. %t</template>
+
+</context>
+
+<context name="section-xref">
+
+<template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect4"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="section-xref-numbered">
+
+<template name="sect1"><Section/> %n</template>
+<template name="sect2"><Section/> %n</template>
+<template name="sect3"><Section/> %n</template>
+<template name="sect4"><Section/> %n</template>
+<template name="sect5"><Section/> %n</template>
+<template name="section"><Section/> %n</template>
+<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+
+</context>
+
+<context name="authorgroup">
+<template name="sep">,</template>
+<template name="sep2"> <and/> </template>
+<template name="seplast">, <and/> </template>
+</context>
+
+<context name="glossary">
+<template name="see"><GlossSee/> </template>
+<template name="seealso"><GlossSeeAlso/> </template>
+</context>
+
+<context name="msgset">
+<template name="MsgLevel"><MsgLevel/>: </template>
+<template name="MsgOrig"><MsgOrig/>: </template>
+<template name="MsgAud"><MsgAud/>: </template>
+</context>
 
 </locale>