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

diff --git a/macros/pagelist b/macros/pagelist
index f4be177..2971515 100755
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -18,30 +18,38 @@
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
+tags='' dir='' depth='' glob_system_pages=false
+
+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;;
+  --) 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"
+  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" \
+    && has_tags "$pagedir" $tags \
     && printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
   done
 printf '</ul>\n'