added mermaid and submodule updates

Makefile

@@ -13,5 +13,8 @@ deploy: all
 	cp index.html site/
 	cp -r css site/
 
+update:
+	git pull --recurse-submodules
+
 clean:
 	rm -rf index.html

hakyll-bootstrap/Main.hs

@@ -285,6 +285,8 @@ pandocCrossrefNumberingCompiler = do
         >>= withItemBody (unixFilter "pandoc" ["-F"
                                             , "pandoc-numbering"
                                             , "-F"
+                                            , "mermaid-filter"
+                                            , "-F"
                                             , "pandoc-crossref"
                                             , "-t"
                                             , "markdown"
@@ -300,6 +302,8 @@ pandocRevealCompiler = do
         >>= withItemBody (unixFilter "pandoc" ["-F"
                                             , "pandoc-numbering"
                                             , "-F"
+                                            , "mermaid-filter"
+                                            , "-F"
                                             , "pandoc-crossref"
                                             , "-t"
                                             , "revealjs"

hakyll-bootstrap/Makefile

 watch: build
-	stack exec blog -- watch
+	# stack exec blog -- watch
+	blog watch
 
 deploy: build 
-	stack exec blog -- deploy
+	# stack exec blog -- deploy
+	blog deploy
 
 build: Main.hs cours/math_tech_info/*.md cours/isc_physics/*.md
 	make hakyll_gen -C cours/math_tech_info
@@ -10,14 +12,15 @@ build: Main.hs cours/math_tech_info/*.md cours/isc_physics/*.md
 	make -C cours/math_tech_info
 	make -C cours/isc_physics
 	make markdown -C cours/prog_seq/slides
-	stack build && stack exec blog -- build
+	# stack build && stack exec blog -- build
+	cabal install && blog build
 
 build_revealjs:
 	cd reveal.js && npm install && npm run build && cd ..
 		
 
 update:
-	git submodule update --recursive --remote
+	make update -C ..
 
 clean:
 	rm -rf _cache _site