Skip to content

rst support #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schmir wants to merge 4 commits into
base: master
Choose a base branch
from
Open

rst support #4

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf4960f
make wrap-row a top-level function
schmir Jul 16, 2015
181e6cb
simplify fmt-row
schmir Jul 16, 2015
a7be439
simplify border-for
schmir Jul 16, 2015
3a821ae
implement support for restructured text tables
schmir Jul 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions src/table/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
{
:plain {:top ["+-" "-+-" "-+"], :middle ["+-" "-+-" "-+"] :bottom ["+-" "-+-" "-+"]
:dash "-" :header-walls walls :body-walls walls }
:rst {:top ["+-" "-+-" "-+"], :middle ["+=" "=+=" "=+"] :bottom ["+-" "-+-" "-+"] :body ["+-" "-+-" "-+"]
:dash "-" :middle-dash "=" :header-walls walls :body-walls walls }

:org {:top ["|-" "-+-" "-|"], :middle ["|-" "-+-" "-|"] :bottom ["|-" "-+-" "-|"]
:dash "-" :header-walls walls :body-walls walls }
:unicode {:top ["┌─" "─┬─" "─┐"] :middle ["├─" "─┼─" "─┤"] :bottom ["└─" "─┴─" "─┘"]
Expand Down Expand Up @@ -77,26 +80,28 @@
(concat rendered-rows [(format "%s rows in set" (count rows))])
rendered-rows)))

(defn- wrap-row
[row [beg mid end]]
(str beg (join mid row) end))

(defn- render-rows-with-fields [rows fields options]
(let [
headers (map #(if (keyword? %) (name %) (str %)) fields)
widths (table.width/get-widths (cons headers rows))
fmt-row (fn [row]
(map-indexed
(fn [idx string] (format-cell string (nth widths idx)))
row))
wrap-row (fn [row strings] (let [[beg mid end] strings] (str beg (join mid row) end)))
fmt-row (fn [row] (map format-cell row widths))
headers (fmt-row headers)
border-for (fn [section dash]
(let [dash-key (if (style-for dash) dash :dash)]
(wrap-row
(map #(apply str (repeat
(.length (str %))(style-for dash-key))) headers)
(style-for section))))
border-for (fn [section dash-key]
(let [dash (or (style-for dash-key) (style-for :dash))]
(wrap-row (map #(join (repeat % dash))
widths)
(style-for section))))
header (wrap-row headers (style-for :header-walls))
body (map #(wrap-row (fmt-row %) (style-for :body-walls)) rows) ]
body (map #(wrap-row (fmt-row %) (style-for :body-walls)) rows)
body (if (style-for :body)
(rest (interleave (repeat (border-for :body :body-dash)) body))
body)]

(concat [(border-for :top :top-dash) header (border-for :middle :dash)]
(concat [(border-for :top :top-dash) header (border-for :middle :middle-dash)]
body [( border-for :bottom :bottom-dash)])))

(defn- escape-newline [string]
Expand Down