From 972ba13f31cc669a35e95f921c236cc510dc9c18 Mon Sep 17 00:00:00 2001
From: Steve Ball <balls@users.sourceforge.net>
Date: Tue, 13 Dec 2005 23:05:24 +0000
Subject: [PATCH] added contrib element, better handling of default paragraph
 style

---
 xsl/wordml/pages-normalise.xsl |  5 +++++
 xsl/wordml/supported.xml       | 14 ++++++++++----
 xsl/wordml/wordml-final.xsl    |  6 +++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/xsl/wordml/pages-normalise.xsl b/xsl/wordml/pages-normalise.xsl
index 80d1cc558..460a22479 100644
--- a/xsl/wordml/pages-normalise.xsl
+++ b/xsl/wordml/pages-normalise.xsl
@@ -220,6 +220,11 @@
 	       select='key("styles", $ident)/self::sf:characterstyle/@sf:name'/>
 
     <xsl:choose>
+      <xsl:when test='$ident = "paragraph-style-default"'>
+	<w:pPr>
+	  <w:pStyle w:val='Normal'/>
+	</w:pPr>
+      </xsl:when>
       <xsl:when test='$para-style-name != ""'>
 	<w:pPr>
 	  <xsl:if test='$para-style-name != ""'>
diff --git a/xsl/wordml/supported.xml b/xsl/wordml/supported.xml
index 059e943a2..0e865213f 100644
--- a/xsl/wordml/supported.xml
+++ b/xsl/wordml/supported.xml
@@ -16,6 +16,12 @@
     <releaseinfo>$Id$</releaseinfo>
 
     <revhistory>
+      <revision>
+	<revnumber>1.1</revnumber>
+	<authorinitials>SRB</authorinitials>
+	<date>2005-12-14</date>
+	<revremark>Added contrib.</revremark>
+      </revision>
       <revision>
 	<revnumber>1.0</revnumber>
 	<authorinitials>SRB</authorinitials>
@@ -1503,16 +1509,16 @@
 	    <para><sgmltag>contrib</sgmltag></para>
 	  </entry>
 	  <entry>
-	    <para><literal>contrib</literal></para>
+	    <para></para>
 	  </entry>
 	  <entry>
-	    <para>dbk:no</para>
+	    <para>dbk:yes</para>
 	  </entry>
 	  <entry>
-	    <para>Paragraph</para>
+	    <para>None</para>
 	  </entry>
 	  <entry>
-	    <para><!-- Comments --></para>
+	    <para>Default element to use for metadata.</para>
 	  </entry>
 	</row>
 	<row>
diff --git a/xsl/wordml/wordml-final.xsl b/xsl/wordml/wordml-final.xsl
index 31f44f5ba..be93a8432 100644
--- a/xsl/wordml/wordml-final.xsl
+++ b/xsl/wordml/wordml-final.xsl
@@ -594,7 +594,11 @@
       <xsl:apply-templates/>
     </revremark>
   </xsl:template>
-  <xsl:template match='w:r' mode='metadata' priority='0'/>
+  <xsl:template match='w:r|w:hlink' mode='metadata' priority='0'>
+    <contrib>
+      <xsl:apply-templates select='w:t'/>
+    </contrib>
+  </xsl:template>
   <xsl:template match='&surname;|&firstname;|&honorific;|&lineage;|&othername; |
 		       &orgname; |
                        &contrib; |
-- 
2.49.0