X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Finclude;h=5254a2609c91623d2edae92bc14361fc71219407;hb=116a9fbba5874eec7efb4f2253844e8158fffde9;hp=9f3339df5201e617ebfb443d7dc9f3575771eead;hpb=291e99a3305880ecb664357ec66eda8d54e377f1;p=shellwiki

diff --git a/macros/include b/macros/include
index 9f3339d..5254a26 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='$'; link='true'
 
 while [ $# -gt 0 ]; do case $1 in
   --from) from="$2"; shift 2;;
@@ -18,6 +14,7 @@ while [ $# -gt 0 ]; do case $1 in
   --items) items="$2"; shift 2;;
   items=*) items="${1#*=}"; shift 1;;
   --rev|--reverse) rev="-r"; shift 1;;
+  --nolink) link=""; shift 1;;
   *) page="$1"; shift 1;;
 esac; done
 
@@ -25,7 +22,7 @@ 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
@@ -34,27 +31,26 @@ if ! printf %s\\n "$items" |grep -qEx '\$|[0-9]+'; then
   exit 1
 fi
 
-printf '<div class="macro include wrapper">'
 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
+  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 page"><article class="include" id="include_%s">' "${hglob}"
-  ( cd -- "${mdfile%/*}"
+  [ "$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%/*}/"
     sed -n "${from},${to}p" <"$mdfile" \
     | md \
     | grep -vx ''
@@ -63,8 +59,5 @@ page_glob "$page" \
     s;(<[^>]+ )(href|src)="([^#/"][^"]*)"([^>]*>);\1\2="'"${refpfx}"'\3"\4;g
     s;(<[^>]+ )(href|src)="/#safe/([^"]*)"([^>]*>);\1\2="\3"\4;g
   '
-  printf '</article>'
-  printf '<a class="include link" href="%s">%s</a>' "${hglob}" "${hglob}"
-  printf '</div>'
+  printf '</article></div>'
 done
-printf '</div>'