From 11ec7998adf4530961c2a5919ca0a99dcd482a17 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 17 Jul 2003 12:03:12 +0000
Subject: [PATCH] * input/regression/slur-area.ly: move from test/

* input/test/: : remove simple-slur-endings slur-attachment
slur-broken-cross-staff slur-broken.ly slur-damping.ly
slur-follow-music.ly slur-position.ly slur-proof.ly slur-shape.ly
slur-symmetry slur-symmetry tie-broken.ly

* scm/drums.scm (set-drum-kit): add function.

* Documentation/user/refman.itely (Percussion staves): use
set-drum-kit

* scm/drums.scm: use alist for instrument-settings. This fixes the
bug with assigning to drums in the .ly file.
---
 ChangeLog                                   | 12 +++++
 Documentation/user/refman.itely             |  2 +-
 input/{test => regression}/slur-area.ly     |  8 ++--
 input/test/simple-slur-endings.ly           | 17 -------
 input/test/slur-attachment.ly               | 21 ---------
 input/test/slur-broken-cross-staff.ly       | 52 ---------------------
 input/test/slur-broken.ly                   | 19 --------
 input/test/slur-damping.ly                  | 14 ------
 input/test/slur-follow-music.ly             | 28 -----------
 input/test/slur-positions.ly                | 22 ---------
 input/test/{slur-proof.ly => slur-shape.ly} |  7 +--
 input/test/slur-symmetry-2.ly               | 20 --------
 input/test/slur-symmetry-3.ly               | 20 --------
 input/test/tie-broken.ly                    | 23 ---------
 scm/drums.scm                               |  4 ++
 15 files changed, 26 insertions(+), 243 deletions(-)
 rename input/{test => regression}/slur-area.ly (74%)
 delete mode 100644 input/test/simple-slur-endings.ly
 delete mode 100644 input/test/slur-attachment.ly
 delete mode 100644 input/test/slur-broken-cross-staff.ly
 delete mode 100644 input/test/slur-broken.ly
 delete mode 100644 input/test/slur-damping.ly
 delete mode 100644 input/test/slur-follow-music.ly
 delete mode 100644 input/test/slur-positions.ly
 rename input/test/{slur-proof.ly => slur-shape.ly} (92%)
 delete mode 100644 input/test/slur-symmetry-2.ly
 delete mode 100644 input/test/slur-symmetry-3.ly
 delete mode 100644 input/test/tie-broken.ly

diff --git a/ChangeLog b/ChangeLog
index f75b697ba4..79048b5d6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2003-07-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* input/regression/slur-area.ly: move from test/
+
+	* input/test/: : remove simple-slur-endings slur-attachment
+	slur-broken-cross-staff slur-broken.ly slur-damping.ly
+	slur-follow-music.ly slur-position.ly slur-proof.ly slur-shape.ly
+	slur-symmetry slur-symmetry tie-broken.ly
+
+	* scm/drums.scm (set-drum-kit): add function.
+
+	* Documentation/user/refman.itely (Percussion staves): use
+	set-drum-kit
+
 	* scripts/etf2ly.py (interpret_finale_key_sig): handle minor keys
 	too
 	(Global_measure.set_timesig): handle 3/8 time sig too.
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 35aeb84c1b..cbcb984360 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -2773,7 +2773,7 @@ If you do not like any of the predefined lists you can define your own
 list at the top of your file:
 
 @lilypond[singleline, verbatim]
-#(define mydrums `(
+#(set-drum-kit 'mydrums `(
         (bassdrum     default   #f        ,(ly:make-pitch -1 2 0))
         (snare        default   #f        ,(ly:make-pitch 0 1 0))
         (hihat        cross     #f        ,(ly:make-pitch 0 5 0))
diff --git a/input/test/slur-area.ly b/input/regression/slur-area.ly
similarity index 74%
rename from input/test/slur-area.ly
rename to input/regression/slur-area.ly
index c810c181b0..4ef3f7afce 100644
--- a/input/test/slur-area.ly
+++ b/input/regression/slur-area.ly
@@ -1,7 +1,9 @@
 \version "1.7.18"
-% regression or delete.  -gp
-\header {texidoc="
-REGRESSION or DELETE. "}
+\header {
+    
+    texidoc = "The area underneath an (up) slur is minimised to improve the shape. "
+
+}
 
 \score{
 \notes\relative c''{
diff --git a/input/test/simple-slur-endings.ly b/input/test/simple-slur-endings.ly
deleted file mode 100644
index 823163f9a6..0000000000
--- a/input/test/simple-slur-endings.ly
+++ /dev/null
@@ -1,17 +0,0 @@
-\version "1.7.18"
-%  regression or delete.  -gp
-\header {texidoc = "REGRESSION or DELETE. "}
-\score{
-	\notes \relative c''{
-		\slurUp c(a-) d(g,-)\break
-		\slurDown c(a-) d(g,-)\break
-		\slurUp a(c-) d(g,-)\break
-		\slurDown a(c-) d(g,-)\break
-		\slurDown a(c-) d(g,-)\break
-	}
-	\paper{
-		indent = 0.0
-		linewidth = 60.0\mm
-	}
-}
-
diff --git a/input/test/slur-attachment.ly b/input/test/slur-attachment.ly
deleted file mode 100644
index 0e70e52f13..0000000000
--- a/input/test/slur-attachment.ly
+++ /dev/null
@@ -1,21 +0,0 @@
-\version "1.7.18"
-\header {texidoc="
-covered by slur-attachment-override.  DELETE. "}
-
-fragment = \notes {
-  \property Voice.Slur \set #'direction = #1
-  \property Voice.Stem \set #'length = #5.5
-  g''8(g g4-)
-  g4(g8 g-)
-  \property Voice.Slur \set #'attachment = #'(stem . stem)
-  g8(g g4-)
-  g4(g8 g-)
-}
-
-\paper { raggedright = ##t} 
-
-\score {
-  \notes\relative c \fragment
-  \paper { }  
-}
-
diff --git a/input/test/slur-broken-cross-staff.ly b/input/test/slur-broken-cross-staff.ly
deleted file mode 100644
index fff384fe53..0000000000
--- a/input/test/slur-broken-cross-staff.ly
+++ /dev/null
@@ -1,52 +0,0 @@
-\version "1.7.18"
-% regression or delete.  -gp
-\header{ texidoc=" REGRESSION or DELETE.
-Slur behave decently when broken across linebreak. "
-}
-
-	
-\score{
-	\context PianoStaff <
-	\context Staff=one \notes\relative c'{
-%{
-		\stemUp \slurUp
-		 c4( c \translator Staff=two c  c-) |
-		\translator Staff=one
-		\stemUp \slurUp
-		 c4( c \translator Staff=two c  c-) |
-		\stemUp \slurUp
-		 c4( c \translator Staff=one c  c-) |
-		\translator Staff=two
-		\stemUp \slurUp
-		 c4( c \translator Staff=one c  c-) |
-		\translator Staff=two
-		\stemUp \slurUp
-		 c4( \translator Staff=one c c  c-) |
-%}
-		r2
-		\translator Staff=two
-		\stemUp \slurUp
-		 c4( \translator Staff=one c
-		   \break
-		c  c-)
-		r2
-
-%{
-		\stemDown \slurDown
-		 d4( \translator Staff=two c c \translator Staff=one  d-)
-		\translator Staff=two
-		\stemUp \slurUp
-		 c4( \translator Staff=one c c \translator Staff=two  c-)
-		r1
-%}
-	}
-	\context Staff=two \notes\relative c'{
-		\clef bass
-		s1 s1 %s1 s1 s1 s1 s1 s1 s1 s1
-	}
-	>
-	\paper { indent = 0. linewidth = 40.*\staffspace }
-}
-
-
-
diff --git a/input/test/slur-broken.ly b/input/test/slur-broken.ly
deleted file mode 100644
index 123845fecb..0000000000
--- a/input/test/slur-broken.ly
+++ /dev/null
@@ -1,19 +0,0 @@
-\version "1.7.18"
-% regression or delete.  -gp
-\header{ texidoc=" REGRESSION or DELETE. "}
-
-\score{
-	\notes\relative c''{
-		\time 2/4
-		e2(
-		\break
-		 e4-) f,(\break
-		 f4-) f(\break
-		a2\break
-		 e'2-)
-	}
-	\paper{
-		linewidth = 60.\mm
-	}
-}
-
diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly
deleted file mode 100644
index 968799171c..0000000000
--- a/input/test/slur-damping.ly
+++ /dev/null
@@ -1,14 +0,0 @@
-\version "1.7.18"
-% delete.  -gp
-\header{ texidoc=" DELETE. "}
-
-\score{
-	\notes\relative c'{
-
-		c'(b'-)-~ b, c
-		c c c c
-		c c c c
-		c c c c
-	}
-}
-
diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly
deleted file mode 100644
index 00d93568b1..0000000000
--- a/input/test/slur-follow-music.ly
+++ /dev/null
@@ -1,28 +0,0 @@
-\version "1.7.18"
-% more fodder for regression.  -gp
-\header {texidoc = "DELETE or REGRESSION"}
-
-\score { 
-  \context Voice \notes\relative c {
-    % CASE 3
-	d''4 (  b-) a (  e'-) \break
-	g,( \stemDown  b-) \stemBoth c (  f,-) \break
-	
-	% no adjusting...
-	\stemUp  d'8-[ ( b a] \stemBoth  e'-) \break
-	\stemUp  g,8-[ ( b d] \stemBoth  c-) \break
-	
-	% still ugly
-	g4 ( b d  c-) \break
-	
-	%TIES
-	d ~ b a ~ e' \break
-	g, ~ \stemDown b \stemBoth c ~ f, \break
-	
-	
-  }
-  \paper {
-    raggedright = ##t
-  }  
-}
-
diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly
deleted file mode 100644
index 00735cfffc..0000000000
--- a/input/test/slur-positions.ly
+++ /dev/null
@@ -1,22 +0,0 @@
-\version "1.7.18"
-\header {texidoc = "
-if this test isn't covered in regression, we're in trouble.  :)  DELETE. "}
-
-\score{
-	\notes\relative c''{
-		\slurUp
-		a2 (a-)\break
-		\slurDown
-		a2 (a-)\break
-		\slurUp
-		c2 (c-)\break
-		\slurDown
-		c2 (c-)\break
-
-	}
-	\paper{
-		raggedright = ##t
-	}
-}
-
-
diff --git a/input/test/slur-proof.ly b/input/test/slur-shape.ly
similarity index 92%
rename from input/test/slur-proof.ly
rename to input/test/slur-shape.ly
index 61e2910515..c2c7d470f7 100644
--- a/input/test/slur-proof.ly
+++ b/input/test/slur-shape.ly
@@ -1,6 +1,8 @@
 \version "1.7.18"
-% looks pretty, but it's for regression.  -gp
-\header { texidoc = "REGRESSION?  or DELETE. "}
+\header {
+    texidoc = "Slurs become flatter as they grow longer. "
+
+}
 
 x = {
   \outputproperty #(make-type-checker 'note-head-interface) 
@@ -38,7 +40,6 @@ x = {
     \context Voice=wa { \x d(s4*26d-) }
   >
   \paper {
-    indent=0.0\mm
     raggedright = ##t
     \translator{
       \VoiceContext
diff --git a/input/test/slur-symmetry-2.ly b/input/test/slur-symmetry-2.ly
deleted file mode 100644
index a01a0cecba..0000000000
--- a/input/test/slur-symmetry-2.ly
+++ /dev/null
@@ -1,20 +0,0 @@
-\version "1.7.18"
-% another regression.  -gp
-\header { texidoc = "REGRESSION or DELETE. "}
-%\header{
-% should look the same
-%title="symmetry"
-%}
-\score{
-	\notes\relative c'{
-		 g'8-[( e  c'-) g,]
-		 d'-[( f'  a,-) a]
-		 d-[( f  a,-) d']
-		 g,-[( e,  c'-) c]
-	}
-	\paper{
-
-		linewidth = 50.0\mm
-	}
-}
-
diff --git a/input/test/slur-symmetry-3.ly b/input/test/slur-symmetry-3.ly
deleted file mode 100644
index 919f0cf35e..0000000000
--- a/input/test/slur-symmetry-3.ly
+++ /dev/null
@@ -1,20 +0,0 @@
-\version "1.7.18"
-% regression, and should be merged with -2.
-\header { texidoc = "REGRESSION or DELETE. "}
-%\header{
-%title="symmetry.
-%
-%Both slurs should look the same. "
-%}
-
-\score{
-	\notes\relative c'{
-		[g'8( e  c'-) g,] r2
-		\break
-		[d''8( f  a,-) d'] r2
-	}
-	\paper{
-	raggedright = ##t
-	}
-}
-
diff --git a/input/test/tie-broken.ly b/input/test/tie-broken.ly
deleted file mode 100644
index b2b1b350ef..0000000000
--- a/input/test/tie-broken.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-\version "1.7.18"
-% regression stuff.  -gp
-\header {texidoc = "REGRESSION or DELETE. "
-}
-
-\score{
-	\notes \relative c''{
-		c1~\break c
-		c4 c c c~\break
-		c c c c 
-
-		c1~\break
-		\time 8/8 c
-		c4 c c c~\break
-		\time 4/4
-		c c c c 
-	}
-	\paper {
-		linewidth=40.\mm
-		indent=0.
-	}
-}
-
diff --git a/scm/drums.scm b/scm/drums.scm
index 426c0e8b1f..0ba9c9f0f6 100644
--- a/scm/drums.scm
+++ b/scm/drums.scm
@@ -84,6 +84,10 @@
 	(fivedown	  de	,(ly:make-pitch -1 2 0))
 ))
 
+(define-public (set-drum-kit kit value)
+  (set! percussive-instrument-settings
+	(assoc-set! percussive-instrument-settings kit value)))
+  
 (define-public (get-drum-kit kit)
   (assoc-get-default kit percussive-instrument-settings '()))
 
-- 
2.39.5