fixed blockquote attribution.

fixed listitem para continuation.

diff --git a/xsl/roundtrip/dbk2wp.xsl b/xsl/roundtrip/dbk2wp.xsl
index 241048af4224fc99c40cc6cf7710be5b7130900b..b51277cc78ea2cc25dffefc9f436b9c67236612e 100644 (file)
--- a/xsl/roundtrip/dbk2wp.xsl
+++ b/xsl/roundtrip/dbk2wp.xsl
@@ -901,7 +901,11 @@
       <xsl:call-template name='doc:make-paragraph'>
        <xsl:with-param name='style' select='"blockquote-attribution"'/>
        <xsl:with-param name='content'>
-          <xsl:apply-templates select='attribution/node()|doc:attribution/node()'/>
+          <xsl:call-template name='doc:make-phrase'>
+            <xsl:with-param name='content'>
+              <xsl:apply-templates select='attribution/node()|doc:attribution/node()'/>
+            </xsl:with-param>
+          </xsl:call-template>
        </xsl:with-param>
       </xsl:call-template>
     </xsl:if>
@@ -952,15 +956,21 @@
       mode='doc:list-continue'/>
 
     <xsl:apply-templates select='*[position() != 1]'
-      mode='doc:body'/>
+      mode='doc:list-continue'/>
   </xsl:template>  
 
-  <xsl:template match='*' mode='doc:list-continue'>
+  <xsl:template match='para|doc:para' mode='doc:list-continue'>
     <xsl:apply-templates select='.'
       mode='doc:body'>
       <xsl:with-param name='class' select='"para-continue"'/>
     </xsl:apply-templates>
   </xsl:template>
+  <!-- non-paragraph elements in a listitem are rolled back into
+       the list item upon conversion.
+       -->
+  <xsl:template match='*' mode='doc:list-continue'>
+    <xsl:apply-templates select='.' mode='doc:body'/>
+  </xsl:template>
 
   <xsl:template match='variablelist|doc:variablelist'
     mode='doc:body'>