]> git.donarmstrong.com Git - lilypond.git/commitdiff
* input/regression/slur-area.ly: move from test/
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Thu, 17 Jul 2003 12:03:12 +0000 (12:03 +0000)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Thu, 17 Jul 2003 12:03:12 +0000 (12:03 +0000)
* 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.

17 files changed:
ChangeLog
Documentation/user/refman.itely
input/regression/slur-area.ly [new file with mode: 0644]
input/test/simple-slur-endings.ly [deleted file]
input/test/slur-area.ly [deleted file]
input/test/slur-attachment.ly [deleted file]
input/test/slur-broken-cross-staff.ly [deleted file]
input/test/slur-broken.ly [deleted file]
input/test/slur-damping.ly [deleted file]
input/test/slur-follow-music.ly [deleted file]
input/test/slur-positions.ly [deleted file]
input/test/slur-proof.ly [deleted file]
input/test/slur-shape.ly [new file with mode: 0644]
input/test/slur-symmetry-2.ly [deleted file]
input/test/slur-symmetry-3.ly [deleted file]
input/test/tie-broken.ly [deleted file]
scm/drums.scm

index f75b697ba4c5ff56855b46f968c1a8086d46243b..79048b5d6b8a493f9ffc39697a02f3897ba215af 100644 (file)
--- 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.
index 35aeb84c1b25c6f6d909fa1805810a1a1219751e..cbcb984360c6576f52c46a0121630618821df229 100644 (file)
@@ -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/regression/slur-area.ly b/input/regression/slur-area.ly
new file mode 100644 (file)
index 0000000..4ef3f7a
--- /dev/null
@@ -0,0 +1,34 @@
+\version "1.7.18"
+\header {
+    
+    texidoc = "The area underneath an (up) slur is minimised to improve the shape. "
+
+}
+
+\score{
+\notes\relative c''{
+
+\slurUp
+\stemDown
+a(a' a, a-)
+a(a a' a,-)
+a(d a a-)
+a(a d a-)
+
+e'8(e e e e e e e-)
+a,8(d a a a a a a-)
+a(a a a a a d a-)
+
+c,(g' c e f d b g-) 
+c,(g' c e f d b g-) 
+
+\property Voice.autoBeaming = ##f
+\stemUp
+a8(a a a a a a a-)
+
+}
+\paper{
+indent=0.0\mm
+}
+}
+
diff --git a/input/test/simple-slur-endings.ly b/input/test/simple-slur-endings.ly
deleted file mode 100644 (file)
index 823163f..0000000
+++ /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-area.ly b/input/test/slur-area.ly
deleted file mode 100644 (file)
index c810c18..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-\version "1.7.18"
-% regression or delete.  -gp
-\header {texidoc="
-REGRESSION or DELETE. "}
-
-\score{
-\notes\relative c''{
-
-\slurUp
-\stemDown
-a(a' a, a-)
-a(a a' a,-)
-a(d a a-)
-a(a d a-)
-
-e'8(e e e e e e e-)
-a,8(d a a a a a a-)
-a(a a a a a d a-)
-
-c,(g' c e f d b g-) 
-c,(g' c e f d b g-) 
-
-\property Voice.autoBeaming = ##f
-\stemUp
-a8(a a a a a a a-)
-
-}
-\paper{
-indent=0.0\mm
-}
-}
-
diff --git a/input/test/slur-attachment.ly b/input/test/slur-attachment.ly
deleted file mode 100644 (file)
index 0e70e52..0000000
+++ /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 (file)
index fff384f..0000000
+++ /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 (file)
index 123845f..0000000
+++ /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 (file)
index 9687991..0000000
+++ /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 (file)
index 00d9356..0000000
+++ /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 (file)
index 00735cf..0000000
+++ /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-proof.ly
deleted file mode 100644 (file)
index 61e2910..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-\version "1.7.18"
-% looks pretty, but it's for regression.  -gp
-\header { texidoc = "REGRESSION?  or DELETE. "}
-
-x = {
-  \outputproperty #(make-type-checker 'note-head-interface) 
-    #'extra-offset = #'(-1 . 0)
-}
-
-\score {
-    \context Staff \notes\relative c <
-    \context Voice=va { \x f(f-) }
-    \context Voice=vb { \x g(s4g-) }
-    \context Voice=vc { \x a(s4*2a-) }
-    \context Voice=vd { \x b(s4*3b-) }
-    \context Voice=ve { \x c(s4*4c-) }
-    \context Voice=vf { \x d(s4*5d-) }
-    \context Voice=vg { \x e(s4*6e-) }
-    \context Voice=vh { \x f(s4*7f-) }
-    \context Voice=vi { \x g(s4*8g-) }
-    \context Voice=vj { \x a(s4*9a-) }
-    \context Voice=vk { \x b(s4*10b-) }
-    \context Voice=vl { \x c(s4*11c-) }
-    \context Voice=vm { \x d(s4*12d-) }
-    \context Voice=vn { \x e(s4*13e-) }
-    \context Voice=vo { \x f(s4*14f-) }
-    \context Voice=vp { \x g(s4*15g-) }
-    \context Voice=vq { \x a(s4*16a-) }
-    \context Voice=vr { \x b(s4*17b-) }
-    \context Voice=vs { \x c(s4*18c-) }
-    \context Voice=vt { \x d(s4*19d-) }
-    \context Voice=vu { \x e(s4*20e-) }
-    \context Voice=vv { \x f(s4*21f-) }
-    \context Voice=vw { \x g(s4*22g-) }
-    \context Voice=vx { \x a(s4*23a-) }
-    \context Voice=vy { \x b(s4*24b-) }
-    \context Voice=vz { \x c(s4*25c-) }
-    \context Voice=wa { \x d(s4*26d-) }
-  >
-  \paper {
-    indent=0.0\mm
-    raggedright = ##t
-    \translator{
-      \VoiceContext
-      Slur \override #'direction = #1
-      Stem \override #'direction = #-1
-    }
-  }
-}
-
diff --git a/input/test/slur-shape.ly b/input/test/slur-shape.ly
new file mode 100644 (file)
index 0000000..c2c7d47
--- /dev/null
@@ -0,0 +1,51 @@
+\version "1.7.18"
+\header {
+    texidoc = "Slurs become flatter as they grow longer. "
+
+}
+
+x = {
+  \outputproperty #(make-type-checker 'note-head-interface) 
+    #'extra-offset = #'(-1 . 0)
+}
+
+\score {
+    \context Staff \notes\relative c <
+    \context Voice=va { \x f(f-) }
+    \context Voice=vb { \x g(s4g-) }
+    \context Voice=vc { \x a(s4*2a-) }
+    \context Voice=vd { \x b(s4*3b-) }
+    \context Voice=ve { \x c(s4*4c-) }
+    \context Voice=vf { \x d(s4*5d-) }
+    \context Voice=vg { \x e(s4*6e-) }
+    \context Voice=vh { \x f(s4*7f-) }
+    \context Voice=vi { \x g(s4*8g-) }
+    \context Voice=vj { \x a(s4*9a-) }
+    \context Voice=vk { \x b(s4*10b-) }
+    \context Voice=vl { \x c(s4*11c-) }
+    \context Voice=vm { \x d(s4*12d-) }
+    \context Voice=vn { \x e(s4*13e-) }
+    \context Voice=vo { \x f(s4*14f-) }
+    \context Voice=vp { \x g(s4*15g-) }
+    \context Voice=vq { \x a(s4*16a-) }
+    \context Voice=vr { \x b(s4*17b-) }
+    \context Voice=vs { \x c(s4*18c-) }
+    \context Voice=vt { \x d(s4*19d-) }
+    \context Voice=vu { \x e(s4*20e-) }
+    \context Voice=vv { \x f(s4*21f-) }
+    \context Voice=vw { \x g(s4*22g-) }
+    \context Voice=vx { \x a(s4*23a-) }
+    \context Voice=vy { \x b(s4*24b-) }
+    \context Voice=vz { \x c(s4*25c-) }
+    \context Voice=wa { \x d(s4*26d-) }
+  >
+  \paper {
+    raggedright = ##t
+    \translator{
+      \VoiceContext
+      Slur \override #'direction = #1
+      Stem \override #'direction = #-1
+    }
+  }
+}
+
diff --git a/input/test/slur-symmetry-2.ly b/input/test/slur-symmetry-2.ly
deleted file mode 100644 (file)
index a01a0ce..0000000
+++ /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 (file)
index 919f0cf..0000000
+++ /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 (file)
index b2b1b35..0000000
+++ /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.
-       }
-}
-
index 426c0e8b1ff70c13656ec305c58b1c52e09149ce..0ba9c9f0f63b54ad69c92f13f5723712c0dbd6c4 100644 (file)
        (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 '()))