diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index 4e9f4bc69..090246323 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -232,15 +232,12 @@ ++ hajj :: send %pr response |= [him=ship tus=path har=httr] ^+ +> - ~& [%hajj him har] +>.$(mow :_(mow [wru [/a hen] [%want him [%r %pr tus] har]])) :: ++ hare :: receive request |= [tus=path him=ship hor=*] ^+ +> - ~& [%hare him tus] =+ hyx=((hard httx) hor) - ~& [%hare-httx hyx] +>.$(mow :_(mow [wru [/e [%e (scot %p him) tus] hen] [%this hyx]])) :: ++ hell :: request, no ship diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index aa85aae3a..8d211efce 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -4441,6 +4441,10 @@ p.q.gen [gen ~] :: + ++ jonk + ^- (list twig) + [gen ~] + :: ++ open ^- twig ?- gen @@ -4478,7 +4482,7 @@ |- ^- twig ?~ p.gen [%dtzz %n ~] - =+ mow=jone(gen i.p.gen) + =+ mow=jonk(gen i.p.gen) ?: =(mow [i.p.gen ~]) [i.p.gen $(p.gen t.p.gen)] $(p.gen (weld mow t.p.gen)) @@ -4487,7 +4491,7 @@ |- ^- twig ?~ p.gen [%zpzp ~] - =+ mow=jone(gen i.p.gen) + =+ mow=jonk(gen i.p.gen) ?: =(mow [i.p.gen ~]) ?~ t.p.gen i.p.gen @@ -6542,7 +6546,7 @@ (stag %dtzz (stag %f (cold & pam))) (stag %dtzz (stag %f (cold | bar))) (stag %dtzz (stag %ta qut)) - (stag %clcn (ifix [sel ser] (most ace wide))) + :: (stag %clcn (ifix [sel ser] (most ace wide))) (cook (jock &) nuck:so) (cook |=(a=(list) [%clsg (posh ~ ~ (lent a) ~)]) (star cen)) :: (easy [%clsg (poof wer)]) @@ -6580,7 +6584,7 @@ :: %+ cook |= a=(list (list beer)) - [%clzz (phax a)] + [%clsg (phax a)] (most dog ;~(pfix hep soil)) :: (cook |=(a=wing [%cnts a ~]) rope) @@ -6601,7 +6605,12 @@ :- ['0' '9'] (stag %dtzy bisk:so) :- ':' - (stag %smcl ;~(pfix col (ifix [pel per] (most ace wide)))) + ;~ pfix col + ;~ pose + (stag %smcl (ifix [pel per] (most ace wide))) + ;~(pfix fas (stag %clfs wide)) + == + == :- '=' (stag %dtts ;~(pfix tis (ifix [pel per] ;~(glam wide wide)))) :- '?' @@ -6654,6 +6663,7 @@ ;~(pfix pat ;~(plug mota ;~(pfix tec wide))) (stag %kthp ;~(plug toil ;~(pfix tec wide))) (stag %ktls ;~(pfix lus ;~(plug wide ;~(pfix tec wide)))) + (cook |=(a=twig [[%dtzz %n ~] a]) wide) == == :- '"' @@ -6822,7 +6832,7 @@ %- stew ^. stet ^. limo :~ ['_' (rune cab %clcb expb)] - ['~' (rune cen %clcn exps)] + :: ['~' (rune cen %clcn exps)] ['/' (rune fas %clfs expa)] ['^' (rune ket %clkt expd)] ['+' (rune lus %clls expc)] diff --git a/try/syn/web/complete/htmn.hoon b/try/syn/web/complete/htmn.hoon index 4756d8ee1..ca273becc 100644 --- a/try/syn/web/complete/htmn.hoon +++ b/try/syn/web/complete/htmn.hoon @@ -5,6 +5,8 @@ :~ %html :~ %body ~[%h3 +"{(scow %p own)} is generally a happy camper."] + [%p -"a paragraph with {i/-"italics"} is nice."] + [%p -"we can go crazy by embedding {:/(scow %p own)}."] +"Hi, neighbor!{?:(=(~ quy) "" " You ask: {}?")}" %br +"You addressed the {?:(p.hut.ced "" "in")}secure, " diff --git a/try/web/game/fun.hoon b/try/web/game/fun.hoon index b1c15264e..2c0a080fc 100644 --- a/try/web/game/fun.hoon +++ b/try/web/game/fun.hoon @@ -15,6 +15,8 @@ :: :~ ~[%form action/"fun" method/"post"] -"message: {%[%input type/"text" name/"msg"]}" + -"message: {~[%i "foo"]} + {I could have 8347r63874r887*&$^*&^$%*&^#* in here} == == ==