diff --git a/pkg/arvo/neo/cod/std/src/con/node-hoon.hoon b/pkg/arvo/neo/cod/std/src/con/node-hoon.hoon index 91082f2b29..d0e96b9b30 100644 --- a/pkg/arvo/neo/cod/std/src/con/node-hoon.hoon +++ b/pkg/arvo/neo/cod/std/src/con/node-hoon.hoon @@ -4,4 +4,9 @@ :- [%node %$ %hoon] |= nod=node ^- hoon -(~(vol manx-utils nod) "text") +=/ raw=tape (need (val:mu "text")) +%- crip +?: =(0 (lent raw)) raw +?. =((rear raw) '\0a') raw +:: remove newline by html encoding nonsense +(snip raw) diff --git a/pkg/arvo/neo/cod/std/src/con/node-sail.hoon b/pkg/arvo/neo/cod/std/src/con/node-sail.hoon index 4d1099cf97..52af53dc94 100644 --- a/pkg/arvo/neo/cod/std/src/con/node-sail.hoon +++ b/pkg/arvo/neo/cod/std/src/con/node-sail.hoon @@ -1,41 +1,15 @@ /@ node -/@ sail /- manx-utils +/- sail :- [%node %$ %sail] |= nod=node -|^ - ^- sail - =/ mu ~(. manx-utils nod) - =/ code - =/ raw=tape (need (val:mu "code")) - ?: =(0 (lent raw)) (crip raw) - ?. =((rear raw) '\0a') (crip raw) - (crip (snip raw)) - =/ class (vol:mu "classes") - [code class `(render-udon code)] -++ render-udon - |= code=@t - ^- (each manx tang) - =/ newline (trip 10) - =/ udon - :: format as udon document - %- crip - ;: welp - ";>" newline newline - (trip code) newline - == - =/ mul - %- mule - |. - !< manx - %+ slap - ;: slop - !>(..zuse) - !>(manx-utils=manx-utils) - == - (ream udon) - ?- -.mul - %.y [%.y (manx p.mul)] - %.n [%.n (tang p.mul)] - == --- +=/ mu ~(. manx-utils nod) +=/ code + =/ raw=tape (need (val:mu "code")) + %- crip + ?: =(0 (lent raw)) raw + ?. =((rear raw) '\0a') raw + :: remove newline by html encoding nonsense + (snip raw) +=/ class (vol:mu "classes") +[code class `(render-udon:sail code)] diff --git a/pkg/arvo/neo/cod/std/src/imp/folder.hoon b/pkg/arvo/neo/cod/std/src/imp/folder.hoon index d9f5dced29..f9a54fc979 100644 --- a/pkg/arvo/neo/cod/std/src/imp/folder.hoon +++ b/pkg/arvo/neo/cod/std/src/imp/folder.hoon @@ -8,7 +8,6 @@ :~ [%iframe iframe/!>('')] [%txt txt/!>('')] - [%sail sail/!>(['' '' ~])] == -- ^- kook:neo diff --git a/pkg/arvo/neo/cod/std/src/imp/sail.hoon b/pkg/arvo/neo/cod/std/src/imp/sail.hoon index 2d5a5e3f5d..77cb493512 100644 --- a/pkg/arvo/neo/cod/std/src/imp/sail.hoon +++ b/pkg/arvo/neo/cod/std/src/imp/sail.hoon @@ -1,6 +1,6 @@ /@ sail +/- sl=sail ^- kook:neo -=< |% ++ state pro/%sail ++ poke (sy %sail ~) @@ -21,35 +21,8 @@ ?~ pal sail/!>(*sail) :: non-empty init unit always re-renders the code =/ sal !<(sail q.u.pal) - :- %sail !> - sal(result `(render-udon code.sal)) + sal(result `(render-udon:sl code.sal)) -- -- -|% -++ render-udon - |= code=@t - ^- (each manx tang) - =/ newline (trip 10) - =/ udon - :: format as udon document - %- crip - ;: welp - ";>" newline newline - (trip code) newline - == - =/ mul - %- mule - |. - !< manx - %+ slap - ;: slop - !>(..zuse) - == - (ream udon) - ?- -.mul - %.y [%.y (manx p.mul)] - %.n [%.n (tang p.mul)] - == --- diff --git a/pkg/arvo/neo/cod/std/src/lib/sail.hoon b/pkg/arvo/neo/cod/std/src/lib/sail.hoon new file mode 100644 index 0000000000..066db2468d --- /dev/null +++ b/pkg/arvo/neo/cod/std/src/lib/sail.hoon @@ -0,0 +1,26 @@ +|% +++ render-udon + |= code=@t + ^- (each manx tang) + =/ newline (trip 10) + =/ udon + :: format as udon document + %- crip + ;: welp + ";>" newline + (trip code) newline + == + =/ mul + %- mule + |. + !< manx + %+ slap + ;: slop + !>(..zuse) + == + (ream udon) + ?- -.mul + %.y [%.y (manx p.mul)] + %.n [%.n (tang p.mul)] + == +--