1 files changed, 24 insertions, 2 deletions

@@ -62,6 +62,10 @@ $0 ~ ("^" COMMENT_DELIM) {
         } else {
                 sep = "\n"
         }
+        # Sanitize HTML
+        gsub(/&/, "\\\\\\&", $0)
+        gsub(/</, "\\\\\\&lt;", $0)
+        gsub(/>/, "\\\\\\&gt;", $0)
         # Loop through BLOCK_TYPES
         for (bt in BLOCK_TYPES) {
                 if (match($0, "^" bt "[ \t]*")) {
@@ -105,8 +109,26 @@ $0 ~ ("^" COMMENT_DELIM) {
                 if (match($0, "^" lt "[ \t]*")) {
                         $0 = substr($0, RSTART + RLENGTH)
                         templ = LINE_TYPES[lt]
-                        while (match(templ, /\$[0-9]+/)) {
-                                sub(/\$[0-9]+/, $(substr(templ, RSTART + 1, RLENGTH - 1)), templ)
+                        while (match(templ, /\$[0-9-]+/)) {
+                                if (substr(templ, RSTART + 1, 1) == "-") {
+                                        # Up to $field
+                                        f = ""
+                                        n = substr(templ, RSTART + 2, RLENGTH - 2)
+                                        for (i = 1; i <= n; i++) {
+                                                f = f (f ? " " : "") $i
+                                        }
+                                        sub(/\$[0-9-]+/, f, templ)
+                                } else if (substr(templ, RSTART + RLENGTH - 1, 1) == "-") {
+                                        # $Field to end
+                                        f = ""
+                                        n = substr(templ, RSTART + 1, RLENGTH - 2)
+                                        for (i = n; i <= NF; i++) {
+                                                f = f (f ? " " : "") $i
+                                        }
+                                        sub(/\$[0-9-]+/, f, templ)
+                                } else {
+                                        sub(/\$[0-9]+/, $(substr(templ, RSTART + 1, RLENGTH - 1)), templ)
+                                }
                         }
                         $0 = templ
                 }