diff --git a/src/autodoc/autodoc.clj b/src/autodoc/autodoc.clj index 8343b8c..f08a8aa 100644 --- a/src/autodoc/autodoc.clj +++ b/src/autodoc/autodoc.clj @@ -1,7 +1,6 @@ (ns autodoc.autodoc (:use - [clojure.contrib.pprint :only (cl-format)] - [clojure.contrib.pprint.utilities :only (prlabel)] + [clojure.pprint :only (cl-format)] [clojure.contrib.duck-streams :only [make-parents]] [clojure.contrib.java-utils :only [file]] [clojure.contrib.find-namespaces :only [find-namespaces-in-dir]] diff --git a/src/autodoc/branches.clj b/src/autodoc/branches.clj index d389035..11871f7 100644 --- a/src/autodoc/branches.clj +++ b/src/autodoc/branches.clj @@ -1,8 +1,7 @@ (ns autodoc.branches (:use [clojure.contrib.duck-streams :only [reader]] [clojure.contrib.java-utils :only [file]] - [clojure.contrib.pprint :only [cl-format pprint]] - [clojure.contrib.pprint.utilities :only [prlabel]] + [clojure.pprint :only [cl-format pprint]] [clojure.contrib.str-utils :only (re-split)] [clojure.contrib.shell-out :only [with-sh-dir sh]] [autodoc.params :only (params)] diff --git a/src/autodoc/build_html.clj b/src/autodoc/build_html.clj index 4723a69..305e7c7 100644 --- a/src/autodoc/build_html.clj +++ b/src/autodoc/build_html.clj @@ -4,9 +4,8 @@ [java.io File FileWriter BufferedWriter StringReader]) (:require [clojure.contrib.str-utils :as str]) (:use [net.cgrand.enlive-html :exclude (deftemplate)] - [clojure.contrib.pprint :only (pprint cl-format)] - [clojure.contrib.pprint.examples.json :only (print-json)] - [clojure.contrib.pprint.utilities :only (prlabel)] + [clojure.pprint :only (pprint cl-format)] + [clojure.contrib.json :only (pprint-json)] [clojure.contrib.duck-streams :only (with-out-writer)] [clojure.contrib.java-utils :only (file)] [clojure.contrib.shell-out :only (sh)] @@ -473,7 +472,7 @@ vars in ns-info that begin with that letter" (when (params :build-json-index) (with-out-writer (BufferedWriter. (FileWriter. (file (params :output-path) *index-json-file*))) - (print-json (structured-index ns-info branch))))) + (pprint-json (structured-index ns-info branch))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; @@ -530,14 +529,12 @@ vars in ns-info that begin with that letter" (defn make-all-pages ([] (make-all-pages {:first? true} nil (contrib-info))) ([branch-info all-branch-info ns-info] - (prlabel make-all-pages branch-info all-branch-info) (let [doc-dir (str (when-not (:first? branch-info) (str (branch-subdir (:name branch-info)) "/")) "doc")] (let [prefix (if (:first? branch-info) nil "../") master-toc (make-master-toc ns-info branch-info all-branch-info prefix) external-docs (wrap-external-doc doc-dir master-toc)] - (prlabel make-all-pages external-docs) (make-overview ns-info master-toc branch-info prefix) (doseq [ns ns-info] (make-ns-page ns master-toc external-docs branch-info prefix)) diff --git a/src/autodoc/doc_files.clj b/src/autodoc/doc_files.clj index a9c693f..7424408 100644 --- a/src/autodoc/doc_files.clj +++ b/src/autodoc/doc_files.clj @@ -3,8 +3,7 @@ ;as necessary." (:use [autodoc.params :only [params]] [clojure.contrib.shell-out :only [sh]] - [clojure.contrib.java-utils :only [delete-file]] - [clojure.contrib.pprint.utilities :only [prlabel]]) + [clojure.contrib.java-utils :only [delete-file]]) (:require [clojure.contrib.duck-streams :as io]) (:import [java.io File])) diff --git a/src/autodoc/gen_docs.clj b/src/autodoc/gen_docs.clj index 53b60db..b6b5a43 100644 --- a/src/autodoc/gen_docs.clj +++ b/src/autodoc/gen_docs.clj @@ -1,6 +1,6 @@ (ns autodoc.gen-docs (:use [clojure.contrib.java-utils :only (delete-file)] - [clojure.contrib.pprint :only (pprint)] + [clojure.pprint :only (pprint)] [autodoc.load-files :only (load-namespaces)] [autodoc.build-html :only (make-all-pages)] [autodoc.params :only (params params-from-dir)] diff --git a/src/autodoc/git_tools.clj b/src/autodoc/git_tools.clj index 6d4c35b..e4848db 100644 --- a/src/autodoc/git_tools.clj +++ b/src/autodoc/git_tools.clj @@ -1,5 +1,5 @@ (ns autodoc.git-tools - (:use [clojure.contrib.pprint :only [cl-format]] + (:use [clojure.pprint :only [cl-format]] [clojure.contrib.shell-out :only [sh with-sh-dir]] [autodoc.build-html :only [branch-subdir]]) (:import [java.io File]))