Add space before td end tag

Signed-off-by: Jarno Elovirta <[email protected]>
jelovirt · Dec 24, 2023 · 664140a · 664140a
1 parent 87942a6
commit 664140a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 16 deletions.
diff --git a/src/main/resources/ast2markdown.xsl b/src/main/resources/ast2markdown.xsl
@@ -255,15 +255,23 @@
                     <xsl:copy-of select="@*"/>
                     <xsl:value-of select="$linefeed"/>
                     <xsl:value-of select="$linefeed"/>
-                    <xsl:variable name="contents" as="xs:string*">
-                      <xsl:apply-templates mode="#current">
-                        <xsl:with-param name="indent" tunnel="yes" select="''"/>
-                      </xsl:apply-templates>
+                    <xsl:variable name="contents" as="xs:string">
+                      <xsl:value-of separator="">
+                        <xsl:apply-templates mode="#current">
+                          <xsl:with-param name="indent" tunnel="yes" select="''"/>
+                        </xsl:apply-templates>
+                      </xsl:value-of>
                     </xsl:variable>
-                    <xsl:value-of select="$contents" separator=""/>
-                    <xsl:if test="empty($contents[last()][ends-with(., '&#xA;')])">
-                      <xsl:value-of select="$linefeed"/>
-                    </xsl:if>
+                    <xsl:value-of select="$contents" separator="|"/>
+                    <xsl:choose>
+                      <xsl:when test="not(ends-with($contents, '&#xA;&#xA;'))">
+                        <xsl:value-of select="$linefeed"/>
+                        <xsl:value-of select="$linefeed"/>
+                      </xsl:when>
+                      <xsl:when test="not(ends-with($contents, '&#xA;'))">
+                        <xsl:value-of select="$linefeed"/>
+                      </xsl:when>
+                    </xsl:choose>
                   </th>
                 </xsl:for-each>
               </tr>
@@ -281,15 +289,23 @@
                     <xsl:copy-of select="@*"/>
                     <xsl:value-of select="$linefeed"/>
                     <xsl:value-of select="$linefeed"/>
-                    <xsl:variable name="contents" as="xs:string*">
-                      <xsl:apply-templates mode="#current">
-                        <xsl:with-param name="indent" tunnel="yes" select="''"/>
-                      </xsl:apply-templates>
+                    <xsl:variable name="contents" as="xs:string">
+                      <xsl:value-of separator="">
+                        <xsl:apply-templates mode="#current">
+                          <xsl:with-param name="indent" tunnel="yes" select="''"/>
+                        </xsl:apply-templates>
+                      </xsl:value-of>
                     </xsl:variable>
-                    <xsl:value-of select="$contents" separator=""/>
-                    <xsl:if test="empty($contents[last()][ends-with(., '&#xA;')])">
-                      <xsl:value-of select="$linefeed"/>
-                    </xsl:if>
+                    <xsl:value-of select="$contents" separator="|"/>
+                    <xsl:choose>
+                      <xsl:when test="not(ends-with($contents, '&#xA;&#xA;'))">
+                        <xsl:value-of select="$linefeed"/>
+                        <xsl:value-of select="$linefeed"/>
+                      </xsl:when>
+                      <xsl:when test="not(ends-with($contents, '&#xA;'))">
+                        <xsl:value-of select="$linefeed"/>
+                      </xsl:when>
+                    </xsl:choose>
                   </td>
                 </xsl:for-each>
               </tr>

diff --git a/src/test/resources/output/markdown/table-block.md b/src/test/resources/output/markdown/table-block.md
@@ -3,12 +3,15 @@
 <table><thead><tr><th>
 
 A
+
 </th><th>
 
 B
+
 </th><th>
 
 C
+
 </th></tr></thead><tbody><tr><td>
 
 A1 **bold**