X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Finclude;h=5eb613aa4659ec96128a0a6da670fc71a17719ac;hb=8250ca8829e0ac4dde2871b445df248e6079411a;hp=d35c2a30c625a5b9938971a9411e9fc6978a948a;hpb=922181c682dc5d499eea65ae502e894e88e07f84;p=shellwiki

diff --git a/macros/include b/macros/include
index d35c2a3..5eb613a 100755
--- a/macros/include
+++ b/macros/include
@@ -4,11 +4,7 @@
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
-from=1
-to=\$
-rev=''
-items=\$
-path_info="$PATH_INFO"
+from='1'; to='$'; rev=''; items='$'
 
 while [ $# -gt 0 ]; do case $1 in
   --from) from="$2"; shift 2;;
@@ -38,21 +34,18 @@ page_glob "$page" \
 | sort $rev \
 | sed "${items}q" \
 | while read glob; do
-  case $glob in
-    /*) export PATH_INFO="$(PATH "$glob")";;
-     *) export PATH_INFO="$(PATH "$path_info/$glob")";;
-  esac
-  acl_read || continue
-  if   [ -f "$_DATA/pages/$PATH_INFO/#page.md" ]; then
-     mdfile="$_DATA/pages/$PATH_INFO/#page.md"
-  elif [ -f "$_EXEC/pages/$PATH_INFO/#page.md" ]; then
-     mdfile="$_EXEC/pages/$PATH_INFO/#page.md"
-  else
-    continue
-  fi
-  printf '<div class="macro include" page="%s">' "$(HTML "$glob")"
-  refpfx="$(HTML "$glob" |sed 's;[\;&\;];\\&;g')"
-  ( cd -- "${mdfile%/*}"
+  page="$(page_abs "$glob")"
+  acl_read "$page" || continue
+  mdfile="$(mdfile "$page")" || continue
+  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}"
+  ( # PATH_INFO may be used by macros in the included page
+    export PATH_INFO="$page"
+    cd -- "${mdfile%/*}/"
     sed -n "${from},${to}p" <"$mdfile" \
     | md \
     | grep -vx ''
@@ -61,5 +54,5 @@ page_glob "$page" \
     s;(<[^>]+ )(href|src)="([^#/"][^"]*)"([^>]*>);\1\2="'"${refpfx}"'\3"\4;g
     s;(<[^>]+ )(href|src)="/#safe/([^"]*)"([^>]*>);\1\2="\3"\4;g
   '
-  printf '</div>'
+  printf '</article></div>'
 done