From 62fec03d968a990e754fec231e635b8333aca873 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Tue, 29 Aug 2017 18:05:44 -0700
Subject: [PATCH] Fixed code block at start of blockquote

---
 lib/vast2.hoon     | 20 +++++++++++++++-----
 web/unmark/doc.umd |  3 +--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/vast2.hoon b/lib/vast2.hoon
index a74bf7f2a..e8862852c 100644
--- a/lib/vast2.hoon
+++ b/lib/vast2.hoon
@@ -208,7 +208,7 @@
       ::  par: current "paragraph" being read in
       ::  [loc txt]: parsing state
       ::
-      =/  verbose  |
+      =/  verbose  &
       =|  err/(unit hair)
       =|  ind/{out/@ud inr/@ud}
       =|  hac/(list item)
@@ -221,7 +221,9 @@
         =>  line
         ::
         ::  if error position is set, produce error
-        ?.  =(~ err)  [+.err ~]
+        ?.  =(~ err)
+          ~&  err+err
+          [+.err ~]
         ::
         ::  all data was consumed
         =-  [loc `[- [loc txt]]]
@@ -358,7 +360,9 @@
           (full para:parse)
         ::
         ::  if error, propagate correctly
-        ?~  q.vex  ..$(err `p.vex)
+        ?~  q.vex
+          ~?  verbose  [%close-par p.cur yex]
+          ..$(err `p.vex)
         ::
         ::  finish tag if it's a header
         =<  ?:(?=($head p.cur) close-item ..$)
@@ -407,7 +411,9 @@
               $0  [& sty.saw]
               $8  [& %new %poem]
             ==
-          ?.  col-ok  ..$(err `[p.loc col.saw])
+          ?.  col-ok
+            ~?  verbose  [%columns-advanced col.saw inr.ind]
+            ..$(err `[p.loc col.saw])
           ::
           =.  inr.ind  col.saw
           ::
@@ -458,6 +464,7 @@
         |=  fel/$-(nail (like tarp))  ^+  +>
         =/  vex/(like tarp)  (fel loc txt)
         ?~  q.vex
+          ~?  verbose  [%parse-block txt]
           +>.$(err `p.vex)
         =+  [res loc txt]=u.q.vex
         %_  +>.$
@@ -752,7 +759,10 @@
         =/  ind  (stun [(dec col) (dec col)] ace)
         =/  ind-tecs  ;~(plug ind tecs)
         %+  cook  |=(txt/tape `tarp`[[%pre ~] ;/(txt) ~]~)
-        %+  ifix  [ind-tecs ind-tecs]
+        ::
+        ::  leading outdent is ok since container may
+        ::  have already been parsed and consumed
+        %+  ifix  [;~(plug (star ace) tecs) ind-tecs]
         %^  stir  ""  |=({a/tape b/tape} "{a}\0a{b}")
         ;~  pose
           %+  ifix  [ind (just '\0a')]
diff --git a/web/unmark/doc.umd b/web/unmark/doc.umd
index 152084d27..e77bc41ee 100644
--- a/web/unmark/doc.umd
+++ b/web/unmark/doc.umd
@@ -124,8 +124,7 @@ Example:
 
 produces:
 
-> TODO: fix code block on first line of blockquote
-  ```
+> ```
   (def Y (fn [f]
          ((fn [x]
             (x x))