From ebe97e341d37d9d3c8925957fe92245e68c52f57 Mon Sep 17 00:00:00 2001 From: Stuart Halloway Date: Fri, 8 Jun 2012 14:14:45 -0400 Subject: [PATCH] make print-table org-mode compatible --- src/clj/clojure/pprint/print_table.clj | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/clj/clojure/pprint/print_table.clj b/src/clj/clojure/pprint/print_table.clj index f285b8c..ea45de9 100644 --- a/src/clj/clojure/pprint/print_table.clj +++ b/src/clj/clojure/pprint/print_table.clj @@ -20,17 +20,17 @@ (fn [k] (apply max (count (str k)) (map #(count (str (get % k))) rows))) ks) - fmts (map #(str "%-" % "s") widths) - fmt-row (fn [row] - (apply str (interpose " | " - (for [[col fmt] (map vector (map #(get row %) ks) fmts)] - (format fmt (str col)))))) - header (fmt-row (zipmap ks ks)) - bar (apply str (repeat (count header) "="))] - (println bar) - (println header) - (println bar) + spacers (map #(apply str (repeat % "-")) widths) + fmts (map #(str "%" % "s") widths) + fmt-row (fn [divider row] + (str (subs divider 1) + (apply str (interpose divider + (for [[col fmt] (map vector (map #(get row %) ks) fmts)] + (format fmt (str col))))) + (subs divider 0 2)))] + (println) + (println (fmt-row " | " (zipmap ks ks))) + (println (fmt-row "-+-" (zipmap ks spacers))) (doseq [row rows] - (println (fmt-row row))) - (println bar)))) + (println (fmt-row " | " row)))))) ([rows] (print-table (keys (first rows)) rows))) -- 1.7.3.5