fix build failures with full redo

5 files changed, 25 insertions, 11 deletions

diff --git a/all.do b/all.do
index a8cc947..9facf1a 100644
--- a/all.do
+++ b/all.do
@@ -1,2 +1 @@
 redo-ifchange index.html
-redo-ifchange htdocs
diff --git a/build/preamble.tex b/build/preamble.tex
index 01c8146..cf3623b 100644
--- a/build/preamble.tex
+++ b/build/preamble.tex
@@ -4,6 +4,8 @@
 \usepackage{amsmath}
 \usepackage{etoolbox}
 \usepackage{xspace}
+\usepackage{mathrsfs}
+\usepackage{xifthen}
 
 \usepackage{tikz}
 \usetikzlibrary{arrows,decorations.markings,chains,calc,matrix}
@@ -38,6 +40,8 @@
 \DeclareMathOperator{\thom}{\textnormal{Th}}
 \DeclareMathOperator{\Bl}{\textnormal{Bl}}
 \DeclareMathOperator{\Stab}{\textnormal{Stab}}
+\DeclareMathOperator{\Grp}{\textnormal{\textsf{Grp}}}
+\DeclareMathOperator{\Set}{\textnormal{\textsf{Set}}}
 
 \newcommand*{\alg}[1]{\ensuremath{\overline{#1}}\xspace}
 \newcommand*{\sep}[1]{\ensuremath{#1^{\textnormal{sep}}}\xspace}
@@ -214,7 +218,7 @@
 \newcommand*{\Alg}{\operatorname{\textnormal{\textsf{Alg}}}}
 \newcommand*{\Disc}{\operatorname{\textnormal{\textsf{Disc}}}}
 \newcommand*{\mfd}{\operatorname{\textnormal{\textsf{Mfd}}}}
-\newcommand*{\sm}[1][k]{\mathop{\textnormal{\textsf{Sm}}/k}}
+\newcommand*{\sm}[1][k]{\mathop{\textnormal{\textsf{Sm}}/#1}}
 \newcommand*{\Simp}{\mathbf{\Delta}}
 \newcommand*{\sset}{\operatorname{\textnormal{\textsf{sSet}}}}
 \newcommand*{\ssetQ}{\operatorname{\textnormal{\textsf{sSet}}_{\textnormal{\textsf{Q}}}}}
@@ -224,6 +228,7 @@
 \newcommand*{\Fin}{\operatorname{\textnormal{\textsf{Fin}}_{*}}}
 \newcommand*{\tang}[1]{\textnormal{T}\mkern-2mu_{#1}}
 \newcommand*{\dual}[1]{\textnormal{D}#1}
+\newcommand*{\sch}[1][k]{\mathop{\textnormal{\textsf{Sch}}/#1}}
 
 \def\<#1>{\left\langle #1 \right\rangle}
 
diff --git a/build/preview/preview.sty.do b/build/preview/preview.sty.do
index 20af68c..cf10bef 100644
--- a/build/preview/preview.sty.do
+++ b/build/preview/preview.sty.do
@@ -1,4 +1,4 @@
 redo-ifchange preview.dtx preview.ins
 KEEP="preview.dtx preview.ins preview.sty.do"
-find * -maxdepth 0 $(for x in $KEEP; do echo "-not -name $x"; done) | xargs rm
+find * -maxdepth 0 $(for x in $KEEP; do echo "-not -name $x"; done) | xargs rm >&2
 latex -interaction=batchmode preview.ins >&2
diff --git a/build/tex-filter.hs b/build/tex-filter.hs
index 67cc88c..13701c3 100755
--- a/build/tex-filter.hs
+++ b/build/tex-filter.hs
@@ -7,13 +7,16 @@ import Control.Monad
 import Control.Applicative
 import qualified Data.ByteString.Char8 as BS
 import Crypto.Hash
-import System.IO
+import qualified System.IO as SIO
+import System.IO.Strict
 import System.Directory
 import System.FilePath
 import Text.Printf
 
 import qualified Data.Text
 
+import Prelude hiding (readFile)
+
 type TeX = String
 type RawHTML = String
 
@@ -44,7 +47,7 @@ compileToSVG basepath t s = let tex = Data.Text.unpack $ Data.Text.strip $ Data.
                                     (do writeFile expr_path $ (display t) ++ tex
                                         writeFile align_path "0")
                                   alignment <- head.lines <$> readFile align_path
-                                  hPutStrLn stderr path
+                                  SIO.hPutStrLn SIO.stderr path
                                   return $ printf "<object data=\"/%s\" type=\"image/svg+xml\" style=\"vertical-align:-%s\">%s</object>" svg_web_path alignment tex
 
 texify :: [String] -> Inline -> IO Inline
diff --git a/default.svg.do b/default.svg.do
index 403fd2d..76a3b0b 100644
--- a/default.svg.do
+++ b/default.svg.do
@@ -1,12 +1,17 @@
 redo-ifchange $2.expr build/preview/preview.sty build/preview/prtightpage.def build/preamble.tex
 INPUT=$(realpath $2.expr)
 TDIR=$(mktemp -d --tmpdir=/tmp)
+PREAMBLE=$(realpath build/preamble.tex)
 
-cp build/preview/preview.sty build/preview/prtightpage.def build/preamble.tex $TDIR
+pushd $(dirname $2) >/dev/null
+TEXDIR=$(pwd)
+popd >/dev/null
 
-pushd $TDIR
-latex -jobname=image <<EOF
-\input{preamble.tex}
+cp build/preview/preview.sty build/preview/prtightpage.def $TDIR
+
+pushd $TDIR >/dev/null
+latex -jobname=image >/dev/null <<EOF
+\input{$PREAMBLE}
 \begin{document}
 \begin{preview}
 \(
@@ -15,7 +20,9 @@ latex -jobname=image <<EOF
 \end{preview}
 \end{document}
 EOF
-popd
 
-dvisvgm --exact --no-fonts -o $3 $TDIR/image.dvi 2>&1 | sed -e '/depth=/!d;s/^.*depth=\(.*\)$/\1/' > $(dirname $2)/vertical-align
+dvisvgm --exact --no-fonts $TDIR/image.dvi 2>&1 | sed -e '/depth=/!d;s/^.*depth=\(.*\)$/\1/' > $TEXDIR/vertical-align
+cat $TDIR/image.svg
+popd >/dev/null
+
 rm -rf $TDIR
\ No newline at end of file