From c63674d9832c968d9b42ecb9d4656ce970ff62a4 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 9 Dec 2014 12:33:09 -0800 Subject: [PATCH 1/2] defuture entity grab --- main/mar/down/parse.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/mar/down/parse.hoon b/main/mar/down/parse.hoon index 716fbca061..8a409b9b7b 100644 --- a/main/mar/down/parse.hoon +++ b/main/mar/down/parse.hoon @@ -13,7 +13,7 @@ =- |= tub=nail ^- (like ,@t) %. tub :: export context =+(poxa enty(ent mapping)) ^- mapping=(map span ,@tF) - =+ pax=/==18%%/html5-entities/json :: XX %%/ + =+ pax=/==1%%/html5-entities/json :: XX %%/ =+ maf=%.(pax ;~(biff file (soft ,@) poja (om so):jo)) ?^ maf u.maf ~& no-enty/pax From e0814b6eae3a8867b8476a981980eae45bc77d52 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 9 Dec 2014 13:52:43 -0800 Subject: [PATCH 2/2] Added sail multi-classes --- arvo/hoon.hoon | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index fd463bb124..31fb1286e8 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -8578,21 +8578,23 @@ ++ hog :: tag head %+ cook |= $: a=twig - b=(unit ,@tas) - c=(unit ,@tas) - d=(unit twig) - e=(list twig) + b=(list ,[@tas @tas]) + c=$|(~ [p=@tas q=twig]) + d=(list twig) == ^- [twig (list 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 e] + =- [a (welp - ?~(c d [[[%dtzz %tas p.c] q.c] d]))] + =- (~(tap by -)) + %. |=(e=(list tank) [%smdq ~(ram re %rose [" " `~] e)]) + =< ~(run by f:(reel b .)) + |= [e=[p=term q=term] f=(jar twig tank)] + (~(add ja f) [[%dtzz %tas p.e] [%leaf (trip q.e)]]) ;~ plug fry - ;~(pose (stag ~ ;~(pfix dot sym)) (easy ~)) - ;~(pose (stag ~ ;~(pfix hax sym)) (easy ~)) - ;~(pose (stag ~ ;~(pfix fas (stag %smdq soil))) (easy ~)) + =- (star ;~(plug - sym)) + ;~(pose (cold %class dot) (cold %id hax)) + =- ;~(pose ;~(plug - (stag %smdq soil)) (easy ~)) + ;~(pose (cold %href fas) (cold %src pat)) ;~ pose %+ ifix [pel per] %+ more ;~(plug com ace)