* GNUmakefile.in: Fix config.h dependency.

* input/test/beam-dir-function.ly: Fix for new default
neutral-direction = -1 (down).

diff --git a/ChangeLog b/ChangeLog
index 1e940cf4597493b01f62681adf16705b397c4b61..0ff74860433d22d5fc9e1f7fe22afb72089a1397 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * GNUmakefile.in: Fix config.h dependency.
+
+       * input/test/beam-dir-function.ly: Fix for new default
+       neutral-direction = -1 (down).
+
        * input/regression/tuplet-properties.ly:
        * input/regression/tuplet-nest.ly: Fix.
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 7bdb175e1fcc0cbffa97401032cfcc34f4208e3d..302b8721315c06715341c60d71f45dcd26c129b0 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -149,14 +149,15 @@ local-clean: builddir-setup-clean
 builddir-setup-clean:
        @cd $(builddir) && rm -rf share
 
-$(config_h): configure
+$(config_h): configure.in aclocal.m4
 #
 # this is to prevent people from getting
 # undefined symbols  when we add them to config.h.in,
 # and they blindly run "cvs update; make".
 #
        @echo
-       @echo ' *** config.h file is out of date'
-       @echo ' *** Remove it, and rerun configure or autogen.sh'
+       @echo ' *** config.h is out of date'
+       @echo ' *** Remove it and rerun autogen:'
+       @echo '         rm config.h; ./autogen.sh'
        @echo
        @false

diff --git a/input/test/beam-dir-function.ly b/input/test/beam-dir-function.ly
index 40c3893ca0c18376a6da383d5fc185c1cf7b897c..7ee5facbef300f6e4e13b0b0ef30c3cff3120dca 100644 (file)
--- a/input/test/beam-dir-function.ly
+++ b/input/test/beam-dir-function.ly
@@ -1,7 +1,7 @@
 \version "1.5.68"
 
 \header{
-texidoc="
+  texidoc="
 
 There are several ways to calculate the direction of a beam
 
@@ -14,29 +14,51 @@ mean centre distance of all notes
 mean centre distance weighted per note
 @end table
 
-We should see:
+These beam direction functions are defined in @file{scm/beam.scm}.  If
+your favourite algorithm isn't one of these, you can hook up your own.
 
-  up down down
-
-  up up down
-"
-}
+Of course, this depends on the neutral-direction for the middle line,
+down by default.  We set that to 1 (up) in the lower staff."  }
 
 \score {
-  \notes \relative c'' {
-    \property Voice.Beam \set #'dir-function = #beam-dir-majority
-    [d8 a]
-    \property Voice.Beam \set #'dir-function = #beam-dir-mean
-    [d a] 
-    \property Voice.Beam \set #'dir-function = #beam-dir-median
-    [d a]
-    
-    \property Voice.Beam \set #'dir-function = #beam-dir-majority
-    \time 3/8
-    [d8 a a]
-    \property Voice.Beam \set #'dir-function = #beam-dir-mean
-    [d a a] 
-    \property Voice.Beam \set #'dir-function = #beam-dir-median
-    [d a a] 
-  }
+  \context PianoStaff <
+    \context Staff \notes \relative c'' {
+      \property Voice.Beam \set #'dir-function = #beam-dir-majority
+      [c8^"down" g]
+      \property Voice.Beam \set #'dir-function = #beam-dir-mean
+      [c^"up" g] 
+      \property Voice.Beam \set #'dir-function = #beam-dir-median
+      [c^"up" g]
+      
+      \time 3/8
+      \property Voice.Beam \set #'dir-function = #beam-dir-majority
+      [c8^"down" c g]
+      \property Voice.Beam \set #'dir-function = #beam-dir-mean
+      [c^"down" c g] 
+      \property Voice.Beam \set #'dir-function = #beam-dir-median
+      [c^"up" c g]
+    }
+    \context Staff=lower \notes \relative c'' {
+      \property Voice.Beam \set #'neutral-direction = #1
+      \property Voice.Beam \set #'dir-function = #beam-dir-majority
+      [d8_"up" a]
+      \property Voice.Beam \set #'dir-function = #beam-dir-mean
+      [d_"down" a] 
+      \property Voice.Beam \set #'dir-function = #beam-dir-median
+      [d_"down" a]
+      
+      \property Voice.Beam \set #'dir-function = #beam-dir-majority
+      \time 3/8
+      [d8_"up" a a]
+      \property Voice.Beam \set #'dir-function = #beam-dir-mean
+      [d_"up" a a] 
+      \property Voice.Beam \set #'dir-function = #beam-dir-median
+      [d_"down" a a] 
+
+    }
+  >
 }
+
+%% Local variables:
+%% LilyPond-indent-level:2
+%% End:

diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly
index b711b6d3a64e6ae336be7ec47f2c0570a27ffe7e..2b54f5b13e406083f536f6a0d042c72b3e8fd6d0 100644 (file)
--- a/input/test/beam-dir-functions.ly
+++ b/input/test/beam-dir-functions.ly
@@ -1,6 +1,6 @@
 \version "1.5.68"
 \header {
-texidoc = "
+  texidoc = "
 
 There are several ways to calculate the direction of a beam.
 @table @code
@@ -21,19 +21,27 @@ your favourite algorithm isn't one of these, you can hook up your own.
 }
 
 \paper { linewidth = -1.}
-\score { \notes \relative c { 
-  [d''8 a]
-  \property Voice.Beam \set #'dir-function = #beam-dir-mean
-  [d a] 
-  \property Voice.Beam \set #'dir-function = #beam-dir-median
-  [d a]
-}}
-\score { \notes \relative c {
-  \time 3/8
-  [d''8 a a]
-  \property Voice.Beam \set #'dir-function = #beam-dir-mean
-  [d a a] 
-  \property Voice.Beam \set #'dir-function = #beam-dir-median
-  [d a a] 
-}}
+\score {
+  \notes\relative c'' {
+    \property Voice.Beam \set #'dir-function = #beam-dir-majority
+    [c8 g]
+    \property Voice.Beam \set #'dir-function = #beam-dir-mean
+    [c g] 
+    \property Voice.Beam \set #'dir-function = #beam-dir-median
+    [c g]
+    
+    \time 3/8
+    \property Voice.Beam \set #'dir-function = #beam-dir-majority
+    [c8 c g]
+    \property Voice.Beam \set #'dir-function = #beam-dir-mean
+    [c c g] 
+    \property Voice.Beam \set #'dir-function = #beam-dir-median
+    [c c g] 
+  }
+}
+
+%% Local variables:
+%% LilyPond-indent-level:2
+%% End:
+