diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 18b31b3f19..3daf523d8d 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -6647,7 +6647,8 @@ %+ knee *tuna |. ~+ ;~ pose (stag %f ;~(pfix (plus ace) pav)) - (stag %e ;~(plug hug nol)) + (stag %e ;~(plug hog nol)) + (stag %f nup) ;~(pfix tis (stag %f nol)) ;~(pfix hep (stag %a ;~(pfix gap tall))) ;~(pfix lus (stag %b ;~(pfix gap tall))) @@ -6660,7 +6661,7 @@ ;~ pose (stag %f nup) (stag %f ped) - (stag %e ;~(plug hug lif)) + (stag %e ;~(plug hog lif)) == :: ++ bet :: wide inner top @@ -6679,21 +6680,38 @@ ?~ b [%dtzz %tas a] [[%dtzz %tas a] [%dtzz %tas u.b]] - ;~(plug sym ;~(pose (stag ~ ;~(pfix fas sym)) (easy ~))) + ;~(plug sym ;~(pose (stag ~ ;~(pfix cab sym)) (easy ~))) :: - ++ hug :: wide twig - %+ cook |=(a=twig a) - ;~(plug fry ;~(pose jaw (easy [%dtzz %n ~]))) - :: - ++ jaw :: wide attributes - %+ ifix [pel per] - %+ stag %clsg - %+ more ;~(plug com ace) - ;~(plug fry ;~(pfix ace wide)) + ++ hog + %+ cook + |= $: a=twig + b=(unit ,@tas) + c=(unit ,@tas) + d=(unit twig) + e=(list twig) + == + ^- twig + =. e ?~(b e [[[%dtzz %tas %class] [%smdq (trip u.b)]] e]) + =. e ?~(c e [[[%dtzz %tas %id] [%smdq (trip u.c)]] e]) + =. e ?~(d e [[[%dtzz %tas %href] u.d] e]) + [a %clsg e] + ;~ plug + fry + ;~(pose (stag ~ ;~(pfix fas sym)) (easy ~)) + ;~(pose (stag ~ ;~(pfix pat sym)) (easy ~)) + ;~(pose (stag ~ ;~(pfix dot (stag %smdq soil))) (easy ~)) + ;~ pose + %+ ifix [pel per] + %+ more ;~(plug com ace) + ;~(plug fry ;~(pfix ace wide)) + :: + (easy ~) + == + == :: ++ lif :: wide elements %+ cook |=(a=(list tuna) a) - ;~(pose ;~(pfix col pep) (easy ~)) + ;~(pose ;~(pfix col pep) (cold ~ sem) (easy ~)) :: ++ luf :: wide elements %+ cook |=(a=(list tuna) a) @@ -6704,6 +6722,7 @@ %+ cook |=(a=(list tuna) a) ;~ pose (cold ~ sem) + ;~(pfix col pep(tol |)) ;~(pfix ;~(plug col ace) (cook |=(a=(list tuna) [[%f a] ~]) pav)) (ifix [gap ;~(plug gap duz)] (more gap amp)) == @@ -6750,7 +6769,7 @@ (ifix [kel ker] (stag %cltr (most ace wide))) :: ++ wot - (ifix [kel ker] ;~(plug hug luf)) + (ifix [kel ker] ;~(plug hog luf)) -- :: ++ scat diff --git a/try/syn/web/template/htmn.hoon b/try/syn/web/template/htmn.hoon index 547f1256d3..d8d83bd7c8 100644 --- a/try/syn/web/template/htmn.hoon +++ b/try/syn/web/template/htmn.hoon @@ -4,9 +4,10 @@ %- give |= epic ^- manx -=+ lim=;li:"second ;{a(href "http://www.urbit.org") "link"} item" +=+ lim=;li:"second ;{a/funky."http://www.urbit.org" "link"} item" =+ lum=;li:"third [owner: {(scow %p own)}] item" =+ lom=;li:"fourth (;{i "italics"}) item" +=+ bar=;br; =+ foo=`manx`i/;"foobar" =+ lam=`(list manx)`[lim lum lom ~] ;html @@ -15,10 +16,15 @@ == ;body ;p: Hello, world. + ;p:"Hello" + ;- "Goodbye" + ;+ ;p:"Hello again" + ;* ~[;p:"One" ;p:"Two" ;p:"Three"] + ;br; ;p: Behold a

aragraph with an embedded {"string"}. ;p: Or an embedded ;{i "tag"}. - ;p: Or even a *{i/;"list" i/;" of" i/;" tags" ~}, - ;p: Sometimes %{|*(a=* [i/;"functionally " i/;"applied" a])}. + ;p: Or even a *{;i:"list" ;i:" of" ;i:" tags" ~}, + ;p: Sometimes %{|*(a=* [;i:"functionally " ;i:"applied" a])}. ;p: It's nice to just be able to use "quotes." ;p ; We are also very good at lists: