From 2b72cba49ea60c4b7f6eec9ad109447186793c0c Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohaitch@gmail.com>
Date: Thu, 25 Sep 2014 17:54:51 -0700
Subject: [PATCH] Arbitrary mark printing sorta worx

---
 arvo/gall.hoon           |  5 +++++
 main/app/demo/core.hook  | 18 ++----------------
 main/app/shell/core.hook | 19 ++++++++++++-------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/arvo/gall.hoon b/arvo/gall.hoon
index 3dee23108..f245eb932 100644
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@@ -1126,6 +1126,11 @@
           (xeno [q.kon imp] %feel ~)
         ::
             %take
+          ?:  (warm %purr)
+            ?>  ?=(^ huv.sat)
+            =+  sam=:(slop [[%atom %ud] ost] !>(p.kon) !>(p.q.kon) q.kon)
+            %+  ford  /s/pour
+            [%call (harm %purr (conf (core u.huv.sat))) (cove %$ sam)]
           ?.  (warm %pour)
             +>.$(qic.sat ~)
           ?>  ?=(^ huv.sat)
diff --git a/main/app/demo/core.hook b/main/app/demo/core.hook
index 3a1460a2d..e70a6901d 100644
--- a/main/app/demo/core.hook
+++ b/main/app/demo/core.hook
@@ -18,8 +18,8 @@
       %+  turn  (~(tap by sup.hid))
       |=  [ost=bone *]
       :-  ost
-      :^  %give  %rush  %tang
-      [rose/[" " ~ ~]^~[leaf/<p.arg> leaf/"says" leaf/(scow %ud q.arg)]]~
+      :^  %give  %rush  %wut
+      [p.arg %says q.arg]
   ==
 ::
 ++  peer
@@ -31,20 +31,6 @@
   :+  ost  %give
   :-  %meta
   !>
-  :-  %meta
-  !>
-  :-  %meta
-  !>
-  :-  %meta
-  !>
-  :-  %meta
-  !>
-  :-  %meta
-  !>
-  :-  %meta
-  !>
-  :-  %meta
-  !>
   :+  %rust  %hymn
   ^-  manx
   ;html
diff --git a/main/app/shell/core.hook b/main/app/shell/core.hook
index 738c025c9..291c056be 100644
--- a/main/app/shell/core.hook
+++ b/main/app/shell/core.hook
@@ -34,8 +34,8 @@
   $%  [%gone p=hapt]                                    ::
       [%mean p=ares]                                    ::
       [%nice ~]                                         ::
-      [%rush p=%tang q=(list tank)]                     ::
-      [%rust p=%tang q=(list tank)]                     ::
+      [%rush p=mark q=*]                                ::
+      [%rust p=mark q=*]                                ::
   ==  ==  ==                                            ::
 --
 !:
@@ -110,11 +110,11 @@
     ==
   ==
 ::
-++  pour
-  |=  [ost=bone pax=path sih=*]
+++  purr
+  |=  [ost=bone pax=path typ=type sih=sign]
   ^-  [(list move) _+>]
   ::  ~&  [%shell-pour -.sih (,@ta +<.sih)]
-  =+  sih=((hard sign) sih)
+  ::=+  sih=((hard sign) sih)
   :_  +>.$
   ?~  pax  ~&  %no-path  !!
   ?+    &1.pax  ~&  %strange-path  !!
@@ -132,9 +132,14 @@
       [ost %give +.sih]~
         %lines
       ?.  ?=(?(%rust %rush) +<.sih)  ~
-      :_  ~  (print ost our.hid q.sih)
+      :_  ~
+      %^  print  ost  our.hid
+      ?+  p.sih 
+        [(sell (slot 15 [typ sih]))]~
+          %tang
+        ;;((list tank) q.sih)
     ==
-  ==
+  ==  ==
 ::
 ++  print
   |=  [ost=bone you=ship tan=(list tank)]