X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;ds=inline;f=macros%2Finclude;h=5eb613aa4659ec96128a0a6da670fc71a17719ac;hb=7213d4e9f90acaa688a17b110f1c17b1e7ca74d3;hp=9f3339df5201e617ebfb443d7dc9f3575771eead;hpb=291e99a3305880ecb664357ec66eda8d54e377f1;p=shellwiki
diff --git a/macros/include b/macros/include
index 9f3339d..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;;
@@ -34,27 +30,22 @@ if ! printf %s\\n "$items" |grep -qEx '\$|[0-9]+'; then
exit 1
fi
-printf '
'
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 '
' "${hglob}"
- ( cd -- "${mdfile%/*}"
+ printf '
+
%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 ''
@@ -63,8 +54,5 @@ page_glob "$page" \
s;(<[^>]+ )(href|src)="([^#/"][^"]*)"([^>]*>);\1\2="'"${refpfx}"'\3"\4;g
s;(<[^>]+ )(href|src)="/#safe/([^"]*)"([^>]*>);\1\2="\3"\4;g
'
- printf ''
- printf '
%s' "${hglob}" "${hglob}"
- printf '
'
+ printf ' '
done
-printf '
'