support for "selected" keyword, improved handling of "checked"

[cgilite] / html-sh.sed

diff --git a/html-sh.sed b/html-sh.sed
index 2d96275933f4343a274d13d059ebedf1a86fc6bb..1f988b3965d0eefc9c620eaa23de2c8350c86668 100755 (executable)
--- a/html-sh.sed
+++ b/html-sh.sed
@@ -1,5 +1,20 @@
 #!/bin/sed -nrf
 
+: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 +22,7 @@ s;\[a[ \t]+"([^"]*)";[a href="\1";g;
 s;\[img[ \t]+"([^"]*)"[ \t]+"([^"]*)";[img src="\1" alt="\2";g;
 
 s;\[!([^]\[]*)\];<!\1>;g;
+s;\[!--([^]\[]*)--\];<!--\1-->;g;
 
 :tags
 s;\[([^]\[< \t]+)([^]\[]*)\];<\1>\2</\1>;g;
@@ -24,14 +40,19 @@ 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;(<input type="(checkbox|radio)" [^>]+)>[ \t]+checked;\1 checked="checked">;g;
+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;
+t attribs;
+s;(<input ([^>]+ )?type=(radio|"radio"|'radio')( [^>]+)?)>[ \t]+checked;\1 checked="checked">;g;
+s;(<input ([^>]+ )?type=(checkbox|"checkbox"|'checkbox')( [^>]+)?)>[ \t]+checked;\1 checked="checked">;g;
+s;(<option( [^>]+))>[ \t]+(checked|selected);\1 selected="selected">;g;
 t attribs;
 
-s;(<[^/][^>]*>) ;\1;g;
+s;(<[^/][^>]*>)[ \t]*;\1;g;
 s;(<[^/][^>]*)>[ \t]*</[^>]+>;\1/>;g;
 
+s;<!-->;<!--;;
+
 p; ${g; s;\n+;;g; p;}