From: Jan Nieuwenhuizen Date: Thu, 15 Jul 1999 15:13:31 +0000 (+0200) Subject: patch::: 1.1.60.jcn1 X-Git-Tag: release/1.1.61~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0417f2f449b5ddd707a5c28d77663c08469ae7b5;p=lilypond.git patch::: 1.1.60.jcn1 pl 60.jcn1 - interstaff slur tuning - added some regtests - removed now silly check in encompass-info --- diff --git a/Documentation/tex/lilypond-regtest.doc b/Documentation/tex/lilypond-regtest.doc index 9f73e72e10..6412e1827d 100644 --- a/Documentation/tex/lilypond-regtest.doc +++ b/Documentation/tex/lilypond-regtest.doc @@ -52,6 +52,11 @@ Beams, stems and noteheads often have communication troubles, since the two systems for y dimensions (1 unit = staffspace, 1 unit = 1 point) are mixed. +Stems, beams, ties and slurs should behave similarly, when placed +on the middle staff line. + +\mudelafile{stem-direction.sly} + \section{Grace notes} Grace notes are typeset as an encapsulated piece of music. You can @@ -84,6 +89,12 @@ Stems may be short, but noteheads should never touch the beam. \mudelafile{beam-extreme.ly} +Beams should always reach the middle staff line, the second beam +counting from the note head side, should never be lower than the +second staff line. This does not hold for grace note beams. + +\mudelafile{beam-position.sly} + Slurs should look nice and symmetric. The curvature may increase only to avoid noteheads, and as little as possible. diff --git a/NEWS b/NEWS index 792499e81e..f685548b28 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +pl 60.jcn1 + - interstaff slur tuning + - added some regtests + - removed now silly check in encompass-info + pl 59.uu1 - papervar loose_column_distance - scripts don't collide. diff --git a/VERSION b/VERSION index 9a194ed92e..8dc0dc50e8 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=60 -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/input/test/beam-position.sly b/input/test/beam-position.sly new file mode 100644 index 0000000000..8755ed44e5 --- /dev/null +++ b/input/test/beam-position.sly @@ -0,0 +1 @@ +[f8 f] \grace { f8 e8 } [f64 f] diff --git a/input/test/stem-direction.sly b/input/test/stem-direction.sly new file mode 100644 index 0000000000..0ac11c4480 --- /dev/null +++ b/input/test/stem-direction.sly @@ -0,0 +1 @@ +b''4 ~ b8()b8 diff --git a/lily/encompass-info.cc b/lily/encompass-info.cc index 323fc20a9c..9b42db316c 100644 --- a/lily/encompass-info.cc +++ b/lily/encompass-info.cc @@ -47,10 +47,6 @@ Encompass_info::Encompass_info (Note_column const* note_column, Direction dir, S && !stem_l->extent (Y_AXIS).empty_b ()) { o_[Y_AXIS] = stem_l->extent (Y_AXIS)[dir]; - // URG URG. - // some slur in choral.ly returns -inf here - if (abs (o_[Y_AXIS]) > 1000) - o_[Y_AXIS] = 0; } else { diff --git a/ly/params.ly b/ly/params.ly index 8ac1cd2880..d0b193ff2f 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -93,10 +93,10 @@ slur_x_minimum = 3.0 * \interline; % slope damping: keep dy/dx < slur_slope_damping slur_slope_damping = 0.35; -slur_interstaff_slope_damping = 0.8; +slur_interstaff_slope_damping = 0.5; % height damping: keep h/dx < slur_height_damping slur_height_damping = 0.45; -slur_interstaff_height_damping = 1.2; +slur_interstaff_height_damping = 0.7; % snap to stem if slur ends closer to stem than slur_snap_to_stem = 1.5 * \interline; slur_interstaff_snap_to_stem = 2.5 * \interline; diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 586ab4e11f..f10fa350ab 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -112,7 +112,7 @@ global = \notes{ \score{ % Moderato - \context GrandStaff < + \context PianoStaff < \context Staff = upper < \global \upper @@ -128,11 +128,6 @@ global = \notes{ % no slur damping slur_slope_damping = 10.0; gourlay_maxmeasures = 4.0; - \translator{ - \GrandStaffContext - minVerticalAlign = 3.0*\staffheight; - maxVerticalAlign = 3.0*\staffheight; - } } \midi{ \tempo 4 = 80; } \header { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 index 6da0ff5e84..fb7f748af2 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 @@ -17,7 +17,7 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.1.60"; upper = \type Staff \notes \transpose c'' { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 71139a0aa6..fc90830c0b 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -189,7 +189,7 @@ global = \notes{ \score{ % Allegretto - \context GrandStaff < + \context PianoStaff < \context Staff = upper < \global \one @@ -205,11 +205,6 @@ global = \notes{ \paper{ \include "preludes-paper.ly"; gourlay_maxmeasures = 2.0; - \translator{ - \GrandStaffContext - minVerticalAlign = 3.0*\staffheight; - maxVerticalAlign = 3.0*\staffheight; - } } \midi{ \tempo 4 = 70; } \header{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 9f0fde9241..213589b9d8 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -186,7 +186,7 @@ global = \notes{ \score{ % Moderato - \context GrandStaff < + \context PianoStaff < \context Staff = upper < \global \upper @@ -200,11 +200,6 @@ global = \notes{ \paper{ \include "preludes-paper.ly"; gourlay_maxmeasures = 5.0; - \translator{ - \GrandStaffContext - minVerticalAlign = 3.0*\staffheight; - maxVerticalAlign = 3.0*\staffheight; - } } \midi{ \tempo 4 = 90; } \header{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index a3568d5bbb..16edc408f4 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -103,7 +103,7 @@ global = \notes{ \score{ % Allegretto - \context GrandStaff < + \context PianoStaff < \context Staff = upper < \global \one @@ -119,11 +119,6 @@ global = \notes{ \paper{ \include "preludes-paper.ly"; gourlay_maxmeasures = 3.0; - \translator{ - \GrandStaffContext - minVerticalAlign = 3.0*\staffheight; - maxVerticalAlign = 3.0*\staffheight; - } } \midi{ \tempo 4 = 40; } \header{