X-Git-Url: https://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=html-sh.sed;h=8d7b61c076b93d3de8b59683e67d9b161ffc8075;hp=2d96275933f4343a274d13d059ebedf1a86fc6bb;hb=cd49a5ce71b79c56477dc351607484b0718fa594;hpb=1a1d111199b770c092e1b16a7e03568d3d911b79
diff --git a/html-sh.sed b/html-sh.sed
index 2d96275..8d7b61c 100755
--- a/html-sh.sed
+++ b/html-sh.sed
@@ -1,5 +1,28 @@
-#!/bin/sed -nrf
+#!/bin/sed -nEf
+:Escapes
+s,\\\\,\\,g; s,\\&,\&,g;
+s,\\<,\<,g; s,\\>,\>,g;
+s,\\",\",g; s,\\',\',g;
+s,\\\[,\[,g; s,\\\],\],g;
+s,\\\.,\.,g; s,\\#,\#,g;
+s,\\,,g;
+
+:CommentHandle
+x; /^<\/!-->/{
+ x; /--]/{
+ H; s;^(.*)--].*$;\1-->;p;
+ g; s;^.*--]([^\n]*)$;\1;
+ x; s;^!-->\n(.*)\n[^\n]*$;\1;; x;
+ bCommentEnd
+ }
+ p; b;
+}
+x;
+:CommentEnd
+
+:shortcuts
+s;\[hidden[ \t]+"([^"]*)"[ \t]+"([^"]*)";[input type="hidden" name="\1" value="\2";g;
s;\[checkbox[ \t]+"([^"]*)"[ \t]+"([^"]*)";[input type="checkbox" name="\1" value="\2";g;
s;\[radio[ \t]+"([^"]*)"[ \t]+"([^"]*)";[input type="radio" name="\1" value="\2";g;
s;\[submit[ \t]+"([^"]*)"[ \t]+"([^"]*)";[button type="submit" name="\1" value="\2";g;
@@ -7,6 +30,7 @@ s;\[a[ \t]+"([^"]*)";[a href="\1";g;
s;\[img[ \t]+"([^"]*)"[ \t]+"([^"]*)";[img src="\1" alt="\2";g;
s;\[!([^]\[]*)\];;g;
+s;\[!--([^]\[]*)--\];;g;
:tags
s;\[([^]\[< \t]+)([^]\[]*)\];<\1>\2\1>;g;
@@ -24,14 +48,22 @@ t tagopen;
G; h; s;^[^\n]*\n+;;; x; s;\n.*$;;;
:attribs
-s;class="([^>]+)>[ \t]+\.([^ \t]+);class="\2 \1>;g; t attribs;
-s;>[ \t]+\.([^ \t]+); class="\1">;g;
-s;>[ \t]+#([^ \t]+); id="\1">;g;
-s;>[ \t]+([^ \t=<]+=("[^"]*"|'[^']*'|[^ \t]*)); \1>;g;
-s;(]+)>[ \t]+checked;\1 checked="checked">;g;
+s;class="([^>]+)>[ \t]*\.([^< \t]+);class="\2 \1>;g; t attribs;
+s;(<[^/][^>]*)>[ \t]*\.([^< \t]+);\1 class="\2">;g;
+s;(<[^/][^>]*)>[ \t]*#([^< \t]+);\1 id="\2">;g;
+s;(<[^/][^>]*)>[ \t]*([^ \t=<]+=("[^"]*"|'[^']*'|[^< \t]*));\1 \2>;g;
t attribs;
+s;(]+ )?type=(radio|"radio"|'radio')( [^>]+)?)>[ \t]*(checked|selected);\1 checked="checked">;g;
+s;(]+ )?type=(checkbox|"checkbox"|'checkbox')( [^>]+)?)>[ \t]*(checked|selected);\1 checked="checked">;g;
+s;(