Fix structures in structures; str -> sur.

arvo/ford.hoon

@@ -19,7 +19,7 @@
           ==                                            ::
 ++  hood                                                ::  assembly plan
           $:  zus=@ud                                   ::  zuse kelvin
-              str=(list hoof)                           ::  structures
+              sur=(list hoof)                           ::  structures
               lib=(list hoof)                           ::  libraries
               fan=(list horn)                           ::  resources
               src=(list hoop)                           ::  program
@@ -114,7 +114,6 @@
 ++  calx                                                ::  concrete cache line
   $%  [%hood p=calm q=(pair beam cage) r=hood]          ::  compile
       [%slap p=calm q=[p=vase q=twig] r=vase]           ::  compute
-      [%twig p=calm q=cage r=twig]                      ::  compile to twig
   ==                                                    ::
 ++  task                                                ::  problem in progress
   $:  nah=duct                                          ::  cause
@@ -128,7 +127,6 @@
   |=  cax=calx
   ?+  sem  !!
     %hood  ?>(?=(%hood -.cax) r.cax)
-    %twig  ?>(?=(%twig -.cax) r.cax)
     %slap  ?>(?=(%slap -.cax) r.cax)
   ==
 ::
@@ -944,7 +942,7 @@
         %+  cope  (neck cof lib.hyd)
         |=  [cof=cafe sel=_..apex]
         =.  ..apex  sel(boy boy)
-        %+  cope  (head cof str.hyd)
+        %+  cope  (head cof sur.hyd)
         |=  [cof=cafe sel=_..apex]
         (fine cof sel)
       ::
@@ -1059,7 +1057,7 @@
           ?.  =(`hoof`i.bir `hoof`p.u.byf)
             (flaw cof [%leaf "structure mismatch: {<~[p.u.byf i.bir]>}"]~)
           $(bir t.bir)
-        =+  bem=(hone %gate %str i.bir)
+        =+  bem=(hone %gate %sur i.bir)
         %+  cope  (fade cof bem)
         |=  [cof=cafe hyd=hood]
         %+  cope  (apex(boy ~) cof hyd)
@@ -1068,7 +1066,9 @@
             %=  sel
               boy  boy
               zeg  zeg
-              rop  (~(put by rop) p.i.bir [i.bir [%tssg (flop boy.sel)]])
+              rop  %+  ~(put by (~(uni by rop) rop.sel))
+                      p.i.bir 
+                   [i.bir [%tssg (flop boy.sel)]]
             ==
         ^^$(cof cof, bir t.bir)
       ::

main/pro/down/core.hoon

@@ -3,9 +3,6 @@
   ::
 /?  314
 /-  markdown
-  !:
-::::  describe
-  ::
 =+  markdown
   ::
 ::::  compute
@@ -20,6 +17,7 @@
     ++  mark
       |=  p=tape
       (scan p apex)
+    ::
     ++  apex                                            :: markdown parser
       |=  tub=nail
       ^-  (like down)

main/str/down/gate.hoon

@@ -1,15 +0,0 @@
-$&  [p=down q=down]
-$%  [%$ p=tape]
-    [%code p=tape]
-    [%inco p=tape]
-    [%head p=@ud q=down]
-    [%link p=tape q=tape r=(unit tape)]
-    [%lord p=(list down)]
-    [%lund p=(list down)]
-    [%parg p=down]
-    [%quot p=down]
-    [%rong p=down]
-    [%emph p=down]
-    [%hrul ~]
-    [%html p=tape]
-==

main/str/markdown/gate.hoon

@@ -1,22 +0,0 @@
-|%
-++  down  (list bloc)                                 ::  markdown model
-++  bloc                                              ::  block elements
-  $%  [%head p=@ud q=(list span) r=(unit tape)]
-      [%para p=(list span)]
-      [%lise p=down] 
-      [%list p=? q=down] 
-      [%quot p=down]
-      [%horz ~]
-      [%code p=wall]
-      [%html p=manx]
-  ==
-::
-++  span                                               ::  span elements
-  $%  [%text p=tape] 
-      [%emph p=term q=(list span)]
-      [%stri p=(list span)]
-      [%brek ~]
-      [%link p=(list span) q=tape r=(unit tape)]
-      [%cods p=tape]
-  ==
---

main/sur/foobar/gate.hoon

@@ -0,0 +1 @@
+,@

main/sur/markdown/gate.hoon

@@ -0,0 +1,22 @@
+|%
+++  down  (list bloc)                                   ::  markdown structure
+++  bloc                                                ::  block elements
+  $%  [%head p=@ud q=(list span) r=(unit tape)]         ::  depth, contents, id
+      [%para p=(list span)]                             ::  paragraph
+      [%lise p=down]                                    ::  list element
+      [%list p=? q=down]                                ::
+      [%quot p=down]
+      [%horz ~]
+      [%code p=wall]                                    ::  <pre>
+      [%html p=manx]
+  ==
+::
+++  span                                                ::  span elements
+  $%  [%text p=tape] 
+      [%emph p=term q=(list span)]
+      [%stri p=(list span)]
+      [%brek ~]
+      [%link p=(list span) q=tape r=(unit tape)]
+      [%cods p=tape]                                    ::  <code>
+  ==
+--