Jira writer: fix output of table headers

Headers were missing from tables.

Fixes: #6035
This commit is contained in:
Albert Krewinkel 2020-01-07 20:45:10 +01:00
parent ad5f7ecfce
commit bef0133fe0
No known key found for this signature in database
GPG key ID: 388DC0B21F631124
2 changed files with 9 additions and 4 deletions

View file

@ -84,7 +84,7 @@ toJiraBlocks :: PandocMonad m => [Block] -> JiraConverter m [Jira.Block]
toJiraBlocks blocks = do
let convert = \case
BlockQuote bs -> singleton . Jira.BlockQuote
<$> toJiraBlocks bs -- FIXME!
<$> toJiraBlocks bs
BulletList items -> singleton . Jira.List Jira.CircleBullets
<$> toJiraItems items
CodeBlock attr cs -> toJiraCode attr cs
@ -100,9 +100,9 @@ toJiraBlocks blocks = do
RawBlock fmt cs -> rawBlockToJira fmt cs
Null -> return mempty
Table _ _ _ hd body -> singleton <$> do
headerRow <- if null hd
then Just <$> toRow Jira.HeaderCell hd
else pure Nothing
headerRow <- if all null hd
then pure Nothing
else Just <$> toRow Jira.HeaderCell hd
bodyRows <- mapM (toRow Jira.BodyCell) body
let rows = case headerRow of
Just header -> header : bodyRows

View file

@ -1,28 +1,33 @@
Simple table with caption:
|| Right || Left || Center || Default ||
| 12 | 12 | 12 | 12 |
| 123 | 123 | 123 | 123 |
| 1 | 1 | 1 | 1 |
Simple table without caption:
|| Right || Left || Center || Default ||
| 12 | 12 | 12 | 12 |
| 123 | 123 | 123 | 123 |
| 1 | 1 | 1 | 1 |
Simple table indented two spaces:
|| Right || Left || Center || Default ||
| 12 | 12 | 12 | 12 |
| 123 | 123 | 123 | 123 |
| 1 | 1 | 1 | 1 |
Multiline table with caption:
|| Centered Header || Left Aligned || Right Aligned || Default aligned ||
| First | row | 12.0 | Example of a row that spans multiple lines. |
| Second | row | 5.0 | Heres another one. Note the blank line between rows. |
Multiline table without caption:
|| Centered Header || Left Aligned || Right Aligned || Default aligned ||
| First | row | 12.0 | Example of a row that spans multiple lines. |
| Second | row | 5.0 | Heres another one. Note the blank line between rows. |