From 0bbf54d6b1245e5c3f655e7bcf04f71e7118057f Mon Sep 17 00:00:00 2001
From: Aneurin Barker Snook <a@aneur.in>
Date: Sat, 10 Jun 2017 17:38:52 +0100
Subject: [PATCH] add tab stops to snippets, plus a few bug fixes

---
 pigs-nose.tidal       | 2 +-
 snippets/pn1drum      | 6 +++---
 snippets/pn1drumintro | 5 +++--
 snippets/pn1jbass     | 2 +-
 snippets/pn1mons      | 2 +-
 snippets/pn1print     | 2 +-
 snippets/pn1qs        | 2 +-
 snippets/pn2baa       | 2 +-
 snippets/pn2bass      | 4 ++--
 snippets/pn2casio     | 2 +-
 snippets/pn2drum      | 6 +++---
 snippets/pn2drumintro | 4 ++--
 snippets/pn2drumoutro | 4 ++--
 snippets/pn2mons      | 2 +-
 snippets/pn2ql        | 2 +-
 snippets/pn3arm       | 2 +-
 snippets/pn3drum      | 4 ++--
 17 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/pigs-nose.tidal b/pigs-nose.tidal
index dcecd4f..467d235 100644
--- a/pigs-nose.tidal
+++ b/pigs-nose.tidal
@@ -53,8 +53,8 @@ d'qs $ cf $
 -- @pn1drumintro
 d'drum $ cf $ stack [
   -- s "bd/2", -- (2)
-  s "[~ [~ ho] ~ ho ~ ~ ho ~]/2"
   -- s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2" -- (1)
+  s "[~ [~ ho] ~ ho ~ ~ ho ~]/2" -- (1) remove
   ]
 
 -- pn1print @ 2
diff --git a/snippets/pn1drum b/snippets/pn1drum
index 97b5eee..b42fcf9 100644
--- a/snippets/pn1drum
+++ b/snippets/pn1drum
@@ -6,12 +6,12 @@
 # --
 -- @pn1drum
 d'drum $ cf $
-  -- overlay (s "[hh*8 [hh*4 ho]]/2") $ -- (5)
+  -- overlay (s "[${3:hh}*8 [$3*4 ${4:ho}]]/2") $ -- (5)
   -- every 8 (density 2) $ -- (3)
   -- jux (iter 4) . -- (2)
   -- jux (density 2 . iter 4) . -- (4) replace (2)(3)
   -- every 3 rev $ -- (1)
   stack [
-    s "[bd [~ ~ ~ bd] bd*2 ~]/2",
-    s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2"
+    s "[${1:bd} [~ ~ ~ $1] $1*2 ~]/2",
+    s "[~ [~ ${2:sn:1}] ~ $2 ~ ~ $2 ~]/2"
     ]
diff --git a/snippets/pn1drumintro b/snippets/pn1drumintro
index 6df5fec..39952df 100644
--- a/snippets/pn1drumintro
+++ b/snippets/pn1drumintro
@@ -6,6 +6,7 @@
 # --
 -- @pn1drumintro
 d'drum $ cf $ stack [
-  s "[~ [~ ho] ~ ho ~ ~ ho ~]/2",
-  -- s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2" -- (1)
+  -- s "${2:bd}/2", -- (2)
+  -- s "[~ [~ ${3:sn:1}] ~ $3 ~ ~ $3 ~]/2" -- (1)
+  s "[~ [~ ${1:ho}] ~ $1 ~ ~ $1 ~]/2" -- (1) remove
   ]
diff --git a/snippets/pn1jbass b/snippets/pn1jbass
index e8226ba..66e2c1b 100644
--- a/snippets/pn1jbass
+++ b/snippets/pn1jbass
@@ -7,6 +7,6 @@
 -- @pn1jbass
 d'jbass $ slow 8 $
   ((1/32) <~) $ -- (1) remove
-  s "jungbass jungbass:1"
+  s "${1:jungbass} $1:1"
   # pan (slow 2 sinewave1)
   # speed 1.2
diff --git a/snippets/pn1mons b/snippets/pn1mons
index 18704ab..1076c61 100644
--- a/snippets/pn1mons
+++ b/snippets/pn1mons
@@ -7,6 +7,6 @@
 -- @pn1mons
 d'mons $ cf $
   -- striate 4 $ -- (1)
-  slow 2 $ s "monsterb"
+  slow 2 $ s "${1:monsterb}"
   # gain 0.7
   # speed (scale 0.6 1.1 $ slow 4 sinewave1)
diff --git a/snippets/pn1print b/snippets/pn1print
index c8ff28e..c71dcda 100644
--- a/snippets/pn1print
+++ b/snippets/pn1print
@@ -5,7 +5,7 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @pn1print
-let p = s "print" -- (3) "{print, wobble}" -- (4) "wobble"
+let p = s "${1:print}" -- (3) "{$1, ${2:wobble}}" -- (4) "$2"
   in d'print $ cf $
      -- jux (slow 1.1) $ -- (2)
      slow 2.5 . striate 6 $ p
diff --git a/snippets/pn1qs b/snippets/pn1qs
index 9bdc485..09d9b0b 100644
--- a/snippets/pn1qs
+++ b/snippets/pn1qs
@@ -9,5 +9,5 @@ d'qs $ cf $
   -- fastspread density [1,2] $ -- (4) -- (5) [1,1,2,0.5] -- (6) [1,1,0.5,2]
   -- jux (iter 8) $ -- (2)
   slow 4 . striate 4 $ -- (1) 2
-  s "qspace"
+  s "${1:qspace}"
   -- # speed (scale 0.7 1.2 $ slow 3.2 triwave1) -- (3)
diff --git a/snippets/pn2baa b/snippets/pn2baa
index 58c03d1..04e6674 100644
--- a/snippets/pn2baa
+++ b/snippets/pn2baa
@@ -5,5 +5,5 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @pn2baa
-d'baa $ slow 6 $ s "baa"
+d'baa $ slow 6 $ s "${1:baa}"
   # vowel "e"
diff --git a/snippets/pn2bass b/snippets/pn2bass
index 1d944be..17ca124 100644
--- a/snippets/pn2bass
+++ b/snippets/pn2bass
@@ -5,7 +5,7 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @pn2bass
-let p = slow 4 $ s "bass*2 bass*2 bass*3 bass*3" -- (3) slow 5
-    -- p = slow 5 $ s "bass*2 bass*2 bass*3 bass*3 ~" -- (2)
+let p = slow 4 $ s "${1:bass}*2 $1*2 $1*3 $1*3" -- (3) slow 5
+    -- p = slow 5 $ s "$1*2 $1*2 $1*3 $1*3 ~" -- (2)
   in d'bass $ p
      -- # speed (scale 1 2 $ density 2.4 sinewave1) -- (1)
diff --git a/snippets/pn2casio b/snippets/pn2casio
index 294a69c..1fe1209 100644
--- a/snippets/pn2casio
+++ b/snippets/pn2casio
@@ -8,4 +8,4 @@
 d'casio $ cf $
   -- jux (slow (4/3)) $ -- (2)
   -- fastspread density [1,4/3] $ -- (1)
-  s "casio*2 ~"
+  s "${1:casio}*2 ~"
diff --git a/snippets/pn2drum b/snippets/pn2drum
index 14c53a5..4abf4b4 100644
--- a/snippets/pn2drum
+++ b/snippets/pn2drum
@@ -6,8 +6,8 @@
 # --
 -- @pn2drum
 d'drum $ cf $ stack [
-  s "[hh*8 [hh*4 ho]]/2",
-  s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2",
+  s "[${3:hh}*8 [$3*4 ${4:ho}]]/2",
+  s "[~ [~ ${2:sn:1}] ~ $2 ~ ~ $2 ~]/2",
   -- every 4 (brak . density 2) $ -- (3)
-  s "bd*2" -- (1) "house*2" -- (2) "house(3,8)"
+  s "${1:bd}*2" -- (1) "${5:house}*2" -- (2) "$5(3,8)"
   ]
diff --git a/snippets/pn2drumintro b/snippets/pn2drumintro
index 68657a0..f56c6eb 100644
--- a/snippets/pn2drumintro
+++ b/snippets/pn2drumintro
@@ -6,6 +6,6 @@
 # --
 -- @pn2drumintro
 d'drum $ cf $ stack [
-  -- s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2", -- (1)
-  s "[hh*8 [hh*4 ho]]/2"
+  -- s "[~ [~ ${3:sn:1}] ~ $3 ~ ~ $3 ~]/2", -- (1)
+  s "[${1:hh}*8 [$1*4 ${2:ho}]]/2"
   ]
diff --git a/snippets/pn2drumoutro b/snippets/pn2drumoutro
index a8c5ede..911ac71 100644
--- a/snippets/pn2drumoutro
+++ b/snippets/pn2drumoutro
@@ -6,5 +6,5 @@
 # --
 -- @pn2drumoutro
 solo $ d'drum $ cf $
-  overlay (s "[hh*8 [hh*4 ho]]/2") $
-  jux (iter 4 . rev) $ s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2"
+  overlay (s "[${2:hh}*8 [$2*4 ${3:ho}]]/2") $
+  jux (iter 4 . rev) $ s "[~ [~ ${1:sn:1}] ~ $1 ~ ~ $1 ~]/2"
diff --git a/snippets/pn2mons b/snippets/pn2mons
index 5af1187..abfcc61 100644
--- a/snippets/pn2mons
+++ b/snippets/pn2mons
@@ -7,6 +7,6 @@
 -- @pn2mons
 d'mons $ cf $
   -- fastspread density [1,2] $ -- (1)
-  striate 4 $ slow 2 $ s "monsterb"
+  striate 4 $ slow 2 $ s "${1:monsterb}"
   # gain 0.7
   # speed (scale 0.6 1.1 $ slow 4 sinewave1)
diff --git a/snippets/pn2ql b/snippets/pn2ql
index 9274374..6beb995 100644
--- a/snippets/pn2ql
+++ b/snippets/pn2ql
@@ -8,5 +8,5 @@
 d'ql $
   -- slow 2 $ -- (0)
   slow (10/4) $ fastspread density [1,5/4] $ -- (0) remove
-  s "[qlatibro:1 qlatibro]*2"
+  s "[${1:qlatibro}:1 $1]*2"
   # vowel "e" -- (0) remove
diff --git a/snippets/pn3arm b/snippets/pn3arm
index 444b373..e899546 100644
--- a/snippets/pn3arm
+++ b/snippets/pn3arm
@@ -8,5 +8,5 @@
 d'arm $ cf $
   -- every 2 (density 3) $ -- (2)
   -- every 8 (# speed "2") $ -- (1)
-  slow 4 $ s "armora"
+  slow 4 $ s "${1:armora}"
   -- # shape (scale 0 (2/3) $ slow 4 sinewave1) -- (3)
diff --git a/snippets/pn3drum b/snippets/pn3drum
index 754b6b1..c41cf7d 100644
--- a/snippets/pn3drum
+++ b/snippets/pn3drum
@@ -9,9 +9,9 @@ d'drum $ cf $
   {- -- (1)
   overlay (
     -- every 4 (density 3) $ -- (5)
-    s "house*2"
+    s "${4:house}*2"
     ) $ -- -}
   -- every 4 (density 2 . brak) $ -- (2)
   density (8/3) $
-  s "sn:0 hh hh" -- (3) "sn:0 hh rm"
+  s "${1:sn:0} ${2:hh} $2" -- (3) "$1:0 $2 ${3:rm}"
   -- # n "[0 1]/5" -- (4)