add advanced support for tables

notslang · Aug 13, 2014 · 985ab68 · 985ab68
1 parent bb07302
commit 985ab68
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/lib/index.coffee b/lib/index.coffee
@@ -245,18 +245,27 @@ module.exports = (dirtyMarkdown) ->
           colWidth = longestStringInArray(col)
           token.header[i] = pad(token.header[i], colWidth)
 
-          #TODO: add support for non-left align
-          token.align[i] = pad('', colWidth, '-')
+          alignment = token.align[i]
+          token.align[i] = (
+            switch alignment
+              when null then pad('', colWidth, '-')
+              when 'left' then ':' + pad('', colWidth - 1, '-')
+              when 'center' then ':' + pad('', colWidth - 2, '-') + ':'
+              when 'right' then pad('', colWidth - 1, '-') + ':'
+          )
 
           for j in [0...token.cells.length]
-            token.cells[j][i] = pad(token.cells[j][i], colWidth)
+            token.cells[j][i] = (
+              if alignment is 'right'
+                pad(colWidth, token.cells[j][i])
+              else
+                pad(token.cells[j][i], colWidth)
+            )
 
         out.push token.header.join(' | ')
         out.push token.align.join(' | ')
         for row in token.cells
-          out.push row.join(' | ').trim() # no trailing whitespace
-
-
+          out.push row.join(' | ').trimRight() # no trailing whitespace
 
     previousToken = token
 

diff --git a/test/index.coffee b/test/index.coffee
@@ -207,6 +207,21 @@ describe 'tables', ->
       Vana'diel Chocobo Society | Chocobo Raising | FFXI:TOAU
     ''')
 
+  it 'should handle tables with text alignment', ->
+    prettyMarkdown('''
+      Group                     | Domain          | First Appearance
+      ------------------------: | :-------------: | :---------------
+      ShinRa                    | Mako Reactors   | FFVII
+      Moogles                   | MogNet          | FFIII
+      Vana'diel Chocobo Society | Chocobo Raising | FFXI:TOAU
+    ''').should.equal('''
+      Group                     | Domain          | First Appearance
+      ------------------------: | :-------------: | :---------------
+                         ShinRa | Mako Reactors   | FFVII
+                        Moogles | MogNet          | FFIII
+      Vana'diel Chocobo Society | Chocobo Raising | FFXI:TOAU
+    ''')
+
 describe 'full documents', ->
   it 'should reformat to match expected', ->
     for file in fs.readdirSync('./test/cases')