diff --git a/project.clj b/project.clj index a09ac99..b3c17c4 100644 --- a/project.clj +++ b/project.clj @@ -1,19 +1,15 @@ -(defproject marginalia "0.5.1" +(defproject marginalia "0.6.0" :description "lightweight literate programming for clojure -- inspired by [docco](http://jashkenas.github.com/docco/)" :main marginalia.core - :eval-in-leiningen true :dependencies [[org.clojure/clojure "1.2.0"] + [org.clojure/clojure-contrib "1.2.0"] [hiccup "0.3.0"] [org.markdownj/markdownj "0.3.0-1.0.2b4"]] :dev-dependencies [[lein-clojars "0.5.0-SNAPSHOT"] [jline "0.9.94"] - [swank-clojure "1.2.1"] - ;;Needed for testing lein plugin - [hiccup "0.3.4"] - [org.markdownj/markdownj "0.3.0-1.0.2b4"]] - ;;Needed for testing cake plugin + [swank-clojure "1.2.1"]] :tasks [marginalia.tasks] ;;Needed for testing Latex equation formatting. You must download ;;and install MathJax in you doc directory. diff --git a/src/leiningen/marg.clj b/src/leiningen/marg.clj deleted file mode 100644 index 1f40ab6..0000000 --- a/src/leiningen/marg.clj +++ /dev/null @@ -1,16 +0,0 @@ -(ns leiningen.marg - "Run Marginalia against your project source files." - (:use [leiningen.compile :only [eval-in-project]] - marginalia.core)) - -(defn marg [project & args] - (eval-in-project project - `(binding [marginalia.html/*resources* ""] - (marginalia.core/run-marginalia (list ~@args))) - nil - nil - '(require 'marginalia.core))) - -(.setMeta #'marg - (assoc (.meta #'marg) - :doc (with-out-str (run-marginalia (list "-h")))))