From ef02f4fd1445db4d8a068b6d3ba5589e6cab2aed Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 4 Jan 1999 21:13:22 +0100 Subject: [PATCH] patch::: 1.1.18.jcn1: koel pl 18.jcn1 - stepmake update - small fixes: spacing.ly, wtk1-fugue2-ly, violino-viola duet. --- NEWS | 4 ++ TODO | 2 + VERSION | 2 +- aclocal.m4 | 9 ++-- input/test/spacing.ly | 67 +++++++++++++++++-------- mutopia/J.S.Bach/viola-i.ly | 3 +- mutopia/J.S.Bach/violino-i.ly | 2 +- mutopia/J.S.Bach/violino-viola.ly | 2 +- mutopia/J.S.Bach/violino-violoncello.ly | 2 +- mutopia/J.S.Bach/violoncello-i.ly | 2 +- mutopia/J.S.Bach/wtk1-fugue2.ly | 4 +- stepmake/NEWS | 6 +++ stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 9 ++-- 14 files changed, 76 insertions(+), 40 deletions(-) diff --git a/NEWS b/NEWS index 6b8d0fb119..fff6375172 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +pl 18.jcn1 + - stepmake update + - small fixes: spacing.ly, wtk1-fugue2-ly, violino-viola duet. + pl 17.jbr2 - Documentation/README-W32: Brought my stuff up to date - Documentation/ntweb: updated for realease diff --git a/TODO b/TODO index 59f23ce0ca..cbde6686c0 100644 --- a/TODO +++ b/TODO @@ -7,6 +7,8 @@ done, or is an idea that I want to think about Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr/urg + * input/test/extender.ly dumps core + * scm-ify \property values. * move class Lookup {} into scm diff --git a/VERSION b/VERSION index c3e453065e..113d0ef748 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=18 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 9928822b00..ba07a79c23 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,9 +1,5 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -83,7 +79,9 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ LD='$(CC)' AC_SUBST(LD) + CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(ICFLAGS) @@ -148,6 +146,7 @@ AC_DEFUN(AC_STEPMAKE_END, [ AC_DEFUN(AC_STEPMAKE_GXX, [ # ugh autoconf + # urg, egcs: how to check for egcs >= 1.1? changequote(<<, >>)dnl if $CXX --version | grep '2\.8' > /dev/null || $CXX --version | grep 'egcs' > /dev/null @@ -155,7 +154,7 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ then true else - AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs) + AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1) fi ]) diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 13fe18350f..fbe02806b1 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -8,42 +8,67 @@ TestedFeatures = "This file tests various spacings"; \version "1.0.14"; -multipart = \notes{ +multipart = \notes \relative c'{ \type StaffGroup < - { + \type Staff = one { c4 c c c } - { + \type Staff = two { [c8 c] [c c] [c c] [c c] } - { - \times 2/3 { [ c8 c c] } - \times 2/3 { [ c c c] } - \times 2/3 { [c c c] } \times 2/3 { [c c c] } + \type Staff = three { + \times 2/3 { [c8 c c] } + \times 2/3 { [c c c] } + \times 2/3 { [c c c] } \times 2/3 { [c c c] } } - { - \times 2/4 { [ c8 c c c] } - \times 2/4 { [ c c c c] } - \times 2/4 { [c c c c] } \times 2/4 { [c c c c] } + \type Staff = four { + \times 2/4 { [c8 c c c] } + \times 2/4 { [c c c c] } + \times 2/4 { [c c c c] } \times 2/4 { [c c c c] } } - { - \times 2/5 { [ c8 c c c c] } - \times 2/5 { [ c c c c c] } - \times 2/5 { [c c c c c] } \times 2/5 { [c c c c c] } - } - { + \type Staff = five { + \times 2/5 { [c8 c c c c] } + \times 2/5 { [c c c c c] } + \times 2/5 { [c c c c c] } \times 2/5 { [c c c c c] } + } + \type Staff = six { \times 2/6 { [c8 c c c c c] } \times 2/6 { [c c c c c c] } - \times 2/6 { [c c c c c c] } \times 2/6 { [c c c c c c] } + \times 2/6 { [c c c c c c] } \times 2/6 { [c c c c c c] } } - { + \type Staff = seven { \times 2/7 { [c8 c c c c c c] } - \times 2/7 { [c c c c c c c] } - \times 2/7 { [c c c c c c c] } \times 2/7 { [c c c c c c c] } + \times 2/7 { [c c c c c c c] } + \times 2/7 { [c c c c c c c] } + \times 2/7 { [c c c c c c c] } + } + \type Staff = eight { + \times 2/8 { [c8 c c c c c c c] } + \times 2/8 { [c c c c c c c c] } + \times 2/8 { [c c c c c c c c] } + \times 2/8 { [c c c c c c c c] } + } + \type Staff = nine { + \times 2/9 { [c8 c c c c c c c c] } + \times 2/9 { [c c c c c c c c c] } + \times 2/9 { [c c c c c c c c c] } + \times 2/9 { [c c c c c c c c c] } + } + \type Staff = ten { + \times 2/10 { [c8 c c c c c c c c c] } + \times 2/10 { [c c c c c c c c c c] } + \times 2/10 { [c c c c c c c c c c] } + \times 2/10 { [c c c c c c c c c c] } + } + \type Staff = eleven { + \times 2/11 { [c8 c c c c c c c c c c] } + \times 2/11 { [c c c c c c c c c c c] } + \times 2/11 { [c c c c c c c c c c c] } + \times 2/11 { [c c c c c c c c c c c] } } > } diff --git a/mutopia/J.S.Bach/viola-i.ly b/mutopia/J.S.Bach/viola-i.ly index 52ec6b8cbf..e36eb7a01b 100644 --- a/mutopia/J.S.Bach/viola-i.ly +++ b/mutopia/J.S.Bach/viola-i.ly @@ -1,8 +1,7 @@ -\header { \header{ filename = "viola-i.ly"; title = "Vier Duette"; -description = "For duets for Violino and Violoncello (Viola)"; +description = "Four duets for Violino and Violoncello (Viola)"; opus = "BWV"; composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; diff --git a/mutopia/J.S.Bach/violino-i.ly b/mutopia/J.S.Bach/violino-i.ly index a29cb50867..094805df0f 100644 --- a/mutopia/J.S.Bach/violino-i.ly +++ b/mutopia/J.S.Bach/violino-i.ly @@ -1,7 +1,7 @@ \header{ filename = "violino-i.ly"; title = "Vier Duette"; -description = "For duets for Violino and Violoncello (Viola)"; +description = "Four duets for Violino and Violoncello (Viola)"; opus = "BWV"; composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; diff --git a/mutopia/J.S.Bach/violino-viola.ly b/mutopia/J.S.Bach/violino-viola.ly index 18e360cfd9..c6cb61238f 100644 --- a/mutopia/J.S.Bach/violino-viola.ly +++ b/mutopia/J.S.Bach/violino-viola.ly @@ -1,7 +1,7 @@ \header{ filename = "violino-viola.ly"; title = "Vier Duette"; -description = "For duets for Violino and Violoncello (Viola)"; +description = "Four duets for Violino and Violoncello (Viola)"; opus = "BWV"; composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; diff --git a/mutopia/J.S.Bach/violino-violoncello.ly b/mutopia/J.S.Bach/violino-violoncello.ly index da628ae629..0f8791a743 100644 --- a/mutopia/J.S.Bach/violino-violoncello.ly +++ b/mutopia/J.S.Bach/violino-violoncello.ly @@ -1,7 +1,7 @@ \header{ filename = "violino-violoncello.ly"; title = "Vier Duette"; -description = "For duets for Violino and Violoncello (Viola)"; +description = "Four duets for Violino and Violoncello (Viola)"; opus = "BWV"; composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; diff --git a/mutopia/J.S.Bach/violoncello-i.ly b/mutopia/J.S.Bach/violoncello-i.ly index 323a4daaa4..d0c82d60a5 100644 --- a/mutopia/J.S.Bach/violoncello-i.ly +++ b/mutopia/J.S.Bach/violoncello-i.ly @@ -1,7 +1,7 @@ \header{ filename = "violoncello.ly"; title = "Vier Duette"; -description = "For duets for Violino and Violoncello (Viola)"; +description = "Four duets for Violino and Violoncello (Viola)"; opus = "BWV"; composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index 3c31452ff7..25cc1598c3 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -179,7 +179,9 @@ bassdux = \notes \relative c' { \paper { gourlay_maxmeasures =5.; % castingalgorithm = \Wordwrap; - + % current default for 16pt -> three pages + % arithmetic_multiplier = 4.8\pt; + arithmetic_multiplier = 4.4\pt; } \midi { diff --git a/stepmake/NEWS b/stepmake/NEWS index c12e5bdba6..514a33a8ac 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,9 @@ +pl 64 + - gcc-2.8/egcs + +pl 63 + - CFLAGS from yodl debian patch + pl 62 - fixed dist from subdirs - junked stepmake/aclocal.m4 (again?) diff --git a/stepmake/VERSION b/stepmake/VERSION index 1094635f8c..8195e1a7de 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=62 +PATCH_LEVEL=64 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index a828ed9907..db2f2d5173 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,7 +1,3 @@ -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -81,7 +77,9 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ LD='$(CC)' AC_SUBST(LD) + CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(ICFLAGS) @@ -146,6 +144,7 @@ AC_DEFUN(AC_STEPMAKE_END, [ AC_DEFUN(AC_STEPMAKE_GXX, [ # ugh autoconf + # urg, egcs: how to check for egcs >= 1.1? changequote(<<, >>)dnl if $CXX --version | grep '2\.8' > /dev/null || $CXX --version | grep 'egcs' > /dev/null @@ -153,7 +152,7 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ then true else - AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs) + AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1) fi ]) -- 2.39.2