From 04fa4fa6dd32b3eb0f73f0b48a2bed50ce076e38 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 29 Mar 2000 23:03:26 +0200 Subject: [PATCH] patch::: 1.3.40.jcn3 1.3.40.jcn3 =========== * mutopia/Coriolan/violino-2.ly: Bugfix: wrong pitch. * input/test: Removed stale AutoStaffSwitch examples. * mutopia/E.Saite: Fixed gnossiene-4, doing \autochange. Removed stale copy of gnossiene-4. --- CHANGES | 10 ++ VERSION | 2 +- input/bugs/direction.ly | 18 +++ input/bugs/empty.ly | 16 +++ input/test/ac-extra-voice.ly | 23 ++-- input/test/ass-extra-voice.ly | 94 ------------- input/test/auto-staff-switch.ly | 38 ------ mutopia/Coriolan/coriolan-paper.ly | 3 +- mutopia/Coriolan/coriolan-part-paper.ly | 3 +- mutopia/Coriolan/violino-2.ly | 2 +- mutopia/E.Satie/gnossienne-4-autochange.ly | 151 --------------------- mutopia/E.Satie/gnossienne-4.ly | 142 +++++++------------ 12 files changed, 109 insertions(+), 393 deletions(-) create mode 100644 input/bugs/direction.ly create mode 100644 input/bugs/empty.ly diff --git a/CHANGES b/CHANGES index d51c494c41..02b5243350 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +1.3.40.jcn3 +=========== + +* mutopia/Coriolan/violino-2.ly: Bugfix: wrong pitch. + +* input/test: Removed stale AutoStaffSwitch examples. + +* mutopia/E.Saite: Fixed gnossiene-4, doing \autochange. Removed stale +copy of gnossiene-4. + 1.3.40.jcn2 =========== diff --git a/VERSION b/VERSION index 876ccdab4e..8360cb4bee 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=40 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/direction.ly b/input/bugs/direction.ly new file mode 100644 index 0000000000..47f6cd4ad5 --- /dev/null +++ b/input/bugs/direction.ly @@ -0,0 +1,18 @@ +% +% urg ik dacht dat jij generic-properties en dir had gefikst? +% deze doet het wel in 1.3.37, voor je change + revert +% +\score{ +\context Voice=x \notes\relative c''{ +\property Voice.dynamicDirection = #-1 +\property Voice.verticalDirection = #1 + +c\pp c c\< c \! c c \ff + +} +\paper{ +} +\midi{ +\tempo 1 = 60; +} +} diff --git a/input/bugs/empty.ly b/input/bugs/empty.ly new file mode 100644 index 0000000000..187ca07d31 --- /dev/null +++ b/input/bugs/empty.ly @@ -0,0 +1,16 @@ +% +% empty bars? +% +\score{ +\context Staff \notes\relative c''{ +\property Staff.defaultBarType = #"" +c1 c +\property Staff.defaultBarType = #"empty" +c1 c +} +\paper{ +} +\midi{ +\tempo 1 = 60; +} +} diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index e6d3f9603f..bf3467bcaf 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -25,12 +25,11 @@ accompany = \notes \relative c{ \score{ \notes \context PianoStaff < -% \global \context Staff=up < \global \context Voice=foo { - \property Voice.verticalDirection = 1 - \property Voice.scriptVerticalDirection = 1 + \property Voice.verticalDirection = #1 + \property Voice.scriptVerticalDirection = #1 \melody } > @@ -46,20 +45,24 @@ accompany = \notes \relative c{ indent = 8.\mm; textheight = 295.\mm; - % no slur damping - slur_slope_damping = 100.0; + % ugly is beautiful + slur_beautiful = 5.0; + \translator{ + \PianoStaffContext + defaultBarType = #"" + } \translator{ \StaffContext % don't auto-generate bars: not a good idea: -> no breakpoints % barAuto = "0"; - % urg defaultBarType = ""; - defaultBarType = "empty"; + % urg defaultBarType = #"" + defaultBarType = #"" \remove "Time_signature_engraver"; - slurVerticalDirection = 1; - verticalDirection = -1; - beamAutoEnd = "1/2"; + slurVerticalDirection = #1 + verticalDirection = -1 + beamAutoEnd = #(make-moment 1 2) } } \midi { diff --git a/input/test/ass-extra-voice.ly b/input/test/ass-extra-voice.ly index c7c57badd7..e69de29bb2 100644 --- a/input/test/ass-extra-voice.ly +++ b/input/test/ass-extra-voice.ly @@ -1,94 +0,0 @@ -global = \notes { - \key a \minor; - \time 6/4; -% \skip 1.*34; -% \bar ".|"; -} - -melody = \notes\relative c''{ - r2 r r - r2 r r - r4 a'8-- \< a-- a-- a-- c-- \!b-- a--\> gis f \!e - es8 \grace b c r4 r2 r -} - -basloopje = \notes\relative c{ - d,8( a' d f a d f d a f d )a -} - -accompany = \notes \relative c{ - \notes\relative c \basloopje - \notes\relative c \basloopje - \notes\relative c \basloopje - \notes\relative c \basloopje -} - -\score{ - \notes{ - \context AutoSwitchGrandStaff \relative c < - \global - \context Staff=upper { - \context Voice=foo - \property Voice.verticalDirection = 1 - \property Voice.scriptVerticalDirection = 1 - \melody - } - \context AutoSwitchContext \accompany - > - } - - \paper { - gourlay_maxmeasures = 4.; - indent = 8.\mm; - textheight = 295.\mm; - - % no slur damping - slur_slope_damping = 100.0; - - \translator{ - \StaffContext - % don't auto-generate bars: not a good idea: -> no breakpoints - % barAuto = "0"; - % urg defaultBarType = ""; - defaultBarType = "empty"; - \remove "Time_signature_engraver"; - } - \translator{ - \GraceContext - \remove "Local_key_engraver"; - } - \translator { - \ScoreContext - \accepts AutoSwitchGrandStaff; - } - \translator{ - \type "Engraver_group_engraver"; - \name AutoSwitchGrandStaff; - \consists "Span_bar_engraver"; - \consists "Vertical_align_engraver"; - \consists "Piano_bar_engraver"; - \consistsend "Axis_group_engraver"; - minVerticalAlign = 2.*\staffheight; - maxVerticalAlign = 2.*\staffheight; - switcherName = "Voice"; - acceptorName = "Thread"; - staffContextName = "Staff"; - - \accepts "AutoSwitchContext"; - \accepts "Staff"; - slurVerticalDirection = 1; - verticalDirection = -1; - beamAutoEnd = "1/2"; - } - \translator { - \type "Engraver_group_engraver"; - \name "AutoSwitchContext"; - \consists "Staff_switching_translator"; - } - } -% broken 1.1.51.hwn2 -% \midi { -% \tempo 4 = 54; -% } -} - diff --git a/input/test/auto-staff-switch.ly b/input/test/auto-staff-switch.ly index 5439d0241d..e69de29bb2 100644 --- a/input/test/auto-staff-switch.ly +++ b/input/test/auto-staff-switch.ly @@ -1,38 +0,0 @@ - -\score { -\notes { - \context AutoSwitchGrandStaff \relative c' { - c8 d b a' a, f' g,4 ~ g - - } -} - -\paper { -\translator { \ScoreContext -\accepts AutoSwitchGrandStaff; -} -\translator{ - \type "Engraver_group_engraver"; - \name AutoSwitchGrandStaff; - \consists "Span_bar_engraver"; - \consists "Vertical_align_engraver"; - \consists "Piano_bar_engraver"; - \consistsend "Axis_group_engraver"; - minVerticalAlign = 2.*\staffheight; - maxVerticalAlign = 2.*\staffheight; - switcherName = "Voice"; - acceptorName = "Thread"; - staffContextName = "Staff"; - - \accepts "AutoSwitchContext"; - \accepts "Staff"; -} -\translator { - \type "Engraver_group_engraver"; - \name "AutoSwitchContext"; - \consists "Staff_switching_translator"; -} - -}} - -\version "1.3.5"; diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly index 0c87cdff7d..e1d7140a33 100644 --- a/mutopia/Coriolan/coriolan-paper.ly +++ b/mutopia/Coriolan/coriolan-paper.ly @@ -21,7 +21,8 @@ %%\consists "Line_number_engraver"; verticalDirection = #1 stemVerticalDirection = #1 - dynamicDirection = #-1 + %dynamicDirection = #-1 + dynamicDirection = #1 } \translator { \VoiceContext diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly index b9ed1f401d..0efeefa7bd 100644 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ b/mutopia/Coriolan/coriolan-part-paper.ly @@ -16,7 +16,8 @@ %%\consists "Line_number_engraver"; verticalDirection = #1 stemVerticalDirection = #1 - dynamicDirection = #-1 + %dynamicDirection = #-1 + dynamicDirection = #1 } \translator { \VoiceContext diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index e2243cf427..be10cbd5e4 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -180,7 +180,7 @@ violino2 = \notes \relative c { a'4 r8 es' d4 r8 a | %120 - b4 r8 es des4 r8 bes | + bes4 r8 es des4 r8 bes | as!4 r8 es' des4 r8 as | g4 r r2 | r4 r8 es' des4 r8 as | diff --git a/mutopia/E.Satie/gnossienne-4-autochange.ly b/mutopia/E.Satie/gnossienne-4-autochange.ly index 87da9140e0..e69de29bb2 100644 --- a/mutopia/E.Satie/gnossienne-4-autochange.ly +++ b/mutopia/E.Satie/gnossienne-4-autochange.ly @@ -1,151 +0,0 @@ -\header { - filename = "gnossienne-4.ly"; - title = "Gnossienne"; - subtitle = "4"; - source = ""; - composer = "Erik Satie (1866-1925)"; - enteredby = "jcn"; - copyright = "Public Domain"; -} - -%{ - Tested Features: cross staff auto beams and slurs, grace notes, no bars -%} - -\version "1.3.4"; - -\include "nederlands.ly" - -global = \notes { - \key a \minor; - \time 6/4; - \skip 1.*34; - \bar ".|"; -} - -melody = \notes\relative c''{ - \clef violin; - \property Voice.verticalDirection = #1 - \property Voice.graceFraction = "1/4" - r2 r r - r2 r r - r4 a'8--(\< a-- a-- a-- c-- \!b-- a--\> gis f \!e - es8 \grace b( ))c r4 r2 r - r2 r r - r4 a'8--(\< a-- a-- a-- c-- \!b-- a--\> gis f \!e - es8 \grace b( ))c r4 r2 r - r4 g16( a bes a g a bes a g a bes a g a bes a g fis es fis - )d4 \grace fis8()gis4 ~ gis8 r r4 r2 - r4 g16( a bes a g a bes a g a bes a g a bes a g fis es fis - )d4 \grace fis8()gis4 ~ gis8 r r4 r2 - \grace a8()f4 ~ f8 r r2 r - r2 r4 a8( b c d c b \grace b8()e \grace a,())g r4 r2 r - r2 r4 a8( b c d c b a b c d c b a b c d c b - \grace b8()e \grace a,())g r4 r2 r - a2( \grace e'8()f4 ~ )f8 r r2 - r2 r r - fis,4( \grace dis8<)cis4 ais> r2 r - \grace b'8()a \grace b()a r4 r2 r - r4 a'8--(\< a-- a-- a-- c-- \!b-- a--\> gis f \!e - es8 \grace b())c r4 r2 r - d,4( \grace fis8()gis4 ~ )gis8 r r4 r2 - f4 ~ f8 r r2 r - f'8( g a b a g f g a b a g - \grace f8()g \grace d)e r4 r2 r - f8( g a b a g f g a b a g - \grace f8()g8 \grace d())e r4 r2 r - a,2( \grace e'8() f4 ~ )f8 r r2 - r2 r r - fis,4( \grace dis8<)cis4 ais> r2 r - ~ -} - -basloopje = \notes\relative c{ -% d,8( a' d f a \translator Staff=treble d f d \translator Staff=bass a f d )a - d,8( a' d f a d f d a f d )a -} - -accompany = \notes \relative c{ - % snapnie, hoevaak relative c heeft ze nodig? - \notes\relative c \basloopje - \notes\relative c \basloopje - \notes\relative c \basloopje - \transpose bes \notes\relative c{ \basloopje } - \transpose bes \notes\relative c{ \basloopje } - \notes\relative c \basloopje - \transpose bes \notes\relative c{ \basloopje } - \transpose bes \notes\relative c{ \basloopje } - \transpose a \notes\relative c{ \basloopje } - \transpose bes \notes\relative c{ \basloopje } - \transpose a \notes\relative c{ \basloopje } - \notes\relative c \basloopje - \notes\relative c \basloopje - % huh? d' - \transpose d' \notes\relative c{ \basloopje } - \notes\relative c \basloopje - \notes\relative c \basloopje - \transpose d' \notes\relative c{ \basloopje } - \notes\relative c \basloopje - \notes\relative c \basloopje - \transpose e' \notes\relative c{ \basloopje } - \notes\relative c \basloopje - \notes\relative c \basloopje - \transpose bes \notes\relative c{ \basloopje } - \transpose a \notes\relative c{ \basloopje } - \notes\relative c \basloopje - \notes\relative c \basloopje - \transpose d' \notes\relative c{ \basloopje } - \notes\relative c \basloopje - \transpose d' \notes\relative c{ \basloopje } - \notes\relative c \basloopje - \notes\relative c \basloopje - \transpose e' \notes\relative c{ \basloopje } - < e1 b' e> ~ < e b' e> -} - - -\score{ - \notes{ - \context PianoStaff \relative c < - %\context Staff=upper < - \context Staff=up < - \global - \context Voice=foo { - \property Voice.verticalDirection = #1 - \property Voice.scriptVerticalDirection = #1 - \melody - } - > - \context Staff=down < - \global - \clef bass; - \property Voice.slurVerticalDirection = #1 - \accompany - > - > - } - \paper { - gourlay_maxmeasures = 4.; - indent = 8.\mm; - textheight = 295.\mm; - - slur_interstaff_slope_damping = 100.0; - slur_interstaff_height_damping = 100.0; - - \translator{ - \StaffContext - % don't auto-generate bars: not a good idea: -> no breakpoints - % barAuto = "0"; - % urg defaultBarType = ""; - defaultBarType = "empty"; - \remove "Time_signature_engraver"; - - slurVerticalDirection = #1 - verticalDirection = #-1 - beamAutoEnd = #(make-moment 1 2) - } - } - \midi { - \tempo 4 = 54; - } -} diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index c53e26066f..4d4b75c0cc 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -2,7 +2,6 @@ filename = "gnossienne-4.ly"; title = "Gnossienne"; subtitle = "4"; - source = ""; composer = "Erik Satie (1866-1925)"; enteredby = "jcn"; copyright = "Public Domain"; @@ -14,19 +13,17 @@ \version "1.3.5"; -\include "nederlands.ly" - global = \notes { - \key a \minor; - \time 6/4; - \skip 1.*34; -% \bar ".|"; + \key a \minor; + \time 6/4; + \skip 1.*34; + \bar "|."; } - + melody = \notes\relative c''{ \clef violin; - \property Voice.verticalDirection = 1 - \property Voice.graceFraction = "1/4" + \property Voice.verticalDirection = #1 + \property Voice.graceFraction = #(make-moment 1 4) r2 r r r2 r r r4 a'8--(\< a-- a-- a-- c-- \!b-- a--\> gis f \!e @@ -57,11 +54,10 @@ melody = \notes\relative c''{ a,2( \grace e'8() f4 ~ )f8 r r2 r2 r r fis,4( \grace dis8<)cis4 ais> r2 r - ~ + ~ } basloopje = \notes\relative c{ -% d,8( a' d f a \translator Staff=treble d f d \translator Staff=bass a f d )a d,8( a' d f a d f d a f d )a } @@ -100,94 +96,48 @@ accompany = \notes \relative c{ \notes\relative c \basloopje \notes\relative c \basloopje \transpose e' \notes\relative c{ \basloopje } - < e1 b' e> ~ < e b' e> + < e1*6/4 b' e> ~ < e b' e> } - \score{ - \notes{ - \context AutoSwitchGrandStaff \relative c < - \context Staff=upper < - \global - \context Voice=foo{ - \property Voice.verticalDirection = 1 - \property Voice.scriptVerticalDirection = 1 - \melody - } - > - \context AutoSwitchContext < - \global - \accompany - > - > - } - \paper { - gourlay_maxmeasures = 4.; - indent = 8.\mm; - textheight = 295.\mm; + \notes \context PianoStaff < + \context Staff=up < + \global + \context Voice=foo { + \property Voice.verticalDirection = #1 + \property Voice.scriptVerticalDirection = #1 + \melody + } + > + \context Staff=down < + \global + \clef bass; + \autochange Staff \accompany + > + > - % no slur damping - slur_slope_damping = 100.0; + \paper { + gourlay_maxmeasures = 4.; + indent = 8.\mm; + textheight = 295.\mm; - \translator{ - \StaffContext - % don't auto-generate bars: not a good idea: -> no breakpoints - % barAuto = "0"; - % urg defaultBarType = ""; - defaultBarType = "empty"; - \remove "Time_signature_engraver"; - } - \translator{ - \GraceContext - \remove "Local_key_engraver"; - } - \translator { - \ScoreContext - \accepts "AutoSwitchGrandStaff"; - } - \translator{ - \type "Engraver_group_engraver"; - \name AutoSwitchGrandStaff; - \consists "Span_bar_engraver"; - \consists "Vertical_align_engraver"; - \consists "Piano_bar_engraver"; - \consistsend "Axis_group_engraver"; - minVerticalAlign = 2.*\staffheight; - maxVerticalAlign = 2.*\staffheight; - switcherName = "Voice"; - acceptorName = "Thread"; - staffContextName = "Staff"; + % ugly is beautiful + slur_beautiful = 5.0; - \accepts "AutoSwitchContext"; - \accepts "Staff"; - slurVerticalDirection = 1; - verticalDirection = -1; - beamAutoEnd = #(make-moment 1 2) - } - \translator { - \type "Engraver_group_engraver"; - \name AutoSwitchContext; - \consists "Staff_switching_translator"; - } - } - \midi { - \tempo 4 = 54; - \translator { - \ScoreContext - \accepts "AutoSwitchGrandStaff"; - } - \translator { - \type "Performer_group_performer"; - \name AutoSwitchGrandStaff; - \accepts "AutoSwitchContext"; - \accepts "Staff"; - } - \translator { - \type "Staff_performer"; - \name AutoSwitchContext; - \accepts "Voice"; - \consists "Key_performer"; - \consists "Time_signature_performer"; - } - } + \translator{ + \StaffContext + % don't auto-generate bars: not a good idea: -> no breakpoints + % barAuto = #f + defaultBarType = #"" + \remove "Time_signature_engraver"; + + slurVerticalDirection = #1 + verticalDirection = #-1 + beamAutoEnd = #(make-moment 1 2) + } + } + \midi { + \tempo 4 = 54; + } } + -- 2.39.2