X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Fpagelist;h=08764aabe4d91c4924557557c609f5037d9d489d;hb=3e35a6bc48b0aaa6ff890cf6a909706cf6d42d7d;hp=f4be1772bf4d28b718df704e0716eb6e8ec941fb;hpb=ebac44302c70e36c951e77f0c5496c74bee547ee;p=shellwiki

diff --git a/macros/pagelist b/macros/pagelist
index f4be177..08764aa 100755
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -18,30 +18,57 @@
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
+tags='' dir='' depth='' glob_system_pages=false
+label='' labeltype='' altlabel='' cnt=0
+
+set -- "$@" --
 while [ $# -gt 0 ]; do case $1 in
   --system) glob_system_pages=true; shift 1;;
   --depth)  depth="$2" shift 2;;
+  \#*) tags="${tags}${tags:+ }${1###}"; shift 1;;
+  --h1|--h2|--h3|--h4|--h5|--h6|--label)
+    labeltype="${1#--}" label="$2"; shift 2;;
+  --alt-label)
+    altlabel="$2"; shift 2;;
+  --) shift 1; break;;
   *) if [ ! "$dir" ]; then
       dir="$1"
+      set -- "$@" "$1"; shift 1;
     elif [ ! "$depth" ]; then
-      depth="$1"
-    fi
-    shift 1;;
+      depth="$1"; shift 1;
+    else
+      set -- "$@" "$1"; shift 1;
+    fi;;
 esac; done
 
-[ "$dir" ] || dir=*
+[ "$*" ] || set -- "*"
 [ "$depth" -ge 0 -o "$depth" -le 0 ] 2>&- || depth=0
 
-printf '<ul class="macro pagelist">\n'
-  page_glob "$dir" "$depth" \
-  | while read -r glob; do
-    printf %s\\n "$glob"
-  done \
-  | while read -r page; do
+for dir in "$@"; do
+  page_glob "$dir" "$depth"
+done \
+| sort -u \
+| {
+  while read -r page; do
     pagedir="$(page_abs "$page")"
-    [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
-      -f "$_EXEC/pages/${pagedir}/#page.md" ] \
-    && acl_read "$pagedir" \
-    && printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
+    if [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
+         -f "$_EXEC/pages/${pagedir}/#page.md" ] \
+       && acl_read "$pagedir" \
+       && has_tags "$pagedir" $tags
+    then
+      [ "$cnt" -eq 0 -a "$label" ] \
+      && printf '<%s class="macro pagelist label">%s</%s>' \
+         "$labeltype" "$(HTML "$label")" "$labeltype"
+      [ "$cnt" -eq 0 ] && printf '<ul class="macro pagelist">\n'
+
+      printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
+      cnt="$((cnt + 1))"
+    fi
   done
-printf '</ul>\n'
+
+  if [ "$cnt" -gt 0 ]; then
+    printf '</ul>\n'
+  elif [ "$altlabel" ]; then
+    printf '<label class="macro pagelist altlabel">%s</label>' "$(HTML "$altlabel")"
+  fi
+}