X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Finclude;h=fbc2ffffbde5b013584c5242bfc27cf244adf452;hb=a0950e004fddb7466b0883c4a623076d654c0849;hp=5eb613aa4659ec96128a0a6da670fc71a17719ac;hpb=8a93d4ef20815df18bfc1a580d3cffb8c6a31ea2;p=shellwiki

diff --git a/macros/include b/macros/include
index 5eb613a..fbc2fff 100755
--- a/macros/include
+++ b/macros/include
@@ -1,11 +1,26 @@
 #!/bin/sh
 
+# Copyright 2022 - 2023 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
+# 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.
+
 . "$_EXEC/cgilite/cgilite.sh"
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
-from='1'; to='$'; rev=''; items='$'
+from='1'; to='$'; rev=''; items='$'; hl=0; link='true'; depth=0; tags=''; page='';
 
+set -- "$@" --
 while [ $# -gt 0 ]; do case $1 in
   --from) from="$2"; shift 2;;
   from=*) from="${1#*=}"; shift 1;;
@@ -14,14 +29,19 @@ while [ $# -gt 0 ]; do case $1 in
   --items) items="$2"; shift 2;;
   items=*) items="${1#*=}"; shift 1;;
   --rev|--reverse) rev="-r"; shift 1;;
-  *) page="$1"; shift 1;;
+  --nolink) link=""; shift 1;;
+  --hl|-hl) hl=$2; shift 2;;
+  --depth) depth=$2; shift 2;;
+  \#*) tags="${tags}${tags:+ }${1}"; shift 1;;
+  --) shift 1; break;;
+  *) set -- "$@" "$1"; shift 1;;
 esac; done
 
 if ! printf %s\\n "$from" |grep -qEx '[0-9]+|/([^/\\]|\\/|\\.)*/'; then
   debug 'Include macro invalid argument: "from"'
   exit 1
 fi
-if ! printf %s\\n "$to" |grep -qEx '[0-9]+|/([^/\\]|\\/|\\.)*/'; then
+if ! printf %s\\n "$to" |grep -qEx '\$|[0-9]+|/([^/\\]|\\/|\\.)*/'; then
   debug 'Include macro Invalid argument: "to"'
   exit 1
 fi
@@ -30,19 +50,28 @@ if ! printf %s\\n "$items" |grep -qEx '\$|[0-9]+'; then
   exit 1
 fi
 
-page_glob "$page" \
+for page in "$@"; do
+  page_glob "$page" "$depth"
+done \
 | sort $rev \
 | sed "${items}q" \
 | while read glob; do
   page="$(page_abs "$glob")"
-  acl_read "$page" || continue
   mdfile="$(mdfile "$page")" || continue
+  acl_read "$page" || continue
+  has_tags "$page" $tags || continue
+  printf %s\\n "$INCLUDE_LIST" |grep -qxF "$page" && continue
+  export INCLUDE_LIST="${INCLUDE_LIST}${INCLUDE_LIST:+${BR}}$page"
   hglob="$(HTML "$glob")"
   refpfx="$(printf %s\\n "$hglob" |sed 's;[\;&\;];\\&;g')"
-  printf '<div class="macro include">
-            <a class="include link" href="%s">%s</a>
-            <article class="include" id="include_%s">' \
-         "${hglob}" "${hglob}" "${hglob}"
+  [ "$link" ] \
+  && printf '<div class="macro include">
+               <a class="include link" href="%s">%s</a>
+               <article class="include" id="include_%s">' \
+            "${hglob}" "${hglob}" "${hglob}" \
+  || printf '<div class="macro include">
+               <article class="include" id="include_%s">' \
+            "${hglob}"
   ( # PATH_INFO may be used by macros in the included page
     export PATH_INFO="$page"
     cd -- "${mdfile%/*}/"
@@ -53,6 +82,39 @@ page_glob "$page" \
     s;(<[^>]+ )(href|src)="([^"]+://[^"]*|[mM][aA][iI][lL][tT][oO]:[^"]*)"([^>]*>);\1\2="/#safe/\3"\4;g
     s;(<[^>]+ )(href|src)="([^#/"][^"]*)"([^>]*>);\1\2="'"${refpfx}"'\3"\4;g
     s;(<[^>]+ )(href|src)="/#safe/([^"]*)"([^>]*>);\1\2="\3"\4;g
-  '
+  ' | case $hl in
+      1) sed -E 's;(<h|</h)5( |>);\16\2;g;
+                 s;(<h|</h)4( |>);\15\2;g;
+                 s;(<h|</h)3( |>);\14\2;g;
+                 s;(<h|</h)2( |>);\13\2;g;
+                 s;(<h|</h)1( |>);\12\2;g;
+         ';;
+      2) sed -E 's;(<h|</h)5( |>);\16\2;g;
+                 s;(<h|</h)4( |>);\16\2;g;
+                 s;(<h|</h)3( |>);\15\2;g;
+                 s;(<h|</h)2( |>);\14\2;g;
+                 s;(<h|</h)1( |>);\13\2;g;
+         ';;
+      3) sed -E 's;(<h|</h)5( |>);\16\2;g;
+                 s;(<h|</h)4( |>);\16\2;g;
+                 s;(<h|</h)3( |>);\16\2;g;
+                 s;(<h|</h)2( |>);\15\2;g;
+                 s;(<h|</h)1( |>);\14\2;g;
+         ';;
+      4) sed -E 's;(<h|</h)5( |>);\16\2;g;
+                 s;(<h|</h)4( |>);\16\2;g;
+                 s;(<h|</h)3( |>);\16\2;g;
+                 s;(<h|</h)2( |>);\16\2;g;
+                 s;(<h|</h)1( |>);\15\2;g;
+         ';;
+      5|[6789])
+         sed -E 's;(<h|</h)5( |>);\16\2;g;
+                 s;(<h|</h)4( |>);\16\2;g;
+                 s;(<h|</h)3( |>);\16\2;g;
+                 s;(<h|</h)2( |>);\16\2;g;
+                 s;(<h|</h)1( |>);\16\2;g;
+         ';;
+      *) cat;;
+    esac
   printf '</article></div>'
 done