From 720644a5324094ceb726bfed1e978e20d8794007 Mon Sep 17 00:00:00 2001
From: Orestis <orestis.malaspinas@pm.me>
Date: Sun, 18 Jul 2021 15:03:25 +0300
Subject: [PATCH] added mermaid and submodule updates
---
Makefile | 3 +++
hakyll-bootstrap/Main.hs | 4 ++++
hakyll-bootstrap/Makefile | 11 +++++++----
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 1e12126..7a67e4b 100644
--- a/Makefile
+++ b/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
diff --git a/hakyll-bootstrap/Main.hs b/hakyll-bootstrap/Main.hs
index ffccec4..5d487ad 100644
--- a/hakyll-bootstrap/Main.hs
+++ b/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"
diff --git a/hakyll-bootstrap/Makefile b/hakyll-bootstrap/Makefile
index 7f4c54f..3b2c6d6 100644
--- a/hakyll-bootstrap/Makefile
+++ b/hakyll-bootstrap/Makefile
@@ -1,8 +1,10 @@
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
--
GitLab