Merge commit '6da40fe70bee6935ed97daeaec58c84d7f3a190c'

diff --combined cgilite/cgilite.awk
index 0000000000000000000000000000000000000000,f16ed6a3281746d6182cd4f340eb15910f6c5a87..f16ed6a3281746d6182cd4f340eb15910f6c5a87
mode 000000,100644..100644
--- /dev/null
--- 2/cgilite.awk
+++ b/cgilite/cgilite.awk
@@@ -1,0 -1,158 +1,158 @@@
+ #!/bin/env awk -f
+ 
+ function PATH( str,    seg, out ) {
+   while ( str ) {
+     seg = str;
+     sub( /\/.*$/, "", seg);
+     sub( /^[^\/]*\//, "", str);
+  
+     if      ( seg == ".." )  sub(/\/[^\/]*\/?$/, "", out);
+     else if ( seg ~ /^\.?$/) sub(/\/?$/, "/", out);
+     else sub(/\/?$/, "/" seg, out);
+ 
+     if (seg == str) break;
+   }
+   if (!(str && out)) sub(/\/?$/,"/" out);
+   return out;
+ }
+ 
+ function HEX_DECODE( pfx, inp,    out, n, k ) {
+   k = length(pfx);
+   gsub(/[].*+?^${}()|\\[]/,"\\\\&",pfx);
+   while ( inp ) if ( n = match(inp, pfx "[0-9a-fA-F][0-9a-fA-F]") ) {
+     out = out substr(inp, 1, n - 1);
+     inp = substr(inp, n + k);
+     if      (inp ~  /^[0-9]/) n = 16 * substr(inp, 1, 1);
+     else if (inp ~  /^[aA]/)  n = 160;
+     else if (inp ~  /^[bB]/)  n = 176;
+     else if (inp ~  /^[cC]/)  n = 192;
+     else if (inp ~  /^[dD]/)  n = 208;
+     else if (inp ~  /^[eE]/)  n = 224;
+     else if (inp ~  /^[fF]/)  n = 240;
+     if      (inp ~ /^.[0-9]/) n += substr(inp, 2, 1);
+     else if (inp ~ /^.[aA]/)  n += 10;
+     else if (inp ~ /^.[bB]/)  n += 11;
+     else if (inp ~ /^.[cC]/)  n += 12;
+     else if (inp ~ /^.[dD]/)  n += 13;
+     else if (inp ~ /^.[eE]/)  n += 14;
+     else if (inp ~ /^.[fF]/)  n += 15;
+     out = out sprintf("%c", n);
+     inp = substr(inp, 3);
+   } else {
+     out = out inp;
+     break;
+   }
+   return out;
+ }
+ 
+ function HTML( text ) {
+   gsub( /&/,  "\\&",  text );
+   gsub( /</,  "\\&lt;",   text );
+   gsub( />/,  "\\&gt;",   text );
+   gsub( /"/,  "\\&quot;", text );
+   gsub( /'/,  "\\&#x27;", text );
+   gsub( /\[/, "\\&#x5B;", text );
+   gsub( /\]/, "\\&#x5D;", text );
+   gsub( /\r/, "\\&#x0D;", text );
+   gsub( /\n/, "\\&#x0A;", text );
+   gsub( /\\/, "\\&#x5C;", text );
+   return text;
+ }
+ 
+ function URL( text ) {
+   gsub( /&/,  "%26", text );
+   gsub( /"/,  "%22", text );
+   gsub( /'/,  "%27", text );
+   gsub( /`/,  "%60", text );
+   gsub( /\?/, "%3F", text );
+   gsub( /#/,  "%23", text );
+   gsub( /\[/, "%5B", text );
+   gsub( /\]/, "%5D", text );
+   gsub( / /,  "%20", text );
+   gsub( /\t/, "%09", text );
+   gsub( /\r/, "%0D", text );
+   gsub( /\n/, "%0A", text );
+   gsub( /%/,  "%25", text );
+   gsub( /\\/, "%5C", text );
+   return text;
+ }
+ 
+ function _cgilite_urldecode( str, arr, spl,   form, k, n, key) {
+   if (! spl) spl="&"
+   split(str, form, spl);
+   for ( k in form ) {
+     key = form[k]; sub(/=.*$/, "", key);
+     sub(/^[^=]*=/, "", form[k]);
+     if ( key in arr ) {
+       n = 1; while ( (key, n) in arr ) n++;
+       arr[key,n] = HEX_DECODE( "%", form[k]);
+     } else {
+       arr[key] = HEX_DECODE( "%", form[k]);
+     }
+   }
+ }
+ 
+ function _cgilite_request(    key, val) {
+   # Read request from client connection
+ 
+   # Read Headers
+   getline; REQUEST_METHOD = $1; REQUEST_URI = $2; SERVER_PROTOCOL = $3;
+   while ( getline ) {
+     if ($0 ~ /^\r?$/) break;
+     else if ($0 ~ /^[a-zA-Z][0-9a-zA-Z_-]+: .*/) {
+       key = toupper($0);
+       sub(/:.*$/, "", key);
+       gsub(/-/, "_", key);
+       _HEADER[key] = $0;
+       sub(/^[^:]:[\t ]*/, "", _HEADER[key]);
+       sub(/[\t ]*\r?$/, "", _HEADER[key]);
+     }
+   }
+   CONTENT_LENGTH = _HEADER["CONTENT_LENGTH"];
+   CONTENT_TYPE   = _HEADER["CONTENT_TYPE"];
+ 
+   PATH_INFO = REQUEST_URI; gsub(/\?.*$/, "", PATH_INFO)
+   PATH_INFO = PATH( HEX_DECODE( "%", PATH_INFO ) );
+   QUERY_STRING = REQUEST_URI;
+   if ( !gsub(/^[^?]+\?/, "", QUERY_STRING) ) QUERY_STRING = "";
+ 
+   # Set up _GET[]-Array
+   _cgilite_urldecode(QUERY_STRING, _GET);
+ 
+   if ( _HEADER["CONTENT_TYPE"] == "application/x-www-form-urlencoded" \
+        && _HEADER["CONTENT_LENGTH"] ) {
+     # Set up _POST[]-Array
+ 
+     val = ""; key = "head -c " _HEADER["CONTENT_LENGTH"];
+     while (key |getline) val = val $0; close(key);
+     _cgilite_urldecode(val, _POST);
+   }
+ 
+   if ( _HEADER["COOKIE"] ) {
+     # Set up _COOKIE[]-Array
+     _cgilite_urldecode(_HEADER["COOKIE"], _COOKIE, "; ?");
+   }
+ 
+   if ( _HEADER["REFERER"] ) {
+     key = HEADER["REFERER"];
+     if (! sub(/^[^\?]+?/, "", key)) key = ""
+     _cgilite_urldecode(key, _REF);
+   }
+ 
+ }
+ 
+ function _cgilite_headers() {
+   # Import request data from webserver environment variables
+ }
+ 
+ BEGIN {
+   REQUEST_METHOD=""; REQUEST_URI=""; SERVER_PROTOCOL="";
+   PATH_INFO=""; QUERY_STRING=""; CONTENT_LENGTH=""; CONTENT_TYPE="";
+   split("", _GET); split("", _POST); split("", _REF);
+   split("", _HEADER); split("", _COOKIE);
+ 
+   if ( ENVIRON["REQUEST_METHOD"] )
+     _cgilite_headers();
+   else
+     _cgilite_request();
+ }

diff --combined cgilite/json.sh
index f43f8ec3c6aabe0633ab9cf45e78755db910a0f3,12afdc4d676b94b705b0c165fee2512c80891cb9..12afdc4d676b94b705b0c165fee2512c80891cb9
--- 1/cgilite/json.sh
--- 2/json.sh
+++ b/cgilite/json.sh
@@@ -95,7 -95,7 +95,7 @@@ json_number() 
  }
  
  json_array() {
-   local struct="$(DB2 new)" value json_document="$json_document"
+   local struct="$(DB2 "" new)" value json_document="$json_document"
  
    json_space
    case $json_document in
@@@ -141,7 -141,7 +141,7 @@@
  }
  
  json_object() {
-   local struct="$(DB2 new)" key value json_document="$json_document"
+   local struct="$(DB2 "" new)" key value json_document="$json_document"
  
    json_space
    case $json_document in

diff --combined cgilite/markdown.awk
index 7e29c572213e553df07563099cf52683ed11b960,c08d856da87c1e3a1b30ea4d3b8a212bfa6856d2..c08d856da87c1e3a1b30ea4d3b8a212bfa6856d2
--- 1/cgilite/markdown.awk
--- 2/markdown.awk
+++ b/cgilite/markdown.awk
@@@ -391,7 -391,7 +391,7 @@@ function _block( block, LOCAL, st, len
  
    # Metadata (custom, block starting with %something)
    # Metadata is ignored but can be interpreted externally
-   } else if ( match(block, /^%[a-zA-Z]+([[:space:]][^\n]*)?(\n|$)(%[a-zA-Z]+([[:space:]][^\n]*)?(\n|$)|%([[:space:]][^\n]*)?(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
+   } else if ( match(block, /^%[a-zA-Z-]+([[:space:]][^\n]*)?(\n|$)(%[a-zA-Z-]+([[:space:]][^\n]*)?(\n|$)|%([[:space:]][^\n]*)?(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
      len = RLENGTH; st = RSTART;
      return  _block( substr( block, len + 1) );