Optimize rendering

markdeck

@@ -65,6 +65,7 @@ services:
 
   pdf:
     image: "arne/markdeck-decktape:0.5"
+    user: "\$MARKDECK_USER"
     volumes:
       - type: bind
         source: ${PWD}/${BUILD}
@@ -74,6 +75,7 @@ services:
 
   standalone:
     image: "arne/markdeck-standalone:0.2"
+    user: "\$MARKDECK_USER"
     volumes:
       - type: bind
         source: ${PWD}/${BUILD}

src/Dockerfile.liveserver

@@ -9,4 +9,4 @@ EXPOSE 8080
 VOLUME /target
 WORKDIR /target
 
-ENTRYPOINT node /usr/local/bin/live-server --no-browser --wait=100 --watch=/target/index.html,assets/css/ .
+ENTRYPOINT node /usr/local/bin/live-server --no-browser --wait=50 --watch=/target/index.html,assets/css/ .

src/Dockerfile.pandoc

@@ -6,6 +6,7 @@ ARG pandoc_version
 ARG version
 ARG motto
 
+# TODO try watchman to get inotify working. Currently watchman in alpine edge ..
 RUN apk add \
     make bash curl \
     graphviz inotify-tools rsync \

src/markdeck/Makefile

@@ -0,0 +1,157 @@
+#!/usr/bin/env make -f
+
+SHELL := /bin/bash
+
+build: .info-build render sync sass config pandoc
+	@echo "-------- /rerendering ---------"
+	@echo
+
+.info-build:
+	@echo "-------- rerendering ---------"
+
+
+.info-render:
+	@echo "-------- rerendering prep ---------"
+
+render: .info-render /target/assets/css/rerendering.css /target/assets/rendered
+	@echo "-------- /rerendering prep ---------"
+	@echo
+
+/target/assets/css/rerendering.css: /markdeck/assets/markdeck/css/when-rerendering.css /target/assets/css
+	cp $< $@
+
+/target/assets/css:
+	mkdir -p $@
+
+/target/assets/rendered:
+	mkdir -p $@
+
+
+.info-sync:
+	@echo "-------- rsync output --------"
+
+sync: .info-sync .rsync .fc-list
+	@echo "-------- /rsync ---------"
+	@echo
+
+.rsync: /target .rsync-sync /target/assets/css/slides.scss /target/assets/css/render-pdf.css
+
+.rsync-sync: /markdeck/assets $(wildcard /source/assets)
+	# FIXME the dynamically generated scss and css files are deleted by rsync.
+	# If there was a way to separate the files coming from rsync and the
+	# dynamically generated files this would be ideal
+	# -rsync -auv --delete $^ /target/
+	-rsync -auv $^ /target/
+
+.fc-list:
+	@echo
+	@echo "Known fonts:"
+	@fc-list
+
+/target/assets/css/slides.scss /target/assets/css/slides.impress.css /target/assets/css/render-pdf.css:
+	touch $@
+
+
+.info-sass:
+	@echo "-------- sass output --------"
+
+sass: .info-sass \
+	/target/assets/css/slides.css \
+	/target/assets/css/slides.impress.css \
+	/target/assets/markdeck/css/markdeck.impressjs.css \
+	/target/assets/markdeck/css/markdeck.revealjs.css \
+	.sync-custom-themes \
+	$(addprefix /target/assets/3rdparty/reveal.js/css/theme/,$(addsuffix .css,$(basename $(notdir $(wildcard /target/assets/3rdparty/reveal.js/css/theme/source/*.scss)))))
+
+	@echo "-------- /sass ---------"
+	@echo
+
+.sync-custom-themes: $(wildcard /source/assets/css/theme/source/*.scss)
+	rsync -au $^ /target/assets/3rdparty/reveal.js/css/theme/source/
+
+
+.info-config:
+	@echo "-------- config --------"
+
+config: .info-config .metadata
+	jq '. | .' < /target/.meta/config.json
+	@echo "ASCIIART_CONFIG=${ASCIIART_CONFIG}"
+	@echo "-------- /config --------"
+	@echo
+
+.metadata: /target/.meta /target/.meta/config.json
+
+/target/.meta/config.json: $(wildcard /source/slide*.md) /markdeck/note.md /markdeck/defaults.yaml
+	pandoc --template=/markdeck/metadata.template $^ > $@
+
+/target/.meta:
+	mkdir -p $@
+
+
+.info-pandoc:
+	@echo "-------- pandoc output --------"
+
+pandoc: .info-pandoc /target/index.html
+	@echo "-------- /pandoc output --------"
+	@echo
+
+/target/.meta/slides.combined.md.txt: $(wildcard /source/slide*.md)
+	-rm -f $@
+	touch $@
+	if [ -n "$^" ]; then \
+		for F in $^; do \
+			markdown-pp --exclude latexrender $$F >> $@ ; \
+			echo >> $@; \
+		done; \
+	else \
+		cp /markdeck/note.md $@; \
+	fi
+
+/target/.meta/index.html: /target/.meta/slides.combined.md.txt /target/.meta/config.json /markdeck/defaults.yaml
+	PANDOC_ARGS=; \
+	[ -e /source/include-before-body ] && PANDOC_ARGS="$${PANDOC_ARGS} --include-before-body /source/include-before-body"; \
+	[ -e /source/include-after-body ] && PANDOC_ARGS="$${PANDOC_ARGS} --include-after-body /source/include-after-body"; \
+	variant="$$(jq -r '.variant' < /target/.meta/config.json)"; \
+	pandoc \
+		-f markdown+yaml_metadata_block \
+		-t revealjs \
+		--no-highlight \
+		--wrap=preserve \
+		--standalone \
+		--template=/markdeck/template-$${variant}.html \
+		--slide-level=2 \
+		--section-divs \
+		--lua-filter /markdeck/lib/skip-slide-filter.lua \
+		--filter mathjax-pandoc-filter \
+		--lua-filter /markdeck/lib/render-asciiart-filter.lua \
+		--lua-filter /markdeck/lib/render-emojis-filter.lua \
+		--lua-filter /markdeck/lib/bg-shortcut-filter.lua \
+		--lua-filter /markdeck/lib/$${variant}-shortcut-filter.lua \
+		--lua-filter /markdeck/lib/inline-svg.lua \
+		--lua-filter /markdeck/lib/font-awesome.lua \
+		$${PANDOC_ARGS} \
+		-o $@ \
+		$< /markdeck/defaults.yaml 2>&1 | tee /target/.meta/pandoc.output
+
+/target/index.html: /target/.meta /target/.meta/index.html
+	# clear rerendering styling
+	echo "" > /target/assets/css/rerendering.css
+	cp /target/.meta/index.html $@
+
+.SECONDEXPANSION:
+/target/assets/3rdparty/reveal.js/css/theme/%.css: $$(addsuffix /%.scss,/target/assets/3rdparty/reveal.js/css/theme/source)
+	sassc $< $@
+
+/target/assets/markdeck/css/%.css /target/assets/css/%.css: $$(subst .css,.scss,$$@)
+	sassc $< $@
+
+wait-for-changes: $(wildcard /source/slide*.md) /source/assets $(wildcard /source/include-before-body) $(wildcard /source/include-after-body)
+	# TODO currently inotify doesn't work on mounted volumes :-/
+	# inotifywait -e modify,create,delete,move,attrib -r $^
+	/markdeck/wait-for-changes "$(WAIT_REFERENCE)"
+
+
+clean:
+	rm -rf /target/.??* /target/*
+
+.PHONY: build .info-build render .info-render sync .info-sync .rsync .rsync-sync .fc-list sass .info-sass .sync-custom-themes clean config .info-config pandoc .info-pandoc wait-for-changes

src/markdeck/assets/markdeck/css/_common.scss

@@ -14,7 +14,6 @@
     }
 }
 
-
 @font-face {
     font-family: 'Inconsolata';
     font-style: normal;

src/markdeck/assets/markdeck/css/markdeck.revealjs.scss

@@ -1,5 +1,14 @@
 @import "commoncommon";
 
+.columns {
+    display: flex;
+}
+
+.no-list-style ul {
+    list-style-type: none;
+    padding-left: 0;
+}
+
 .reveal .license {
     font-size: 12pt;
 }

src/markdeck/assets/markdeck/css/theme/source/markdeck.scss

@@ -52,10 +52,10 @@ $linkColor: #00008B;
 $linkColorHover: lighten( $linkColor, 20% );
 $selectionBackgroundColor: rgba(0, 0, 0, 0.99);
 
-$heading1Size: 1.4em;
-$heading2Size: 0.8em;
-$heading3Size: 0.8em;
-$heading4Size: 0.8em;
+$heading1Size: 2.5em;
+$heading2Size: 1.5em;
+$heading3Size: 1.3em;
+$heading4Size: 1.1em;
 
 section.has-dark-background {
 	&, h1, h2, h3, h4, h5, h6 {

src/markdeck/defaults.yaml

@@ -16,7 +16,7 @@ margin: 0.1
 minScale: 0.2
 maxScale: 1.5
 
-markdeckFooter: true
+markdeckFooter: false
 
 standalone:
 
@@ -41,6 +41,7 @@ loop: false
 rtl: false
 shuffle: false
 fragments: true
+fragmentsInURL: true
 embedded: false
 help: true
 showNotes: false

src/markdeck/lib/render-asciiart-filter.lua

@@ -41,11 +41,11 @@ else
    io.stderr:write(err)
 end
 
-local outputdir=io.open("rendered","r")
+local outputdir=io.open("assets/rendered","r")
 if outputdir~=nil then
     io.close(outputdir)
 else
-    os.execute("mkdir rendered")
+    os.execute("mkdir assets/rendered")
 end
 
 LIBDIR=os.getenv("ASCIIART_LIBDIR") or "lib"
@@ -128,7 +128,7 @@ images = {}
 
 
 function Cleanup(doc)
-    local pfile = io.popen('ls -a rendered/*.png rendered/*.svg 2> /dev/null')
+    local pfile = io.popen('ls -a assets/rendered/*.png assets/rendered/*.svg 2> /dev/null')
     for fname in pfile:lines() do
         if not images[fname] then
             io.stderr:write("removing obsolete '" .. fname .. "'\n")
@@ -146,7 +146,7 @@ function Render(elem, attr)
         if elem.classes[1] == format then
             local cmd, filetype = render_cmd(elem.text, elem.attributes or {})
             local mimetype = "image/" .. filetype
-            local fname = "rendered/" .. format .. "-" .. pandoc.sha1(cmd[1] .. table.concat(cmd[2], " ") .. cmd[3]) .. "." .. filetype
+            local fname = "assets/rendered/" .. format .. "-" .. pandoc.sha1(cmd[1] .. table.concat(cmd[2], " ") .. cmd[3]) .. "." .. filetype
             local data = nil
 
             local f=io.open(fname,"rb")