From add7d646e4c50acd50af8265b05e5ee716088664 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 25 Jul 2003 05:03:54 +0000
Subject: [PATCH] Rearranged xref contexts into xref, xref-number,
 xref-number-and-title. Changed datetime context to add full and abbrev
 contexts.

---
 gentext/locale/af.xml    | 108 ++++++++++++++++++------------
 gentext/locale/ar.xml    | 141 ++++++++++++++++++++++++---------------
 gentext/locale/bg.xml    |  96 ++++++++++++++++----------
 gentext/locale/bn.xml    | 128 +++++++++++++++++++----------------
 gentext/locale/ca.xml    | 109 ++++++++++++++++++------------
 gentext/locale/cs.xml    | 116 ++++++++++++++++++++------------
 gentext/locale/da.xml    | 129 +++++++++++++++++++++--------------
 gentext/locale/de.xml    | 131 ++++++++++++++++++++++--------------
 gentext/locale/el.xml    | 108 ++++++++++++++++++------------
 gentext/locale/en.xml    | 130 ++++++++++++++++++++----------------
 gentext/locale/es.xml    | 108 ++++++++++++++++++------------
 gentext/locale/et.xml    | 108 ++++++++++++++++++------------
 gentext/locale/eu.xml    | 108 ++++++++++++++++++------------
 gentext/locale/fi.xml    | 108 ++++++++++++++++++------------
 gentext/locale/fr.xml    | 108 ++++++++++++++++++------------
 gentext/locale/he.xml    | 108 ++++++++++++++++++------------
 gentext/locale/hr.xml    | 141 ++++++++++++++++++++++++---------------
 gentext/locale/hu.xml    |  98 +++++++++++++++++----------
 gentext/locale/id.xml    | 108 ++++++++++++++++++------------
 gentext/locale/it.xml    |  96 ++++++++++++++++----------
 gentext/locale/ja.xml    |  74 +++++++++++++-------
 gentext/locale/ko.xml    |  98 +++++++++++++++++----------
 gentext/locale/la.xml    | 124 ++++++++++++++++++----------------
 gentext/locale/lt.xml    |  96 ++++++++++++++++----------
 gentext/locale/nl.xml    | 108 ++++++++++++++++++------------
 gentext/locale/nn.xml    | 108 ++++++++++++++++++------------
 gentext/locale/no.xml    | 108 ++++++++++++++++++------------
 gentext/locale/pl.xml    | 108 ++++++++++++++++++------------
 gentext/locale/pt.xml    | 108 ++++++++++++++++++------------
 gentext/locale/pt_br.xml | 102 ++++++++++++++++++----------
 gentext/locale/ro.xml    | 108 ++++++++++++++++++------------
 gentext/locale/ru.xml    | 108 ++++++++++++++++++------------
 gentext/locale/sk.xml    | 106 +++++++++++++++++++----------
 gentext/locale/sl.xml    | 108 ++++++++++++++++++------------
 gentext/locale/sr.xml    | 108 ++++++++++++++++++------------
 gentext/locale/sv.xml    | 102 ++++++++++++++++++----------
 gentext/locale/th.xml    | 115 ++++++++++++++++++-------------
 gentext/locale/tr.xml    | 128 ++++++++++++++++++++++-------------
 gentext/locale/uk.xml    | 108 ++++++++++++++++++------------
 gentext/locale/vi.xml    |  96 ++++++++++++++++----------
 gentext/locale/xh.xml    | 108 ++++++++++++++++++------------
 gentext/locale/zh_cn.xml | 102 ++++++++++++++++++----------
 gentext/locale/zh_tw.xml | 102 ++++++++++++++++++----------
 43 files changed, 2920 insertions(+), 1800 deletions(-)

diff --git a/gentext/locale/af.xml b/gentext/locale/af.xml
index 20a6579fb..a750b2d13 100644
--- a/gentext/locale/af.xml
+++ b/gentext/locale/af.xml
@@ -335,10 +335,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -349,13 +348,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n</template>
-<template name="figure"><Figure/> %n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -374,26 +373,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -401,39 +396,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/ar.xml b/gentext/locale/ar.xml
index 692b970ea..db7ea8e14 100644
--- a/gentext/locale/ar.xml
+++ b/gentext/locale/ar.xml
@@ -340,10 +340,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -354,14 +353,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/>&#160;%n</template>
-<template name="figure" style="title"><Figure/>&#160;%n.&#160;%t</template>
-<template name="figure"><Figure/>&#160;%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -380,26 +378,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>&#160;%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>&#160;%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -407,56 +401,87 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
 <template name="bridgehead"><Section/>&#160;%n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1"><Section/>&#160;%n</template>
 <template name="sect2"><Section/>&#160;%n</template>
 <template name="sect3"><Section/>&#160;%n</template>
 <template name="sect4"><Section/>&#160;%n</template>
 <template name="sect5"><Section/>&#160;%n</template>
 <template name="section"><Section/>&#160;%n</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
 <context name="xref-number-and-title">
 
-<template name="bridgehead"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="sect1"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect2"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect3"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect4"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect5"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="section"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 <template name="chapter"><Chapter/>&#160;%n, %t</template>
 <template name="appendix"><Appendix/>&#160;%n, %t</template>
 
@@ -481,6 +506,9 @@
 
 <context name="datetime">
 <template name="format">d/m/Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">êæÇêÑ</template>
 <template name="February">áÈÑÇêÑ</template>
 <template name="March">åÇÑÓ</template>
@@ -493,6 +521,16 @@
 <template name="October">ÃãÊèÈÑ</template>
 <template name="November">æèáåÈÑ</template>
 <template name="December">ÏêÓåÈÑ</template>
+<template name="Monday">ÇäÅËæêæ</template>
+<template name="Tuesday">ÇäËäÇËÇÁ</template>
+<template name="Wednesday">ÇäÃÑÈÙÇÁ</template>
+<template name="Thursday">ÇäÎåêÓ</template>
+<template name="Friday">ÇäÌåÙÉ</template>
+<template name="Saturday">ÇäÓÈÊ</template>
+<template name="Sunday">ÇäÃÍÏ</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">êæÇêÑ</template>
 <template name="Feb">áÈÑÇêÑ</template>
 <template name="Mar">åÇÑÓ</template>
@@ -505,13 +543,6 @@
 <template name="Oct">ÃãÊèÈÑ</template>
 <template name="Nov">æèáåÈÑ</template>
 <template name="Dec">ÏêÓåÈÑ</template>
-<template name="Monday">ÇäÅËæêæ</template>
-<template name="Tuesday">ÇäËäÇËÇÁ</template>
-<template name="Wednesday">ÇäÃÑÈÙÇÁ</template>
-<template name="Thursday">ÇäÎåêÓ</template>
-<template name="Friday">ÇäÌåÙÉ</template>
-<template name="Saturday">ÇäÓÈÊ</template>
-<template name="Sunday">ÇäÃÍÏ</template>
 <template name="Mon">ÇäÅËæêæ</template>
 <template name="Tue">ÇäËäÇËÇÁ</template>
 <template name="Wed">ÇäÃÑÈÙÇÁ</template>
diff --git a/gentext/locale/bg.xml b/gentext/locale/bg.xml
index 918657ff5..a8c75d3d2 100644
--- a/gentext/locale/bg.xml
+++ b/gentext/locale/bg.xml
@@ -337,10 +337,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -351,13 +350,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/>&#160;%n</template>
-<template name="figure"><Figure/>&#160;%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -376,26 +375,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>&#160;%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>&#160;%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -403,39 +398,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
 <template name="bridgehead"><Section/>&#160;%n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1"><Section/>&#160;%n</template>
 <template name="sect2"><Section/>&#160;%n</template>
 <template name="sect3"><Section/>&#160;%n</template>
 <template name="sect4"><Section/>&#160;%n</template>
 <template name="sect5"><Section/>&#160;%n</template>
 <template name="section"><Section/>&#160;%n</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/bn.xml b/gentext/locale/bn.xml
index de47f775c..6be1a6545 100644
--- a/gentext/locale/bn.xml
+++ b/gentext/locale/bn.xml
@@ -192,8 +192,8 @@
 
 <!-- n.b. &#x2010; might be better, but it doesn't always render properly -->
 <gentext key="hyphenation-character" text="-"/>
-<gentext key="hyphenation-push-character-count" text="&#2536;"/>
-<gentext key="hyphenation-remain-character-count" text="&#2536;"/>
+<gentext key="hyphenation-push-character-count" text="2"/>
+<gentext key="hyphenation-remain-character-count" text="2"/>
 
 
 <context name="styles">
@@ -353,10 +353,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -367,14 +366,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/>&#160;%n</template>
-<template name="figure" style="title"><Figure/>&#160;%n.&#160;%t</template>
-<template name="figure"><Figure/>&#160;%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -393,26 +391,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>&#160;%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>&#160;%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -420,58 +414,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
 <template name="bridgehead"><Section/>&#160;%n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1"><Section/>&#160;%n</template>
 <template name="sect2"><Section/>&#160;%n</template>
 <template name="sect3"><Section/>&#160;%n</template>
 <template name="sect4"><Section/>&#160;%n</template>
 <template name="sect5"><Section/>&#160;%n</template>
 <template name="section"><Section/>&#160;%n</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
 <context name="xref-number-and-title">
 
-<template name="bridgehead"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="sect1"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect2"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect3"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect4"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect5"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="section"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="chapter"><Chapter/>&#160;%n, %t</template>
 <template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
@@ -494,6 +500,9 @@
 
 <context name="datetime">
 <template name="format">d/m/Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">&#2460;&#2494;&#2472;&#2497;&#2527;&#2494;&#2480;&#2496;</template>
 <template name="February">&#2475;&#2503;&#2476;&#2509;&#2480;&#2497;&#2527;&#2494;&#2480;&#2496;</template>
 <template name="March">&#2478;&#2494;&#2480;&#2509;&#2458;</template>
@@ -506,6 +515,16 @@
 <template name="October">&#2437;&#2453;&#2509;&#2463;&#2507;&#2476;&#2480;</template>
 <template name="November">&#2472;&#2477;&#2503;&#2478;&#2509;&#2476;&#2480;</template>
 <template name="December">&#2465;&#2495;&#2488;&#2503;&#2478;&#2509;&#2476;&#2480;</template>
+<template name="Monday">&#2488;&#2507;&#2478;&#2476;&#2494;&#2480;</template>
+<template name="Tuesday">&#2478;&#2457;&#2509;&#2455;&#2482;&#2476;&#2494;&#2480;</template>
+<template name="Wednesday">&#2476;&#2497;&#2471;&#2476;&#2494;&#2480;</template>
+<template name="Thursday">&#2476;&#2499;&#2489;&#2435;&#2488;&#2509;&#2474;&#2468;&#2495;&#2476;&#2494;&#2480;</template>
+<template name="Friday">&#2486;&#2497;&#2453;&#2509;&#2480;&#2476;&#2494;&#2480;</template>
+<template name="Saturday">&#2486;&#2472;&#2495;&#2476;&#2494;&#2480;</template>
+<template name="Sunday">&#2480;&#2476;&#2495;&#2476;&#2494;&#2480;</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">&#2460;&#2494;&#2472;&#2497;&#2527;&#2494;&#2480;&#2496;</template>
 <template name="Feb">&#2475;&#2503;&#2476;&#2509;&#2480;&#2497;&#2527;&#2494;&#2480;&#2496;</template>
 <template name="Mar">&#2478;&#2494;&#2480;&#2509;&#2458;</template>
@@ -518,13 +537,6 @@
 <template name="Oct">&#2437;&#2453;&#2509;&#2463;&#2507;&#2476;&#2480;</template>
 <template name="Nov">&#2472;&#2477;&#2503;&#2478;&#2509;&#2476;&#2480;</template>
 <template name="Dec">&#2465;&#2495;&#2488;&#2503;&#2478;&#2509;&#2476;&#2480;</template>
-<template name="Monday">&#2488;&#2507;&#2478;&#2476;&#2494;&#2480;</template>
-<template name="Tuesday">&#2478;&#2457;&#2509;&#2455;&#2482;&#2476;&#2494;&#2480;</template>
-<template name="Wednesday">&#2476;&#2497;&#2471;&#2476;&#2494;&#2480;</template>
-<template name="Thursday">&#2476;&#2499;&#2489;&#2435;&#2488;&#2509;&#2474;&#2468;&#2495;&#2476;&#2494;&#2480;</template>
-<template name="Friday">&#2486;&#2497;&#2453;&#2509;&#2480;&#2476;&#2494;&#2480;</template>
-<template name="Saturday">&#2486;&#2472;&#2495;&#2476;&#2494;&#2480;</template>
-<template name="Sunday">&#2480;&#2476;&#2495;&#2476;&#2494;&#2480;</template>
 <template name="Mon">&#2488;&#2507;&#2478;</template>
 <template name="Tue">&#2478;&#2457;&#2509;&#2455;&#2482;</template>
 <template name="Wed">&#2476;&#2497;&#2471;</template>
diff --git a/gentext/locale/ca.xml b/gentext/locale/ca.xml
index 36f32a9b9..7de664c4b 100644
--- a/gentext/locale/ca.xml
+++ b/gentext/locale/ca.xml
@@ -341,10 +341,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -355,13 +354,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -381,66 +380,92 @@
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
 <template name="page.citation"> [%p]</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
 <template name="varlistentry">%n</template>
 <template name="warning">%t</template>
 
+<template name="bridgehead"> <startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"> &#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/cs.xml b/gentext/locale/cs.xml
index 79124e250..9510e5091 100644
--- a/gentext/locale/cs.xml
+++ b/gentext/locale/cs.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer">%n</template>
-<template name="appendix">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation">%n</template>
-<template name="example">%n</template>
-<template name="figure">%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -373,26 +372,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure">%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry">%n</template>
 <template name="qandaset">%t</template>
 <template name="question">%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table">%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -400,39 +395,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead">&#x201E;%t&#x201C;</template>
-<template name="refsection">&#x201E;%t&#x201C;</template>
-<template name="refsect1">&#x201E;%t&#x201C;</template>
-<template name="refsect2">&#x201E;%t&#x201C;</template>
-<template name="refsect3">&#x201E;%t&#x201C;</template>
-<template name="sect1">&#x201E;%t&#x201C;</template>
-<template name="sect2">&#x201E;%t&#x201C;</template>
-<template name="sect3">&#x201E;%t&#x201C;</template>
-<template name="sect4">&#x201E;%t&#x201C;</template>
-<template name="sect5">&#x201E;%t&#x201C;</template>
-<template name="section">&#x201E;%t&#x201C;</template>
-<template name="simplesect">&#x201E;%t&#x201C;</template>
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer">%n</template>
+<template name="appendix">%n</template>
 <template name="bridgehead">%n</template>
-<template name="refsection">&#x201E;%t&#x201C;</template>
-<template name="refsect1">&#x201E;%t&#x201C;</template>
-<template name="refsect2">&#x201E;%t&#x201C;</template>
-<template name="refsect3">&#x201E;%t&#x201C;</template>
+<template name="chapter">%n</template>
+<template name="equation">%n</template>
+<template name="example">%n</template>
+<template name="figure">%n</template>
+<template name="part">%n</template>
+<template name="procedure">%n</template>
+<template name="productionset">%n</template>
+<template name="qandadiv">%n</template>
+<template name="qandaentry">%n</template>
+<template name="question">%n</template>
 <template name="sect1">%n</template>
 <template name="sect2">%n</template>
 <template name="sect3">%n</template>
 <template name="sect4">%n</template>
 <template name="sect5">%n</template>
 <template name="section">%n</template>
-<template name="simplesect">&#x201E;%t&#x201C;</template>
+<template name="table">%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="bridgehead">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="chapter">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="equation">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="example">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="figure">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="part">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="procedure">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="productionset">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="qandadiv">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="sect1">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="sect2">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="sect3">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="sect4">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="sect5">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="section">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="simplesect">%n &#x2013; &#x201E;%t&#x201C;</template>
+<template name="table">%n &#x2013; &#x201E;%t&#x201C;</template>
 
 </context>
 
@@ -455,6 +481,9 @@
 
 <context name="datetime">
 <template name="format">d.&#160;B Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">ledna</template>
 <template name="February">února</template>
 <template name="March">března</template>
@@ -467,6 +496,16 @@
 <template name="October">října</template>
 <template name="November">listopadu</template>
 <template name="December">prosince</template>
+<template name="Monday">pondělí</template>
+<template name="Tuesday">úterý</template>
+<template name="Wednesday">středa</template>
+<template name="Thursday">čtvrtek</template>
+<template name="Friday">pátek</template>
+<template name="Saturday">sobota</template>
+<template name="Sunday">neděle</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">led</template>
 <template name="Feb">úno</template>
 <template name="Mar">bře</template>
@@ -479,13 +518,6 @@
 <template name="Oct">řij</template>
 <template name="Nov">lis</template>
 <template name="Dec">pro</template>
-<template name="Monday">pondělí</template>
-<template name="Tuesday">úterý</template>
-<template name="Wednesday">středa</template>
-<template name="Thursday">čtvrtek</template>
-<template name="Friday">pátek</template>
-<template name="Saturday">sobota</template>
-<template name="Sunday">neděle</template>
 <template name="Mon">po</template>
 <template name="Tue">út</template>
 <template name="Wed">st</template>
diff --git a/gentext/locale/da.xml b/gentext/locale/da.xml
index 5cd09fe1a..ff7ed277b 100644
--- a/gentext/locale/da.xml
+++ b/gentext/locale/da.xml
@@ -343,10 +343,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/> %n</template>
-<template name="appendix"><Appendix/> %n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -357,13 +356,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/> %n</template>
-<template name="example"><Example/> %n</template>
-<template name="figure"><Figure/> %n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -382,27 +381,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/> %n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/> %n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/> %n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -410,39 +404,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><Section/> %n</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
@@ -465,6 +490,9 @@
 
 <context name="datetime">
 <template name="format">d/m/Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">Januar</template>
 <template name="February">Februar</template>
 <template name="March">Marts</template>
@@ -477,6 +505,16 @@
 <template name="October">Oktober</template>
 <template name="November">November</template>
 <template name="December">December</template>
+<template name="Monday">Mandag</template>
+<template name="Tuesday">Tirsdag</template>
+<template name="Wednesday">Onsdag</template>
+<template name="Thursday">Torsdag</template>
+<template name="Friday">Fredag</template>
+<template name="Saturday">L&#xF8;rdag</template>
+<template name="Sunday">S&#xF8;ndag</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">Jan</template>
 <template name="Feb">Feb</template>
 <template name="Mar">Mar</template>
@@ -489,13 +527,6 @@
 <template name="Oct">Okt</template>
 <template name="Nov">Nov</template>
 <template name="Dec">Dec</template>
-<template name="Monday">Mandag</template>
-<template name="Tuesday">Tirsdag</template>
-<template name="Wednesday">Onsdag</template>
-<template name="Thursday">Torsdag</template>
-<template name="Friday">Fredag</template>
-<template name="Saturday">L&#xF8;rdag</template>
-<template name="Sunday">S&#xF8;ndag</template>
 <template name="Mon">Man</template>
 <template name="Tue">Tir</template>
 <template name="Wed">ins</template>
diff --git a/gentext/locale/de.xml b/gentext/locale/de.xml
index 5e1c4306f..6e2e26abd 100644
--- a/gentext/locale/de.xml
+++ b/gentext/locale/de.xml
@@ -354,10 +354,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -368,13 +367,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -393,26 +392,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/> %n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -420,39 +415,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201E;%t&#x201C;</template>
-<template name="refsection">&#x201E;%t&#x201C;</template>
-<template name="refsect1">&#x201E;%t&#x201C;</template>
-<template name="refsect2">&#x201E;%t&#x201C;</template>
-<template name="refsect3">&#x201E;%t&#x201C;</template>
-<template name="sect1">&#x201E;%t&#x201C;</template>
-<template name="sect2">&#x201E;%t&#x201C;</template>
-<template name="sect3">&#x201E;%t&#x201C;</template>
-<template name="sect4">&#x201E;%t&#x201C;</template>
-<template name="sect5">&#x201E;%t&#x201C;</template>
-<template name="section">&#x201E;%t&#x201C;</template>
-<template name="simplesect">&#x201E;%t&#x201C;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201E;%t&#x201C;</template>
-<template name="refsection">&#x201E;%t&#x201C;</template>
-<template name="refsect1">&#x201E;%t&#x201C;</template>
-<template name="refsect2">&#x201E;%t&#x201C;</template>
-<template name="refsect3">&#x201E;%t&#x201C;</template>
-<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">&#x201E;%t&#x201C;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
@@ -472,13 +498,15 @@
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
 </context>
-
   
 <context name="datetime">
 <template name="format">d.M.Y</template>
+</context>
+  
+<context name="datetime-full">
 <template name="January">Januar</template>
 <template name="February">Februar</template>
-<template name="March">M&aml;rz</template>
+<template name="March">M&#x00E4;rz</template>
 <template name="April">April</template>
 <template name="May">Mai</template>
 <template name="June">Juni</template>
@@ -488,6 +516,16 @@
 <template name="October">Oktober</template>
 <template name="November">November</template>
 <template name="December">Dezember</template>
+<template name="Monday">Montag</template>
+<template name="Tuesday">Dienstag</template>
+<template name="Wednesday">Mittwoch</template>
+<template name="Thursday">Donnerstag</template>
+<template name="Friday">Freitag</template>
+<template name="Saturday">Samstag</template>
+<template name="Sunday">Sonntag</template>
+</context>
+  
+<context name="datetime-abbrev">
 <template name="Jan">Jan</template>
 <template name="Feb">Feb</template>
 <template name="Mar">Mar</template>
@@ -500,13 +538,6 @@
 <template name="Oct">Okt</template>
 <template name="Nov">Nov</template>
 <template name="Dec">Dez</template>
-<template name="Monday">Montag</template>
-<template name="Tuesday">Dienstag</template>
-<template name="Wednesday">Mittwoch</template>
-<template name="Thursday">Donnerstag</template>
-<template name="Friday">Freitag</template>
-<template name="Saturday">Samstag</template>
-<template name="Sunday">Sonntag</template>
 <template name="Mon">Mo</template>
 <template name="Tue">Di</template>
 <template name="Wed">Mi</template>
diff --git a/gentext/locale/el.xml b/gentext/locale/el.xml
index f88b896c1..44a98788d 100644
--- a/gentext/locale/el.xml
+++ b/gentext/locale/el.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -374,65 +373,92 @@
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
 <template name="page.citation"> [%p]</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
 <template name="varlistentry">%n</template>
 <template name="warning">%t</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/en.xml b/gentext/locale/en.xml
index 5b30a6c07..8c412bf3e 100644
--- a/gentext/locale/en.xml
+++ b/gentext/locale/en.xml
@@ -79,6 +79,8 @@
 <gentext key="pubdate" text="Publication date"/>
 <gentext key="Published" text="Published"/>
 <gentext key="published" text="Published"/>
+<gentext key="Qandadiv" text="Q &amp; A"/>
+<gentext key="qandadiv" text="Q &amp; A"/>
 <gentext key="Question" text="Q:"/>
 <gentext key="question" text="Q:"/>
 <gentext key="RefEntry" text=""/>
@@ -350,10 +352,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -364,14 +365,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/>&#160;%n</template>
-<template name="figure" style="title"><Figure/>&#160;%n.&#160;%t</template>
-<template name="figure"><Figure/>&#160;%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -390,85 +390,95 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>&#160;%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>&#160;%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
 <template name="varlistentry">%n</template>
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
+<template name="page">(page %p)</template>
+<template name="pageabbrev">(p. %p)</template>
+<template name="Page">Page %p</template>
+
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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">
+<context name="xref-number">
 
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
 <template name="bridgehead"><Section/>&#160;%n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1"><Section/>&#160;%n</template>
 <template name="sect2"><Section/>&#160;%n</template>
 <template name="sect3"><Section/>&#160;%n</template>
 <template name="sect4"><Section/>&#160;%n</template>
 <template name="sect5"><Section/>&#160;%n</template>
 <template name="section"><Section/>&#160;%n</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
 <context name="xref-number-and-title">
 
-<template name="bridgehead"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="sect1"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect2"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect3"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect4"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect5"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="section"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="chapter"><Chapter/>&#160;%n, %t</template>
 <template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
@@ -491,6 +501,9 @@
 
 <context name="datetime">
 <template name="format">m/d/Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">January</template>
 <template name="February">February</template>
 <template name="March">March</template>
@@ -503,6 +516,16 @@
 <template name="October">October</template>
 <template name="November">November</template>
 <template name="December">December</template>
+<template name="Monday">Monday</template>
+<template name="Tuesday">Tuesday</template>
+<template name="Wednesday">Wednesday</template>
+<template name="Thursday">Thursday</template>
+<template name="Friday">Friday</template>
+<template name="Saturday">Saturday</template>
+<template name="Sunday">Sunday</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">Jan</template>
 <template name="Feb">Feb</template>
 <template name="Mar">Mar</template>
@@ -515,13 +538,6 @@
 <template name="Oct">Oct</template>
 <template name="Nov">Nov</template>
 <template name="Dec">Dec</template>
-<template name="Monday">Monday</template>
-<template name="Tuesday">Tuesday</template>
-<template name="Wednesday">Wednesday</template>
-<template name="Thursday">Thursday</template>
-<template name="Friday">Friday</template>
-<template name="Saturday">Saturday</template>
-<template name="Sunday">Sunday</template>
 <template name="Mon">Mon</template>
 <template name="Tue">Tue</template>
 <template name="Wed">Wed</template>
diff --git a/gentext/locale/es.xml b/gentext/locale/es.xml
index a46a660f4..af0ad9e92 100644
--- a/gentext/locale/es.xml
+++ b/gentext/locale/es.xml
@@ -339,10 +339,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -353,13 +352,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -378,26 +377,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -405,39 +400,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><Section/> %n</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/et.xml b/gentext/locale/et.xml
index 1cfb0eb40..47e361d1d 100644
--- a/gentext/locale/et.xml
+++ b/gentext/locale/et.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -374,65 +373,92 @@
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
 <template name="page.citation"> [%p]</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
 <template name="varlistentry">%n</template>
 <template name="warning">%t</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/eu.xml b/gentext/locale/eu.xml
index 4258b53f0..c88ef4d23 100644
--- a/gentext/locale/eu.xml
+++ b/gentext/locale/eu.xml
@@ -332,10 +332,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -346,13 +345,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n</template>
-<template name="figure"><Figure/> %n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -371,26 +370,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -398,39 +393,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><Section/> %n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/fi.xml b/gentext/locale/fi.xml
index 51c4fcd3c..8ab837b85 100644
--- a/gentext/locale/fi.xml
+++ b/gentext/locale/fi.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -373,26 +372,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -400,39 +395,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/fr.xml b/gentext/locale/fr.xml
index 9f64768c4..cca136799 100644
--- a/gentext/locale/fr.xml
+++ b/gentext/locale/fr.xml
@@ -339,10 +339,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -353,13 +352,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -378,66 +377,93 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
 <template name="varlistentry">%n</template>
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref">
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><Section/> %n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/he.xml b/gentext/locale/he.xml
index 319e2664b..3e457e506 100644
--- a/gentext/locale/he.xml
+++ b/gentext/locale/he.xml
@@ -333,10 +333,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -347,13 +346,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n</template>
-<template name="figure"><Figure/> %n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -372,26 +371,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -399,39 +394,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><Section/> %n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/hr.xml b/gentext/locale/hr.xml
index 4450eaad1..f67d96506 100644
--- a/gentext/locale/hr.xml
+++ b/gentext/locale/hr.xml
@@ -351,10 +351,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -365,14 +364,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/>&#160;%n</template>
-<template name="figure" style="title"><Figure/>&#160;%n.&#160;%t</template>
-<template name="figure"><Figure/>&#160;%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -391,26 +389,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>&#160;%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>&#160;%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -418,56 +412,87 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
 <template name="bridgehead"><Section/>&#160;%n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1"><Section/>&#160;%n</template>
 <template name="sect2"><Section/>&#160;%n</template>
 <template name="sect3"><Section/>&#160;%n</template>
 <template name="sect4"><Section/>&#160;%n</template>
 <template name="sect5"><Section/>&#160;%n</template>
 <template name="section"><Section/>&#160;%n</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
 <context name="xref-number-and-title">
 
-<template name="bridgehead"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="sect1"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect2"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect3"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect4"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="sect5"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="section"><Section/>&#160;%n, &#x201C;%t&#x201D;</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 <template name="chapter"><Chapter/>&#160;%n, %t</template>
 <template name="appendix"><Appendix/>&#160;%n, %t</template>
 
@@ -492,6 +517,9 @@
 
 <context name="datetime">
 <template name="format">m/d/Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">Sije&#x010D;anj</template>
 <template name="February">Velja&#x010D;a</template>
 <template name="March">O&#x017E;ujak</template>
@@ -504,6 +532,16 @@
 <template name="October">Listopad</template>
 <template name="November">Studeni</template>
 <template name="December">Prosinac</template>
+<template name="Monday">Ponedjeljak</template>
+<template name="Tuesday">Utorak</template>
+<template name="Wednesday">Srijeda</template>
+<template name="Thursday">&#x010C;etvrtak</template>
+<template name="Friday">Petak</template>
+<template name="Saturday">Subota</template>
+<template name="Sunday">Nedjelja</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">Sij</template>
 <template name="Feb">Velj</template>
 <template name="Mar">O&#x017E;u</template>
@@ -516,13 +554,6 @@
 <template name="Oct">Lis</template>
 <template name="Nov">Stu</template>
 <template name="Dec">Pro</template>
-<template name="Monday">Ponedjeljak</template>
-<template name="Tuesday">Utorak</template>
-<template name="Wednesday">Srijeda</template>
-<template name="Thursday">&#x010C;etvrtak</template>
-<template name="Friday">Petak</template>
-<template name="Saturday">Subota</template>
-<template name="Sunday">Nedjelja</template>
 <template name="Mon">Pon</template>
 <template name="Tue">Uto</template>
 <template name="Wed">Sri</template>
diff --git a/gentext/locale/hu.xml b/gentext/locale/hu.xml
index d7b2fbfb8..9c4ae455e 100644
--- a/gentext/locale/hu.xml
+++ b/gentext/locale/hu.xml
@@ -337,10 +337,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix">%n. <appendix/> - %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -351,13 +350,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter">%n. <chapter/> - %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example">%n. <example/> - %t</template>
-<template name="figure">%n. <figure/> - %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -376,26 +375,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part">%n. <part/> - %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table">%n. <table/> - %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -403,39 +398,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix">%n. <appendix/></template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter">%n. <chapter/></template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example">%n. <example/></template>
+<template name="figure">%n. <figure/></template>
+<template name="part">%n. <part/></template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1">%n. <section/></template>
 <template name="sect2">%n. <section/></template>
 <template name="sect3">%n. <section/></template>
 <template name="sect4">%n. <section/></template>
 <template name="sect5">%n. <section/></template>
 <template name="section">%n. <section/></template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix">%n. <appendix/> - %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter">%n. <chapter/> - %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example">%n. <example/> - %t</template>
+<template name="figure">%n. <figure/> - %t</template>
+<template name="part">%n. <part/> - %t</template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="sect1">%n. <section/> - %t</template>
+<template name="sect2">%n. <section/> - %t</template>
+<template name="sect3">%n. <section/> - %t</template>
+<template name="sect4">%n. <section/> - %t</template>
+<template name="sect5">%n. <section/> - %t</template>
+<template name="section">%n. <section/> - %t</template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+<template name="table">%n. <table/> - %t</template>
 
 </context>
 
diff --git a/gentext/locale/id.xml b/gentext/locale/id.xml
index ef46e0302..025b484e4 100644
--- a/gentext/locale/id.xml
+++ b/gentext/locale/id.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -373,26 +372,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -400,39 +395,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/it.xml b/gentext/locale/it.xml
index 08b24c0bc..6c03d66b5 100644
--- a/gentext/locale/it.xml
+++ b/gentext/locale/it.xml
@@ -337,10 +337,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -351,13 +350,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/>&#160;%n</template>
-<template name="figure"><Figure/>&#160;%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -376,26 +375,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>&#160;%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>&#160;%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -403,39 +398,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-    
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
 <template name="bridgehead"><Section/>&#160;%n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1"><Section/>&#160;%n</template>
 <template name="sect2"><Section/>&#160;%n</template>
 <template name="sect3"><Section/>&#160;%n</template>
 <template name="sect4"><Section/>&#160;%n</template>
 <template name="sect5"><Section/>&#160;%n</template>
 <template name="section"><Section/>&#160;%n</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/ja.xml b/gentext/locale/ja.xml
index a400300a9..98605958d 100644
--- a/gentext/locale/ja.xml
+++ b/gentext/locale/ja.xml
@@ -337,10 +337,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -351,13 +350,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter1/>%n<Chapter2/></template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n</template>
-<template name="figure"><Figure/> %n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -376,26 +375,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -403,10 +398,6 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
 <template name="bridgehead">%t<section/></template>
 <template name="refsection">%t<section/></template>
 <template name="refsect1">%t<section/></template>
@@ -422,20 +413,55 @@
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
-<template name="bridgehead"><Section/>%n</template>
-<template name="refsection">%t<section/></template>
-<template name="refsect1">%t<section/></template>
-<template name="refsect2">%t<section/></template>
-<template name="refsect3">%t<section/></template>
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter1/>%n<Chapter2/></template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <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">%t<section/></template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n. %t</template>
+<template name="bridgehead"><Section/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n. %t</template>
+<template name="equation"><Equation/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>%n. <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>%n. <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>%n. <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>%n. <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>%n. <startquote/>%t<endquote/></template>
+<template name="section"><Section/>%n. <startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n. <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/ko.xml b/gentext/locale/ko.xml
index 6d3b91802..079af8432 100644
--- a/gentext/locale/ko.xml
+++ b/gentext/locale/ko.xml
@@ -329,10 +329,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -343,13 +342,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter">%n<Chapter/>. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -368,26 +367,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part">%n<Part/>. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -395,39 +390,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter">%n<Chapter/></template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part">%n<Part/></template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1">%n<Section/></template>
 <template name="sect2">%n<Section/></template>
 <template name="sect3">%n<Section/></template>
 <template name="sect4">%n<Section/></template>
 <template name="sect5">%n<Section/></template>
 <template name="section">%n<Section/></template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n. %t</template>
+<template name="bridgehead"><Section/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="chapter">%n<Chapter/>. %t</template>
+<template name="equation"><Equation/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="part">%n<Part/>. %t</template>
+<template name="procedure"><Procedure/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n. <startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2">startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="sect1">%n<Section/>. <startquote/>%t<endquote/></template>
+<template name="sect2">%n<Section/>. <startquote/>%t<endquote/></template>
+<template name="sect3">%n<Section/>. <startquote/>%t<endquote/></template>
+<template name="sect4">%n<Section/>. <startquote/>%t<endquote/></template>
+<template name="sect5">%n<Section/>. <startquote/>%t<endquote/></template>
+<template name="section">%n<Section/>. <startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n. <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/la.xml b/gentext/locale/la.xml
index 2b7442fc1..ea125ece2 100644
--- a/gentext/locale/la.xml
+++ b/gentext/locale/la.xml
@@ -340,10 +340,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>%n</template>
-<template name="appendix"><Appendix/>%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -354,14 +353,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>%n</template>
-<template name="example"><Example/>%n</template>
-<template name="figure" style="title"><Figure/>%n.%t</template>
-<template name="figure"><Figure/>%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -380,26 +378,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -407,58 +401,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsection"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect1"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect2"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect3"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="sect1"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="sect2"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="sect3"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="sect4"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="sect5"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="section"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="simplesect"><sectioncalled/> &#8220;%t&#8221;</template>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer"><Answer/>%n</template>
+<template name="appendix"><Appendix/>%n</template>
 <template name="bridgehead"><Section/>%n</template>
-<template name="refsection"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect1"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect2"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect3"><sectioncalled/> &#8220;%t&#8221;</template>
+<template name="chapter"><Chapter/>%n</template>
+<template name="equation"><Equation/>%n</template>
+<template name="example"><Example/>%n</template>
+<template name="figure"><Figure/>%n</template>
+<template name="part"><Part/>%n</template>
+<template name="procedure"><Procedure/>%n</template>
+<template name="productionset"><ProductionSet/>%n</template>
+<template name="qandadiv"><Qandadiv/>%n</template>
+<template name="qandaentry"><Question/>%n</template>
+<template name="question"><Question/>%n</template>
 <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/> &#8220;%t&#8221;</template>
+<template name="table"><Table/>%n</template>
 
 </context>
 
 <context name="xref-number-and-title">
 
-<template name="bridgehead"><Section/>%n, &#8220;%t&#8221;</template>
-<template name="refsection"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect1"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect2"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="refsect3"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="sect1"><Section/>%n, &#8220;%t&#8221;</template>
-<template name="sect2"><Section/>%n, &#8220;%t&#8221;</template>
-<template name="sect3"><Section/>%n, &#8220;%t&#8221;</template>
-<template name="sect4"><Section/>%n, &#8220;%t&#8221;</template>
-<template name="sect5"><Section/>%n, &#8220;%t&#8221;</template>
-<template name="section"><Section/>%n, &#8220;%t&#8221;</template>
-<template name="simplesect"><sectioncalled/> &#8220;%t&#8221;</template>
-<template name="chapter"><Chapter/>%n, %t</template>
 <template name="appendix"><Appendix/>%n, %t</template>
+<template name="bridgehead"><Section/>%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>%n, %t</template>
+<template name="equation"><Equation/>%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>%n, <startquote/>%t<endquote/></template>
 
 </context>
 
@@ -481,6 +487,9 @@
 
 <context name="datetime">
 <template name="format">d/m/Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">Ianuarii</template>
 <template name="February">Februarii</template>
 <template name="March">Martii</template>
@@ -493,6 +502,16 @@
 <template name="October">Octobris</template>
 <template name="November">Novembris</template>
 <template name="December">Decembris</template>
+<template name="Monday">Lunae</template>
+<template name="Tuesday">Martis</template>
+<template name="Wednesday">Mercurii</template>
+<template name="Thursday">Iovis</template>
+<template name="Friday">Veneris</template>
+<template name="Saturday">Sabathi</template>
+<template name="Sunday">Dominica</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">Ian</template>
 <template name="Feb">Feb</template>
 <template name="Mar">Mar</template>
@@ -505,13 +524,6 @@
 <template name="Oct">Oct</template>
 <template name="Nov">Nov</template>
 <template name="Dec">Dec</template>
-<template name="Monday">Lunae</template>
-<template name="Tuesday">Martis</template>
-<template name="Wednesday">Mercurii</template>
-<template name="Thursday">Iovis</template>
-<template name="Friday">Veneris</template>
-<template name="Saturday">Sabathi</template>
-<template name="Sunday">Dominica</template>
 <template name="Mon">Lun</template>
 <template name="Tue">Mar</template>
 <template name="Wed">Mer</template>
diff --git a/gentext/locale/lt.xml b/gentext/locale/lt.xml
index cf7c65d1d..93304b2ef 100644
--- a/gentext/locale/lt.xml
+++ b/gentext/locale/lt.xml
@@ -331,10 +331,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -345,13 +344,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/>&#160;%n</template>
-<template name="figure"><Figure/>&#160;%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -370,26 +369,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>&#160;%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>&#160;%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -397,39 +392,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
 <template name="bridgehead"><Section/>&#160;%n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1"><Section/>&#160;%n</template>
 <template name="sect2"><Section/>&#160;%n</template>
 <template name="sect3"><Section/>&#160;%n</template>
 <template name="sect4"><Section/>&#160;%n</template>
 <template name="sect5"><Section/>&#160;%n</template>
 <template name="section"><Section/>&#160;%n</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/nl.xml b/gentext/locale/nl.xml
index a3f21574a..f021905c7 100644
--- a/gentext/locale/nl.xml
+++ b/gentext/locale/nl.xml
@@ -333,10 +333,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -347,13 +346,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -372,26 +371,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -399,39 +394,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/nn.xml b/gentext/locale/nn.xml
index 4e269eff0..6bd0147a3 100644
--- a/gentext/locale/nn.xml
+++ b/gentext/locale/nn.xml
@@ -341,10 +341,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -355,13 +354,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -380,26 +379,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -407,38 +402,69 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#8220;%t&#8221;</template>
-<template name="refsection">&#8220;%t&#8221;</template>
-<template name="refsect1">&#8220;%t&#8221;</template>
-<template name="refsect2">&#8220;%t&#8221;</template>
-<template name="refsect3">&#8220;%t&#8221;</template>
-<template name="sect1">&#8220;%t&#8221;</template>
-<template name="sect2">&#8220;%t&#8221;</template>
-<template name="sect3">&#8220;%t&#8221;</template>
-<template name="sect4">&#8220;%t&#8221;</template>
-<template name="sect5">&#8220;%t&#8221;</template>
-<template name="section">&#8220;%t&#8221;</template>
-<template name="simplesect">&#8220;%t&#8221;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
+
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#8220;%t&#8221;</template>
-<template name="refsection">&#8220;%t&#8221;</template>
-<template name="refsect1">&#8220;%t&#8221;</template>
-<template name="refsect2">&#8220;%t&#8221;</template>
-<template name="refsect3">&#8220;%t&#8221;</template>
-<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">&#8220;%t&#8221;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/no.xml b/gentext/locale/no.xml
index 0a0584e2b..f14f6414b 100644
--- a/gentext/locale/no.xml
+++ b/gentext/locale/no.xml
@@ -339,10 +339,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -353,13 +352,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -378,26 +377,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -405,39 +400,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/pl.xml b/gentext/locale/pl.xml
index b57a17386..bae249d78 100644
--- a/gentext/locale/pl.xml
+++ b/gentext/locale/pl.xml
@@ -332,10 +332,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -346,13 +345,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -371,26 +370,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -398,39 +393,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/pt.xml b/gentext/locale/pt.xml
index 7e19e2dcb..4347e2530 100644
--- a/gentext/locale/pt.xml
+++ b/gentext/locale/pt.xml
@@ -336,10 +336,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -350,13 +349,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -375,26 +374,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -402,39 +397,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/pt_br.xml b/gentext/locale/pt_br.xml
index ba0bdba1f..0311d7fb4 100644
--- a/gentext/locale/pt_br.xml
+++ b/gentext/locale/pt_br.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -373,25 +372,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</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="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -399,37 +395,69 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
+<context name="xref-number">
 
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/ro.xml b/gentext/locale/ro.xml
index c7bf876a9..b1f65f11b 100644
--- a/gentext/locale/ro.xml
+++ b/gentext/locale/ro.xml
@@ -342,10 +342,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -356,13 +355,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -381,26 +380,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -408,39 +403,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/ru.xml b/gentext/locale/ru.xml
index f791cf553..b82bc0711 100644
--- a/gentext/locale/ru.xml
+++ b/gentext/locale/ru.xml
@@ -376,10 +376,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -390,13 +389,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -415,26 +414,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -442,39 +437,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/sk.xml b/gentext/locale/sk.xml
index 6f17cc69f..f05a8ddd0 100644
--- a/gentext/locale/sk.xml
+++ b/gentext/locale/sk.xml
@@ -332,10 +332,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -346,13 +345,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -371,26 +370,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -398,10 +393,6 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
 <template name="bridgehead">“%t”</template>
 <template name="refsection">“%t”</template>
 <template name="refsect1">“%t”</template>
@@ -417,20 +408,55 @@
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
-<template name="bridgehead">“%t”</template>
-<template name="refsection">“%t”</template>
-<template name="refsect1">“%t”</template>
-<template name="refsect2">“%t”</template>
-<template name="refsect3">“%t”</template>
-<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">“%t”</template>
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
@@ -453,6 +479,9 @@
 
 <context name="datetime">
 <template name="format">d.&#160;B Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">januára</template>
 <template name="February">februára</template>
 <template name="March">marca</template>
@@ -465,6 +494,16 @@
 <template name="October">októbra</template>
 <template name="November">novembra</template>
 <template name="December">decembra</template>
+<template name="Monday">pondelok</template>
+<template name="Tuesday">utorok</template>
+<template name="Wednesday">streda</template>
+<template name="Thursday">Å¡tvrtok</template>
+<template name="Friday">piatok</template>
+<template name="Saturday">sobota</template>
+<template name="Sunday">nedeľa</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">jan</template>
 <template name="Feb">feb</template>
 <template name="Mar">mar</template>
@@ -477,13 +516,6 @@
 <template name="Oct">okt</template>
 <template name="Nov">nov</template>
 <template name="Dec">dec</template>
-<template name="Monday">pondelok</template>
-<template name="Tuesday">utorok</template>
-<template name="Wednesday">streda</template>
-<template name="Thursday">Å¡tvrtok</template>
-<template name="Friday">piatok</template>
-<template name="Saturday">sobota</template>
-<template name="Sunday">nedeľa</template>
 <template name="Mon">po</template>
 <template name="Tue">ut</template>
 <template name="Wed">st</template>
diff --git a/gentext/locale/sl.xml b/gentext/locale/sl.xml
index fe224003b..85803d862 100644
--- a/gentext/locale/sl.xml
+++ b/gentext/locale/sl.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -373,26 +372,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -400,39 +395,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/sr.xml b/gentext/locale/sr.xml
index 0ee2a6dce..db903fdda 100644
--- a/gentext/locale/sr.xml
+++ b/gentext/locale/sr.xml
@@ -332,10 +332,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -346,13 +345,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -371,26 +370,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -398,39 +393,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/sv.xml b/gentext/locale/sv.xml
index 299462a17..b69a33ffd 100644
--- a/gentext/locale/sv.xml
+++ b/gentext/locale/sv.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -373,25 +372,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</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="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -399,37 +395,69 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
+<context name="xref-number">
 
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/th.xml b/gentext/locale/th.xml
index c0e69e314..502f49498 100644
--- a/gentext/locale/th.xml
+++ b/gentext/locale/th.xml
@@ -340,11 +340,10 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/> %n</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -355,14 +354,14 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/> %n</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n</template>
-<template name="figure"><Figure/> %n</template>
+<template name="equation">%t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -381,31 +380,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/> %n</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
-<template name="qandadiv">%t</template>
-<template name="qandaentry"><Question/> %n</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
-<template name="qandaset">%t</template>
-<template name="question"><Question/> %n</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -414,39 +404,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><Section/> %n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/tr.xml b/gentext/locale/tr.xml
index 602ef31af..169fdc167 100644
--- a/gentext/locale/tr.xml
+++ b/gentext/locale/tr.xml
@@ -345,10 +345,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/> %n</template>
-<template name="appendix"><Appendix/> %n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -359,13 +358,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/> %n</template>
-<template name="example"><Example/> %n</template>
-<template name="figure"><Figure/> %n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -384,26 +383,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/> %n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/> %n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/> %n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -411,39 +406,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><Section/> %n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
@@ -466,6 +492,9 @@
 
 <context name="datetime">
 <template name="format">d/m/Y</template>
+</context>
+
+<context name="datetime-full">
 <template name="January">Ocak</template>
 <template name="February">Şubat</template>
 <template name="March">Mart</template>
@@ -478,6 +507,16 @@
 <template name="October">Ekim</template>
 <template name="November">Kasım</template>
 <template name="December">Aralık</template>
+<template name="Monday">Pazartesi</template>
+<template name="Tuesday">Salı</template>
+<template name="Wednesday">Çarşamba</template>
+<template name="Thursday">Perşembe</template>
+<template name="Friday">Cuma</template>
+<template name="Saturday">Cumartesi</template>
+<template name="Sunday">Pazar</template>
+</context>
+
+<context name="datetime-abbrev">
 <template name="Jan">Oca</template>
 <template name="Feb">Şub</template>
 <template name="Mar">Mar</template>
@@ -490,13 +529,6 @@
 <template name="Oct">Eki</template>
 <template name="Nov">Kas</template>
 <template name="Dec">Ara</template>
-<template name="Monday">Pazartesi</template>
-<template name="Tuesday">Salı</template>
-<template name="Wednesday">Çarşamba</template>
-<template name="Thursday">Perşembe</template>
-<template name="Friday">Cuma</template>
-<template name="Saturday">Cumartesi</template>
-<template name="Sunday">Pazar</template>
 <template name="Mon">Pzt</template>
 <template name="Tue">Sal</template>
 <template name="Wed">Çar</template>
diff --git a/gentext/locale/uk.xml b/gentext/locale/uk.xml
index ff0b5a614..bfd8f1945 100644
--- a/gentext/locale/uk.xml
+++ b/gentext/locale/uk.xml
@@ -373,10 +373,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -387,13 +386,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -412,26 +411,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -439,39 +434,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsection"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<context name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsection">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/vi.xml b/gentext/locale/vi.xml
index c03f4b5c7..292fefb62 100644
--- a/gentext/locale/vi.xml
+++ b/gentext/locale/vi.xml
@@ -331,10 +331,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -345,13 +344,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/>&#160;%n</template>
-<template name="figure"><Figure/>&#160;%n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -370,26 +369,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/>&#160;%n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/>&#160;%n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -397,39 +392,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
-</context>
-
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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>
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
 
 </context>
 
-<context name="section-xref-numbered">
+<context name="xref-number">
 
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
 <template name="bridgehead"><Section/>&#160;%n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="sect1"><Section/>&#160;%n</template>
 <template name="sect2"><Section/>&#160;%n</template>
 <template name="sect3"><Section/>&#160;%n</template>
 <template name="sect4"><Section/>&#160;%n</template>
 <template name="sect5"><Section/>&#160;%n</template>
 <template name="section"><Section/>&#160;%n</template>
-<template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
+<template name="table"><Table/>&#160;%n</template>
+
+</context>
+
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/xh.xml b/gentext/locale/xh.xml
index 2f9ece2ac..44b520bcd 100644
--- a/gentext/locale/xh.xml
+++ b/gentext/locale/xh.xml
@@ -334,10 +334,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -348,13 +347,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n</template>
-<template name="figure"><Figure/> %n</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -373,26 +372,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</template>
 <template name="reference">%t</template>
-<template name="refsection">%t</template>
-<template name="refsect1">%t</template>
-<template name="refsect2">%t</template>
-<template name="refsect3">%t</template>
 <template name="refsynopsisdiv">%t</template>
 <template name="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -401,39 +396,70 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect4"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect5"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="section"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
-
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number">
+
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead"><Section/> %n</template>
-<template name="refsection"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="refsect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<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 name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/zh_cn.xml b/gentext/locale/zh_cn.xml
index 20c9297a7..09bfee98c 100644
--- a/gentext/locale/zh_cn.xml
+++ b/gentext/locale/zh_cn.xml
@@ -329,10 +329,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -343,13 +342,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -368,25 +367,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</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="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -394,37 +390,69 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
+<context name="xref-number">
 
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
diff --git a/gentext/locale/zh_tw.xml b/gentext/locale/zh_tw.xml
index 5948f8de9..9786007bc 100644
--- a/gentext/locale/zh_tw.xml
+++ b/gentext/locale/zh_tw.xml
@@ -332,10 +332,9 @@
 </context>
 
 <context name="xref">
-
 <template name="abstract">%t</template>
 <template name="answer"><Answer/>&#160;%n</template>
-<template name="appendix"><Appendix/> %n. %t</template>
+<template name="appendix">%t</template>
 <template name="article">%t</template>
 <template name="authorblurb">%t</template>
 <template name="bibliodiv">%t</template>
@@ -346,13 +345,13 @@
 <template name="book">%t</template>
 <template name="calloutlist">%t</template>
 <template name="caution">%t</template>
-<template name="chapter"><Chapter/> %n. %t</template>
+<template name="chapter">%t</template>
 <template name="colophon">%t</template>
 <template name="constraintdef">%t</template>
 <template name="dedication">%t</template>
-<template name="equation"><Equation/>&#160;%n</template>
-<template name="example"><Example/> %n. %t</template>
-<template name="figure"><Figure/> %n. %t</template>
+<template name="equation">%t</template>
+<template name="example">%t</template>
+<template name="figure">%t</template>
 <template name="formalpara">%t</template>
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
@@ -371,25 +370,22 @@
 <template name="msgsub">%t</template>
 <template name="note">%t</template>
 <template name="orderedlist">%t</template>
-<template name="part"><Part/> %n. %t</template>
+<template name="part">%t</template>
 <template name="partintro">%t</template>
 <template name="preface">%t</template>
-<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="procedure">%t</template>
 <template name="productionset">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaentry"><Question/>&#160;%n</template>
 <template name="qandaset">%t</template>
 <template name="question"><Question/>&#160;%n</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="segmentedlist">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="sidebar">%t</template>
-<template name="table"><Table/> %n. %t</template>
+<template name="table">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
@@ -397,37 +393,69 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
 
+<template name="bridgehead"><startquote/>%t<endquote/></template>
+<template name="refsect1"><startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
+<template name="refsect3"><startquote/>%t<endquote/></template>
+<template name="sect1"><startquote/>%t<endquote/></template>
+<template name="sect2"><startquote/>%t<endquote/></template>
+<template name="sect3"><startquote/>%t<endquote/></template>
+<template name="sect4"><startquote/>%t<endquote/></template>
+<template name="sect5"><startquote/>%t<endquote/></template>
+<template name="section"><startquote/>%t<endquote/></template>
+<template name="simplesect"><startquote/>%t<endquote/></template>
+
 </context>
 
-<context name="section-xref">
+<context name="xref-number">
 
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<template name="sect1">&#x201C;%t&#x201D;</template>
-<template name="sect2">&#x201C;%t&#x201D;</template>
-<template name="sect3">&#x201C;%t&#x201D;</template>
-<template name="sect4">&#x201C;%t&#x201D;</template>
-<template name="sect5">&#x201C;%t&#x201D;</template>
-<template name="section">&#x201C;%t&#x201D;</template>
-<template name="simplesect">&#x201C;%t&#x201D;</template>
+<template name="answer"><Answer/>&#160;%n</template>
+<template name="appendix"><Appendix/>&#160;%n</template>
+<template name="bridgehead"><Section/>&#160;%n</template>
+<template name="chapter"><Chapter/>&#160;%n</template>
+<template name="equation"><Equation/>&#160;%n</template>
+<template name="example"><Example/>&#160;%n</template>
+<template name="figure"><Figure/>&#160;%n</template>
+<template name="part"><Part/>&#160;%n</template>
+<template name="procedure"><Procedure/>&#160;%n</template>
+<template name="productionset"><ProductionSet/>&#160;%n</template>
+<template name="qandadiv"><Qandadiv/>&#160;%n</template>
+<template name="qandaentry"><Question/>&#160;%n</template>
+<template name="question"><Question/>&#160;%n</template>
+<template name="sect1"><Section/>&#160;%n</template>
+<template name="sect2"><Section/>&#160;%n</template>
+<template name="sect3"><Section/>&#160;%n</template>
+<template name="sect4"><Section/>&#160;%n</template>
+<template name="sect5"><Section/>&#160;%n</template>
+<template name="section"><Section/>&#160;%n</template>
+<template name="table"><Table/>&#160;%n</template>
 
 </context>
 
-<context name="section-xref-numbered">
-
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
-<template name="refsect1">&#x201C;%t&#x201D;</template>
-<template name="refsect2">&#x201C;%t&#x201D;</template>
-<template name="refsect3">&#x201C;%t&#x201D;</template>
-<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">&#x201C;%t&#x201D;</template>
+<context name="xref-number-and-title">
+
+<template name="appendix"><Appendix/>&#160;%n, %t</template>
+<template name="bridgehead"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="chapter"><Chapter/>&#160;%n, %t</template>
+<template name="equation"><Equation/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="example"><Example/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="figure"><Figure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="part"><Part/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="refsection"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="sect1"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect2"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect3"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect4"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="sect5"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="section"><Section/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="simplesect"><sectioncalled/> <startquote/>%t<endquote/></template>
+<template name="table"><Table/>&#160;%n, <startquote/>%t<endquote/></template>
 
 </context>
 
-- 
2.40.0