1 files changed, 42 insertions, 14 deletions

@@ -15,45 +15,71 @@ BEGIN {
         }
         # Output buffer.  The output will be chunked into blocks.
         BUFFER = ""
+        # Default block type
+        DEFAULT_BLOCK = "p"
         # The current block type.  We start with a standard paragraph.
-        BLOCK = "p"
+        BLOCK = DEFAULT_BLOCK
 }
 
 ### RAW TEXT
 /^>>>/ {
+        BLOCK = "raw"
+        if ($1) {
+                split($1, raw_type, ",")
+        }
 }
 
 /^<<</ {
+        BLOCK = DEFAULT_BLOCK
+        for (type in raw_type) {
+                delete raw_type[type]
+        }
 }
 
 ### BLOCKS
-/^#+/ {                 # Headers
+block == "raw" {
+        bufpush($0, "\n")
+        next
+}
+
+/^#+/ { # Headers
+        match($0, /^#+/)
+        if (! (BLOCK == "h" RLENGTH)) {
+                buflush()
+                tag = "h" RLENGTH
+        }
+        sub(/^#+[ \t]*/, "", $0)
 }
 
-/^>/ {                          # Block quote
+/^>/ {  # Block quote
 }
 
-/^-/ {                          # Unordered list
+/^-/ {  # Unordered list
 }
 
-/^[0-9]\./ {                    # Ordered list
+/^[0-9]\./ {    # Ordered list
 }
 
-/^---$/ {                       # Section break
+/^---$/ {       # Section break
+}
+
+/^$/ {  # End a block
+        buflush()
+        BLOCK = DEFAULT_BLOCK
 }
 
 ### LINES
-/^=>/ {                 # Link
+/^=>/ { # Link
 }
 
-/^</ {                          # HTML tag
+/^</ {  # HTML tag
 }
 
-/^;/ {                          # Comment
+/^;/ {  # Comment
 }
 
-### EVERYTHING ELSE
-{
+# EVERYTHING ELSE
+/./ {
 }
 
 ### FINISH
@@ -61,6 +87,7 @@ END {
         buflush()
 }
 
+
 ### FUNCTIONS
 function buflush()
 {
@@ -75,10 +102,11 @@ function buflush()
         print
 }
 
-function bufpush(str)
+function bufpush(str, sep)
 {
-        # Push STR onto the buffer after a newline.
-        BUFFER = BUFFER (BUFFER ? "\n" : "") str
+        # Push STR onto the buffer after SEP (defaults to space).
+        sep = sep ? sep : " "
+        BUFFER = BUFFER (BUFFER ? sep : "") str
 }
 
 function ht_print(str)