From 98ff6b2fd06288598a7acf1f19b84418db47e6db Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Sat, 28 Nov 2009 03:22:33 +0000
Subject: Better looking simple tables.  Resolves Issue #180.

* Markdown reader: simple tables are now given column widths of 0.

* Column width of 0 is interpreted as meaning: use default column width.

* Writers now include explicit column width information only
  for multiline tables.  (Exception:  RTF writer, which requires
  column widths.  In this case, columns are given equal widths,
  adding up to the text width.)

* Simple tables should now look better in most output formats.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1631 788f1e2b-df1e-0410-8736-df70ead52e1b
---
 src/Text/Pandoc/Writers/LaTeX.hs | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'src/Text/Pandoc/Writers/LaTeX.hs')

diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
index a0f9e9004..9a74a069e 100644
--- a/src/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -197,17 +197,7 @@ blockToLaTeX (Table caption aligns widths heads rows) = do
   headers <- tableRowToLaTeX heads
   captionText <- inlineListToLaTeX caption
   rows' <- mapM tableRowToLaTeX rows
-  let colWidths = map (printf "%.2f") widths
-  let colDescriptors = concat $ zipWith
-                                (\width align -> ">{\\PBS" ++ 
-                                (case align of 
-                                       AlignLeft -> "\\raggedright"
-                                       AlignRight -> "\\raggedleft"
-                                       AlignCenter -> "\\centering"
-                                       AlignDefault -> "\\raggedright") ++
-                                "\\hspace{0pt}}p{" ++ width ++ 
-                                "\\columnwidth}")
-                                colWidths aligns
+  let colDescriptors = concat $ zipWith toColDescriptor widths aligns
   let tableBody = text ("\\begin{tabular}{" ++ colDescriptors ++ "}") $$
                   headers $$ text "\\hline" $$ vcat rows' $$ 
                   text "\\end{tabular}" 
@@ -221,6 +211,22 @@ blockToLaTeX (Table caption aligns widths heads rows) = do
               else text "\\begin{table}[h]" $$ centered tableBody $$ 
                    inCmd "caption" captionText $$ text "\\end{table}\n" 
 
+toColDescriptor :: Double -> Alignment -> String
+toColDescriptor 0 align =
+  case align of
+         AlignLeft    -> "l"
+         AlignRight   -> "r"
+         AlignCenter  -> "c"
+         AlignDefault -> "l"
+toColDescriptor width align = ">{\\PBS" ++
+  (case align of
+         AlignLeft -> "\\raggedright"
+         AlignRight -> "\\raggedleft"
+         AlignCenter -> "\\centering"
+         AlignDefault -> "\\raggedright") ++
+  "\\hspace{0pt}}p{" ++ printf "%.2f" width ++
+  "\\columnwidth}"
+
 blockListToLaTeX :: [Block] -> State WriterState Doc
 blockListToLaTeX lst = mapM blockToLaTeX lst >>= return . vcat
 
-- 
cgit v1.2.3