diff --git a/src/_tape/main.html.m4 b/src/_tape/main.html.m4
index ff81873..d1a18a9 100644
--- a/src/_tape/main.html.m4
+++ b/src/_tape/main.html.m4
@@ -1,6 +1,6 @@
dnl template.m4.html v1.0
dnl Part of the tape-and-string suite used to construct the website
-include(`lib.m4')dnl
+include(LIB)dnl
diff --git a/src/_tape/render.sh b/src/_tape/render.sh
index 4610da8..e5d231f 100755
--- a/src/_tape/render.sh
+++ b/src/_tape/render.sh
@@ -1,17 +1,30 @@
#!/bin/bash
# render.sh: part of the tape-and-string framework.
-# v2.0
-source string.sh
+# v2.1
+declare -A prog
+prog[m4]=`readlink -f main.html.m4`
+prog[lib]=`readlink -f lib.m4`
+prog[title]=`readlink -f titlelookup`
+function tape {
+ case $1 in
+ *.txti) redcloth $1 ;;
+ *.org) org-ruby --translate html $1 ;;
+ *.md) comrak --gfm $1 ;;
+ *.html) cat $1 ;;
+ *) pandoc --cols 168 -t html $i || echo "Unable to render $i, unknown format" ;;
+ esac
+}
cd ..
files=(`find -not -path './_*'`)
for i in ${files[@]}; do
+ echo $i
if test -d $i; then
if test -d ../$i; then
- mkdir -p ../$i
+ mkdir -vp ../$i
else continue
fi
elif test -f $i; then
- tape $i | m4 -DTITLE=`${prog[title]}` ${prog[m4]} < $i > ../$i
+ tape $i | m4 -DTITLE=`${prog[title]}` -DLIB=${prog[lib]} ${prog[m4]} > ../$i
else
echo "Skipping $i, unknown file type"
fi
diff --git a/src/_tape/string.sh b/src/_tape/string.sh
deleted file mode 100644
index 1651e82..0000000
--- a/src/_tape/string.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-declare -A prog
-prog[m4]=`readlink -f main.html.m4`
-prog[title]=`readlink -f titlelookup`
-function tape {
- case $1 in
- *.txti) redcloth $1 ;;
- *.org) org-ruby --translate html $1 ;;
- *.md) comrak --gfm $1 ;;
- *.html) cat $1
- *) pandoc --cols 168 -t html $i || echo "Unable to render $i, unknown format" ;;
- esac
-}