msyds/net-deertopia
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: doerg → cfg

Browse Source
This commit is contained in:
Madeleine Sydney Slaga
2026-04-18 16:13:04 -06:00
parent dcaac98252
commit 55dd22f220
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/net/deertopia/doerg/default-config.edn
View File

@@ -3,6 +3,7 @@
#env IBM_PLEX_WEB] #env IBM_PLEX_WEB]
:latex "xelatex" :latex "xelatex"
:dvisvgm "dvisvgm" :dvisvgm "dvisvgm"
:debug-unimplemented? #profile {:dev true :default false}
:doerg-temml-worker :doerg-temml-worker
#profile {:dev #file "../../../../doerg-temml-worker/index.js" #profile {:dev #file "../../../../doerg-temml-worker/index.js"
:default "doerg-temml-worker"} :default "doerg-temml-worker"}

3
src/net/deertopia/doerg/element.clj
View File

@@ -4,7 +4,6 @@
[babashka.process :as p] [babashka.process :as p]
[cheshire.core :as json] [cheshire.core :as json]
[clojure.core.match :refer [match]] [clojure.core.match :refer [match]]
[net.deertopia.doerg :as-alias doerg]
[clojure.java.io :as io] [clojure.java.io :as io]
[clojure.set :as set] [clojure.set :as set]
[clojure.string :as str] [clojure.string :as str]
@@ -35,7 +34,7 @@
:or {in *in*}}] :or {in *in*}}]
(let [r (-> (p/process (let [r (-> (p/process
{:in in :out :string} {:in in :out :string}
(-> cfg/*cfg* ::doerg/doerg-parser str)) (-> cfg/*cfg* ::cfg/doerg-parser str))
(common/deref-with-timeout *uniorg-timeout-duration*))] (common/deref-with-timeout *uniorg-timeout-duration*))]
(when (zero? (:exit r)) (when (zero? (:exit r))
(-> r :out (json/parse-string (comp keyword camel->kebab)))))) (-> r :out (json/parse-string (comp keyword camel->kebab))))))

2
src/net/deertopia/doerg/repl.clj
View File

@@ -35,7 +35,7 @@
(fs/create-dirs dest) (fs/create-dirs dest)
(fs/create-dirs resource-dir) (fs/create-dirs resource-dir)
(force-create-sym-link (fs/file resource-dir "ibm-plex-web") (force-create-sym-link (fs/file resource-dir "ibm-plex-web")
(-> cfg/*cfg* ::doerg/ibm-plex-web)) (-> cfg/*cfg* ::cfg/ibm-plex-web))
(doseq [x #{"Temml-Plex.css" "tuftesque.css" "deerstar.css"}] (doseq [x #{"Temml-Plex.css" "tuftesque.css" "deerstar.css"}]
(force-create-sym-link (force-create-sym-link
(fs/file resource-dir x) (fs/file resource-dir x)

2
src/net/deertopia/doerg/server.clj
View File

@@ -118,7 +118,7 @@
(if-some [[_ resource] (re-matches #"^/resource/ibm-plex-web/(.*)" uri)] (if-some [[_ resource] (re-matches #"^/resource/ibm-plex-web/(.*)" uri)]
(-> resource (-> resource
(response/file-response (response/file-response
{:root (-> doerg-config/*cfg* ::doerg/ibm-plex-web str)})) {:root (-> doerg-config/*cfg* ::cfg/ibm-plex-web str)}))
(-> uri (-> uri
(str/replace-first #"^/resource/" "") (str/replace-first #"^/resource/" "")
(response/resource-response (response/resource-response

4
src/net/deertopia/doerg/tex/native.clj
View File

@@ -83,14 +83,14 @@
acc)))) acc))))
(defn- invoke-latex [& {:keys [file output-dir]}] (defn- invoke-latex [& {:keys [file output-dir]}]
(let [latex (-> cfg/*cfg* ::doerg/latex)] (let [latex (-> cfg/*cfg* ::cfg/latex)]
(invoke (invoke
{:dir output-dir} {:dir output-dir}
latex "-no-pdf" "-interaction" "nonstopmode" latex "-no-pdf" "-interaction" "nonstopmode"
"-output-directory" output-dir file))) "-output-directory" output-dir file)))
(defn- invoke-dvisvgm [& {:keys [file output-dir]}] (defn- invoke-dvisvgm [& {:keys [file output-dir]}]
(let [dvisvgm (-> cfg/*cfg* ::doerg/dvisvgm)] (let [dvisvgm (-> cfg/*cfg* ::cfg/dvisvgm)]
(invoke (invoke
{:dir output-dir} {:dir output-dir}
dvisvgm "--page=1-" "--optimize" "--clipjoin" dvisvgm "--page=1-" "--optimize" "--clipjoin"

2
src/net/deertopia/doerg/tex/temml.clj
View File

@@ -25,7 +25,7 @@
fs/file)) fs/file))
(defn worker [] (defn worker []
(let [doerg-temml-worker (-> cfg/*cfg* ::doerg/doerg-temml-worker)] (let [doerg-temml-worker (-> cfg/*cfg* ::cfg/doerg-temml-worker)]
(when (or (not (fs/exists? prelude-file)) (when (or (not (fs/exists? prelude-file))
(zero? (fs/size prelude-file))) (zero? (fs/size prelude-file)))
(-> "net/deertopia/doerg/prelude.tex" (-> "net/deertopia/doerg/prelude.tex"