various fixes.

Author: agentzh

gen-changes

@@ -8,12 +8,15 @@ perl twiki2pod.pl a.twiki \
     | sed 's/\<SrcacheNginxModule\>/the ngx_srcache module/' \
     | sed 's/\<LuaRestyCoreLibrary\>/the lua-resty-core library/' \
     | sed 's/\<LuaCjsonLibrary\>/the lua-cjson library/' \
+    | sed 's/\<LuaRdsParserLibrary\>/the lua-rds-parser library/' \
+    | sed 's/\<LuaRedisParserLibrary\>/the lua-redis-parser library/' \
     | sed 's/\<LuaRestyUpstreamHealthcheckLibrary\>/the lua-resty-upstream-healthcheck library/' \
     | sed 's/\<LuaRestyDNSLibrary\>/the lua-resty-dns library/' \
     | sed 's/\<LuaRestyWebSocketLibrary\>/the lua-resty-websocket library/' \
     | sed 's/\<LuaRestyMySQLLibrary\>/the lua-resty-mysql library/' \
     | sed 's/\<LuaRestyLrucacheLibrary\>/the lua-resty-lrucache library/' \
     | sed 's/\<LuaRestyLockLibrary\>/the lua-resty-lock library/' \
+    | sed 's/\<LuaRestyRedisLibrary\>/the lua-resty-redis library/' \
     | sed 's/\<EchoNginxModule\>/the ngx_echo module/' \
     | sed 's/\<DrizzleNginxModule\>/the ngx_drizzle module/' \
     | sed 's/\<CoolkitNginxModule\>/the ngx_coolkit module/' \

markdown-toc.pl

@@ -107,7 +107,7 @@
 
 my $outfile = "$infile.new";
 open my $out, ">$outfile"
-    or die "Cannot open $infile for writing: $!\n";
+    or die "Cannot open $outfile for writing: $!\n";
 
 my $i = 0;
 print $out $preamble;
@@ -120,10 +120,12 @@
 
     print $out $src;
     if (++$i > 3 && $src !~ /Back to TOC/sm) {
-        if ($src !~ /\n\n$/s) {
-            print $out "\n";
+        if ($src =~ /\w\n.*?\n.*?\w/s) {
+            if ($src !~ /\n\n$/s) {
+                print $out "\n";
+            }
+            print $out "[Back to TOC](#table-of-contents)\n\n";
         }
-        print $out "[Back to TOC](#table-of-contents)\n\n";
     }
 
     if ($title =~ /^Name$/i) {

ngx-releng

@@ -24,6 +24,7 @@ ack '(?<!:)//' $cfiles /dev/null
 ack '[ \t]+$' $cfiles /dev/null
 ack '^\s*?\t\s*\S' $cfiles /dev/null
 ack '^master_on' `find t -name '*.t'` /dev/null
+ack '=== TEST \d+\s+' `find t -name '*.t'` /dev/null
 ack 'if \( |if \(! |if \(.*? \)' $cfiles /dev/null
 ack '\--- *(?:ONLY|LAST)' `find t -name '*.t'` /dev/null
 ack -l '\r\n' t /dev/null
@@ -32,7 +33,7 @@ ack '^static .*?\(\);' $cfiles /dev/null
 ack '^static [^()]*?\*\s\w+' $cfiles /dev/null
 ack '^\w+[^()]*?\*\s\w+' $hfiles /dev/null
 ack '^[a-zA-Z]\w+\(\)$' $cfiles /dev/null
-ack '^\#\s*define\s+ngx_http_\w+?_version\s+\d+$' $cfiles /dev/null
+ack '^\#\s*define\s+ngx_[a-z]+_\w+?_version\s+\d+$' $cfiles /dev/null
 ack '\b(?:if|for|while)\(|\bdo\{' $cfiles /dev/null
 ack '^\s*plan\s+tests\s*=>.*?repeat_each\(\d+\)' t /dev/null
 

src2png

@@ -26,6 +26,6 @@ sed 's/ color: #000000;/ color: #eee;/g' $1.tmp > $1.html
 
 #echo "sed: $? $1.html"
 
-CutyCapt --url=$1.html --out=$1.png --zoom-factor=2 || exit 1
+CutyCapt --url=$1.html --out=$1.png --zoom-factor=1.6 || exit 1
 convert -trim +repage -bordercolor black -border 50x50 $1.png $1.png