1 files changed, 21 insertions, 24 deletions

@@ -3,26 +3,28 @@
 # usage: et <file> | sh
 
 BEGIN {
-        xend = xend ? xend : "...end...shexpand..."
-        dend = dend ? dend : "...end...document..."
-        # We shell out to sed for this because awk doesn't do capture groups ;-;
+        dend = ";doc_end;"
+        # Ask sed to do these b/c awk has no capture groups ;_;
         shellfix = "sed -E" \
                 " -e 's/`/\\\\`/g'" \
                 " -e 's/(^|[^\\$])\\$([^\\$]|$)/\\1\\\\$\\2/g'" \
                 " -e 's/(^|[^\\$])\\$(\\$+)([^\\$]|$)/\\1\\2\\3/g'"
+        shxwrap = " -e 's/^/:/'"
         htmlfix = "sed -E" \
-                " -e 's#([^\\\\]|^)&#\\1\\&amp;#g;'" \
-                " -e 's#([^\\\\]|^)<#\\1\\&lt;#g;'" \
-                " -e 's#([^\\\\]|^)>#\\1\\&gt;#g;'" \
-                " -e 's#\\\\([&<>])#\\1#g;'"
+                " -e 's#([^\\\\]|^)&#\\1\\&amp;#g'" \
+                " -e 's#([^\\\\]|^)<#\\1\\&lt;#g'" \
+                " -e 's#([^\\\\]|^)>#\\1\\&gt;#g'" \
+                " -e 's#\\\\([&<>])#\\1#g'"
         true = 1 ; false = 0
-        print "shexpand()(eval \"$(echo \"cat<<'"xend"'\";cat;echo "xend")\")"
-        print "shellfix()(" shellfix ")"
-        print "htmlfix()(" htmlfix ")"
+        print "#!/bin/sh\n########## generated with excitable text #########"
+        print "shexpand()(eval \"$(:;(echo 'cat<<.';cat|sed 's/^/,/';echo .)"\
+                                                      "|unwrap ,)\")"
+        print "shellfix()(" shellfix ")\nhtmlfix()(" htmlfix ")"
+        print "wrap()(sed \"s/^/$1/\")\nunwrap()(sed \"s/^$1//\")"
 }
 
 end[endn] && $0 == end[endn] {
-        par = par "\n" end[endn--] "\n)"
+        par = par "\n" end[endn--] "\n" ")"
         printpar()
         subdocp = false
         next
@@ -38,10 +40,8 @@ end[endn] && $0 == end[endn] {
         printpar()
         docp = !docp
         docend = $2 ? $2 : dend
-        if (docp)
-                print "shexpand<<" docend
-        else
-                print docend "\n"
+        if (docp) print "unwrap :<<'" docend "'|shexpand"
+        else print docend "\n"
         next
 }
 
@@ -56,8 +56,7 @@ end[endn] && $0 == end[endn] {
         specialp = 2
         gsub(/"/,"\\\\&")
         ln = "$$(" substr($1, 2)
-        for (f=2;f<=NF;f++)
-                ln = ln " \"" $f "\""
+        for (f=2;f<=NF;f++) ln = ln " \"" $f "\""
         ln = ln ")"
         $0 = ln
 }
@@ -78,12 +77,10 @@ END {
 function printpar() {
         specialp = specialp || (match(par, /^[  ]*</))
         if (docp) {
-                if (!subdocp && !specialp)
-                        par = "<p>" par "</p>"
-                print par | shellfix
-                print ""
-                close(shellfix)
-        } else
-                print par
+                if (!subdocp && !specialp) par = "<p>" par "</p>"
+                shx = shellfix shxwrap
+                print par | shx
+                close(shx)
+        } else print par
         par = ""
 }