From: hanwen Date: Sat, 12 Oct 2002 22:14:56 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/1.7.25~720 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=de739aed405bbd63cc35b417814a8035c38a6c75;p=lilypond.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 00d3f72e80..93aa738f99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-10-12 Han-Wen Nienhuys + * ly/grace-init.ly (startGraceMusic): shorten default grace stem + length. + * input/regression/spacing-to-grace.ly: new file. * input/regression/spacing-end-of-line.ly: new file. diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 130c42b95a..8a4a0d85fd 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -120,5 +120,5 @@ put on top of all staves, and appears only at left side of the staff.", /* creats*/ "BarNumber", /* accepts */ "", /* acks */ "break-aligned-interface", -/* reads */ "currentBarNumber stavesFound" , +/* reads */ "currentBarNumber stavesFound barNumberVisibility" , /* write */ ""); diff --git a/ly/grace-init.ly b/ly/grace-init.ly index ac54002b05..09db889aca 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -2,9 +2,10 @@ startGraceMusic = { \property Voice.Stem \override #'direction = #1 - \property Voice.Stem \override #'length = #5.5 \property Voice.Stem \override #'lengths = - #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)) + #(map (lambda (x) (* 0.8 x)) '(2.5 2.5 3.0 4.0 5.0)) + \property Voice.Stem \override #'stem-shorten = + #'(0.4 0) \property Voice.Stem \override #'beamed-lengths = #(map (lambda (x) (* 0.8 x)) '(3.26)) \property Voice.Stem \override #'beamed-minimum-free-lengths = @@ -34,6 +35,9 @@ startGraceMusic = { \property Voice.Slur \override #'direction = #-1 } + +%% attention: order is significant: reversed from above +%% (consistent ordering reduces memory usage.) stopGraceMusic = { \property Voice.Slur \revert #'direction \property Staff.Accidental \revert #'font-relative-size @@ -41,11 +45,11 @@ stopGraceMusic = { \property Voice.Stem \revert #'stroke-style \property Voice.Stem \revert #'no-stem-extend - \property Voice.Stem \revert #'beamed-lengths - \property Voice.Stem \revert #'beamed-minimum-free-lengths \property Voice.Stem \revert #'beamed-extreme-minimum-free-lengths - \property Voice.Stem \revert #'lengths - \property Voice.Stem \revert #'length + \property Voice.Stem \revert #'beamed-minimum-free-lengths + \property Voice.Stem \revert #'beamed-lengths + \property Voice.Stem \revert #'stem-shorten + \property Voice.Stem \revert #'lengths \property Voice.Stem \revert #'direction \property Voice.Beam \revert #'space-function diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 3ef7279925..1fb9ace404 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -1081,7 +1081,7 @@ (break-visibility . ,all-visible) (space-alist . ( (first-note . (extra-space . 2.0)) - (right-edge . (extra-space . 0.8)) + (right-edge . (extra-space . 0.5)) (staff-bar . (minimum-space . 2.0)) )) (breakable . #t)