Merge branch 'patch-readme'

Conflicts:
	README.md

README.md

@@ -6,21 +6,33 @@ Puget
 [![Dependency Status](https://www.versioneye.com/user/projects/53718bfb14c1589a89000144/badge.png)](https://www.versioneye.com/clojure/mvxcvi:puget/0.5.1)
 
 Puget is a Clojure library for printing [EDN](https://github.com/edn-format/edn)
-values. Under the hood, Puget uses the
+values. Under the hood, Puget formats data into a _print document_ and uses the
 [Fast Idiomatic Pretty-Printer](https://github.com/brandonbloom/fipp) library to
-format values into a _print document_. Puget offers two main features which set
-it apart from FIPP and Clojure's native pretty-printing functions.
+render it. Puget offers two main features which set it apart from FIPP and
+Clojure's native pretty-printing functions: [syntax coloring](#syntax-coloring)
+and [canonical printing](#canonical-representation).
 
-## ANSI Coloring
+## Installation
+
+Puget releases are [published on Clojars](https://clojars.org/mvxcvi/puget).
+
+To use this version with Leiningen, add the following dependency to your project
+definition:
+
+```clojure
+[mvxcvi/puget "0.5.1"]
+```
+
+## Syntax Coloring
 
 Puget's first main feature is colorizing the printed data using ANSI escape
 codes. This is kind of like syntax highlighting, except much easier since the
 code works directly with the data instead of parsing it from text.
 
 Different syntax elements are given different colors to make reading the
 printed output much easier for humans. The `*colored-output*` var can be set to
-enable colorization - alternately, the `cprint` function prints with colored
-output enabled:
+enable colorization using the `with-color` macro - alternately, the `cprint`
+function prints with colored output enabled:
 
 ![colorization example](screenshot.png)
 
@@ -46,11 +58,11 @@ var can be bound to true to throw an exception for these values instead.
 (def usd (java.util.Currency/getInstance "USD"))
 
 (puget/pprint usd)
-; #<java.util.Currency USD>
+;; #<java.util.Currency USD>
 
 (binding [puget/*strict-mode* true]
   (puget/pprint usd))
-; IllegalArgumentException: No canonical representation for class java.util.Currency: USD
+;; IllegalArgumentException: No canonical representation for class java.util.Currency: USD
 ```
 
 ## EDN Tagged Values
@@ -66,22 +78,35 @@ Puget extends this protocol to support the `#inst` and `#uuid` built-ins from
 the EDN standard. In addition, it supports `#bin` for base64-encoded binary
 data, and `#uri` for specifying Uniform Resource Identifiers.
 
-## Installation
+To give your own types a tag extension, use the `extend-tagged-*` functions. For
+example, to extend `#inst` tagging to Joda `DateTime` objects:
 
-Puget is [published on Clojars](https://clojars.org/mvxcvi/puget).
+```clojure
+(require '(clj-time [core :as t] [format :as f]))
 
-To use this version with Leiningen, add the following dependency to your project
-definition:
+(t/now)
+#<org.joda.time.DateTime 2014-05-14T00:58:40.922Z>
 
-```clojure
-[mvxcvi/puget "0.5.1"]
+(require 'puget.data)
+
+(puget.data/extend-tagged-value
+  org.joda.time.DateTime 'inst
+  (partial f/unparse (ftime/formatters :date-time)))
+
+(t/now)
+#inst "2014-05-14T01:05:53.885Z"
 ```
 
-From the REPL, you can use the following helper functions for some control of
-Puget:
+## Customization
+
+Puget's colors are defined in the `*color-scheme*` var, which maps syntax
+element keywords to a vector of ANSI style keywords to apply. The
+`set-color-scheme!` function offers a convenient way to change the color scheme
+by providing either color/style argument pairs or a single map of colors to
+merge into the current color scheme.
 
 ```clojure
-user=> (puget/set-color-scheme! :nil [:bold :black])
+(puget/set-color-scheme! :nil [:bold :black])
 {:boolean [:green]
  :class-delimiter [:blue]
  :class-name [:bold :blue]
@@ -93,11 +118,22 @@ user=> (puget/set-color-scheme! :nil [:bold :black])
  :string [:bold :magenta]
  :symbol nil
  :tag [:red]}
-user=> (puget/set-map-commas!)
-","
-user=> (puget/pprint {:z 'qx :a 123})
+```
+
+By default, Puget does not put any delimiters between map entries. This is
+controlled by the `*map-delimiter*` var. For convenience, Puget provides a
+function to change the delimiter to a comma instead:
+
+```clojure
+(def value {:z 'qx :a 123})
+
+(puget/pprint value)
+;; {:a 123 :z qx}
+
+(puget/set-map-commas!)
+
+(puget/pprint value)
 ;; {:a 123, :z qx}
-nil
 ```
 
 ## License