proper column alignment in latex output format

astanin · astanin · commit d8700172fba0 · 2013-11-19T15:23:22.000+01:00
diff --git a/tabulate.py b/tabulate.py
@@ -107,6 +107,13 @@ def _mediawiki_row_with_attrs(separator, cell_values, colwidths, colaligns):
     colsep = separator*2
     return (separator + colsep.join(values_with_attrs)).rstrip()
 
+
+def _latex_line_begin_tabular(colwidths, colaligns):
+    alignment = { "left": "l", "right": "r", "center": "c", "decimal": "r" }
+    tabular_columns_fmt = "".join([alignment[a] for a in colaligns])
+    return "\\begin{tabular}{" + tabular_columns_fmt + "}\n\hline"
+
+
 _table_formats = {"simple":
                   TableFormat(lineabove=Line("", "-", "  ", ""),
                               linebelowheader=Line("", "-", "  ", ""),
@@ -164,8 +171,8 @@ def _mediawiki_row_with_attrs(separator, cell_values, colwidths, colaligns):
                               headerrow=partial(_mediawiki_row_with_attrs, "!"),
                               datarow=partial(_mediawiki_row_with_attrs, "|"),
                               padding=0, with_header_hide=None),
-                  "latex":  # TODO: row alignment
-                  TableFormat(lineabove=Line("\\begin{tabular}{r", "", "r", "}\n\hline"),
+                  "latex":
+                  TableFormat(lineabove=_latex_line_begin_tabular,
                               linebelowheader=Line("\\hline", "", "", ""),
                               linebetweenrows=None,
                               linebelow=Line("\\hline\n\\end{tabular}", "", "", ""),
diff --git a/test/test_output.py b/test/test_output.py
@@ -171,7 +171,7 @@ def test_mediawiki_headerless():
 
 
 def test_latex():
-    "Output: LaTeX with headers"
+    "Output: latex with headers"
     result   = tabulate(_test_table, _test_table_headers, tablefmt="latex")
     expected = "\n".join([r"\begin{tabular}{lr}",
                           r"\hline",
@@ -185,7 +185,7 @@ def test_latex():
 
 
 def test_latex_headerless():
-    "Output: LaTeX without headers"
+    "Output: latex without headers"
     result   = tabulate(_test_table, tablefmt="latex")
     expected = "\n".join([r"\begin{tabular}{lr}",
                           r"\hline",
