From: Trevor Daniels Date: Thu, 3 Apr 2008 08:21:02 +0000 (+0100) Subject: New from master X-Git-Tag: release/2.11.44-1~15^2~15 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5c3fb066fb0cbd4bafc6bff5179b3b8ef327fadc;p=lilypond.git New from master --- diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index 44027924e8..5a08ab6c5c 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -1,43 +1,43 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" - -\header { - doctitle = "Broken crescendo hairpin" - lsrtags = "expressive-marks" - texidoc = " -In order to make parts of a crescendo hairpin invisible, the following -method is used: A white rectangle is drawn on top of the respective -part of the crescendo hairpin, making it invisible. The rectangle is -defined as postscript code within a text markup. - -To fine-tune the position and size of the markup, the number -preceding @code{setgray} in the postscript definition can be set to a -value <1 making it grey. The two numbers before @code{scale} in the -postscript code are responsible for the width and height of the -rectangle, the two numbers before @code{translate} change the x- and -y-origin of the rectangle. - -Make sure to put the hairpin in a lower layer than the text markup to -actually draw the rectangle above the hairpin. -" } - -\score { - \relative c' { - << { - \dynamicUp - \override DynamicLineSpanner #'staff-padding = #4 - r2 r16 c'8.\pp r4 - } \\ { - \override DynamicLineSpanner #'layer = #0 - des,2\mf\< ~ - \override TextScript #'layer = #2 - des16_\markup { - \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1 - lineto 1 1 lineto 1 0 lineto 0 0 lineto fill" - } - r8. des4 ~ des16->\sff - } >> - } - \layout { ragged-right = ##t } -} +\version "2.11.38" + +\header { + doctitle = "Broken crescendo hairpin" + lsrtags = "expressive-marks" + texidoc = " +In order to make parts of a crescendo hairpin invisible, the following +method is used: A white rectangle is drawn on top of the respective +part of the crescendo hairpin, making it invisible. The rectangle is +defined as postscript code within a text markup. + +To fine-tune the position and size of the markup, the number +preceding @code{setgray} in the postscript definition can be set to a +value <1 making it grey. The two numbers before @code{scale} in the +postscript code are responsible for the width and height of the +rectangle, the two numbers before @code{translate} change the x- and +y-origin of the rectangle. + +Make sure to put the hairpin in a lower layer than the text markup to +actually draw the rectangle above the hairpin. +" } + +\score { + \relative c' { + << { + \dynamicUp + \override DynamicLineSpanner #'staff-padding = #4 + r2 r16 c'8.\pp r4 + } \\ { + \override DynamicLineSpanner #'layer = #0 + des,2\mf\< ~ + \override TextScript #'layer = #2 + des16_\markup { + \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1 + lineto 1 1 lineto 1 0 lineto 0 0 lineto fill" + } + r8. des4 ~ des16->\sff + } >> + } + \layout { ragged-right = ##t } +} diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly index 037ccbddb2..5a1f443443 100644 --- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly @@ -1,34 +1,34 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" -\layout { ragged-right = ##t } -\header { - doctitle = "Making an object invisible with the transparent property" - lsrtags = "rhythms,tweaks-and-overrides" - texidoc = " -Setting the @code{transparent} property will cause an object to be -printed in \"invisible ink\": the object is not printed, but all its -other behavior is retained. The object still takes up space, it takes -part in collisions, and slurs, ties and beams can be attached to it. - - -The snippet demonstrates how to connect different voices using ties. -Normally, ties only connect two notes in the same voice. By -introducing a tie in a different voice, and blanking the first up-stem -in that voice, the tie appears to cross voices. To prevent the blanked stem's -flag from interfering with tie positioning, the stem is extended. -" } - -\relative c'' { - \time 2/4 - << { - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - b8 ~ b\noBeam - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - g ~ g\noBeam - } \\ { - b g g e - } >> -} +\version "2.11.38" +\layout { ragged-right = ##t } +\header { + doctitle = "Making an object invisible with the transparent property" + lsrtags = "rhythms,tweaks-and-overrides" + texidoc = " +Setting the @code{transparent} property will cause an object to be +printed in \"invisible ink\": the object is not printed, but all its +other behavior is retained. The object still takes up space, it takes +part in collisions, and slurs, ties and beams can be attached to it. + + +The snippet demonstrates how to connect different voices using ties. +Normally, ties only connect two notes in the same voice. By +introducing a tie in a different voice, and blanking the first up-stem +in that voice, the tie appears to cross voices. To prevent the blanked stem's +flag from interfering with tie positioning, the stem is extended. +" } + +\relative c'' { + \time 2/4 + << { + \once \override Stem #'transparent = ##t + \once \override Stem #'length = #8 + b8 ~ b\noBeam + \once \override Stem #'transparent = ##t + \once \override Stem #'length = #8 + g ~ g\noBeam + } \\ { + b g g e + } >> +} diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly index 3bd097c800..14ac6b04eb 100644 --- a/input/new/broken-crescendo-hairpin.ly +++ b/input/new/broken-crescendo-hairpin.ly @@ -1,41 +1,41 @@ -\version "2.11.38" - -\header { - doctitle = "Broken crescendo hairpin" - lsrtags = "expressive-marks" - texidoc = " -In order to make parts of a crescendo hairpin invisible, the following -method is used: A white rectangle is drawn on top of the respective -part of the crescendo hairpin, making it invisible. The rectangle is -defined as postscript code within a text markup. - -To fine-tune the position and size of the markup, the number -preceding @code{setgray} in the postscript definition can be set to a -value <1 making it grey. The two numbers before @code{scale} in the -postscript code are responsible for the width and height of the -rectangle, the two numbers before @code{translate} change the x- and -y-origin of the rectangle. - -Make sure to put the hairpin in a lower layer than the text markup to -actually draw the rectangle above the hairpin. -" } - -\score { - \relative c' { - << { - \dynamicUp - \override DynamicLineSpanner #'staff-padding = #4 - r2 r16 c'8.\pp r4 - } \\ { - \override DynamicLineSpanner #'layer = #0 - des,2\mf\< ~ - \override TextScript #'layer = #2 - des16_\markup { - \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1 - lineto 1 1 lineto 1 0 lineto 0 0 lineto fill" - } - r8. des4 ~ des16->\sff - } >> - } - \layout { ragged-right = ##t } -} +\version "2.11.38" + +\header { + doctitle = "Broken crescendo hairpin" + lsrtags = "expressive-marks" + texidoc = " +In order to make parts of a crescendo hairpin invisible, the following +method is used: A white rectangle is drawn on top of the respective +part of the crescendo hairpin, making it invisible. The rectangle is +defined as postscript code within a text markup. + +To fine-tune the position and size of the markup, the number +preceding @code{setgray} in the postscript definition can be set to a +value <1 making it grey. The two numbers before @code{scale} in the +postscript code are responsible for the width and height of the +rectangle, the two numbers before @code{translate} change the x- and +y-origin of the rectangle. + +Make sure to put the hairpin in a lower layer than the text markup to +actually draw the rectangle above the hairpin. +" } + +\score { + \relative c' { + << { + \dynamicUp + \override DynamicLineSpanner #'staff-padding = #4 + r2 r16 c'8.\pp r4 + } \\ { + \override DynamicLineSpanner #'layer = #0 + des,2\mf\< ~ + \override TextScript #'layer = #2 + des16_\markup { + \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1 + lineto 1 1 lineto 1 0 lineto 0 0 lineto fill" + } + r8. des4 ~ des16->\sff + } >> + } + \layout { ragged-right = ##t } +} diff --git a/input/new/making-an-object-invisible-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly index 403b8babd7..46975c1ec6 100644 --- a/input/new/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly @@ -1,32 +1,32 @@ -\version "2.11.23" -\layout { ragged-right = ##t } -\header { - doctitle = "Making an object invisible with the transparent property" - lsrtags = "rhythms,tweaks-and-overrides" - texidoc = " -Setting the @code{transparent} property will cause an object to be -printed in \"invisible ink\": the object is not printed, but all its -other behavior is retained. The object still takes up space, it takes -part in collisions, and slurs, ties and beams can be attached to it. - - -The snippet demonstrates how to connect different voices using ties. -Normally, ties only connect two notes in the same voice. By -introducing a tie in a different voice, and blanking the first up-stem -in that voice, the tie appears to cross voices. To prevent the blanked stem's -flag from interfering with tie positioning, the stem is extended. -" } - -\relative c'' { - \time 2/4 - << { - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - b8 ~ b\noBeam - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - g ~ g\noBeam - } \\ { - b g g e - } >> -} +\version "2.11.23" +\layout { ragged-right = ##t } +\header { + doctitle = "Making an object invisible with the transparent property" + lsrtags = "rhythms,tweaks-and-overrides" + texidoc = " +Setting the @code{transparent} property will cause an object to be +printed in \"invisible ink\": the object is not printed, but all its +other behavior is retained. The object still takes up space, it takes +part in collisions, and slurs, ties and beams can be attached to it. + + +The snippet demonstrates how to connect different voices using ties. +Normally, ties only connect two notes in the same voice. By +introducing a tie in a different voice, and blanking the first up-stem +in that voice, the tie appears to cross voices. To prevent the blanked stem's +flag from interfering with tie positioning, the stem is extended. +" } + +\relative c'' { + \time 2/4 + << { + \once \override Stem #'transparent = ##t + \once \override Stem #'length = #8 + b8 ~ b\noBeam + \once \override Stem #'transparent = ##t + \once \override Stem #'length = #8 + g ~ g\noBeam + } \\ { + b g g e + } >> +} diff --git a/input/regression/musicxml/19a-PageLayout-PrintMusic.xml b/input/regression/musicxml/19a-PageLayout-PrintMusic.xml index 95e2e0073b..ac51b7fff1 100644 --- a/input/regression/musicxml/19a-PageLayout-PrintMusic.xml +++ b/input/regression/musicxml/19a-PageLayout-PrintMusic.xml @@ -1,102 +1,102 @@ - - - - Layout options - - - PrintMusic 2008 for Windows - Dolet Light for PrintMusic 2008 - 2007-11-04 - - - - - 3.7703 - 40 - - - 954 - 1804 - - 318 - 212 - 53 - 74 - - - - - 248 - 206 - - 561 - 436 - - - - - - Layout options - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + Layout options + + + PrintMusic 2008 for Windows + Dolet Light for PrintMusic 2008 + 2007-11-04 + + + + + 3.7703 + 40 + + + 954 + 1804 + + 318 + 212 + 53 + 74 + + + + + 248 + 206 + + 561 + 436 + + + + + + Layout options + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + + 4 + 1 + + + light-heavy + + + + +