From: Jan Nieuwenhuizen Date: Tue, 28 Sep 1999 15:38:25 +0000 (+0200) Subject: patch::: 1.2.11.jcn1 X-Git-Tag: release/1.2.12~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3e0e3d224ec79ea733ce106fd4bedb91acc8a875;p=lilypond.git patch::: 1.2.11.jcn1 pl 11.jcn1 - gnossiene with new \autochange --- diff --git a/BUGS b/BUGS index 8fb51c7c21..f9c6a51ea8 100644 --- a/BUGS +++ b/BUGS @@ -43,6 +43,11 @@ Guile 1.3.2 is buggy in several respects. Do not use it for LilyPond. Lilypond 1.1.35-1.1.51,...: Wierd errors in guile scm_gc_mark () +[Sparc64/Solaris 2.6, make-3.77] + +GNU make-3.77 is buggy on this platform, upgrade to 3.78.1 or newer. + + [All platforms] Some bugs may be captured in input/bugs/*y diff --git a/CHANGES b/CHANGES index 8a5495b15a..319d800af1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +pl 11.jcn1 + - gnossiene with new \autochange + pl 10.hwn1 - Auto_change_music, Auto_change_iterator: auto staff switching. 2nd try. See input/test/auto-change.ly diff --git a/VERSION b/VERSION index ae415ac44e..437df27278 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=2 PATCH_LEVEL=11 -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/core.ly b/input/bugs/core.ly new file mode 100644 index 0000000000..5564617f77 --- /dev/null +++ b/input/bugs/core.ly @@ -0,0 +1,24 @@ +% core dumps + +global = \notes { + \key a \minor; + \time 6/4; +} + +\score{ + \notes \context PianoStaff < + \global + \context Staff=up { c } + %\context Staff=down { \autochange Staff c } + \context Staff=down { c } + > + \paper { + \translator{ + \StaffContext + + % other core dump when this is removed? + \remove "Time_signature_engraver"; + } + } +} + diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly new file mode 100644 index 0000000000..e6d3f9603f --- /dev/null +++ b/input/test/ac-extra-voice.ly @@ -0,0 +1,69 @@ +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 PianoStaff < +% \global + \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 + > + > + + \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"; + + slurVerticalDirection = 1; + verticalDirection = -1; + beamAutoEnd = "1/2"; + } + } + \midi { + \tempo 4 = 54; + } +} + diff --git a/mutopia/E.Satie/gnossienne-4-autochange.ly b/mutopia/E.Satie/gnossienne-4-autochange.ly new file mode 100644 index 0000000000..2780a7016e --- /dev/null +++ b/mutopia/E.Satie/gnossienne-4-autochange.ly @@ -0,0 +1,150 @@ +\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.2.0"; + +\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; + \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 = "1/2"; + } + } + \midi { + \tempo 4 = 54; + } +} diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index 41296e26e4..6094281c8b 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -20,7 +20,7 @@ global = \notes { \key a \minor; \time 6/4; \skip 1.*34; - \bar ".|"; +% \bar ".|"; } melody = \notes\relative c''{ @@ -107,14 +107,18 @@ accompany = \notes \relative c{ \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 + \context Staff=upper < + \global + \context Voice=foo{ + \property Voice.verticalDirection = 1 + \property Voice.scriptVerticalDirection = 1 + \melody + } + > + \context AutoSwitchContext < + \global + \accompany + > > } \paper {