From 02638919e2b2b1d700d1ccc6bc3bf40e6acb67c8 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Mon, 25 Dec 2023 11:12:01 +0200
Subject: [PATCH] Support all AST block types

Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
---
 src/main/resources/ast2markdown.xsl               | 2 +-
 src/test/resources/dita/table-block.dita          | 6 ++++--
 src/test/resources/output/ast/table-block.xml     | 2 +-
 src/test/resources/output/markdown/table-block.md | 4 +++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/ast2markdown.xsl b/src/main/resources/ast2markdown.xsl
index adc01eb..5cebbd7 100644
--- a/src/main/resources/ast2markdown.xsl
+++ b/src/main/resources/ast2markdown.xsl
@@ -240,7 +240,7 @@
     <xsl:value-of select="."/>
   </xsl:template>
 
-  <xsl:template match="table[*/tr/tablecell/para]" mode="ast" priority="10">
+  <xsl:template match="table[*/tr/tablecell/(para | plain | codeblock | rawblock | blockquote | orderedlist | bulletlist | definitionlist | header | table | div)]" mode="ast" priority="10">
     <xsl:variable name="html" as="element()*">
       <table>
         <xsl:copy-of select="@*"/>
diff --git a/src/test/resources/dita/table-block.dita b/src/test/resources/dita/table-block.dita
index 22b0588..75aa2b2 100644
--- a/src/test/resources/dita/table-block.dita
+++ b/src/test/resources/dita/table-block.dita
@@ -55,10 +55,12 @@
           </row>
           <row class="- topic/row ">
             <entry class="- topic/entry ">
-              <p class="- topic/p ">A4</p>
+              <codeblock class="+ topic/pre pr-d/codeblock ">A4</codeblock>
             </entry>
             <entry class="- topic/entry ">
-              <p class="- topic/p ">B4</p>
+              <ol class="- topic/ol ">
+                <li class="- topic/li ">B4</li>
+              </ol>
             </entry>
           </row>
         </tbody>
diff --git a/src/test/resources/output/ast/table-block.xml b/src/test/resources/output/ast/table-block.xml
index e3686f4..8710bf4 100644
--- a/src/test/resources/output/ast/table-block.xml
+++ b/src/test/resources/output/ast/table-block.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><pandoc><div><header id="tables" level="1">Table with block content</header><div><table><col/><col/><col/><thead><tr><tablecell>A</tablecell><tablecell>B</tablecell><tablecell>C</tablecell></tr></thead><tbody><tr><tablecell><para>A1 <strong>bold</strong></para> <para>A1</para></tablecell><tablecell><para>B1</para> <para><strong>bold</strong> B1</para></tablecell><tablecell><para><strong>C1</strong></para> <para>C1</para></tablecell></tr><tr><tablecell align="left"><para>A2 <strong>bold</strong></para></tablecell><tablecell align="center"><para>B2</para></tablecell><tablecell align="right"><para><strong>C2</strong></para></tablecell></tr><tr><tablecell colspan="2"><para>A3</para> <para>B3</para></tablecell><tablecell rowspan="2"><para>C3</para></tablecell></tr><tr><tablecell><para>A4</para></tablecell><tablecell><para>B4</para></tablecell></tr></tbody></table></div></div></pandoc>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><pandoc><div><header id="tables" level="1">Table with block content</header><div><table><col/><col/><col/><thead><tr><tablecell>A</tablecell><tablecell>B</tablecell><tablecell>C</tablecell></tr></thead><tbody><tr><tablecell><para>A1 <strong>bold</strong></para> <para>A1</para></tablecell><tablecell><para>B1</para> <para><strong>bold</strong> B1</para></tablecell><tablecell><para><strong>C1</strong></para> <para>C1</para></tablecell></tr><tr><tablecell align="left"><para>A2 <strong>bold</strong></para></tablecell><tablecell align="center"><para>B2</para></tablecell><tablecell align="right"><para><strong>C2</strong></para></tablecell></tr><tr><tablecell colspan="2"><para>A3</para> <para>B3</para></tablecell><tablecell rowspan="2"><para>C3</para></tablecell></tr><tr><tablecell><codeblock xml:space="preserve">A4</codeblock></tablecell><tablecell><orderedlist><li><plain>B4</plain></li></orderedlist></tablecell></tr></tbody></table></div></div></pandoc>
\ No newline at end of file
diff --git a/src/test/resources/output/markdown/table-block.md b/src/test/resources/output/markdown/table-block.md
index b938e95..43f8e09 100644
--- a/src/test/resources/output/markdown/table-block.md
+++ b/src/test/resources/output/markdown/table-block.md
@@ -54,11 +54,13 @@ C3
 
 </td></tr><tr><td>
 
+```
 A4
+```
 
 </td><td>
 
-B4
+1.  B4
 
 </td></tr></tbody>
 </table>
\ No newline at end of file