Reviewed-on: #10

doerg/doerg-parser/index.js

@@ -2,13 +2,17 @@
 
 const { parse } = require ("uniorg-parse/lib/parser.js");
 
+const opts = {
+    trackPosition: true
+}
+
 async function main () {
     const chunks = []
     for await (const chunk of process.stdin) {
 	chunks.push (chunk)
     }
     const orgText = Buffer.concat (chunks).toString ("utf8")
-    process.stdout.write (JSON.stringify (parse (orgText)))
+    process.stdout.write (JSON.stringify (parse (orgText, opts)))
 }
 
 main ()

doerg/resources/net/deertopia/doerg/preview-template.tex

@@ -48,6 +48,12 @@
 \newcommand{\optic}[3]{\opticname{#1}^\prime\;#2\;#3}
 \newcommand{\Optic}[5]{\opticname{#1}\;#2\;#3\;#4\;#5}
 
+% Default uses arrow glyphs from the active font, which are kinda ugly in the
+% case of Plex.
+\tikzcdset{
+  arrow style=tikz
+}
+
 \begin{document}
 \setlength\abovedisplayskip{0pt} % Remove padding before equation environments.
 %% \color[rgb]{0.000,0.000,0.004}\special{dvisvgm:currentcolor on}\setcounter{equation}{0}%

doerg/resources/net/deertopia/doerg/tuftesque.css

@@ -104,6 +104,7 @@ section {
 p,
 dl,
 ol,
+.latex-fragment,
 ul {
     font-size: 1.2rem;
     line-height: 1.5rem;

doerg/src/net/deertopia/doerg/element.clj

@@ -208,3 +208,36 @@
                                     :children first-section-nodes})
                              rest)]
     (assoc node :children new-children)))
+
+(defn- neighbourly-mapcat [coll f]
+  (let [rest-coll (rest coll)]
+    (map f
+         coll
+         rest-coll
+         (concat (rest rest-coll) [nil]))))
+
+(comment
+  (-> [1 2 3 4]
+      (neighbourly-mapcat prn) )
+  (def doc (read-string (slurp some-org-file)))
+
+  (let [r (atom [])
+        blah
+        (sp/transform
+         [postorder-walker
+          (sp/must :children)
+          (sp/collect-one sp/VAL)
+          sp/INDEXED-VALS
+          #_
+          #(of-type? (second %) "latex-environment")
+          #_
+          sp/ALL
+          #_
+          sp/INDEXED-VALS]
+         (fn [siblings x]
+           x)
+         doc)]
+    @r))
+
+(defn gather-latex-paragraphs [node]
+  ())

doerg/src/net/deertopia/doerg/tex.clj

@@ -34,33 +34,24 @@
       ;; it doesn't get e.g. TikZ arrows.
       (str/replace #"stroke=['\"]#000['\"]" "stroke=\"currentColor\"")))
 
-(def ^:dynamic *save-snippets?* false)
-
 (defn render-snippets [snippet-promises]
-  (with-redefs [fs/delete-tree
+  (fs/with-temp-dir [svg-dir {:prefix "doerg-svg-"}]
-                (fn
+    (let [rendered-snippets
-                  ([path]
+          (delay (->> snippet-promises
-                   (l/warnf "refusing to delete %s" path))
+                      (map first)
-                  ([path opts]
+                      (apply native/render svg-dir)))]
-                   (lr/warnf "refusing to delete %s with opts %s"
+      (doseq [[snippet p] snippet-promises]
-                             path opts)))]
+        (try (let [temml (temml/render snippet)]
-    (fs/with-temp-dir [svg-dir {:prefix "doerg-svg-"}]
+               (->> (if (temml/erroneous-output? temml)
-      (let [rendered-snippets
+                      (let [tex (get @rendered-snippets snippet)]
-            (delay (->> snippet-promises
+                        (if (:errors tex)
-                        (map first)
+                          temml
-                        (apply native/render svg-dir)))]
+                          (read-and-patch-generated-svg tex)))
-        (doseq [[snippet p] snippet-promises]
+                      temml)
-          (try (let [temml (temml/render snippet)]
+                    hiccup/raw (deliver p)))
-                 (->> (if (temml/erroneous-output? temml)
+             (catch Exception e
-                        (let [tex (get @rendered-snippets snippet)]
+               (l/error e "Error in TeX thread")
-                          (if (:errors tex)
+               (throw e)))))))
-                            temml
-                            (read-and-patch-generated-svg tex)))
-                        temml)
-                      hiccup/raw (deliver p)))
-               (catch Exception e
-                 (l/error e "Error in TeX thread")
-                 (throw e))))))))
 
 (comment
   (let [snippets (for [x ["\\(\\ifxetex blah \\fi\\)"