1 files changed, 16 insertions, 16 deletions

@@ -71,8 +71,7 @@ gmi() {
 filter_buff() {
         case "$1" in
                 (html)
-                        sed -e "s/$nl/\n/g" -e "s/$sp/ /g" | # fix whitespace
-                                sed 's#\*\([^*]*\)\*#<b>\1</b>#g' | # *strong*
+                        sed 's#\*\([^*]*\)\*#<b>\1</b>#g' | # *strong*
                                 sed 's#_\([^_]*\)_#<i>\1</i>#g' | # _emph_
                                 sed 's#`\([^`]*\)`#<code>\1</code>#' | # `code`
                                 cat
@@ -91,17 +90,18 @@ filter_line() {
 
 ## Utility functions
 
-buffpush() {
+pushline() {
         tag="$1"; shift
         printf "$(eval echo "\$fmtline_$tag")" "$@" |
                 filter_line "$to" >> "$buff"
 }
 
-buffclose() {
-        b="$(cat<"$buff")"
+bufprint() {
+        b="$(cat<"$buff"|filter_buff "$to")"
         test -n "$b" || return
-        printf "$(eval echo "\$fmtbuff_$1")" "$b" | filter_buff "$to"
-        :>"$buff"
+        printf "$(eval echo "\$fmtbuff_$1")" "$b" |
+                sed -e "s/$nl/\n/g" -e "s/$sp/ /g" # fix whitespace
+        : > "$buff"
 }
 
 ## Where the magic happens
@@ -111,7 +111,7 @@ process() {
         do
                 if $verbatim && test "$sigil" != '```'
                 then
-                        buffpush verb "$sigil $line"
+                        pushline verb "$sigil $line"
                         continue
                 fi
 
@@ -119,11 +119,11 @@ process() {
                         ('```')
                                 if $verbatim
                                 then
-                                        buffclose verb
+                                        bufprint verb
                                         verbatim=false
                                         prev=
                                 else
-                                        buffclose "$prev"
+                                        bufprint "$prev"
                                         verbatim=true
                                 fi
                                 continue
@@ -133,7 +133,7 @@ process() {
                                 read -r url title < "$lbuf"
                                 if test "$curr" = para
                                 then
-                                        buffpush plnk "$url" "$title"
+                                        pushline plnk "$url" "$title"
                                         continue
                                 else curr=link
                                 fi
@@ -148,22 +148,22 @@ process() {
                                 ;;
                 esac
 
-                test "$curr" = "$prev" || buffclose "$prev"
+                test "$curr" = "$prev" || bufprint "$prev"
                 prev="$curr"
 
                 if test "$curr" = verb
                 then
-                        buffpush "$curr" "$line"
+                        pushline "$curr" "$line"
                         continue
                 fi
 
                 if test "$curr" = link
-                then buffpush "$curr" "$url" "$title"
-                else buffpush "$curr" "$line"
+                then pushline "$curr" "$url" "$title"
+                else pushline "$curr" "$line"
                 fi
         done
 
-        buffclose "$curr"
+        bufprint "$curr"
 }
 
 ### Entry point