aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-04-09 19:56:43 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-04-09 19:56:43 -0700
commitda13ad89cea34f68ef059783d49faa20e24d3c80 (patch)
tree7b8e83d8d2ea63e56f610ad3b2d182eea1cf4b64
parentdf1522e1ebe7e6ece9f53d2d69963991cf3f97c0 (diff)
downloadpandoc-da13ad89cea34f68ef059783d49faa20e24d3c80.tar.gz
Man writer: use one decimal place for column widths.
This, I hope, will fix test failures on GHC 7.6 due to (presumably) different rounding or floating point multiplication.
-rw-r--r--src/Text/Pandoc/Writers/Man.hs2
-rw-r--r--tests/tables.man6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Writers/Man.hs b/src/Text/Pandoc/Writers/Man.hs
index d5e44e71a..5541aeb3b 100644
--- a/src/Text/Pandoc/Writers/Man.hs
+++ b/src/Text/Pandoc/Writers/Man.hs
@@ -187,7 +187,7 @@ blockToMan opts (Table caption alignments widths headers rows) =
modify $ \st -> st{ stHasTables = True }
let iwidths = if all (== 0) widths
then repeat ""
- else map (printf "w(%0.2fn)" . (70 *)) widths
+ else map (printf "w(%0.1fn)" . (70 *)) widths
-- 78n default width - 8n indent = 70n
let coldescriptions = text $ intercalate " "
(zipWith (\align width -> aligncode align ++ width)
diff --git a/tests/tables.man b/tests/tables.man
index 35922b4df..788b2199d 100644
--- a/tests/tables.man
+++ b/tests/tables.man
@@ -138,7 +138,7 @@ Multiline table with caption:
Here\[aq]s the caption. It may span multiple lines.
.TS
tab(@);
-cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
+cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).
T{
Centered Header
T}@T{
@@ -174,7 +174,7 @@ Multiline table without caption:
.PP
.TS
tab(@);
-cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
+cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).
T{
Centered Header
T}@T{
@@ -244,7 +244,7 @@ Multiline table without column headers:
.PP
.TS
tab(@);
-cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
+cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).
T{
First
T}@T{