michael/csci8980-f21
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #342

Browse source
This commit is contained in:
Wen Kokke 2019-07-14 12:13:51 +01:00
parent 528fd86344
commit e748a9740f
2 changed files with 41 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -4,7 +4,6 @@ AGDAI := $(shell find . -type f -and \( -path '*/src/*' -or -path '*/courses/*'
MARKDOWN := $(subst courses/,out/,$(subst src/,out/,$(subst .lagda.md,.md,$(AGDA)))) MARKDOWN := $(subst courses/,out/,$(subst src/,out/,$(subst .lagda.md,.md,$(AGDA))))
PLFA_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) PLFA_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
AGDA2HTML_FLAGS := --verbose --link-to-local-agda-names --use-jekyll=out/ AGDA2HTML_FLAGS := --verbose --link-to-local-agda-names --use-jekyll=out/
AGDA_STDLIB_SED := ".agda-stdlib.sed"
ifeq ($(AGDA_STDLIB_VERSION),) ifeq ($(AGDA_STDLIB_VERSION),)
AGDA_STDLIB_URL := https://agda.github.io/agda-stdlib/ AGDA_STDLIB_URL := https://agda.github.io/agda-stdlib/
@ -40,10 +39,10 @@ $$(out) : out = $(subst courses/,out/,$(subst src/,out/,$(subst .lagda.md,.md,$(
$$(out) : $$(in) | out/ $$(out) : $$(in) | out/
@echo "Processing $$(subst ./,,$$(in))" @echo "Processing $$(subst ./,,$$(in))"
ifeq (,$$(findstring courses/,$$(in))) ifeq (,$$(findstring courses/,$$(in)))
./highlight.sh $$(in) ./highlight.sh $$(in) --include-path=src/
else else
# Fix links to the file itself (out/<filename> to out/<filepath>) # Fix links to the file itself (out/<filename> to out/<filepath>)
./highlight.sh $$(in) --include-path $(realpath src) --include-path $$(realpath $$(dir $$(in))) ./highlight.sh $$(in) --include-path=src/ --include-path=$$(dir $$(in))
@sed -i 's|out/$$(notdir $$(out))|$$(subst ./,,$$(out))|g' $$(out) @sed -i 's|out/$$(notdir $$(out))|$$(subst ./,,$$(out))|g' $$(out)
endif endif
endef endef
@ -85,7 +84,8 @@ build-incremental: $(MARKDOWN)
# Remove all auxiliary files # Remove all auxiliary files
clean: clean:
rm -f $(AGDA_STDLIB_SED) rm -f .agda-stdlib.sed
rm -f .links-*.sed
ifneq ($(strip $(AGDAI)),) ifneq ($(strip $(AGDAI)),)
rm $(AGDAI) rm $(AGDAI)
endif endif

42
highlight.sh
View file

@ -7,22 +7,31 @@ shift
function out_path { function out_path {
OUT="$1" OUT="$1"
OUT=$(eval "echo \"$OUT\" | sed -e \"s|/src/|/out/|; s|/courses/|/out/|; s|\.lagda\.md|\.md|;\"") OUT=`echo "$OUT" | sed -e "s|src/|out/|; s|courses/|out/|; s|\.lagda\.md|\.md|;"`
echo "$OUT" echo "$OUT"
} }
OUT="$(out_path $SRC)" OUT="$(out_path $SRC)"
OUT_DIR="$(dirname $OUT)" OUT_DIR="$(dirname $OUT)"
function html_path {
SRC="$1"
HTML_DIR="$2"
# Extract the module name from the Agda file # Extract the module name from the Agda file
# NOTE: this fails if there is more than a single space after 'module' # NOTE: this fails if there is more than a single space after 'module'
MOD_NAME=`grep -oP -m 1 "(?<=^module )(\\S+)(?=\\s+(\\S+\\s+)*where)" "$SRC"` MOD_NAME=`grep -oP -m 1 "(?<=^module )(\\S+)(?=\\s+(\\S+\\s+)*where)" "$SRC"`
# Create temporary directory and compute path to output of `agda --html` # Extract the extension from the Agda file
HTML_DIR="$(mktemp -d)"
SRC_EXT="$(basename $SRC)" SRC_EXT="$(basename $SRC)"
SRC_EXT="${SRC_EXT##*.}" SRC_EXT="${SRC_EXT##*.}"
HTML="$HTML_DIR/$MOD_NAME.$SRC_EXT" HTML="$HTML_DIR/$MOD_NAME.$SRC_EXT"
echo "$HTML"
}
HTML_DIR="$(mktemp -d)"
HTML="$(html_path $SRC $HTML_DIR)"
# Highlight Syntax using Agda # Highlight Syntax using Agda
set -o pipefail \ set -o pipefail \
@ -69,13 +78,26 @@ fi
sed -i -f "$AGDA_STDLIB_SED" "$HTML" sed -i -f "$AGDA_STDLIB_SED" "$HTML"
# Fix links to local modules # Create a sed script which matches and repairs all local links
# TODO: for INCLUDE_PATH in "$@"; do
# 1) gather source files from the dirname and --include-path arguments, e.g., src/ and courses/tspl/2018/ if [[ "$INCLUDE_PATH" = --include-path=* ]]; then
# 2) compute module filenames for these files and compute their HTML output names (as above) INCLUDE_PATH="${INCLUDE_PATH:15}"
# 3) compute output filenames for these files (requires output names to be computable) INCLUDE_PATH="${INCLUDE_PATH%/}"
# 4) create sed script which matches and replaces the HTML filenames with Jekyll links to the output filenames INCLUDE_PATH="${INCLUDE_PATH#./}"
# 5) run sed script LOCAL_LINKS_SED=`echo ".links-${INCLUDE_PATH}.sed" | sed -e "s|/|-|g;"`
if [ ! -f "$LOCAL_LINKS_SED" ]; then
find "$INCLUDE_PATH" -name "*.lagda.md" -print0 | while read -d $'\0' AGDA_MODULE_SRC; do
AGDA_MODULE_SRC="${AGDA_MODULE_SRC#./}"
AGDA_MODULE_OUT="$(out_path "$AGDA_MODULE_SRC")"
AGDA_MODULE_HTML="$(basename "$(html_path "$AGDA_MODULE_SRC" "$HTML_DIR")" .md).html"
echo "s|$AGDA_MODULE_HTML|{% endraw %}{{ site.baseurl }}{% link $AGDA_MODULE_OUT %}{% raw %}|;" >> "$LOCAL_LINKS_SED"
done
fi
sed -i -f "$LOCAL_LINKS_SED" "$HTML"
fi
done
# Copy over the temporary file to the output path # Copy over the temporary file to the output path
mkdir -p "$OUT_DIR" mkdir -p "$OUT_DIR"