From: Jan Nieuwenhuizen Date: Mon, 6 Aug 2001 15:25:42 +0000 (+0200) Subject: patch::: 1.5.4.jcn1 X-Git-Tag: release/1.5.5~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=83b33e64bfaa3628a501b3b0c573a3bce6b50c96;p=lilypond.git patch::: 1.5.4.jcn1 1.5.4.jcn1 ========== * Website fixes, found bug in grace note stem lengths. 1.5.4 ===== --- diff --git a/CHANGES b/CHANGES index 78a9eaa2a5..cdd2e4841b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +1.5.4.jcn1 +========== + +* Website fixes, found bug in grace note stem lengths. + +1.5.4 +===== + 1.5.3.hwn1 ========== diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 3abaec6594..589a895342 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -157,11 +157,15 @@ the duration of the long a. is proportionate to that of the main note. \property Score.TextScript \set #'font-style = #'large r -{ \property Grace.Stem \override #'flag-style = #"" - \grace g16 } +{ \property Voice.Stem \override #'flag-style = #"" + \grace g16 + \property Voice.Stem \revert #'flag-style + } fis8 e16 fis -{ \property Grace.Stem \override #'flag-style = #"" - \grace a16 } +{ \property Voice.Stem \override #'flag-style = #"" + \grace a16 + \property Voice.Stem \revert #'flag-style + } g8 fis16 g | a4 \bar "||" } \notes\relative c'' { r g16 () fis e fis a () g fis g | a4 \bar "||" } diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 809565998e..d2fb4cf5c0 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1350,7 +1350,11 @@ stem. @lilypond[fragment,verbatim] \relative c'' { \grace c8 c4 \grace { [c16 c16] } c4 - \grace { \property Grace.Stem \override #'flag-style = #'() c16 } c4 + \grace { + \property Voice.Stem \override #'flag-style = #'() + c16 + \property Voice.Stem \revert #'flag-style + } c4 } @end lilypond diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index bbc3d20133..2567b0743e 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1828,20 +1828,22 @@ viola = \notes \relative c' \context Voice = viola { oboes = \notes \relative c'' \context Voice = oboe { \stemUp s4 g8. b,16 c8 r - \grace + \grace { } \times 2/3 { } < { \times 2/3 { a8 g c } \! c2 } \context Voice = oboeTwo { \stemDown \grace { - \property Grace.Stem \override #'direction = #-1 - [f,16 g] } + \property Voice.Stem \override #'direction = #-1 + [f,16 g] + \property Voice.Stem \revert #'direction + } f8 e e2 } > \stemBoth - \grace <)b8. d8.-\trill> | + \grace { } <)b8. d8.-\trill> | [ < )f8. a>] <)b,8 d> r [ ] r | [ < )e8. g>] } @@ -1986,12 +1988,13 @@ these notes are indeed processed by precisely one context with defined above. @separate @example -\grace < d4 f> +\grace { } < d4 f> @end example @cindex @code{\grace} @cindex ornaments @cindex grace notes +[FIXME] @code{\grace} introduces grace notes. It takes one argument, in this case a chord. @@ -2052,6 +2055,7 @@ it from the other context. Stems go down in this voice. @example \grace @{ @end example +[FIXME] @cindex Grace context When a grace section is processed, a @code{Grace} context is created. This context acts like a miniature score of its own. It has @@ -2061,8 +2065,9 @@ etc. Here we fiddle with a property and make a beam. The argument of @separate @example -\property Grace.Stem \override #'direction = #-1 -[f,16 g] @} + \property Voice.Stem \override #'direction = #-1 + [f,16 g] + \property Voice.Stem \revert #'direction @end example Normally, grace notes are always stem up, but in this case, the upper @@ -2081,7 +2086,7 @@ This ends the two-part section. @separate @example \stemBoth -\grace <)b8. d8.-\trill> | +\grace { } <)b8. d8.-\trill> | @end example @cindex trill @cindex stemBoth diff --git a/VERSION b/VERSION index c76a3bf252..706c6e07de 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=4 -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/bugs/grace-stems.ly b/input/bugs/grace-stems.ly new file mode 100644 index 0000000000..26add43ba8 --- /dev/null +++ b/input/bugs/grace-stems.ly @@ -0,0 +1,23 @@ +\header{ +texidoc="startGraceMusic should no-stem-extend to true, but there's no effect: +the two grace beams should be the same here. +" +} + + +\score { + \context Voice \notes\relative c { + \grace { + [f8 e8] + \property Voice.Stem \override #'no-stem-extend = ##t + [f8 e8] + \property Voice.Stem \revert #'no-stem-extend + } + a4 + + } + \paper { + linewidth=-1.0 + } + \midi { } +} diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index 52f5dafeb6..7fc51c1875 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -11,8 +11,13 @@ Override with @code{noStemExtend}. \score { \context Voice \notes\relative c { - [f8 f] [f64 f] \grace { [f8 e8] } - \property Grace.Stem \override #'no-stem-extend = ##t + [f8 f] [f64 f] + \grace { + [f8 e8] + \property Voice.Stem \override #'no-stem-extend = ##f + [f8 e8] + \property Voice.Stem \revert #'no-stem-extend + } [f8 f] } diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 903d3462a3..b58a05b148 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -25,7 +25,9 @@ not set. Main note scripts don't end up on the grace note. \grace { [b32 ( c32] } ) c4 \grace [c8 c8] % \grace c16 [c8 c8] - \grace { \property Grace.graceAlignPosition = \right c16} c4 + %% broken? + %%\grace { \property Grace.graceAlignPosition = \right c16} c4 + c4 \grace { c16 } c4 } \paper {linewidth = -1.} \midi{ } diff --git a/input/tutorial/sammartini.ly b/input/tutorial/sammartini.ly index 8b1b54fe95..b69ea4086c 100644 --- a/input/tutorial/sammartini.ly +++ b/input/tutorial/sammartini.ly @@ -14,20 +14,22 @@ viola = \notes \relative c' \context Voice = viola { oboes = \notes \relative c'' \context Voice = oboe { \stemUp s4 g8. b,16 c8 r - \grace + \grace { } \times 2/3 { } < { \times 2/3 { a8 g c } \! c2 } \context Voice = oboeTwo { \stemDown \grace { - \property Grace.Stem \override #'direction = #-1 - [f,16 g] } + \property Voice.Stem \override #'direction = #-1 + [f,16 g] + \property Voice.Stem \revert #'direction + } f8 e e2 } > \stemBoth - \grace <)b8. d8.-\trill> | + \grace { } <)b8. d8.-\trill> | [ < )f8. a>] <)b,8 d> r [ ] r | [ < )e8. g>] }