feat: config updating

LICENSE

@@ -0,0 +1,35 @@
+ISC License
+
+Copyright 2026 N0\A
+
+Permission to use, copy, modify, and/or distribute this software
+for any purpose with or without fee is hereby granted, provided
+that the above copyright notice and this permission notice appear
+in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+---
+
+This project incorporates code (CSS style) from the 'kew' project, which is also licensed under the ISC License:
+
+Copyright (c) 2023 uint23
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

README.md

@@ -63,6 +63,9 @@ display_logo = false
 display_title = true
 logo_as_favicon = true
 favicon = ""
+generate_page_title = true
+error_page = "not_found.html"
+versioning = false
 ```
 
 - `title` site title
@@ -81,6 +84,9 @@ favicon = ""
 - `display_title` show title text in header
 - `logo_as_favicon` use `logo` as favicon
 - `favicon` explicit favicon path (used when `logo_as_favicon` is false or no logo is set)
+- `generate_page_title` automatically generate title text from the first markdown heading or filename (default: true)
+- `error_page` filename for the generated 404 error page (default: "not_found.html", empty to disable)
+- `versioning` append a version query parameter (`?v=timestamp`) to css asset urls to bypass cache (default: false)
 
 ## Ignores
 
@@ -100,7 +106,6 @@ favicon = ""
 
 ## Credits
 
-- Markdown to html conversion based on [markdown.bash](https://github.com/chadbraunduin/markdown.bash) by [chadbraunduin](https://github.com/chadbraunduin)
 - Default css style and html template based on _[kew](https://github.com/uint23/kew)_ by [uint23](https://github.com/uint23)
 
 >[!WARNING]

awk/headers.awk

@@ -8,18 +8,21 @@ function strip_markdown(s) {
     return s
 }
 function print_header(line) {
-    if (line ~ /^# /) {
+    tag = ""
-        sub(/^# /, "", line); print "<h1 id=\"" strip_markdown(line) "\">" line "</h1>"
+    if (line ~ /^# /) { tag = "h1"; sub(/^# /, "", line) }
-    } else if (line ~ /^## /) {
+    else if (line ~ /^## /) { tag = "h2"; sub(/^## /, "", line) }
-        sub(/^## /, "", line); print "<h2 id=\"" strip_markdown(line) "\">" line "</h2>"
+    else if (line ~ /^### /) { tag = "h3"; sub(/^### /, "", line) }
-    } else if (line ~ /^### /) {
+    else if (line ~ /^#### /) { tag = "h4"; sub(/^#### /, "", line) }
-        sub(/^### /, "", line); print "<h3 id=\"" strip_markdown(line) "\">" line "</h3>"
+    else if (line ~ /^##### /) { tag = "h5"; sub(/^##### /, "", line) }
-    } else if (line ~ /^#### /) {
+    else if (line ~ /^###### /) { tag = "h6"; sub(/^###### /, "", line) }
-        sub(/^#### /, "", line); print "<h4 id=\"" strip_markdown(line) "\">" line "</h4>"
+
-    } else if (line ~ /^##### /) {
+    if (tag != "") {
-        sub(/^##### /, "", line); print "<h5 id=\"" strip_markdown(line) "\">" line "</h5>"
+        id = strip_markdown(line)
-    } else if (line ~ /^###### /) {
+        if (enable_header_links == "true") {
-        sub(/^###### /, "", line); print "<h6 id=\"" strip_markdown(line) "\">" line "</h6>"
+            print "<" tag " id=\"" id "\"><a href=\"#" id "\" class=\"header-anchor\">" line "</a></" tag ">"
+        } else {
+            print "<" tag " id=\"" id "\">" line "</" tag ">"
+        }
     } else {
         print line
     }

kewt.sh

@@ -6,16 +6,18 @@ die() {
 }
 
 usage() {
-    invoked_as="${KEWT_INVOKED_AS:-$0}"
+    invoked_as=$(basename "${KEWT_INVOKED_AS:-$0}")
     cat <<EOF
 Usage: $invoked_as [--from <src>] [--to <out>]
        $invoked_as [src] [out]
        $invoked_as --new [title]
+       $invoked_as --update [dir]
        $invoked_as --help
 
 Options:
   --help          Show this help message.
   --new [title]   Create a new site directory (default: site)
+  --update [dir]  Update site.conf and template.html with latest defaults (defaults to current directory)
   --from <src>    Source directory (default: site)
   --to <out>      Output directory (default: out)
 EOF
@@ -46,6 +48,11 @@ display_logo = false
 display_title = true
 logo_as_favicon = true
 favicon = ""
+generate_page_title = true
+error_page = "not_found.html"
+versioning = false
+enable_header_links = true
+base_url = ""
 EOF
     fi
 
@@ -97,6 +104,103 @@ create_new_site() {
     exit 0
 }
 
+update_site() {
+    update_dir="${1:-.}"
+    [ -d "$update_dir" ] || die "Directory '$update_dir' does not exist."
+
+    target_conf="$update_dir/site.conf"
+    target_tmpl="$update_dir/template.html"
+
+    # Generate default site.conf
+    default_conf="$KEWT_TMPDIR/default_site.conf"
+    cat > "$default_conf" <<'CONFEOF'
+title = "kewt"
+style = "kewt"
+dir_indexes = true
+single_file_index = true
+flatten = false
+order = ""
+home_name = "Home"
+show_home_in_nav = true
+nav_links = ""
+nav_extra = ""
+footer = "made with <a href="https://kewt.krzak.org">kewt</a>"
+logo = ""
+display_logo = false
+display_title = true
+logo_as_favicon = true
+favicon = ""
+generate_page_title = true
+error_page = "not_found.html"
+versioning = false
+enable_header_links = true
+base_url = ""
+CONFEOF
+
+    # Update site.conf: add missing keys
+    if [ ! -f "$target_conf" ]; then
+        echo "No site.conf found in '$update_dir'; nothing to update."
+    else
+        added=0
+        while IFS= read -r line; do
+            case "$line" in
+                ''|'#'*) continue ;;
+                *=*) ;;
+                *) continue ;;
+            esac
+            key=$(printf '%s' "${line%%=*}" | sed 's/^[[:space:]]*//; s/[[:space:]]*$//')
+            if ! grep -q "^[[:space:]]*${key}[[:space:]]*=" "$target_conf"; then
+                printf '%s\n' "$line" >> "$target_conf"
+                echo "  Added: $key"
+                added=$((added + 1))
+            fi
+        done < "$default_conf"
+        if [ "$added" -eq 0 ]; then
+            echo "site.conf is already up to date."
+        else
+            echo "Added $added new key(s) to '$target_conf'."
+        fi
+    fi
+
+    # Update template.html
+    if [ -f "$target_tmpl" ]; then
+        default_tmpl="$KEWT_TMPDIR/default_template.html"
+        cat > "$default_tmpl" <<'TMPLEOF'
+<!doctype html>
+<html>
+    <head>
+        <meta charset="UTF-8" />
+        <title>{{TITLE}}</title>
+
+        <link rel="stylesheet" href="{{CSS}}" type="text/css" />
+        {{HEAD_EXTRA}}
+    </head>
+
+    <body>
+        <header>
+            <h1>{{HEADER_BRAND}}</h1>
+        </header>
+
+        <nav id="side-bar">{{NAV}}</nav>
+
+        <article>{{CONTENT}}</article>
+        <footer>{{FOOTER}}</footer>
+    </body>
+</html>
+TMPLEOF
+        if cmp -s "$default_tmpl" "$target_tmpl" 2>/dev/null; then
+            echo "template.html is already up to date."
+        else
+            cp "$default_tmpl" "${target_tmpl}.default"
+            echo "template.html has local changes; saved latest default as '${target_tmpl}.default'."
+            echo ""
+            diff "$target_tmpl" "${target_tmpl}.default" || true
+        fi
+    fi
+
+    exit 0
+}
+
 
 
 src=""
@@ -118,6 +222,14 @@ while [ $# -gt 0 ]; do
                 shift
             fi
             ;;
+        --update)
+            update_dir="."
+            if [ $# -gt 1 ] && [ "${2#-}" = "$2" ]; then
+                update_dir="$2"
+                shift
+            fi
+            update_site "$update_dir"
+            ;;
         --from)
             [ $# -lt 2 ] && die "--from requires a value."
             src="$2"
@@ -155,7 +267,14 @@ ensure_root_defaults
 src="${src%/}"
 out="${out%/}"
 
-[ -d "$src" ] || die "Source directory '$src' does not exist."
+if [ ! -d "$src" ]; then
+    if [ "$src" = "site" ]; then
+        usage
+        exit 1
+    else
+        die "Source directory '$src' does not exist."
+    fi
+fi
 
 IGNORE_ARGS="-name '.kewtignore' -o -path '$src/.*'"
 
@@ -269,6 +388,11 @@ display_logo="false"
 display_title="true"
 logo_as_favicon="true"
 favicon=""
+generate_page_title="true"
+error_page="not_found.html"
+versioning="false"
+enable_header_links="true"
+base_url=""
 
 load_config() {
     [ -f "$1" ] || return
@@ -306,6 +430,11 @@ load_config() {
             display_title) display_title="$val" ;;
             logo_as_favicon) logo_as_favicon="$val" ;;
             favicon) favicon="$val" ;;
+            generate_page_title) generate_page_title="$val" ;;
+            error_page) error_page="$val" ;;
+            versioning) versioning="$val" ;;
+            enable_header_links) enable_header_links="$val" ;;
+            base_url) base_url="$val" ;;
         esac
     done < "$1"
 }
@@ -313,6 +442,11 @@ load_config() {
 load_config "./site.conf"
 load_config "$src/site.conf"
 
+asset_version=""
+if [ "$versioning" = "true" ]; then
+    asset_version="?v=$(date +%s)"
+fi
+
 escape_html_text() {
     printf '%s' "$1" | sed \
         -e 's/&/\&amp;/g' \
@@ -414,6 +548,7 @@ copy_style_with_resolved_vars() {
 
 render_markdown() {
     file="$1"
+    is_home="$2"
     local_template=$(find_closest "template.html" "$(dirname "$file")")
     [ -z "$local_template" ] && local_template="$template"
 
@@ -462,7 +597,26 @@ render_markdown() {
         head_extra="<link rel=\"icon\" href=\"$favicon_src\" />"
     fi
 
-    MARKDOWN_SITE_ROOT="$src" MARKDOWN_FALLBACK_FILE="$script_dir/styles/$style.css" sh "$script_dir/markdown.sh" "$file" | awk -v title="$title" -v nav="$nav" -v footer="$footer" -v style_path="$style_path" -v header_brand="$header_brand" -v head_extra="$head_extra" -f "$awk_dir/render_template.awk" "$local_template"
+    page_title="$title"
+    if [ "$generate_page_title" = "true" ] && [ -n "$file" ] && [ -f "$file" ]; then
+        if [ "$is_home" = "true" ] && [ -n "$home_name" ]; then
+            page_title="$home_name - $title"
+        else
+            first_heading=$(grep -m 1 '^# ' "$file" | sed 's/^# *//; s/ *$//')
+            if [ -n "$first_heading" ]; then
+                first_heading=$(echo "$first_heading" | sed -e 's/\[//g' -e 's/\]//g' -e 's/!//g' -e 's/\*//g' -e 's/_//g' -e 's/`//g' -e 's/([^)]*)//g' | sed 's/\\//g')
+                page_title="$first_heading - $title"
+            else
+                basename_no_ext=$(basename "$file" .md)
+                if [ "$basename_no_ext" != "index" ] && [ "$basename_no_ext" != "404_gen" ]; then
+                    cap_basename=$(echo "$basename_no_ext" | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
+                    page_title="$cap_basename - $title"
+                fi
+            fi
+        fi
+    fi
+
+    ENABLE_HEADER_LINKS="$enable_header_links" MARKDOWN_SITE_ROOT="$src" MARKDOWN_FALLBACK_FILE="$script_dir/styles/$style.css" sh "$script_dir/markdown.sh" "$file" | awk -v title="$page_title" -v nav="$nav" -v footer="$footer" -v style_path="${style_path}${asset_version}" -v header_brand="$header_brand" -v head_extra="$head_extra" -f "$awk_dir/render_template.awk" "$local_template"
 }
 
 echo "Building site from '$src' to '$out'..."
@@ -487,7 +641,8 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type d -print" | sort | while
             md_count=$(find "$dir" ! -name "$(basename "$dir")" -prune -name "*.md" | wc -l)
             if [ "$md_count" -eq 1 ]; then
                 md_file=$(find "$dir" ! -name "$(basename "$dir")" -prune -name "*.md")
-                render_markdown "$md_file" > "$out_dir/index.html"
+                is_home="false"; [ "$dir" = "$src" ] && is_home="true"
+                render_markdown "$md_file" "$is_home" > "$out_dir/index.html"
                 continue
             fi
         fi
@@ -510,7 +665,8 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type d -print" | sort | while
                 echo "- [$name]($name)" >> "$temp_index"
             fi
         done
-        render_markdown "$temp_index" > "$out_dir/index.html"
+        is_home="false"; [ "$dir" = "$src" ] && is_home="true"
+        render_markdown "$temp_index" "$is_home" > "$out_dir/index.html"
         rm "$temp_index"
     fi
 done
@@ -540,12 +696,44 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type f -print" | sort | while
     fi
 
     if [ "${file%.md}" != "$file" ] && [ "$is_preserved" -eq 0 ]; then
+        is_home="false"; [ "$file" = "$src/index.md" ] && is_home="true"
         out_file="$out/${rel_path%.md}.html"
-        render_markdown "$file" > "$out_file"
+        render_markdown "$file" "$is_home" > "$out_file"
     else
         cp "$file" "$out/$rel_path"
     fi
 done
 
+if [ -n "$error_page" ] && [ ! -f "$out/$error_page" ]; then
+    temp_404="$KEWT_TMPDIR/404_gen.md"
+    echo "# 404 - Not Found" > "$temp_404"
+    echo "" >> "$temp_404"
+    echo "The requested page could not be found." >> "$temp_404"
+    render_markdown "$temp_404" > "$out/$error_page"
+    rm -f "$temp_404"
+fi
+
+if [ -n "$base_url" ]; then
+    sitemap_file="$out/sitemap.xml"
+    base_url="${base_url%/}"
+    today=$(date +%Y-%m-%d)
+    
+    printf '<?xml version="1.0" encoding="UTF-8"?>\n' > "$sitemap_file"
+    printf '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n' >> "$sitemap_file"
+    
+    find "$out" -type f -name "*.html" -print | sort | while IFS= read -r html_file; do
+        rel_url="${html_file#"$out"}"
+        
+        # Don't include 404 in the sitemap (duh)
+        [ "${rel_url#/}" = "$error_page" ] && continue
+        
+        printf '  <url>\n' >> "$sitemap_file"
+        printf '    <loc>%s%s</loc>\n' "$base_url" "$rel_url" >> "$sitemap_file"
+        printf '    <lastmod>%s</lastmod>\n' "$today" >> "$sitemap_file"
+        printf '  </url>\n' >> "$sitemap_file"
+    done
+    
+    printf '</urlset>\n' >> "$sitemap_file"
+fi
 
 echo "Build complete."

markdown.sh

@@ -51,7 +51,7 @@ awk -f "$awk_dir/blockquote_to_admonition.awk" "$temp_file" > "$temp_file.tmp" &
 awk -f "$awk_dir/fenced_code.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
 awk -f "$awk_dir/indented_code.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
 awk -f "$awk_dir/pipe_tables.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
-awk -f "$awk_dir/headers.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
+awk -v enable_header_links="$ENABLE_HEADER_LINKS" -f "$awk_dir/headers.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
 awk -f "$awk_dir/lists.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
 
 # Spacing

site.conf

@@ -1,16 +0,0 @@
-title = "kewt"
-style = "kewt"
-dir_indexes = true
-single_file_index = true
-flatten = false
-footer = "made with <a href="https://kewt.krzak.org">kewt</a>"
-logo = ""
-display_logo = false
-display_title = true
-logo_as_favicon = true
-favicon = ""
-order = ""
-home_name = "Home"
-show_home_in_nav = true
-nav_links = ""
-nav_extra = ""

site/index.md

@@ -63,6 +63,9 @@ display_logo = false
 display_title = true
 logo_as_favicon = true
 favicon = ""
+generate_page_title = true
+error_page = "not_found.html"
+versioning = false
 ```
 
 - `title` site title
@@ -81,6 +84,9 @@ favicon = ""
 - `display_title` show title text in header
 - `logo_as_favicon` use `logo` as favicon
 - `favicon` explicit favicon path (used when `logo_as_favicon` is false or no logo is set)
+- `generate_page_title` automatically generate title text from the first markdown heading or filename (default: true)
+- `error_page` filename for the generated 404 error page (default: "not_found.html", empty to disable)
+- `versioning` append a version query parameter (`?v=timestamp`) to css asset urls to bypass cache (default: false)
 
 ## Ignores
 
@@ -100,7 +106,6 @@ favicon = ""
 
 ## Credits
 
-- Markdown to html conversion based on [markdown.bash](https://github.com/chadbraunduin/markdown.bash) by [chadbraunduin](https://github.com/chadbraunduin)
 - Default css style and html template based on _[kew](https://github.com/uint23/kew)_ by [uint23](https://github.com/uint23)
 
 >![WARNING]

site/site.conf

@@ -10,3 +10,12 @@ display_title = true
 logo_as_favicon = true
 favicon = ""
 order = ""
+home_name = "Home"
+show_home_in_nav = true
+nav_links = ""
+nav_extra = ""
+generate_page_title = true
+error_page = "not_found.html"
+versioning = false
+enable_header_links = true
+base_url = "https://kewt.krzak.org"

template.html

@@ -1,21 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <meta charset="UTF-8" />
-        <title>{{TITLE}}</title>
-
-        <link rel="stylesheet" href="{{CSS}}" type="text/css" />
-        {{HEAD_EXTRA}}
-    </head>
-
-    <body>
-        <header>
-            <h1>{{HEADER_BRAND}}</h1>
-        </header>
-
-        <nav id="side-bar">{{NAV}}</nav>
-
-        <article>{{CONTENT}}</article>
-        <footer>{{FOOTER}}</footer>
-    </body>
-</html>