lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-10-04 21:28:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use compactifyTable for tables produced by all readers.

Browse Source 
Remove old ad hoc `paraToPlain` at the table cell level.

This should ensure that we don't get tables that mix
Plain and Para. Such tables tend to look funny when
rendered in docx and other formats.

Closes #11864.
This commit is contained in:
John MacFarlane
2026-09-12 20:02:41 -07:00
parent d4cddb5539
commit 7cf4d41fe5
33 changed files with 447 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/command/10390.md
+2 -2
View File
@@ -11,12 +11,12 @@
<caption>Overview of basic table markup</caption>
<thead>
<tr>
<th><p>Key</p></th>
<th>Key</th>
</tr>
</thead>
<tbody>
<tr>
<td><p>Value</p></td>
<td>Value</td>
</tr>
</tbody>
</table>
test/command/10490.md
+16 -16
View File
@@ -18,31 +18,31 @@
<table>
<thead>
<tr>
<th style=""><p>Witness program version</p></th>
<th colspan="4" style=""><p>Hash size</p></th>
<th style="">Witness program version</th>
<th colspan="4" style="">Hash size</th>
</tr>
</thead>
<tbody>
<tr>
<td><p>Mainnet</p></td>
<td><p>Testnet</p></td>
<td><p>Mainnet</p></td>
<td><p>Testnet</p></td>
<td>Mainnet</td>
<td>Testnet</td>
<td>Mainnet</td>
<td>Testnet</td>
<td></td>
</tr>
<tr>
<td><p>0</p></td>
<td><p>p2</p></td>
<td><p>QW</p></td>
<td><p>7Xh</p></td>
<td><p>T7n</p></td>
<td>0</td>
<td>p2</td>
<td>QW</td>
<td>7Xh</td>
<td>T7n</td>
</tr>
<tr>
<td><p>1</p></td>
<td><p>p4</p></td>
<td><p>QY</p></td>
<td><p>7Xq</p></td>
<td><p>T7w</p></td>
<td>1</td>
<td>p4</td>
<td>QY</td>
<td>7Xq</td>
<td>T7w</td>
</tr>
</tbody>
</table>
test/command/1166.md
+6 -6
View File
@@ -24,15 +24,15 @@ col 1 col 2
</thead>
<tbody>
<tr>
<td>1</td>
<td>Second column of row 1.</td>
<td><p>1</p></td>
<td><p>Second column of row 1.</p></td>
</tr>
<tr>
<td>2</td>
<td>Second column of row 2. Second line of paragraph.</td>
<td><p>2</p></td>
<td><p>Second column of row 2. Second line of paragraph.</p></td>
</tr>
<tr>
<td>3</td>
<td><p>3</p></td>
<td><ul>
<li>Second column of row 3.</li>
<li>Second item in bullet list (row 3, column 2).</li>
@@ -40,7 +40,7 @@ col 1 col 2
</tr>
<tr>
<td></td>
<td>Row 4; column 1 will be empty.</td>
<td><p>Row 4; column 1 will be empty.</p></td>
</tr>
</tbody>
</table>
test/command/2606.md
+2 -2
View File
@@ -7,7 +7,7 @@
<table>
<tbody>
<tr>
<td><p>* hello</p></td>
<td>* hello</td>
</tr>
</tbody>
</table>
@@ -41,7 +41,7 @@
<table>
<tbody>
<tr>
<td><p><code>* hello</code></p></td>
<td><code>* hello</code></td>
</tr>
</tbody>
</table>
test/command/2649.md
+15 -15
View File
@@ -32,27 +32,27 @@
<table>
<tbody>
<tr>
<td><p>peildatum Simbase</p></td>
<td><p>november 2005</p></td>
<td colspan="2"><p><strong>uitslagen Flohrgambiet</strong></p></td>
<td>peildatum Simbase</td>
<td>november 2005</td>
<td colspan="2"><strong>uitslagen Flohrgambiet</strong></td>
</tr>
<tr>
<td><p>totaal aantal partijen Simbase</p></td>
<td><p>7.316.773</p></td>
<td><p>wit wint</p></td>
<td><p>53%</p></td>
<td>totaal aantal partijen Simbase</td>
<td>7.316.773</td>
<td>wit wint</td>
<td>53%</td>
</tr>
<tr>
<td><p>percentage (en partijen) Flohrgambiet</p></td>
<td><p>0.023 % (1.699)</p></td>
<td><p>zwart wint</p></td>
<td><p>27%</p></td>
<td>percentage (en partijen) Flohrgambiet</td>
<td>0.023 % (1.699)</td>
<td>zwart wint</td>
<td>27%</td>
</tr>
<tr>
<td><p>percentage Flohrgambiet in aug 2003</p></td>
<td><p>0.035 %</p></td>
<td><p>remise</p></td>
<td><p>20%</p></td>
<td>percentage Flohrgambiet in aug 2003</td>
<td>0.035 %</td>
<td>remise</td>
<td>20%</td>
</tr>
</tbody>
</table>
test/command/6549.md
+3 -3
View File
@@ -9,13 +9,13 @@
<caption>Test table</caption>
<thead>
<tr>
<th>Column1</th>
<th>Column2</th>
<th><p>Column1</p></th>
<th><p>Column2</p></th>
</tr>
</thead>
<tbody>
<tr>
<td>Data1</td>
<td><p>Data1</p></td>
<td><ul>
<li>data1</li>
<li>data2</li>
test/command/6992.md
+5 -5
View File
@@ -23,7 +23,7 @@
AlignDefault
(RowSpan 1)
(ColSpan 4)
[ Para [ Str "template" , Space , Str "request" ] ]
[ Plain [ Str "template" , Space , Str "request" ] ]
]
])
[ TableBody
@@ -37,25 +37,25 @@
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "mode" ] ]
[ Plain [ Str "mode" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "No" ] ]
[ Plain [ Str "No" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "String" ] ]
[ Plain [ Str "String" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "MUST"
, Space
, Str "be"
test/command/8110.md
+9 -9
View File
@@ -19,21 +19,21 @@
<table>
<thead>
<tr>
<th><p>Header text</p></th>
<th><p>Header text</p></th>
<th><p>Header text</p></th>
<th>Header text</th>
<th>Header text</th>
<th>Header text</th>
</tr>
</thead>
<tbody>
<tr>
<td><p>Example</p></td>
<td><p>Example</p></td>
<td><p>Example</p></td>
<td>Example</td>
<td>Example</td>
<td>Example</td>
</tr>
<tr>
<td><p>Example</p></td>
<td><p>Example</p></td>
<td><p>Example</p></td>
<td>Example</td>
<td>Example</td>
<td>Example</td>
</tr>
</tbody>
</table>
test/command/8659.md
+4 -4
View File
@@ -44,10 +44,10 @@ The misaligned pipe in the first row is treated as an empty table.
</thead>
<tbody>
<tr>
<td style="text-align: left;">a</td>
<td>b</td>
<td style="text-align: right;">c</td>
<td style="text-align: right;">d</td>
<td style="text-align: left;"><p>a</p></td>
<td><p>b</p></td>
<td style="text-align: right;"><p>c</p></td>
<td style="text-align: right;"><p>d</p></td>
</tr>
</tbody>
</table>