@@ -34,20 +34,16 @@

                    "th")]

         (str n suffix)))

-(defn- join-lines

-    [coll]

+(defn- join-lines [coll]

     (string/join \newline coll))

-(defn- comma-separated

-    [coll]

+(defn- comma-separated [coll]

     (string/join ", " coll))

-(defn- parenthesize

-    [s]

+(defn- parenthesize [s]

     (when s (str "(" s ")")))

-(defn- spaced

-    [& elements]

+(defn- spaced [& elements]

     (string/join " " (filter identity elements)))

 (defn- with-default [default x]

@@ -88,12 +84,10 @@

         [:section.license-notice

          (spaced (x :name) "is" (l :content-kind) "subject to the" (l :license-name))])))

-(defn- description

-    [x]

+(defn- description [x]

     (some->> x :desc (map #(vector :p %)) (into [:section.description])))

-(defn- heading

-    [x]

+(defn- heading [x]

     [:h1 (get x :name (str x))])

 (defn- pounds [w]

@@ -118,6 +112,9 @@

           (when (not no-quantity)

             (some->> x :quantity (str "for ") parenthesize))))))

+(defn- capacity [x]

+    (some-> x :capacity))

+

 (defn- short-spell-description [spell]

   (spaced

     (-> spell :level ordinal)

@@ -129,7 +126,8 @@

     [:article {:class (styles/license-panel)}

      [:h1 (license :license-name)]

      [:p (license :preamble)]

-     (into [:ol.clauses] (->> license :clauses (map #(vector :li %))))

+     [:ol.clauses

+       (for [clause (license :clauses)] [:li clause])]

      [:div.copyright-notice (->> license :copyright-notice (map #(vector :p %)))]])

 (defn spell-panel [spell]

@@ -176,6 +174,8 @@

      (property-list

       :Speed

         (speed item)

+      "Carrying Capacity"

+        (capacity item)

       :Weight

         (weight item)

       :Cost

@@ -237,7 +237,8 @@

     [{e :err}]

     [:div {:class (styles/error-message)} e])

-(defn input [x] [:div.input x])

+(defn input [x]

+    [:div.input x])

 (def is-license? :license-name)

 (def is-spell? #(some-> % :url (string/starts-with? "/api/spells")))

@@ -259,15 +260,11 @@

       (is-equipment? x) (equipment-panel x)

       (is-error? x) (error-message x))])

-

 (defn history []

   (let [history (re-frame/subscribe [::subs/cmd-history])]

-    (into

-     [:ul {:class (styles/history-style)}]

-     (map #(vector :li

-                   (-> % :input input)

-                   (-> % :output output))

-          @history))))

+    [:ul {:class (styles/history-style)}

+      (for [item @history]

+        [:li (-> item :input input) (-> item :output output)])]))

 (defn main-panel []

   [:div {:class (styles/screen)}