diff options
| author | despresc <christian.j.j.despres@gmail.com> | 2020-04-04 16:35:42 -0400 |
|---|---|---|
| committer | despresc <christian.j.j.despres@gmail.com> | 2020-04-15 23:03:22 -0400 |
| commit | 4e34d366df31937cdc69b6b366355f10a84c16b2 (patch) | |
| tree | 844503b0f59439acaec5d2f8e2f016e2eb1d214c /src/Text/Pandoc/Readers/MediaWiki.hs | |
| parent | f8ce38975b547fe7fc8c12ccee3a940b35d8b9cf (diff) | |
| download | pandoc-4e34d366df31937cdc69b6b366355f10a84c16b2.tar.gz | |
Adapt to the newest Table type, fix some previous adaptation issues
- Writers.Native is now adapted to the new Table type.
- Inline captions should now be conditionally wrapped in a Plain, not
a Para block.
- The toLegacyTable function now lives in Writers.Shared.
Diffstat (limited to 'src/Text/Pandoc/Readers/MediaWiki.hs')
| -rw-r--r-- | src/Text/Pandoc/Readers/MediaWiki.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs index 5e9aecc49..0396c95de 100644 --- a/src/Text/Pandoc/Readers/MediaWiki.hs +++ b/src/Text/Pandoc/Readers/MediaWiki.hs @@ -221,9 +221,9 @@ table = do let restwidth = tableWidth - sum widths let zerocols = length $ filter (==0.0) widths let defaultwidth = if zerocols == 0 || zerocols == length widths - then Nothing - else Just $ restwidth / fromIntegral zerocols - let widths' = map (\w -> if w == 0 then defaultwidth else Just w) widths + then ColWidthDefault + else ColWidth $ restwidth / fromIntegral zerocols + let widths' = map (\w -> if w > 0 then ColWidth w else defaultwidth) widths let cellspecs = zip (map fst cellspecs') widths' rows' <- many $ try $ rowsep *> (map snd <$> tableRow) optional blanklines |