use Bob's simpler approach

diff --git a/xsl/wordml/README b/xsl/wordml/README
new file mode 100644 (file)
index 0000000..9075d7e
--- /dev/null
+++ b/xsl/wordml/README
@@ -0,0 +1,8 @@
+       DocBook to/from WordML
+
+       Steve Ball, Bob Stayton
+
+docbook.xsl    Accepts DocBook XML and produces WordML
+wordml.xsl     Accepts WordML and produces DocBook XML
+
+

diff --git a/xsl/wordml/wordml-div.xsl b/xsl/wordml/wordml-div.xsl
deleted file mode 100644 (file)
index 7291618..0000000
--- a/xsl/wordml/wordml-div.xsl
+++ /dev/null
@@ -1,211 +0,0 @@
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:w10="urn:schemas-microsoft-com:office:word"
-  xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core"
-  xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
-  xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
-  xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882">
-
-  <xsl:output method='xml' indent="yes" encoding='UTF-8'/>
-
-  <!-- ********************************************************************
-       $Id$
-       ********************************************************************
-
-       This file is part of the XSL DocBook Stylesheet distribution.
-       See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-       and other information.
-
-       ******************************************************************** -->
-
-  <xsl:strip-space elements='*'/>
-  <xsl:preserve-space elements='w:t'/>
-
-  <xsl:template match="w:body">
-    <xsl:copy>
-      <xsl:variable name='sect1s'
-        select='w:p[w:pPr/w:pStyle/@w:val = "section-title" and
-                *[2]/self::w:r[w:rPr/w:rStyle/@w:val = "section-level"]/w:t = 1] |
-                w:p[w:pPr/w:pStyle/@w:val = "sect1-title"]'/>
-
-      <xsl:choose>
-        <xsl:when test='$sect1s'>
-          <xsl:apply-templates select='$sect1s[1]/preceding-sibling::*'/>
-
-          <xsl:apply-templates select='$sect1s[1]' mode='section1'>
-            <xsl:with-param name='sect1s'
-              select='$sect1s[position() != 1]'/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match='w:p' mode='section1'>
-    <xsl:param name='sect1s' select='/..'/>
-
-    <xsl:choose>
-      <xsl:when test='$sect1s and 
-                      (w:pPr/w:pStyle/@w:val = "sect1-title" or
-                       (w:pPr/w:pStyle/@w:val = "section-title" and
-                      *[2]/self::w:r[w:rPr/w:rStyle/@w:val = "section-level"]/w:t = 1))'>
-        <xsl:variable name='sect2s'
-          select='$sect1s[1]/preceding-sibling::w:p[
-                  w:pPr/w:pStyle/@w:val = "sect2-title" or
-                  (w:pPr/w:pStyle/@w:val = "section-title" and
-                  *[2]/self::w:r[w:rPr/w:rStyle/@w:val = "section-level"]/w:t = 2)]'/>
-
-        <xsl:call-template name='make-sect1'>
-          <xsl:with-param name='sect1s' select='$sect1s'/>
-          <xsl:with-param name='sect2s' select='$sect2s'/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name='sect2s'
-          select='following-sibling::w:p[
-                  w:pPr/w:pStyle/@w:val = "sect2-title" or
-                  (w:pPr/w:pStyle/@w:val = "section-title" and
-                  *[2]/self::w:r[w:rPr/w:rStyle/@w:val = "section-level"]/w:t = 2)]'/>
-        <xsl:call-template name='make-sect1'>
-          <xsl:with-param name='sect1s' select='$sect1s'/>
-          <xsl:with-param name='sect2s' select='$sect2s'/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name='make-sect1'>
-    <xsl:param name='sect1s' select='/..'/>
-    <xsl:param name='sect2s' select='/..'/>
-
-    <wx:sub-section>
-      <xsl:call-template name='copy'/>
-
-      <xsl:apply-templates select='following-sibling::*[1]' mode='section2'>
-        <xsl:with-param name='nextSect1' select='$sect1s[1]'/>
-        <xsl:with-param name='sect2s' select='$sect2s'/>
-      </xsl:apply-templates>
-    </wx:sub-section>
-
-    <xsl:apply-templates select='$sect1s[1]' mode='section1'>
-      <xsl:with-param name='sect1s' select='$sect1s[position() != 1]'/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template match='w:p' mode='section2'>
-    <xsl:param name='nextSect1' select='/..'/>
-    <xsl:param name='sect2s' select='/..'/>
-
-    <xsl:choose>
-      <xsl:when test='generate-id() = generate-id($nextSect1)'/>
-
-      <xsl:when test='w:pPr/w:pStyle/@w:val = "sect2-title" or
-                      (w:pPr/w:pStyle/@w:val = "section-title" and
-                      *[2]/self::w:r[w:rPr/w:rStyle/@w:val = "section-level"]/w:t = 2)'>
-        <xsl:variable name='nextSect2'
-          select='following-sibling::w:p[w:pPr/w:pStyle/@w:val = "sect2-title" or
-                  (w:pPr/w:pStyle/@w:val = "section-title" and
-                  *[2]/self::w:r[w:rPr/w:rStyle/@w:val = "section-level"]/w:t = 2)][1]'/>
-
-        <wx:sub-section>
-          <xsl:call-template name='copy'/>
-
-          <xsl:apply-templates select='following-sibling::*[1]' mode='terminal'>
-            <xsl:with-param name='nextSect1' select='$nextSect1'/>
-            <xsl:with-param name='nextSect2' select='$nextSect2'/>
-            <xsl:with-param name='sect2s' select='$sect2s'/>
-          </xsl:apply-templates>
-        </wx:sub-section>
-
-        <xsl:if test='count($sect2s|$nextSect2) = count($sect2s)'>
-          <xsl:apply-templates select='$nextSect2' mode='section2'>
-            <xsl:with-param name='nextSect1' select='$nextSect1'/>
-            <xsl:with-param name='sect2s' select='$sect2s'/>
-          </xsl:apply-templates>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name='copy'/>
-
-        <xsl:apply-templates select='following-sibling::*[1]' mode='section2'>
-          <xsl:with-param name='nextSect1' select='$nextSect1'/>
-          <xsl:with-param name='sect2s' select='$sect2s'/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match='w:p' mode='terminal'>
-    <xsl:param name='nextSect1' select='/..'/>
-    <xsl:param name='nextSect2' select='/..'/>
-    <xsl:param name='sect2s' select='/..'/>
-
-    <xsl:choose>
-      <xsl:when test='generate-id() = generate-id($nextSect1)'/>
-      <xsl:when test='generate-id() = generate-id($nextSect2)'/>
-
-      <xsl:otherwise>
-        <xsl:call-template name='copy'/>
-
-        <xsl:apply-templates select='following-sibling::*[1]' mode='terminal'>
-          <xsl:with-param name='nextSect1' select='$nextSect1'/>
-          <xsl:with-param name='nextSect2' select='$nextSect2'/>
-          <xsl:with-param name='sect2s' select='$sect2s'/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match='*'>
-    <xsl:call-template name='copy'/>
-  </xsl:template>
-  <xsl:template match='*' mode='section1'>
-    <xsl:param name='sect1s' select='/..'/>
-
-    <xsl:call-template name='copy'/>
-
-    <xsl:apply-templates select='following-sibling::*[1]' mode='section1'>
-      <xsl:with-param name='sect1s' select='$sect1s'/>
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match='*' mode='section2'>
-    <xsl:param name='nextSect1' select='/..'/>
-    <xsl:param name='sect2s' select='/..'/>
-
-    <xsl:call-template name='copy'/>
-
-    <xsl:apply-templates select='following-sibling::*[1]' mode='section2'>
-      <xsl:with-param name='nextSect1' select='$nextSect1'/>
-      <xsl:with-param name='sect2s' select='$sect2s'/>
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match='*' mode='terminal'>
-    <xsl:param name='nextSect1' select='/..'/>
-    <xsl:param name='nextSect2' select='/..'/>
-    <xsl:param name='sect2s' select='/..'/>
-
-    <xsl:call-template name='copy'/>
-
-    <xsl:apply-templates select='following-sibling::*[1]' mode='terminal'>
-      <xsl:with-param name='nextSect1' select='$nextSect1'/>
-      <xsl:with-param name='nextSect2' select='$nextSect2'/>
-      <xsl:with-param name='sect2s' select='$sect2s'/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template name='copy'>
-    <xsl:copy>
-      <xsl:for-each select='@*'>
-        <xsl:copy/>
-      </xsl:for-each>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>

diff --git a/xsl/wordml/wordml-final.xsl b/xsl/wordml/wordml-final.xsl
deleted file mode 100644 (file)
index 8db7d8f..0000000
--- a/xsl/wordml/wordml-final.xsl
+++ /dev/null
@@ -1,70 +0,0 @@
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:w10="urn:schemas-microsoft-com:office:word"
-  xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core"
-  xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
-  xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
-  xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
-  exclude-result-prefixes='w v w10 sl aml wx o dt'>
-
-  <xsl:output method='xml' indent="yes" encoding='UTF-8'/>
-
-  <!-- ********************************************************************
-       $Id$
-       ********************************************************************
-
-       This file is part of the XSL DocBook Stylesheet distribution.
-       See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-       and other information.
-
-       ******************************************************************** -->
-
-  <xsl:strip-space elements='*'/>
-  <xsl:preserve-space elements='w:t'/>
-
-  <xsl:template match="w:body">
-    <!-- let's assume an article document element for the moment -->
-    <article>
-      <xsl:apply-templates/>
-    </article>
-  </xsl:template>
-
-  <xsl:template match='wx:sub-section'>
-    <xsl:element name='{substring-before(w:p[1]/w:pPr/w:pStyle/@w:val, "-")}'>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-
-  <xsl:template match='w:p'>
-    <xsl:choose>
-      <xsl:when test='w:pPr/w:pStyle/@w:val = "blockerror"'>
-        <xsl:comment>
-          <xsl:apply-templates/>
-        </xsl:comment>
-      </xsl:when>
-      <xsl:when test='substring-after(w:pPr/w:pStyle/@w:val, "-") = "title"'>
-        <title>
-          <xsl:apply-templates/>
-        </title>
-      </xsl:when>
-      <xsl:otherwise>
-        <para>
-          <xsl:apply-templates/>
-        </para>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match='w:r'>
-    <xsl:choose>
-      <xsl:when test='w:rPr/w:rStyle/@w:val = "section-level"'/>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>

diff --git a/xsl/wordml/wordml-normalise.xsl b/xsl/wordml/wordml-normalise.xsl
deleted file mode 100644 (file)
index 2ef0d03..0000000
--- a/xsl/wordml/wordml-normalise.xsl
+++ /dev/null
@@ -1,58 +0,0 @@
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:w10="urn:schemas-microsoft-com:office:word"
-  xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core"
-  xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
-  xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
-  xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882">
-
-  <xsl:output method='xml' indent="yes" encoding='UTF-8'/>
-
-  <!-- ********************************************************************
-       $Id$
-       ********************************************************************
-
-       This file is part of the XSL DocBook Stylesheet distribution.
-       See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-       and other information.
-
-       ******************************************************************** -->
-
-  <xsl:strip-space elements='*'/>
-  <xsl:preserve-space elements='w:t'/>
-
-  <xsl:template match="w:wordDocument">
-    <xsl:copy>
-      <xsl:apply-templates select='w:body'/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match='wx:sect|wx:sub-section|wx:pBdrGroup|aml:annotation|aml:content'>
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <xsl:template match='wx:borders |
-                       wx:margin-left |
-                       w:r[w:rPr/w:rStyle/@w:val = "CommentReference"]'/>
-
-  <xsl:template match='w:pStyle|w:rStyle'>
-    <xsl:copy>
-      <xsl:for-each select='@*'>
-        <xsl:copy/>
-      </xsl:for-each>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match='*'>
-    <xsl:copy>
-      <xsl:for-each select='@*'>
-        <xsl:copy/>
-      </xsl:for-each>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>

diff --git a/xsl/wordml/wordml.xsl b/xsl/wordml/wordml.xsl
new file mode 100755 (executable)
index 0000000..15f39e1
--- /dev/null
+++ b/xsl/wordml/wordml.xsl
@@ -0,0 +1,856 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE xsl:stylesheet [
+
+<!ENTITY para "w:p[w:pPr/w:pStyle[@w:val='para']]">
+
+<!ENTITY itemizedlist "w:p[w:pPr/w:pStyle[starts-with(@w:val,'itemizedlist')]]">
+<!ENTITY itemizedlist1 "w:p[w:pPr/w:pStyle[@w:val = 'itemizedlist']]">
+<!ENTITY orderedlist "w:p[w:pPr/w:pStyle[starts-with(@w:val,'orderedlist')]]">
+<!ENTITY orderedlist1 "w:p[w:pPr/w:pStyle[@w:val = 'orderedlist']]">
+<!ENTITY listcontinue "w:p[w:pPr/w:pStyle[starts-with(@w:val,'listcontinue')]]">
+
+<!ENTITY variablelist "w:tbl[w:tblPr/w:tblStyle[starts-with(@w:val,'variablelist')]]">
+
+<!ENTITY verbatim "w:p[w:pPr/w:pStyle[@w:val='programlisting' or @w:val='screen' or @w:val='literallayout']]">
+<!ENTITY admon "w:p[w:pPr/w:pStyle[@w:val='note' or @w:val='caution' or @w:val='important' or @w:val='tip' or @w:val='warning']]">
+<!ENTITY admoncontinue "w:p[w:pPr/w:pStyle[@w:val='notecontinue' or @w:val='cautioncontinue' or @w:val='importantcontinue' or @w:val='tipcontinue' or @w:val='warningcontinue']]">
+<!ENTITY figure "w:p[w:pPr/w:pStyle[@w:val='figure']]">
+<!ENTITY figuretitle "w:p[w:pPr/w:pStyle[@w:val='figuretitle']]">
+<!ENTITY figurecaption "w:p[w:pPr/w:pStyle[@w:val='figuretitle']]">
+<!ENTITY tabletitle "w:p[w:pPr/w:pStyle[@w:val='tabletitle']]">
+<!ENTITY exampletitle "w:p[w:pPr/w:pStyle[@w:val='exampletitle']]">
+<!ENTITY listlevel "substring-after(w:pPr/w:pStyle/@w:val, 'edlist')">
+<!ENTITY listlabel "w:pPr/w:listPr/wx:t/@wx:val">
+<!ENTITY footnote "w:p[w:pPr/w:pStyle[@w:val='FootnoteText']]">
+]>
+
+<xsl:stylesheet xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml"
+  xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
+  xmlns:v="urn:schemas-microsoft-com:vml" 
+  xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
+  xmlns:o="urn:schemas-microsoft-com:office:office" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="aml w wx o v" version="1.0">
+
+  <!-- $Id$ -->
+  <!-- Stylesheet to convert WordProcessingML to DocBook -->
+
+<xsl:output indent="yes" method="xml" 
+    doctype-public="-//OASIS//DTD DocBook XML V4.3//EN"
+    doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"/>
+
+<!-- ================================================== -->
+<!--    Parameters                                      -->
+<!-- ================================================== -->
+
+<xsl:param name="nest.sections">1</xsl:param>
+
+<!-- ================================================== -->
+<!--    Templates                                       -->
+<!-- ================================================== -->
+<!-- Look up a w:listDef element by its StyleLink -->
+<xsl:key name="listdef-stylelink"
+         match="w:listDef"
+         use="w:listStyleLink/@w:val"/>
+
+<xsl:key name="list-ilst"
+         match="w:list"
+         use="w:ilst/@w:val"/>
+
+
+<xsl:template match="/">
+  <xsl:apply-templates select="//w:body"/>
+</xsl:template>
+
+<xsl:template match="w:body">
+    <xsl:apply-templates mode="group"/>
+</xsl:template>
+
+<xsl:template match="wx:sect" mode="group">
+  <xsl:apply-templates  mode="group"/>
+</xsl:template>
+
+<xsl:template match="wx:sub-section" mode="group">
+  <xsl:variable name="first.node" select="w:p[1]"/>
+  <xsl:variable name="style" select="$first.node/w:pPr/w:pStyle/@w:val"/>
+
+  <xsl:variable name="element.name">
+    <xsl:choose>
+      <xsl:when test="$style = 'article'">article</xsl:when>
+      <xsl:when test="$style = 'appendix'">appendix</xsl:when>
+      <xsl:when test="$style = 'sect1' and 
+                                $nest.sections != 0">section</xsl:when>
+      <xsl:when test="$style = 'sect1'">sect1</xsl:when>
+      <xsl:when test="$style = 'sect2' and 
+                                $nest.sections != 0">section</xsl:when>
+      <xsl:when test="$style = 'sect2'">sect2</xsl:when>
+      <xsl:when test="$style = 'sect3' and 
+                                $nest.sections != 0">section</xsl:when>
+      <xsl:when test="$style = 'sect3'">sect3</xsl:when>
+      <xsl:when test="$style = 'sect4' and 
+                                $nest.sections != 0">section</xsl:when>
+      <xsl:when test="$style = 'sect4'">sect4</xsl:when>
+      <xsl:when test="$style = 'sect5' and 
+                                $nest.sections != 0">section</xsl:when>
+      <xsl:when test="$style = 'sect5'">sect5</xsl:when>
+      <xsl:otherwise>bogus</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:element name="{$element.name}">
+    <xsl:call-template name="object.id"/>
+    <xsl:apply-templates mode="group"/>
+  </xsl:element>
+    
+</xsl:template>
+
+<!-- sub-section title paragraph -->
+<xsl:template match="wx:sub-section/w:p[1]" mode="group">
+  <xsl:variable name="style" select="w:pPr/w:pStyle/@w:val"/>
+  <xsl:variable name="element.name">
+    <xsl:choose>
+      <xsl:when test="$style = 'article'">title</xsl:when>
+      <xsl:when test="$style = 'sect1'">title</xsl:when>
+      <xsl:when test="$style = 'sect2'">title</xsl:when>
+      <xsl:when test="$style = 'sect3'">title</xsl:when>
+      <xsl:when test="$style = 'sect4'">title</xsl:when>
+      <xsl:when test="$style = 'sect5'">title</xsl:when>
+      <xsl:when test="$style = 'appendix'">title</xsl:when>
+      <xsl:otherwise>title</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <xsl:element name="{$element.name}">
+    <xsl:apply-templates select="w:r|w:hlink"/>
+  </xsl:element>
+</xsl:template>
+
+<!-- Ordinary para -->
+<xsl:template match="&para;" mode="group">
+  <para>
+    <xsl:call-template name="object.id"/>
+    <xsl:apply-templates select="w:r|w:hlink"/>
+  </para>
+</xsl:template>
+
+<!-- Unmatched para style -->
+<xsl:template match="w:p" mode="group">
+  <nomatch>
+    <xsl:apply-templates select="w:r|w:hlink"/>
+  </nomatch>
+</xsl:template>
+
+<!-- unused elements are bypassed -->
+<xsl:template match="*" mode="group">
+</xsl:template>
+
+
+<!-- Match on the first one of an itemizedlist -->
+<xsl:template match="&itemizedlist1;[not(preceding-sibling::*[1]
+                     [self::&itemizedlist; or self::&listcontinue;])]" 
+                     priority="2"
+                     mode="group">
+
+  <!-- Identify the node that follows all the listitems -->
+  <xsl:variable name="stop.node"
+              select="generate-id(following-sibling::*[not(self::&itemizedlist;
+                      or self::&listcontinue;
+                      or self::&orderedlist;)][1])"/>
+                       
+  <!-- Start the list and process all the level 1 listitems -->
+  <itemizedlist>
+    <xsl:apply-templates mode="item" 
+          select=".|following-sibling::&itemizedlist;[&listlevel; = '']
+                  [following-sibling::*[generate-id() = $stop.node]]">
+      <xsl:with-param name="depth" select="1"/>
+    </xsl:apply-templates>
+  </itemizedlist>
+  
+</xsl:template>
+
+<xsl:template match="&itemizedlist;" mode="item">
+  <xsl:param name="depth" select="1"/>
+
+  <listitem>
+    <para>
+      <xsl:apply-templates/>
+    </para>
+    <xsl:apply-templates mode="item" 
+                select="following-sibling::*[1][self::&listcontinue;]"/>
+    <!-- Now any nested list is inside this list item -->
+    <xsl:apply-templates mode="subgroup"
+            select="following-sibling::*[1]
+                    [self::&itemizedlist; or self::&orderedlist;]
+                    [&listlevel; &gt; $depth]">
+
+      <xsl:with-param name="depth" select="$depth + 1"/>
+    </xsl:apply-templates>
+  </listitem>
+
+</xsl:template>
+
+<xsl:template match="&itemizedlist;" mode="subgroup">
+  <xsl:param name="depth" select="0"/>
+
+  <xsl:variable name="stop.node"
+      select="generate-id(following-sibling::*[
+                        self::&itemizedlist1; or
+                        self::&orderedlist1; or
+                        self::&itemizedlist;[&listlevel; &lt; $depth] or
+                        self::&orderedlist;[&listlevel; &lt; $depth] or
+                        not(self::&itemizedlist; or 
+                            self::&orderedlist; or
+                            self::&listcontinue;)]
+                        [1])"/>
+
+  <itemizedlist>
+    <xsl:apply-templates mode="item"
+             select=".|following-sibling::&itemizedlist;
+                       [&listlevel; = $depth]
+                       [following-sibling::*[generate-id() = $stop.node]]">
+      <xsl:with-param name="depth" select="$depth"/>
+    </xsl:apply-templates>
+  </itemizedlist>
+</xsl:template>
+
+<xsl:template match="&itemizedlist;[preceding-sibling::*[1]
+                     [self::&itemizedlist; or 
+                      self::&orderedlist; or
+                      self::&listcontinue;]]" 
+                     mode="group">
+  <!-- Handle with mode = group -->
+</xsl:template>
+
+
+
+
+
+<!-- Match on the first one of an orderedlist -->
+<xsl:template match="&orderedlist1;[not(preceding-sibling::*[1]
+                     [self::&orderedlist; or self::&listcontinue;])]" 
+                     priority="2"
+                     mode="group">
+
+  <!-- Identify the node that follows all the listitems -->
+  <xsl:variable name="stop.node"
+              select="generate-id(following-sibling::*[not(self::&itemizedlist;
+                      or self::&listcontinue;
+                      or self::&orderedlist;)][1])"/>
+                       
+  <!-- Start the list and process all the level 1 listitems -->
+  <orderedlist>
+    <xsl:apply-templates mode="item" 
+          select=".|following-sibling::&orderedlist;[&listlevel; = '']
+                  [following-sibling::*[generate-id() = $stop.node]]">
+      <xsl:with-param name="depth" select="1"/>
+    </xsl:apply-templates>
+  </orderedlist>
+  
+</xsl:template>
+
+<xsl:template match="&orderedlist;" mode="item">
+  <xsl:param name="depth" select="1"/>
+
+  <listitem>
+    <para>
+      <xsl:apply-templates/>
+    </para>
+    <xsl:apply-templates mode="item" 
+                select="following-sibling::*[1][self::&listcontinue;]"/>
+    <!-- Now any nested list is inside this list item -->
+    <xsl:apply-templates mode="subgroup"
+            select="following-sibling::*[1]
+                    [self::&itemizedlist; or self::&orderedlist;]
+                    [&listlevel; &gt; $depth]">
+
+      <xsl:with-param name="depth" select="$depth + 1"/>
+    </xsl:apply-templates>
+  </listitem>
+
+</xsl:template>
+
+<xsl:template match="&orderedlist;" mode="subgroup">
+  <xsl:param name="depth" select="0"/>
+
+  <xsl:variable name="stop.node"
+      select="generate-id(following-sibling::*[
+                        self::&itemizedlist1; or
+                        self::&orderedlist1; or
+                        self::&itemizedlist;[&listlevel; &lt; $depth] or
+                        self::&orderedlist;[&listlevel; &lt; $depth] or
+                        not(self::&itemizedlist; or 
+                            self::&orderedlist; or
+                            self::&listcontinue;)]
+                        [1])"/>
+
+  <orderedlist>
+    <xsl:apply-templates mode="item"
+             select=".|following-sibling::&orderedlist;
+                       [&listlevel; = $depth]
+                       [following-sibling::*[generate-id() = $stop.node]]">
+      <xsl:with-param name="depth" select="$depth"/>
+    </xsl:apply-templates>
+  </orderedlist>
+</xsl:template>
+
+<xsl:template match="&orderedlist;[preceding-sibling::*[1]
+                     [self::&itemizedlist; or 
+                      self::&orderedlist; or
+                      self::&listcontinue;]]" 
+                     mode="group">
+  <!-- Handle with mode = group -->
+</xsl:template>
+
+
+<xsl:template match="&listcontinue;" mode="item">
+  <para>
+    <xsl:call-template name="object.id"/>
+    <xsl:apply-templates select="w:r|w:hlink"/>
+  </para>
+  <!-- Continue to process any immediate following -->
+  <xsl:apply-templates mode="item" 
+                select="following-sibling::*[1][self::&listcontinue;]"/>
+</xsl:template>
+
+<xsl:template match="&listcontinue;" mode="group">
+  <!-- Handled in item mode -->
+</xsl:template>
+
+<xsl:template match="*" mode="item">
+  <xsl:apply-templates/>
+</xsl:template>
+
+
+<!-- =========================================================== -->
+<!--   Inline elements                                           -->
+<!-- =========================================================== -->
+<xsl:template match="w:hlink[w:r/w:rPr/w:rStyle[@w:val='link']]">
+  <link>
+    <xsl:attribute name="linkend"><xsl:value-of
+            select="@w:bookmark"/></xsl:attribute>
+    <xsl:apply-templates select="w:r"/>
+  </link>
+</xsl:template>
+
+<xsl:template match="w:hlink[w:r/w:rPr/w:rStyle[@w:val='ulink']]">
+  <ulink>
+    <xsl:attribute name="url"><xsl:value-of
+            select="@w:dest"/></xsl:attribute>
+    <xsl:apply-templates select="w:r"/>
+  </ulink>
+</xsl:template>
+
+<xsl:template match="w:hlink[w:r/w:rPr/w:rStyle[@w:val='olink']]">
+  <olink>
+    <xsl:attribute name="targetdoc"><xsl:value-of
+            select="@w:dest"/></xsl:attribute>
+    <xsl:attribute name="targetptr"><xsl:value-of
+            select="@w:bookmark"/></xsl:attribute>
+    <xsl:apply-templates select="w:r"/>
+  </olink>
+</xsl:template>
+
+<xsl:template match="w:hlink[w:r/w:rPr/w:rStyle[@w:val='xref']]">
+  <xref>
+    <xsl:attribute name="linkend"><xsl:value-of
+            select="@w:bookmark"/></xsl:attribute>
+  </xref>
+</xsl:template>
+
+<xsl:template match="w:r[w:rPr/w:rStyle[@w:val = 'emphasis']]">
+  <emphasis>
+    <xsl:apply-templates select="w:t"/>
+  </emphasis>
+</xsl:template>
+
+<xsl:template match="w:r[w:rPr/w:rStyle[@w:val = 'FootnoteReference']]">
+  <footnote>
+    <xsl:apply-templates/>
+  </footnote>
+</xsl:template>
+
+<!-- Ignore the footnote number with the footnote text -->
+<xsl:template match="w:r[w:rPr/w:rStyle[@w:val = 'FootnoteReference']]
+                        [child::w:footnoteRef]">
+</xsl:template>
+
+<xsl:template match="w:footnote">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<!-- The footnote text -->
+<xsl:template match="&footnote;">
+  <para>
+    <xsl:apply-templates/>
+  </para>
+</xsl:template>
+
+<xsl:template match="w:r">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="w:t">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template name="object.id">
+  <xsl:variable name="id">
+    <xsl:apply-templates select="." mode="object.id"/>
+  </xsl:variable>
+  <xsl:if test="$id != ''">
+    <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="w:p" mode="object.id">
+
+  <xsl:variable name="bookmark.inside">
+    <xsl:value-of select="aml:annotation
+                 [@w:type = 'Word.Bookmark.Start'][1]/@w:name"/>
+  </xsl:variable>
+
+  <xsl:variable name="bookmark.preceding">
+    <xsl:value-of select="preceding-sibling::*[2]
+                          [self::aml:annotation
+                          [@w:type = 'Word.Bookmark.Start']
+                          [following-sibling::aml:annotation
+                          [@w:type = 'Word.Bookmark.End']]]
+                          /@w:name"/>
+  </xsl:variable>
+
+  <xsl:choose>
+    <xsl:when test="$bookmark.inside != ''">
+      <xsl:value-of select="$bookmark.inside"/>
+    </xsl:when>
+    <xsl:when test="$bookmark.preceding != ''">
+      <xsl:value-of select="$bookmark.preceding"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template>
+
+<xsl:template match="wx:sub-section" mode="object.id">
+  <!-- First para has the bookmark -->
+  <xsl:value-of select="w:p[1]/aml:annotation
+                 [@w:type = 'Word.Bookmark.Start'][1]/@w:name"/>
+</xsl:template>
+
+<!-- Index entry -->
+<xsl:template match="w:r/w:instrText">
+  <xsl:variable name="text" select="normalize-space(.)"/>
+
+  <xsl:choose>
+    <xsl:when test="starts-with($text, 'XE')">
+
+      <xsl:variable name="primary">
+        <xsl:choose>
+          <xsl:when test="contains($text, ':')">
+            <xsl:value-of select="substring-before(
+                                  substring-after($text, 'XE &quot;'), ':')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="substring-before(
+                                  substring-after($text, 'XE &quot;'), '&quot;')"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+    
+      <xsl:variable name="secondary">
+        <xsl:choose>
+          <xsl:when test="contains($text, ':')">
+            <xsl:value-of select="substring-before(
+                                  substring-after($text, ':'), '&quot;')"/>
+          </xsl:when>
+          <xsl:otherwise></xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+    
+      <indexterm>
+        <primary><xsl:value-of select="$primary"/></primary>
+        <xsl:if test="$secondary != ''">
+          <secondary><xsl:value-of select="$secondary"/></secondary>
+        </xsl:if>
+      </indexterm>
+    </xsl:when>
+  </xsl:choose>
+        
+</xsl:template>
+
+<xsl:template match="&figure;" mode="group">
+
+  <!-- Get title and caption from siblings -->
+  <xsl:variable name="title">
+    <xsl:choose>
+      <xsl:when test="following-sibling::*[1][self::&figuretitle;]">
+        <xsl:apply-templates 
+                 mode="figuretitle"
+                 select="following-sibling::*[1][self::&figuretitle;]"/>
+      </xsl:when>
+      <xsl:when test="preceding-sibling::*[1][self::&figuretitle;]">
+        <xsl:apply-templates 
+                 mode="figuretitle"
+                 select="preceding-sibling::*[1][self::&figuretitle;]"/>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <!-- FIXME -->
+  <xsl:variable name="caption"/>
+
+  <xsl:variable name="shape" select="w:r/w:pict/v:shape"/>
+  <xsl:variable name="style" select="$shape/@style"/>
+
+  <xsl:variable name="src" select="$shape/v:imagedata/@src"/>
+  <xsl:variable name="width"
+                select="substring-before(
+                        substring-after($style, 'width:'), ';')"/>
+  <xsl:variable name="height">
+    <xsl:variable name="candidate" 
+                  select="substring-before(
+                          substring-after($style, 'height:'), ';') != ''"/>
+    <xsl:choose>
+      <xsl:when test="$candidate != ''">
+        <xsl:value-of select="$candidate"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="substring-after($style, 'height:')"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="element">
+    <xsl:choose>
+      <xsl:when test="$title != ''">figure</xsl:when>
+      <xsl:otherwise>informalfigure</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:element name="{$element}">
+    <xsl:call-template name="object.id"/>
+    <xsl:if test="$title != ''">
+      <title>
+        <xsl:copy-of select="$title"/>
+      </title>
+    </xsl:if>
+    <mediaobject>
+      <imageobject>
+        <imagedata>
+          <xsl:attribute name="fileref">
+            <xsl:value-of select="$src"/>
+          </xsl:attribute>
+          <xsl:if test="$width != ''">
+            <xsl:attribute name="contentwidth">
+              <xsl:value-of select="$width"/>
+            </xsl:attribute>
+          </xsl:if>
+          <xsl:if test="$height != ''">
+            <xsl:attribute name="contentdepth">
+              <xsl:value-of select="$height"/>
+            </xsl:attribute>
+          </xsl:if>
+        </imagedata>
+      </imageobject>
+    </mediaobject>
+  </xsl:element>
+
+</xsl:template>
+
+<xsl:template match="&figuretitle;" mode="group"/>
+
+<xsl:template match="&figuretitle;" mode="figuretitle">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="&exampletitle;" mode="group">
+  <example>
+    <title>
+      <xsl:apply-templates/>
+    </title>
+    <xsl:apply-templates mode="example"
+             select="following-sibling::*[1][self::w:p or self::w:tbl]" />
+  </example>
+</xsl:template>
+
+
+<!-- Process tables -->
+<xsl:template match="w:tbl" mode="group">
+
+  <!-- Get title and caption from siblings -->
+  <xsl:variable name="title">
+    <xsl:choose>
+      <xsl:when test="following-sibling::*[1][self::&tabletitle;]">
+        <xsl:apply-templates 
+                 mode="tabletitle"
+                 select="following-sibling::*[1][self::&tabletitle;]"/>
+      </xsl:when>
+      <xsl:when test="preceding-sibling::*[1][self::&tabletitle;]">
+        <xsl:apply-templates 
+                 mode="tabletitle"
+                 select="preceding-sibling::*[1][self::&tabletitle;]"/>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <!-- FIXME -->
+  <xsl:variable name="caption"/>
+
+  <xsl:variable name="element">
+    <xsl:choose>
+      <xsl:when test="$title != ''">table</xsl:when>
+      <xsl:otherwise>informaltable</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:element name="{$element}">
+    <xsl:call-template name="object.id"/>
+    <xsl:if test="$title != ''">
+      <title>
+        <xsl:copy-of select="$title"/>
+      </title>
+    </xsl:if>
+
+    <tgroup>
+      <xsl:attribute name="cols">
+        <xsl:value-of select="count(w:tblGrid/w:gridCol)"/>
+      </xsl:attribute>
+      <xsl:apply-templates select="w:tblGrid" mode="colspec"/>
+      <xsl:if test="w:tr[descendant::w:pStyle[@w:val = 'tableheader']]">
+        <thead>
+          <xsl:apply-templates mode="tableheader"
+                  select="w:tr[descendant::w:pStyle[@w:val = 'tableheader']]"/>
+        </thead>
+      </xsl:if>
+      <tbody>
+        <xsl:apply-templates/>
+      </tbody>
+    </tgroup>
+
+  </xsl:element>
+
+</xsl:template>
+
+<xsl:template match="&tabletitle;" mode="group"/>
+
+<xsl:template match="&tabletitle;" mode="tabletitle">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="w:tblGrid" mode="colspec">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="w:tblGrid">
+</xsl:template>
+
+<xsl:template match="w:tblGrid/w:gridCol">
+  <colspec>
+    <xsl:attribute name="colnum">
+      <xsl:value-of select="position()"/>
+    </xsl:attribute>
+    <xsl:attribute name="colname">
+      <xsl:value-of select="concat('col', position())"/>
+    </xsl:attribute>
+    <xsl:if test="@w:w != ''">
+      <xsl:variable name="calcwidth">
+        <xsl:value-of select="@w:w div 20"/>
+      </xsl:variable>
+      <xsl:attribute name="colwidth">
+        <xsl:value-of select="concat($calcwidth, 'pt')"/>
+      </xsl:attribute>
+    </xsl:if>
+  </colspec>
+</xsl:template>
+  
+<!-- Table header row -->
+<xsl:template mode="tableheader"
+              match="w:tr[descendant::w:pStyle[@w:val = 'tableheader']]">
+  <row>
+    <xsl:apply-templates/>
+  </row>
+</xsl:template>
+
+<xsl:template match="w:tr[descendant::w:pStyle[@w:val = 'tableheader']]">
+  <!-- Already handled in tableheader mode -->
+</xsl:template>
+
+<xsl:template match="w:tr">
+  <row>
+    <xsl:apply-templates/>
+  </row>
+</xsl:template>
+
+<xsl:template match="w:tc">
+  <entry>
+    <!-- Process any spans -->
+    <xsl:call-template name="cell.span"/>
+    <!-- Process as paras if more than one w:p in the cell -->
+    <xsl:choose>
+      <xsl:when test="count(w:p) = 1">
+            <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates mode="group"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </entry>
+</xsl:template>
+
+<xsl:template name="cell.span">
+  <xsl:variable name="span" select="0 + w:tcPr/w:gridSpan/@w:val"/>
+  <xsl:if test="$span &gt; 0">
+    <!-- Get the current cell number -->
+    <xsl:variable name="colstart">
+      <xsl:call-template name="colcount">
+        <xsl:with-param name="count" select="1"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:attribute name="namest"><xsl:value-of 
+                 select="concat('col', $colstart)"/></xsl:attribute>
+    <xsl:attribute name="nameend"><xsl:value-of
+                 select="concat('col', $colstart + $span - 1)"/></xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!-- recursively count preceding columns, including spans -->
+<xsl:template name="colcount">
+  <xsl:param name="count" select="0"/>
+  <xsl:param name="cell" select="."/>
+  <xsl:choose>
+    <xsl:when test="$cell/preceding-sibling::w:tc">
+      <xsl:variable name="span" 
+          select="0 + $cell/preceding-sibling::w:tc/w:tcPr/w:gridSpan/@w:val"/>
+      <xsl:choose>
+        <xsl:when test="$span &gt; 0">
+          <xsl:call-template name="colcount">
+            <xsl:with-param name="count" select="$count + $span"/>
+            <xsl:with-param name="cell" select="$cell/preceding-sibling::w:tc"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="colcount">
+            <xsl:with-param name="count" select="$count + 1"/>
+            <xsl:with-param name="cell" select="$cell/preceding-sibling::w:tc"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$count"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!--
+<xsl:template match="w:p[w:pPr/w:pStyle[@w:val = 'tableheader']]">
+  <para>
+    <xsl:call-template name="object.id"/>
+    <xsl:apply-templates select="w:r|w:hlink"/>
+  </para>
+</xsl:template>
+-->
+
+<!-- variablelist is a two-column table with table style='variablelist' -->
+<xsl:template match="&variablelist;" mode="group">
+  <variablelist>
+    <xsl:call-template name="object.id"/>
+    <xsl:apply-templates select="w:tr" mode="variablelist"/>
+  </variablelist>
+</xsl:template>
+
+<xsl:template match="w:tr" mode="variablelist">
+  <varlistentry>
+    <term>
+      <xsl:apply-templates select="w:tc[1]/*" mode="variablelist.term"/>
+    </term>
+    <listitem>
+      <xsl:apply-templates select="w:tc[2]/*" mode="group"/> 
+    </listitem>
+  </varlistentry>
+</xsl:template>
+
+<!-- No para tags inside variablelist term -->
+<xsl:template match="w:p" mode="variablelist.term">
+  <xsl:apply-templates select="w:r|w:hlink"/>
+</xsl:template>
+
+<xsl:template match="&admon;" mode="group">
+  <xsl:variable name="element.name" select="w:pPr/w:pStyle/@w:val"/>
+
+  <xsl:element name="{$element.name}">
+    <xsl:call-template name="object.id"/>
+    <para>
+      <xsl:apply-templates select="w:r|w:hlink"/>
+    </para>
+    <xsl:apply-templates mode="item" 
+                select="following-sibling::*[1][self::&admoncontinue;]"/>
+  </xsl:element>
+</xsl:template>
+
+<xsl:template match="&admoncontinue;" mode="item">
+  <para>
+    <xsl:call-template name="object.id"/>
+    <xsl:apply-templates select="w:r|w:hlink"/>
+  </para>
+  <!-- Continue to process any immediate following -->
+  <xsl:apply-templates mode="item" 
+                select="following-sibling::*[1][self::&admoncontinue;]"/>
+</xsl:template>
+
+<xsl:template match="&admoncontinue;" mode="group">
+  <!-- Handled by note -->
+</xsl:template>
+
+<xsl:template match="&verbatim;[not(preceding-sibling::*[1]
+                     [self::&verbatim;])]" 
+                     mode="group">
+
+  <xsl:variable name="element.name" select="w:pPr/w:pStyle/@w:val"/>
+  <!-- Start the listing and process all subsequent ones too -->
+  <xsl:element name="{$element.name}">
+    <xsl:call-template name="object.id"/>
+    <xsl:apply-templates select="." mode="item"/>
+  </xsl:element>
+
+</xsl:template>
+
+<xsl:template match="&verbatim;[not(preceding-sibling::*[1]
+                     [self::&verbatim;])]" 
+                     mode="example">
+
+  <xsl:variable name="element.name" select="w:pPr/w:pStyle/@w:val"/>
+  <!-- Start the listing and process all subsequent ones too -->
+  <xsl:element name="{$element.name}">
+    <xsl:call-template name="object.id"/>
+    <xsl:apply-templates select="." mode="item"/>
+  </xsl:element>
+
+</xsl:template>
+
+
+<xsl:template match="&verbatim;[preceding-sibling::*[1]
+                     [self::&verbatim;]]" 
+                     mode="group">
+  <!-- Non-first verbatims are handled in item mode -->
+</xsl:template>
+
+<xsl:template match="&verbatim;" mode="item">
+  
+  <xsl:apply-templates select="w:r|w:hlink" />
+  <xsl:text>&#x0A;</xsl:text>
+  <xsl:apply-templates select="following-sibling::*[1][self::&verbatim;]"
+                       mode="item"/>
+</xsl:template>
+
+<xsl:template match="w:br[ancestor::&verbatim;]">
+  <xsl:text>&#x0A;</xsl:text>
+</xsl:template>
+  
+<xsl:template match="&verbatim;[preceding-sibling::*[1]
+                     [self::&exampletitle;]]" 
+              priority="2"
+              mode="group"/>
+
+<xsl:template match="w:tbl[preceding-sibling::*[1][self::&exampletitle;]]" 
+              priority="2"
+              mode="group"/>
+
+</xsl:stylesheet>