Fixed code block at start of blockquote

This commit is contained in:
Ted Blackman 2017-08-29 18:05:44 -07:00
parent bba0b68585
commit 62fec03d96
2 changed files with 16 additions and 7 deletions

View File

@ -208,7 +208,7 @@
:: par: current "paragraph" being read in :: par: current "paragraph" being read in
:: [loc txt]: parsing state :: [loc txt]: parsing state
:: ::
=/ verbose | =/ verbose &
=| err/(unit hair) =| err/(unit hair)
=| ind/{out/@ud inr/@ud} =| ind/{out/@ud inr/@ud}
=| hac/(list item) =| hac/(list item)
@ -221,7 +221,9 @@
=> line => line
:: ::
:: if error position is set, produce error :: if error position is set, produce error
?. =(~ err) [+.err ~] ?. =(~ err)
~& err+err
[+.err ~]
:: ::
:: all data was consumed :: all data was consumed
=- [loc `[- [loc txt]]] =- [loc `[- [loc txt]]]
@ -358,7 +360,9 @@
(full para:parse) (full para:parse)
:: ::
:: if error, propagate correctly :: 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 :: finish tag if it's a header
=< ?:(?=($head p.cur) close-item ..$) =< ?:(?=($head p.cur) close-item ..$)
@ -407,7 +411,9 @@
$0 [& sty.saw] $0 [& sty.saw]
$8 [& %new %poem] $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 =. inr.ind col.saw
:: ::
@ -458,6 +464,7 @@
|= fel/$-(nail (like tarp)) ^+ +> |= fel/$-(nail (like tarp)) ^+ +>
=/ vex/(like tarp) (fel loc txt) =/ vex/(like tarp) (fel loc txt)
?~ q.vex ?~ q.vex
~? verbose [%parse-block txt]
+>.$(err `p.vex) +>.$(err `p.vex)
=+ [res loc txt]=u.q.vex =+ [res loc txt]=u.q.vex
%_ +>.$ %_ +>.$
@ -752,7 +759,10 @@
=/ ind (stun [(dec col) (dec col)] ace) =/ ind (stun [(dec col) (dec col)] ace)
=/ ind-tecs ;~(plug ind tecs) =/ ind-tecs ;~(plug ind tecs)
%+ cook |=(txt/tape `tarp`[[%pre ~] ;/(txt) ~]~) %+ 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}") %^ stir "" |=({a/tape b/tape} "{a}\0a{b}")
;~ pose ;~ pose
%+ ifix [ind (just '\0a')] %+ ifix [ind (just '\0a')]

View File

@ -124,8 +124,7 @@ Example:
produces: produces:
> TODO: fix code block on first line of blockquote > ```
```
(def Y (fn [f] (def Y (fn [f]
((fn [x] ((fn [x]
(x x)) (x x))