diff options
| author | Paul Buetow <paul@buetow.org> | 2024-12-29 23:14:36 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-12-29 23:14:36 +0200 |
| commit | 05702da478d3fadd6a75586132a26442391f0455 (patch) | |
| tree | fbeb60fb41bea29cec9f3b63f01aa0f0c2e6adb0 | |
| parent | e08ffccf5f0582ba9479628c937412d1f438768b (diff) | |
add links to Markdown and Gemtext versions of this page on the page headers
| -rw-r--r-- | extras/html/header.html.part | 3 | ||||
| -rw-r--r-- | extras/html/themes/business/style.css | 4 | ||||
| -rw-r--r-- | extras/html/themes/future/style.css | 5 | ||||
| -rwxr-xr-x | gemtexter | 7 | ||||
| -rw-r--r-- | gemtexter.conf | 1 | ||||
| -rw-r--r-- | lib/generate.source.sh | 9 |
6 files changed, 24 insertions, 5 deletions
diff --git a/extras/html/header.html.part b/extras/html/header.html.part index 03ac281..b96076f 100644 --- a/extras/html/header.html.part +++ b/extras/html/header.html.part @@ -8,3 +8,6 @@ <link rel="stylesheet" href="%%STYLESHEET_OVERRIDE%%" /> </head> <body> +<p class="header"> +View this page as <a href="%%MARKDOWN_BASE_URI%%%%CURRENT_PAGE%%.md">Markdown</a> | <a href="gemini://%%DOMAIN%%%%CURRENT_PAGE%%.gmi">Gemtext</a> +</p> diff --git a/extras/html/themes/business/style.css b/extras/html/themes/business/style.css index 3fbbf03..e43aa19 100644 --- a/extras/html/themes/business/style.css +++ b/extras/html/themes/business/style.css @@ -124,6 +124,10 @@ span.inlinecode { color: #333; } +.header { + font-family: handnotes; +} + .footer { font-family: handnotes; } diff --git a/extras/html/themes/future/style.css b/extras/html/themes/future/style.css index b8e2569..18b49b2 100644 --- a/extras/html/themes/future/style.css +++ b/extras/html/themes/future/style.css @@ -143,6 +143,11 @@ span.inlinecode { color: #00d4ff; } +.header { + font-family: handnotes; +} + .footer { font-family: handnotes; } + @@ -1,12 +1,12 @@ #!/usr/bin/env bash # # The Gemtexter blog engine and static site generator -# by Paul Buetow 2021, 2022, 2023, 2024 +# by Paul Buetow 2021, 2022, 2023,stable 2024 declare -r ARG="$1"; shift declare CONTENT_FILTER="$1"; shift -declare -r VERSION=3.0.0 -declare -r VERSION_DESCR='stable' +declare -r VERSION=3.0.1 +declare -r VERSION_DESCR='develop' declare -r GEMTEXTER="Gemtexter $VERSION-$VERSION_DESCR" declare -r DATE_FORMAT='--iso-8601=seconds' declare DATE=date @@ -29,6 +29,7 @@ test -z "$LOG_VERBOSE" && LOG_VERBOSE='' test -z "$PRE_GENERATE_HOOK" && PRE_GENERATE_HOOK='' test -z "$POST_PUBLISH_HOOK" && POST_PUBLISH_HOOK='' test -z "$MASTODON_URI" && MASTODON_URI='' +test -z "$MARKDOWN_BASE_URI" && MARKDOWN_BASE_URI='' test -z "$SOURCE_HIGHLIGHT_CSS" && SOURCE_HIGHLIGHT_CSS='' set -euf -o pipefail diff --git a/gemtexter.conf b/gemtexter.conf index c45f7a6..87b63e4 100644 --- a/gemtexter.conf +++ b/gemtexter.conf @@ -1,4 +1,5 @@ declare -xr DOMAIN=foo.zone +declare -xr MARKDOWN_BASE_URI=https://codeberg.org/snonux/foo.zone/src/branch/content-md declare -xr SUBTITLE='To be in the .zone!' declare -xr AUTHOR='Paul Buetow aka snonux' declare -xr EMAIL='paul@dev.buetow.org' diff --git a/lib/generate.source.sh b/lib/generate.source.sh index 89e54b0..db9dc95 100644 --- a/lib/generate.source.sh +++ b/lib/generate.source.sh @@ -93,6 +93,7 @@ generate::convert_gmi_atom_to_html_atom () { # Internal helper function for generate::fromgmi generate::_to_output_format () { local -r src="$1"; shift + local -r current_page="$1"; shift local -r format="$1"; shift local dest=${src/gemtext/$format} @@ -119,9 +120,12 @@ generate::_to_output_format () { if [[ "$CONTENT_BASE_DIR/html" != "$(dirname "$dest")" ]]; then stylesheet="../$stylesheet" fi + $SED -i "s|%%TITLE%%|$title|g; s|%%DOMAIN%%|$DOMAIN|g; s|%%GEMTEXTER%%|$GEMTEXTER|g; + s|%%MARKDOWN_BASE_URI%%|$MARKDOWN_BASE_URI|g; + s|%%CURRENT_PAGE%%|$current_page|g; s|%%STYLESHEET%%|$stylesheet|g; s|%%STYLESHEET_OVERRIDE%%|$stylesheet_override|g;" "$dest.tmp" @@ -140,6 +144,7 @@ generate::_to_output_format () { generate::fromgmi () { local -i num_gmi_files=0 local -i num_doc_files=0 + local current_page log INFO "Generating $* from Gemtext" @@ -151,11 +156,11 @@ generate::fromgmi () { if test -n "$CONTENT_FILTER" && ! $GREP -q "$CONTENT_FILTER" <<< "$src"; then continue fi - + current_page=$($SED "s|$CONTENT_BASE_DIR/gemtext||;"'s/.gmi$//;' <<< "$src") num_gmi_files=$(( num_gmi_files + 1 )) log INFO "Generating output formats from $src" for format in "$@"; do - generate::_to_output_format "$src" "$format" & + generate::_to_output_format "$src" "$current_page" "$format" & done done < <(find "$CONTENT_BASE_DIR/gemtext" -type f -name \*.gmi) |