Merge commit '11b24625989e65362b0d4e4aae3c12cbced8338b'

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..24781a9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,9 @@
+.PHONY: _subtrees
+
+_subtrees: _cgilite
+
+cgilite:
+       git subtree add --squash -P $@ https://git.plutz.net/git/$@ master
+
+_cgilite: cgilite
+       git subtree pull --squash -P $< https://git.plutz.net/git/$< master

diff --git a/.gitignore b/cgilite/.gitignore
similarity index 100%
rename from .gitignore
rename to cgilite/.gitignore

diff --git a/cgilite.sh b/cgilite/cgilite.sh
similarity index 100%
rename from cgilite.sh
rename to cgilite/cgilite.sh

diff --git a/common.css b/cgilite/common.css
similarity index 100%
rename from common.css
rename to cgilite/common.css

diff --git a/file.sh b/cgilite/file.sh
similarity index 100%
rename from file.sh
rename to cgilite/file.sh

diff --git a/html-sh.sed b/cgilite/html-sh.sed
similarity index 100%
rename from html-sh.sed
rename to cgilite/html-sh.sed

diff --git a/logging.sh b/cgilite/logging.sh
similarity index 100%
rename from logging.sh
rename to cgilite/logging.sh

diff --git a/markdown.awk b/cgilite/markdown.awk
similarity index 100%
rename from markdown.awk
rename to cgilite/markdown.awk

diff --git a/session.sh b/cgilite/session.sh
similarity index 100%
rename from session.sh
rename to cgilite/session.sh

diff --git a/storage.sh b/cgilite/storage.sh
similarity index 100%
rename from storage.sh
rename to cgilite/storage.sh

diff --git a/users.sh b/cgilite/users.sh
similarity index 100%
rename from users.sh
rename to cgilite/users.sh

diff --git a/md_macros.awk b/md_macros.awk
new file mode 100755 (executable)
index 0000000..7e15482
--- /dev/null
+++ b/md_macros.awk
@@ -0,0 +1,66 @@
+#!/bin/awk -f
+#!/opt/busybox/awk -f
+
+function sh_escape(arg){
+  return "'" gensub(/'/, "'\"'\"'", "g", arg) "'";
+}
+
+function argsplit(line, args, LOCAL, c, n, ctx) {
+  ctx="space"; n=0;
+
+  while ( length(line) > 0 ) {
+    c = substr(line, 1, 1);
+    line = substr(line, 2);
+    if (ctx == "space" )
+           if (c ~ /[ \t]/) ctx = "space";
+      else if (c ~ /\\/) { n++; ctx = "escbare"; }
+      else if (c ~ /"/)  { n++; ctx = "dquot"; }
+      else if (c ~ /'/)  { n++; ctx = "squot"; }
+      else   { n++; args[n] = c; ctx = "bare"; }
+    else if (ctx == "bare")
+           if (c ~ /[ \t]/) ctx = "space";
+      else if (c ~ /\\/)  ctx = "escbare";
+      else if (c ~ /"/)   ctx = "dquot";
+      else if (c ~ /'/)   ctx = "squot";
+      else args[n] = args[n] c;
+    else if (ctx == "dquot")
+           if (c ~ /"/)  ctx = "bare";
+      else if (c ~ /\\/) ctx = "escdquot";
+      else args[n] = args[n] c;
+    else if (ctx == "squot")
+      if (c ~ /'/)  ctx = "bare";
+      else args[n] = args[n] c;
+    else if (ctx == "escbare") {
+      args[n] = args[n] c;
+      ctx = "bare";
+    }
+    else if (ctx == "escdquot") {
+      args[n] = args[n] c;
+      ctx = "dquot";
+    }
+  }
+} 
+
+function macro(call, LOCAL, line, files, n, args) {
+  "cd " sh_escape(ENVIRON["MD_MACROS"]) "; printf '%s/' *" |getline line;
+  split(line, files, "/");
+  for (n in files) { files[files[n]] = ""; delete files[n]; }
+  delete files[""];
+
+  argsplit(call, args);
+  call="";
+
+  for (n = 1; n in args; n++) call = call sh_escape(args[n]) " ";
+
+  if (args[1] in files) {
+    RS=""; ORS=""; line="";
+    "printf '%s' " sh_escape(file) " | " sh_escape(ENVIRON["MD_MACROS"]) "/" call | getline line;
+    return line;
+  } else {
+    return HTML("<<" call ">>");
+  }
+}
+
+BEGIN {
+  if (ENVIRON["MD_MACROS"]) { AllowMacros = "true"; }
+}