Bumped version number and added more problem cases

project.clj

@@ -1,4 +1,4 @@
-(defproject marginalia "0.2.1"
+(defproject marginalia "0.2.2"
   :description "lightweight literate programming for clojure -- inspired by [docco](http://jashkenas.github.com/docco/)"
   :dependencies
   [[org.clojure/clojure "1.2.0"]
@@ -11,7 +11,7 @@
    ;;Needed for testing lein plugin
    [hiccup "0.3.0"]
    [org.clojars.nakkaya/markdownj "1.0.2b4"]
-   [marginalia "0.2.1"]]
+   [marginalia "0.2.2"]]
   ;;Needed for testing cake plugin
   :tasks [marginalia.tasks]
   ;;Needed for testing Latex equation formatting. You must download

src/leiningen/marg.clj

@@ -3,7 +3,7 @@
 
    ## Usage
 
-   1. Add `[marginalia \"0.2.1\"]` to your project.clj's `:dev-dependencies` section.
+   1. Add `[marginalia \"0.2.2\"]` to your project.clj's `:dev-dependencies` section.
    2. run `lein marg` from your project's root directory. "
   (:use [marginalia.core]))
 

src/marginalia/tasks.clj

@@ -3,7 +3,7 @@
 
    ## Usage
 
-   1. In your project.clj, add `[marginalia \"0.2.1\"] to your `:dev-dependencies` and `marginalia.tasks` to `:tasks`
+   1. In your project.clj, add `[marginalia \"0.2.2\"] to your `:dev-dependencies` and `marginalia.tasks` to `:tasks`
    2. Run `cake marg` from within your project directory."
   (:use marginalia.core
         [cake.core :only [deftask]]))

src/problem_cases/general.clj

@@ -10,3 +10,25 @@
                          "0" false
                          "1" true
                          "throw exception here"))
+
+(defn a-function "Here is a docstring. It should be to the left."
+  [x]
+  (* x x))
+
+(defn b-function
+  "Here is a docstring. It should be to the left."
+  [x]
+  "Here is just a string.  It should be to the right."
+  (* x x))
+
+(def ^{:doc "This is also a docstring via metadata. It should be on the left."}
+  a 42)
+
+(def ^{:doc
+       "This is also a docstring via metadata. It should be on the left."}
+  b 42)
+
+(def ^{:doc
+       "This is also a docstring via metadata. It should be on the left."}
+  c
+  "This is just a value.  It should be on the right.")