diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/clarktown/parsers/list_block.clj | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/clarktown/parsers/list_block.clj b/src/clarktown/parsers/list_block.clj index 437f780..52f955f 100644 --- a/src/clarktown/parsers/list_block.clj +++ b/src/clarktown/parsers/list_block.clj @@ -7,7 +7,7 @@ "Determines whether we're dealing with a list block or not." [block] (->> (string/trim block) - (re-matches #"(?s)^(\d\.\s|\*{1}\s).*$"))) + (re-matches #"(?s)^(\d\.\s|\*{1}\s|\-{1}\s).*$"))) (defn string->indent-n @@ -97,13 +97,21 @@ (loop [result "" inner-items items] (if (empty? inner-items) - (if (string/starts-with? (:value (first items)) "*") + (if (or (string/starts-with? (:value (first items)) "*") + (string/starts-with? (:value (first items)) "-")) (str "<ul>" result "</ul>") (str "<ol>" result "</ol>")) (let [inner-item (first inner-items) - value (if (string/starts-with? (:value inner-item) "*") + value (cond + ; * unordered list + (string/starts-with? (:value inner-item) "*") (-> (string/replace-first (:value inner-item) "*" "") string/trim) + ; - unordered list + (string/starts-with? (:value inner-item) "-") + (-> (string/replace-first (:value inner-item) "-" "") + string/trim) + :else (-> (string/replace-first (:value inner-item) #"\d\." "") string/trim))] (recur (if (:items inner-item) |