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

@@ -17,8 +17,11 @@
 (def ^:private tightpage-regexp
   #"Preview: Tightpage (-?\d+) *(-?\d+) *(-?\d+) *(-?\d+)")
 
+(def ^:private preview-start-regexp
+  #"^! Preview: Snippet (\d+) started.")
+
 (def ^:private preview-end-regexp
-  #"(?:^Preview: Tightpage.*$)?\n! Preview: Snippet \d+ ended.\((\d+)\+(\d+)x(\d+)\)")
+  #"(?:^Preview: Tightpage.*$)?\n! Preview: Snippet (\d+) ended.\((\d+)\+(\d+)x(\d+)\)")
 
 (defn- invoke [extra-opts & args]
   (let [namespace (or (::ns extra-opts)
@@ -42,6 +45,8 @@
     (-> r
         (assoc ::out out))))
 
+(defn- snippetwise [xelatex-out])
+
 (defn- invoke-xelatex [& {:keys [file output-dir]}]
   (let [{out ::out} (invoke
                      {:dir output-dir}
@@ -51,7 +56,7 @@
                                (drop 1)
                                (map parse-long))]
     (->> (re-seq preview-end-regexp out)
-         (map #(let [[d1 d2 d3] (map parse-long (drop 1 %))
+         (map #(let [[d1 d2 d3] (map parse-long (drop 2 %))
                      depth (/ (- d2 tp2)
                               scale-divisor
                               font-size)]
@@ -98,7 +103,7 @@
     (let [preview-tex (fs/file dir "preview.tex")
           preview-xdv (fs/file dir "preview.xdv")
           snippet->file (-> (snippet-file-names snippets)
-                            (update-keys #(fs/file dir %)))]
+                            (update-vals #(fs/file dir %)))]
       (fs/create-dirs output-dir)
       (->> (instantiate-preview-template snippets)
            (spit preview-tex))