Merge commit '8a7abfd24c55754dc0ee886cbece67cd3afc585c'

[shellwiki] / tools.sh

diff --git a/tools.sh b/tools.sh
index dfa4594576d9538105afbdc7a2c9eabdded5ec92..65327d7c38f229e3815b207f173d86823245ae50 100755 (executable)
--- a/tools.sh
+++ b/tools.sh
@@ -3,7 +3,7 @@
 [ "$include_tools" ] && return 0
 include_tools="$0"
 
-# Copyright 2022 - 2023 Paul Hänsch
+# Copyright 2022 - 2024 Paul Hänsch
 # 
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -187,25 +187,36 @@ has_tag() {
 }
 
 page_title() {
-  local mdfile PAGE_TITLE
+  local mdfile='' PAGE_TITLE=''
 
-  if  mdfile="$(mdfile "${1:-${PATH_INFO%/*}}")"; then
+  if mdfile="$(mdfile "${1}")"; then
     PAGE_TITLE="$(
+      # pick title from %title pragma
       sed -nE '
         s;^%title[ \t]+([[:graph:]][[:print:]]+)\r?$;\1;p; tQ;
         b; :Q q;
       ' "$mdfile"
     )"
     [ ! "${PAGE_TITLE}" ] && PAGE_TITLE="$(
+      # pick title from first h1/h2 headline
       MD_MACROS="" md <"$mdfile" \
       | sed -nE '
-        s;^.*<h1[^>]*>(.*>)?([^<]+)(<.*)?</h1>.*$;\2;p; tQ;
-        s;^.*<h2[^>]*>(.*>)?([^<]+)(<.*)?</h2>.*$;\2;p; tQ;
-        b; :Q q;
+        s;^.*<h1[^>]*>(.*>)?([^<]+)(<.*)?</h1>.*$;\2;; tQ;
+        s;^.*<h2[^>]*>(.*>)?([^<]+)(<.*)?</h2>.*$;\2;; tQ;
+        b; :Q
+        # reverse escapes of cgilite HTML function,
+        # to prevent later double escaping
+        # later escaping must not be omited
+        s/&lt;/</g; s/&gt;/>/g;  s/&quot;/'\"'/g; s/&#x27;/'\''/g;
+        s/&#x5B;/[/g; s/&#x5D;/]/g;  s/&#x0D;/\r/g; s/&amp;/\&/g;
+        p; q;
       '
     )"
-    printf %s\\n "$PAGE_TITLE"
-  else
-    return 1
   fi
+  if [ ! "${PAGE_TITLE}" ]; then
+    # use last part of page URL as title
+    PAGE_TITLE="${1%/}"
+    PAGE_TITLE="${PAGE_TITLE##*/}"
+  fi
+  printf %s\\n "$PAGE_TITLE"
 }