meissa/cryogen-core
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Swap order of _list-types and list-type in toc.clj

Browse source
This commit is contained in:
Carmen La 2015-10-31 14:50:51 -04:00
parent 30b3503abc
commit 1063704f4f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cryogen_core/toc.clj
View file

@ -3,6 +3,7 @@
[hiccup.core :as hiccup])) [hiccup.core :as hiccup]))
(def _h [:h1 :h2 :h3 :h4 :h5 :h6]) (def _h [:h1 :h2 :h3 :h4 :h5 :h6])
(defn- compare_index [i1 i2] (- (.indexOf ^clojure.lang.APersistentVector _h i2) (.indexOf ^clojure.lang.APersistentVector _h i1))) (defn- compare_index [i1 i2] (- (.indexOf ^clojure.lang.APersistentVector _h i2) (.indexOf ^clojure.lang.APersistentVector _h i1)))
(defn- get-headings (defn- get-headings
@ -18,7 +19,6 @@
headings))) headings)))
[] content)) [] content))
(defn make-links (defn make-links
"Create a table of contents from the given headings. This function will look "Create a table of contents from the given headings. This function will look
for either: for either:
@ -43,8 +43,8 @@
(hiccup/html entry)) tag))))) (hiccup/html entry)) tag)))))
(str acc li-close))))) (str acc li-close)))))
(def _list-types {true ["<ol>" "</ol>"] :ol ["<ol>" "</ol>"] :ul ["<ul>" "</ul>"]}) (def _list-types {true ["<ol>" "</ol>"] :ol ["<ol>" "</ol>"] :ul ["<ul>" "</ul>"]})
(defn generate-toc [^String html & {list-type :list-type :or {list-type true}}] (defn generate-toc [^String html & {list-type :list-type :or {list-type true}}]
"Reads an HTML string and parses it for headers, then returns a list of links "Reads an HTML string and parses it for headers, then returns a list of links
to them. to them.
@ -53,7 +53,7 @@
:ol and true will result in an ordered list being generated for the table of :ol and true will result in an ordered list being generated for the table of
contents, while :ul will result in an unordered list. The default is an contents, while :ul will result in an unordered list. The default is an
ordered list." ordered list."
(let [li-tags (list-type _list-types) (let [li-tags (_list-types list-type)
top-tag (-> li-tags first (subs 1 3))] top-tag (-> li-tags first (subs 1 3))]
(-> html (-> html
(.getBytes "UTF-8") (.getBytes "UTF-8")