diff --git a/Makefile b/Makefile index 9f1bc0c..624e878 100644 --- a/Makefile +++ b/Makefile @@ -12,13 +12,10 @@ all: subdirs \ gmi/feed.atom \ html/feed.atom \ -test: - mawk -f ~/projects/awk_functions/lib.awk -f scripts/html.awk -- testing/example.gmi > testing/script_output.html - diff testing/expected_output.html testing/script_output.html - htmlvalidator testing/script_output.html - - mawk -f ~/projects/awk_functions/lib.awk -f scripts/html.awk -- testing/example.gmi > testing/script_output.gmi - diff testing/expected_output.gmi testing/script_output.gmi +# test: testing/example.gmi testing/example.ass + # mawk -f ~/projects/awk_functions/lib.awk -f scripts/html.awk -- testing/example.gmi > testing/output.html + # mawk -f ~/projects/awk_functions/lib.awk -f scripts/gemini.awk -- testing/example.gmi > testing/output.gmi + # mawk -f ~/projects/awk_functions/lib.awk -f scripts/feed.awk -- testing/example.ass > testing/output.atom clean: rm -rf html/* gmi/* @@ -48,4 +45,4 @@ gmi/feed.atom: src/feed.ass scripts/feed.awk mawk -f ~/projects/awk_functions/lib.awk -f scripts/feed.awk -- $< > $@ html/feed.atom: src/feed.ass scripts/feed.awk - mawk -v 'willConvertLinks=1' -f ~/projects/awk_functions/lib.awk -f scripts/feed.awk -- $< > $@ + mawk -v 'willConvertLinks=1' -f ~/projects/awk_functions/lib.awk -f scripts/feed.awk -- $< > $@ diff --git a/scripts/gemini.awk b/scripts/gemini.awk index bc7fbaf..0c4511a 100644 --- a/scripts/gemini.awk +++ b/scripts/gemini.awk @@ -1,15 +1,19 @@ BEGIN { - getline + getline firstLine if (FILENAME != "-") printf "Navigation:\n\ => %s home\n\ => %s notes\n\ => %s useful\n\ -=> %s sitemap\n", \ - relpath(getDirname(FILENAME), ENVIRON["PWD"] "/src/index.gmi"), \ - relpath(getDirname(FILENAME), ENVIRON["PWD"] "/src/notes/index.gmi"), \ - relpath(getDirname(FILENAME), ENVIRON["PWD"] "/src/useful/index.gmi"), \ - relpath(getDirname(FILENAME), ENVIRON["PWD"] "/src/sitemap.gmi") +=> %s sitemap\n\ +=> %s feed\n\n", \ + relpath(getDirname(FILENAME), "src/index.gmi"), \ + relpath(getDirname(FILENAME), "src/notes/index.gmi"), \ + relpath(getDirname(FILENAME), "src/useful/index.gmi"), \ + relpath(getDirname(FILENAME), "src/sitemap.gmi"), \ + relpath(getDirname(FILENAME), "src/feed.atom") + + printf "%s\n", firstLine } { print } diff --git a/scripts/html.awk b/scripts/html.awk index ce47dc8..906144a 100644 --- a/scripts/html.awk +++ b/scripts/html.awk @@ -131,12 +131,15 @@ END { navbarText = sprintf("\n", \ - relpath(getDirname(FILENAME), ENVIRON["PWD"] "/src/index.html"), \ - relpath(getDirname(FILENAME), ENVIRON["PWD"] "/src/notes/index.html"), \ - relpath(getDirname(FILENAME), ENVIRON["PWD"] "/src/useful/index.html"), \ - relpath(getDirname(FILENAME), ENVIRON["PWD"] "/src/useful/index.html")) \ + relpath(getDirname(FILENAME), "src/index.html"), \ + relpath(getDirname(FILENAME), "src/notes/index.html"), \ + relpath(getDirname(FILENAME), "src/useful/index.html"), \ + relpath(getDirname(FILENAME), "src/sitemap.html"), \ + relpath(getDirname(FILENAME), "src/feed.atom")) \ printf "\n\ \n\ diff --git a/scripts/sitemap_gmi.awk b/scripts/sitemap_gmi.awk index e3ef727..8e61f0f 100644 --- a/scripts/sitemap_gmi.awk +++ b/scripts/sitemap_gmi.awk @@ -1,9 +1,15 @@ BEGIN { filename = FILENAME - printf "# Sitemap\n\ + printf "Navigation:\n\ +=> index.gmi home\n\ +=> notes/index.gmi notes\n\ +=> useful/index.gmi useful\n\ +=> sitemap.gmi sitemap\n\ +=> feed.atom feed\n\n\ +# Sitemap\n\ This document is automatically generated. See:\n\ -=> howto/website-generation.gmi\n" +=> notes/awk-make-sh.gmi\n" } FILENAME != filename { @@ -22,7 +28,7 @@ FILENAME != filename { sub("^([ ]*)", "", link) sub("^([ ]*)", "", description) - link = relpath(ENVIRON["PWD"] "/src", resolvePath(ENVIRON["PWD"] "/" getDirname(FILENAME) "/" link)) + link = relpath("src", resolvePath(getDirname(FILENAME) "/" link)) printf "=> %s %s\n", link, description } diff --git a/scripts/sitemap_html.awk b/scripts/sitemap_html.awk index 7b8b673..fe407da 100644 --- a/scripts/sitemap_html.awk +++ b/scripts/sitemap_html.awk @@ -25,7 +25,7 @@ BEGIN { gsub("'", "'", description) gsub("\"", """, description) - link = relpath(ENVIRON["PWD"] "/src", resolvePath(ENVIRON["PWD"] "/" getDirname(FILENAME) "/" link)) + link = relpath("src", resolvePath(getDirname(FILENAME) "/" link)) if (link !~ "^([a-zA-Z0-9_]):") sub("\.gmi$", ".html", link) @@ -50,17 +50,13 @@ body { margin: 15px; }\n\ \n\ \n\
\n\ - \n\ + \n\
\n\
\n\ %s\n\