@@ -68,6 +68,14 @@

         [:section.license-notice

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

+(defn- description

+    [x]

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

+

+(defn- heading

+    [x]

+    [:h1 (x :name)])

+

 (defn- pounds [w]

     (if (= w 1)

       (spaced w "lb")

@@ -81,6 +89,12 @@

     (when (x :speed)

         (spaced (-> x :speed :quantity) (-> x :speed :unit))))

+(defn- weight [x]

+    (when (x :weight)

+     (spaced

+      (-> x :weight pounds)

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

+

 (defn license-panel [license]

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

      [:h1 (license :license-name)]

@@ -90,15 +104,15 @@

 (defn spell-panel [spell]

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

-       [:h1 (spell :name)]

+       (heading spell)

        [:div

         [:span.kind

          (spaced

           (-> spell :level ordinal)

           "level"

           (-> spell :school :name string/lower-case)

-          "spell")]

-        (property-list

+          "spell")]]

+       (property-list

         ; Refactor these so that we get the "name" from the keyword by replacing

         ; '-' and '_' and capitalizing

          :Damage

@@ -117,8 +131,8 @@

          :Duration

            (spaced

             (-> spell :duration string/lower-case)

-            (when (spell :concentration) "(requires concentration)")))]

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

+            (when (spell :concentration) "(requires concentration)")))

+       (description spell)

        (let [at-higher-levels (some-> spell :higher_level join-lines)]

         (when at-higher-levels

            [:section.higher-level

@@ -128,7 +142,7 @@

 (defn equipment-panel [item]

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

-     [:h1 (item :name)]

+     (heading item)

      [:span.kind

       (spaced

        (-> item :equipment_category :name)

@@ -139,24 +153,20 @@

       :Speed

         (speed item)

       :Weight

-        (when (item :weight)

-         (spaced

-          (-> item :weight pounds)

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

+        (weight item)

       :Cost

         (spaced

          (cost item)

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

-     (when (item :desc)

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

+     (description item)

      (license-notice item)])

 (defn weapon-panel [weapon]

  (let [weapon-kind (-> weapon :weapon_range string/lower-case)

        weapon-category (-> weapon :weapon_category string/lower-case)]

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

-    [:h1 (weapon :name)]

-    [:span.kind (string/join " " [weapon-category weapon-kind "weapon"])]

+    (heading weapon)

+    [:span.kind (spaced weapon-category weapon-kind "weapon")]

     (property-list

      ; 'two-handed-damage' is defined for *single-handed* weapons with the "versatile"

      ; property. Actual two-handed weapons have 'damage' only.

@@ -171,9 +181,9 @@

        (when (= weapon-kind "ranged")

          (gstr/format "%d' (%d')" (-> weapon :range :normal) (-> weapon :range :long)))

      :Properties

-       (comma-separated (->> weapon :properties (map :name) (map string/lower-case)))

+       (some->> weapon :properties (map :name) (map string/lower-case) comma-separated)

      :Weight

-       (-> weapon :weight pounds)

+       (weight weapon)

      :Cost

        (cost weapon))

     (license-notice weapon)]))