diff --git a/.gitignore b/.gitignore index 14cfc7b..f673b76 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ pom.xml lib classes .lein-deps-sum +/.lein-failures diff --git a/project.clj b/project.clj index e0e05fa..0c86503 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ (defproject doric "0.6.0-SNAPSHOT" :description "Clojure table layout" - :dependencies [[org.clojure/clojure "1.2.0"] - [org.clojure/clojure-contrib "1.2.0"]]) + :dependencies [[org.clojure/clojure "1.3.0"]] + :multi-deps {"1.2" [[org.clojure/clojure "1.2.1"]]}) diff --git a/src/doric/core.clj b/src/doric/core.clj index 19c25d0..151de9c 100644 --- a/src/doric/core.clj +++ b/src/doric/core.clj @@ -1,7 +1,6 @@ (ns doric.core (:refer-clojure :exclude [format name join split when]) - (:use [clojure.string :only [join split]]) - (:require [clojure.contrib.string :as s])) + (:use [clojure.string :only [join split]])) (defn- title-case-word [w] (if (zero? (count w)) @@ -44,7 +43,7 @@ (defn align-cell [col s align] (let [width (:width col) - s (s/take width s) + s (subs s 0 (min (count s) width)) len (count s) pad #(apply str (take % (repeat " "))) padding (- width len)