Fixed tex \end fuckup

3 files changed, 18 insertions, 10 deletions

diff --git a/provider/templates/preamble.tex b/provider/templates/preamble.tex
index 0d76503..1f2c1e4 100644
--- a/provider/templates/preamble.tex
+++ b/provider/templates/preamble.tex
@@ -11,11 +11,12 @@
 \newcommand*{\ca}[1]{\ensuremath{\mathbf{#1}}}
 \newcommand*{\idarr}[1]{\ensuremath{\mathrm{id}_{#1}}}
 
-\newcommand{\id}{\ensuremath{\mathrm{id}}}
+\newcommand*{\id}{\ensuremath{\mathrm{id}}}
 \renewcommand{\implies}{\ensuremath{\rightarrow}}
 
-\newcommand{\N}{\ensuremath{\mathbb{N}}}
-\newcommand{\arr}[3]{\begin{tikzcd}[ampersand replacement=\&]{#1} \rar{#2} \& {#3}\end{tikzcd}}
-\renewcommand{\hom}[3]{\ensuremath{\mathrm{hom}_{#1} \left [ #2, #3 \right ]}}
+\newcommand*{\N}{\ensuremath{\mathbb{N}}}
+\newcommand*{\arr}[3]{\begin{tikzcd}[ampersand replacement=\&]{#1} \rar{#2} \& {#3}\end{tikzcd}}
+\newcommand*{\Hom}[3]{\ensuremath{\mathrm{Hom}_{#1} \left [ #2, #3 \right ]}}
+\newcommand*{\End}[2]{\ensuremath{\mathrm{End}_{#1} \left [ #2 \right ]}}
 
-\newcommand{\powerset}{\raisebox{.15\baselineskip}{\Large\ensuremath{\wp}}}
+\newcommand*{\powerset}{\raisebox{.15\baselineskip}{\Large\ensuremath{\wp}}}
diff --git a/src/Site.hs b/src/Site.hs
index d3ac76d..03b6e16 100644
--- a/src/Site.hs
+++ b/src/Site.hs
@@ -170,7 +170,7 @@ getTex pattern makeId = do
       getTex' :: FilePath -> Rules [String]
       getTex' path = preprocess . fmap concat $ (\x -> [query extractTex, query extractTex'] <*> pure x) `liftM` readPandoc' path
       extractTex :: Inline -> [String]
-      extractTex (Math _ str) = ["\\(" ++ str ++ "\\)"]
+      extractTex (Math _ str) = [wrapMath str]
       extractTex (RawInline "latex" str) = [str]
       extractTex _ = []
       extractTex' :: Block -> [String]
@@ -181,6 +181,9 @@ getTex pattern makeId = do
       mergeGroups' :: [([Identifier], String)] -> ([Identifier], String)
       mergeGroups' xs@((_, str):_) = (concatMap fst xs, str)
 
+wrapMath :: String -> String
+wrapMath str = "\\(" ++ str ++ "\\)"
+
 readPandoc' :: FilePath -> IO Pandoc
 readPandoc' path = readFile path >>= either fail return . result'
   where
@@ -211,7 +214,7 @@ texTransform :: Pandoc -> Compiler Pandoc
 texTransform = walkM texTransformInline <=< walkM texTransformBlock
   where
     texTransformInline :: Inline -> Compiler Inline
-    texTransformInline (Math mathType tex) = (\html -> Span ("", [classOf mathType], []) [RawInline "html" html]) <$> texTransform' ("\\(" ++ tex ++ "\\)")
+    texTransformInline (Math mathType tex) = (\html -> Span ("", [classOf mathType], []) [RawInline "html" html]) <$> texTransform' (wrapMath tex)
     texTransformInline (RawInline "latex" tex) = (\html -> Span ("", [], []) [RawInline "html" html]) <$> texTransform' tex
     texTransformInline x = return x
     texTransformBlock :: Block -> Compiler Block
diff --git a/src/Tex.hs b/src/Tex.hs
index a247218..5d347b9 100644
--- a/src/Tex.hs
+++ b/src/Tex.hs
@@ -2,10 +2,10 @@ module Tex
        ( compileTex
        ) where
 
-import System.IO (stdout, stderr, hPutStrLn, writeFile, readFile)
-import System.IO.Temp (withSystemTempDirectory)
+import System.IO (stdout, stderr, hPutStrLn, writeFile, readFile, hClose)
+import System.IO.Temp (withSystemTempDirectory, openTempFile)
 import System.Process (callProcess, readProcessWithExitCode)
-import System.Directory (copyFile, getCurrentDirectory, setCurrentDirectory)
+import System.Directory (copyFile, getCurrentDirectory, setCurrentDirectory, getTemporaryDirectory)
 import System.FilePath (takeFileName, FilePath(..), (</>))
 import System.Exit (ExitCode(..))
 
@@ -50,6 +50,10 @@ compileTex' input tmpDir = do
   when (exitCode /= ExitSuccess) $ do
     hPutStrLn stdout out
     hPutStrLn stderr err
+    (srcF, srcH) <- flip openTempFile "source.tex" =<< getTemporaryDirectory
+    hPutStrLn srcH input
+    hClose srcH
+    hPutStrLn stdout $ "Tex source saved to " ++ srcF
     throwIO exitCode
   (\x -> return $!! (x, extractAlignment err)) =<< (readFile $ tmpDir </> "image.svg")
   where