prevent double escape in page title

diff --git a/tools.sh b/tools.sh
index a85e63c5e4ca12a1bffb2b3da5220d194cb8f21a..2ee1818f569685c8bd848ba2e7e9fe01bb6d0626 100755 (executable)
--- a/tools.sh
+++ b/tools.sh
@@ -193,23 +193,33 @@ page_title() {
     return 1
   fi
   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;
     '
   )"
   if [ ! "${PAGE_TITLE}" ]; then
+    # use last part of page URL as title
     PAGE_TITLE="${1:-${PATH_INFO}}"
     PAGE_TITLE="${PAGE_TITLE%/*}"
     PAGE_TITLE="${PAGE_TITLE##*/}"
   fi
+  debug "TITLE: $PAGE_TITLE"
   printf %s\\n "$PAGE_TITLE"
 }