diff --git a/.gitignore b/.gitignore index 1efda87..b59e039 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ format site/* resources/style.css -resources/footer.html diff --git a/gen.sh b/gen.sh index e349b95..61c7bf5 100755 --- a/gen.sh +++ b/gen.sh @@ -4,15 +4,20 @@ echo "Generating CSS" makros resources/style-formatted.css | tr -d " \t\n\r" > resources/style.css -# Generate the footer -makros resources/_footer.html > resources/footer.html - # Generate HTML pages from Writan sources echo "Generating pages" for file in site-src/*; do bn=$(basename $file .wtn) echo " $file -> site/$bn.html" - ./format $file site/$bn.html + # if the file has macros, expand them + if grep "#makro" $file >/dev/null; then + tmp=$(mktemp) + makros $file > $tmp + ./format $tmp site/$bn.html + rm $tmp + else + ./format $file site/$bn.html + fi done # Generate the site index diff --git a/resources/_footer.html b/resources/_footer.html deleted file mode 100644 index 20e4bd0..0000000 --- a/resources/_footer.html +++ /dev/null @@ -1,6 +0,0 @@ -DATE @ date +%s - -
index | Last generated DATE -