From dfa63b878e03201c38910ab7d5d69dbb8bf1ede1 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 11 Aug 2002 13:59:26 +0000 Subject: [PATCH] * GNUmakefile.in: Fix config.h dependency. * input/test/beam-dir-function.ly: Fix for new default neutral-direction = -1 (down). --- ChangeLog | 5 +++ GNUmakefile.in | 7 ++-- input/test/beam-dir-function.ly | 68 +++++++++++++++++++++----------- input/test/beam-dir-functions.ly | 40 +++++++++++-------- 4 files changed, 78 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e940cf459..0ff7486043 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2002-08-11 Jan Nieuwenhuizen + * 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 7bdb175e1f..302b872131 100644 --- 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 40c3893ca0..7ee5facbef 100644 --- 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 b711b6d3a6..2b54f5b13e 100644 --- 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: + -- 2.39.5