Change where markdown is processed
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
[clojure.java.io :as io]
|
[clojure.java.io :as io]
|
||||||
[clojure.string :as string]
|
[clojure.string :as string]
|
||||||
[marginalia.core :as marg]
|
[marginalia.core :as marg]
|
||||||
|
[markdown.core :as m]
|
||||||
[play-clj-doclet.html :as html])
|
[play-clj-doclet.html :as html])
|
||||||
(:import [com.sun.javadoc ClassDoc ConstructorDoc Doc ExecutableMemberDoc
|
(:import [com.sun.javadoc ClassDoc ConstructorDoc Doc ExecutableMemberDoc
|
||||||
FieldDoc MethodDoc Parameter RootDoc]))
|
FieldDoc MethodDoc Parameter RootDoc]))
|
||||||
@@ -72,7 +73,7 @@
|
|||||||
(into {})))
|
(into {})))
|
||||||
|
|
||||||
(defn process-group
|
(defn process-group
|
||||||
[{:keys [type raw] :as group} doc-map]
|
[{:keys [type raw docstring] :as group} doc-map]
|
||||||
(let [form (read-string raw)
|
(let [form (read-string raw)
|
||||||
n (second form)]
|
n (second form)]
|
||||||
(when (and (contains? #{'defn 'defmacro} (first form))
|
(when (and (contains? #{'defn 'defmacro} (first form))
|
||||||
@@ -82,7 +83,8 @@
|
|||||||
:java (->> doc-map
|
:java (->> doc-map
|
||||||
(filter #(.startsWith (first %) (str n)))
|
(filter #(.startsWith (first %) (str n)))
|
||||||
(sort-by first)
|
(sort-by first)
|
||||||
vec)))))
|
vec)
|
||||||
|
:docstring (m/md-to-html-string docstring)))))
|
||||||
|
|
||||||
(defn merge-groups
|
(defn merge-groups
|
||||||
[groups]
|
[groups]
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
(ns play-clj-doclet.html
|
(ns play-clj-doclet.html
|
||||||
(:require [clojure.string :as string]
|
(:require [clojure.string :as string]
|
||||||
[hiccup.core :refer :all]
|
[hiccup.core :refer :all]))
|
||||||
[markdown.core :as m]))
|
|
||||||
|
|
||||||
(defn param
|
(defn param
|
||||||
[[type-name param-name]]
|
[[type-name param-name]]
|
||||||
@@ -26,7 +25,7 @@
|
|||||||
(for [group groups]
|
(for [group groups]
|
||||||
[:div
|
[:div
|
||||||
[:h2 {} (:name group)]
|
[:h2 {} (:name group)]
|
||||||
(m/md-to-html-string (:docstring group))
|
(:docstring group)
|
||||||
(for [[name items] (:java group)]
|
(for [[name items] (:java group)]
|
||||||
[:div
|
[:div
|
||||||
(when (not= (:name group) name)
|
(when (not= (:name group) name)
|
||||||
|
|||||||
Reference in New Issue
Block a user