From: Jan Nieuwenhuizen Date: Sun, 28 Jan 2001 11:10:58 +0000 (+0100) Subject: patch::: 1.3.125.jcn3 X-Git-Tag: release/1.3.126~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=291f831ae09fb158b4f095806655ef81ad69d4b9;p=lilypond.git patch::: 1.3.125.jcn3 1.3.125.jcn3 ============ * Clef workarounds for Coriolan. --- diff --git a/CHANGES b/CHANGES index 200fdcb319..69539bb20c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.3.125.jcn3 +============ + +* Clef workarounds for Coriolan. + 1.3.125.jcn2 ============ diff --git a/VERSION b/VERSION index 12fd5a4e59..461ff6f30b 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=125 -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/clef-staff.ly b/input/bugs/clef-staff.ly new file mode 100644 index 0000000000..bb1e8e2bb7 --- /dev/null +++ b/input/bugs/clef-staff.ly @@ -0,0 +1,279 @@ +% Bugs: +% * CLef has `Staff' hardcoded +% * Dynamics into staff: pp/ff at first note cello/contrabass + +\header { +texidoc="Template for part-combining orchestral scores"; +} + +\include "paper16.ly"; +% \include "mutopia/Coriolan/coriolan-paper.ly"; + + + +flautoI = \notes\relative c'' { + c4 d e f + b,4 d c d + r2 e4 f + \break + c4 d e f + c4 r e f + c4 r e f + \break + c4 r a r + a a r a + a2 \property VoiceCombineThread.soloADue = ##f a +} + +flautoII = \notes\relative c'' { + g4 b d f + r2 c4 d + a c c d + a4. b8 c4 d + c r e r + r2 s2 + a,4 r a r + a r r a + a2 \property VoiceCombineThread.soloADue = ##f a +} + +flautiStaff = \notes \context VoiceCombineStaff = flauti < + \property VoiceCombineStaff.midiInstrument = #"flute" + \property VoiceCombineStaff.instrument = #"2 Flauti" + \property VoiceCombineStaff.instr = #"Fl." + %\global + \context VoiceCombineVoice=one \partcombine VoiceCombineVoice + \context VoiceCombineThread=one \flautoI + \context VoiceCombineThread=two \flautoII +> + +legniGroup = \context StaffGroup = legni_group < + \flautiStaff + %\oboiStaff + %\clarinettiStaff + %\fagottiStaff +> + +violinoI = \notes\relative c'' { + c4 d e f + c d e f + c d e f + c d e f + c d e f + c d e f + c4 d e f + a8 a a a b b b b + d1 +} + +violinoII = \notes\relative c'' { + c4 d e f + c d e f + c d e f + c2 e2 + c4 d e f + c2 e2 + c,4 d e f + a8 a a a b b b b + b1 +} + +violinoIStaff = \context Staff = oneViolino < + \property Staff.midiInstrument = #"violin" + \property Staff.instrument = #"Violino I" + \property Staff.instr = #"Vl. I" + %\notes < + %\global + %\context Voice=oneViolino + %\context Thread=oneViolino + \violinoI + % > +> + +violinoIIStaff = \context Staff = twoViolino < + % MIDI hoort geeneens verschil tussen een + % eerste en tweede viool ;-) + \property Staff.midiInstrument = #"violin" + \property Staff.instrument = #"Violino II" + \property Staff.instr = #"Vl. II" + %\notes < + %\global + %\context Voice=twoViolino + %\context Thread=twoViolino + \violinoII + % > +> + +violaI = \notes\transpose c, \violinoI + +violaII = \notes\transpose c, \violinoII + +violiGroup = \notes \context VoiceCombineStaff = oneVioli < + \property VoiceCombineStaff.midiInstrument = #"viola" + \property VoiceCombineStaff.instrument = #"Viola" + \property VoiceCombineStaff.instr = #"Vla." + \clef "alto"; + + \key f \major; + \skip 1*314; + \bar "|."; + + \context VoiceCombineVoice=oneVioli \partcombine VoiceCombineVoice + \context VoiceCombineThread=oneVioli \violaI + \context VoiceCombineThread=twoVioli \violaII +> + +violoncello = \notes\relative c { + c1\ff d e f c d e f c +} + +contrabasso = \notes\relative c { + c1\pp + d4 e d e + e1 + f4 g f g + c1 + d4 e d e + e1 + f4 g f g + c1 +} + + +bassiGroup = \context PianoStaff = bassi_group \notes < + \context StaffCombineStaff=oneBassi { + \property StaffCombineStaff.midiInstrument = #"cello" + %\property StaffCombineStaff.instrument = #"Violoncello\ne\nContrabasso" + \property StaffCombineStaff.instrument = #'(lines "Violoncello" "e" "Contrabasso") + \property StaffCombineStaff.instr = #"Vc." + + \clef "bass"; + \key es \major; + \skip 1*314; + \bar "|."; + } + \context StaffCombineStaff=twoBassi { + \property StaffCombineStaff.midiInstrument = #"contrabass" + \property StaffCombineStaff.instrument = #"Contrabasso" + \property StaffCombineStaff.instr = #"Cb." + + \clef "bass"; + \key as \major; + \skip 1*314; + \bar "|."; + } + + \context StaffCombineStaff=oneBassi \partcombine StaffCombineStaff + \context StaffCombineVoice=oneBassi \violoncello + \context StaffCombineVoice=twoBassi \contrabasso +> + + +violiniGroup = \context GrandStaff = violini_group < + \violinoIStaff + \violinoIIStaff +> + +archiGroup = \context StaffGroup = archi_group < + \violiniGroup + \violiGroup + \bassiGroup +> + + +\score{ + < + \legniGroup + %\ottoniGroup + %\timpaniGroup + \archiGroup + > + \header { + title = "Coriolan"; + subtitle = "Ouverture"; + opus = "Opus 62"; + composer = "Ludwig van Beethoven (1770-1827)"; + enteredby = "JCN"; + copyright = "public domain"; + } + %\paper {} + \paper{ + \paperSixteen + + %textheight = 290.0\mm; + %linewidth = 195.0\mm; + textheight = 285.0\mm; + linewidth = 190.0\mm; + + \translator{ \HaraKiriStaffContext } + % + % The Voice combine hierarchy + % + \translator{ + \ThreadContext + \name "VoiceCombineThread"; + \consists "Rest_engraver"; + } + \translator{ + \VoiceContext + \name "VoiceCombineVoice"; + soloText = #"I." + soloIIText = #"II." + \remove "Rest_engraver"; + \accepts "VoiceCombineThread"; + } + \translator{ + \HaraKiriStaffContext + \consists "Mark_engraver"; + \name "VoiceCombineStaff"; + \accepts "VoiceCombineVoice"; + } + + % + % The Staff combine hierarchy + % + \translator{ + \ThreadContext + \name "StaffCombineThread"; + } + \translator{ + \VoiceContext + \name "StaffCombineVoice"; + \accepts "StaffCombineThread"; + \consists "Thread_devnull_engraver"; + } + \translator { + \HaraKiriStaffContext + \name "StaffCombineStaff"; + \accepts "StaffCombineVoice"; + + soloADue = ##t + soloText = #"" + soloIIText = #"" + % This is non-conventional, but currently it is + % the only way to tell the difference. + aDueText = #"\\`a2" + splitInterval = #'(1 . 0) + changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + } + \translator { + \StaffGroupContext + \accepts "VoiceCombineStaff"; + \accepts "StaffCombineStaff"; + } + \translator{ \HaraKiriStaffContext } + + \translator { + %\ScoreContext + \OrchestralScoreContext + \accepts "VoiceCombineStaff"; + \accepts "StaffCombineStaff"; + skipBars = ##t + + markScriptPadding = #4.0 + + BarNumber \override #'padding = #3 + RestCollision \override #'maximum-rest-count = #1 + } + } +} diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly index 591343f6e0..319154c2c5 100644 --- a/input/test/part-combine-score.ly +++ b/input/test/part-combine-score.ly @@ -8,10 +8,13 @@ texidoc="Template for part-combining orchestral scores"; flautoI = \notes\relative c'' { - c4 d e f + c4\pp d e f b,4 d c d r2 e4 f \break + \context Score \outputproperty #(make-type-checker 'paper-column-interface) + #'between-system-string = #"\\eject" + c4 d e f c4 r e f c4 r e f @@ -22,7 +25,7 @@ flautoI = \notes\relative c'' { } flautoII = \notes\relative c'' { - g4 b d f + g4\ff b d f r2 c4 d a c c d a4. b8 c4 d @@ -74,57 +77,50 @@ violinoII = \notes\relative c'' { b1 } -violinoIStaff = \context Staff = violino1 < - \property Staff.midiInstrument = #"violin" +violinoIStaff = \context Staff = oneViolini < + \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino I" \property Staff.instr = #"Vl. I" - \notes< - %\global - \context Voice=violinoi - \violinoI - > + \violinoI + { \skip 1*9; \bar "|."; } > -violinoIIStaff = \context Staff = violino2 < +violinoIIStaff = \context Staff = twoViolini < % MIDI hoort geeneens verschil tussen een % eerste en tweede viool ;-) \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino II" \property Staff.instr = #"Vl. II" - \notes< - %\global - \context Voice=violinoii - \violinoII - > + \violinoII + { \skip 1*9; \bar "|."; } > violaI = \notes\transpose c, \violinoI violaII = \notes\transpose c, \violinoII -violiGroup = \notes \context VoiceCombineStaff = violi < - \context VoiceCombineStaff=violi { - \property VoiceCombineStaff.midiInstrument = #"viola" - \property VoiceCombineStaff.instrument = #"Viola" - \property VoiceCombineStaff.instr = #"Vla." - \clef "alto"; - \key es \major; - \skip 1*314; - \bar "|."; - } - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \violaI - \context VoiceCombineThread=two \violaII +violeGroup = \notes \context VoiceCombineStaff = oneViole < + \property VoiceCombineStaff.midiInstrument = #"viola" + \property VoiceCombineStaff.instrument = #"Viola" + \property VoiceCombineStaff.instr = #"Vla." + %\clef "alto"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-C" + \property VoiceCombineStaff.clefPosition = #0 + \key f \major; + { \skip 1*9; \bar "|."; } + + \context VoiceCombineVoice=oneViole \partcombine VoiceCombineVoice + \context VoiceCombineThread=oneViole \violaI + \context VoiceCombineThread=twoViole \violaII > violoncello = \notes\relative c { - \clef bass; - c1 d e f c d e f c + c1\ff d e f c d e f c } contrabasso = \notes\relative c { - \clef bass; - c1 + c1\pp d4 e d e e1 f4 g f g @@ -142,19 +138,29 @@ bassiGroup = \context PianoStaff = bassi_group \notes < %\property StaffCombineStaff.instrument = #"Violoncello\ne\nContrabasso" \property StaffCombineStaff.instrument = #'(lines "Violoncello" "e" "Contrabasso") \property StaffCombineStaff.instr = #"Vc." - \clef "bass"; + + %\clef "bass"; + % Ugh, clef broken in 1.3.125 + \property StaffCombineStaff.clefGlyph = #"clefs-F" + \property StaffCombineStaff.clefPosition = #2 + \key es \major; - \skip 1*314; - \bar "|."; + \skip 1*9; + \bar "|."; } \context StaffCombineStaff=twoBassi { \property StaffCombineStaff.midiInstrument = #"contrabass" \property StaffCombineStaff.instrument = #"Contrabasso" \property StaffCombineStaff.instr = #"Cb." - \clef "bass"; - \key es \major; - \skip 1*314; - \bar "|."; + + %\clef "bass"; + % Ugh, clef broken in 1.3.125 + \property StaffCombineStaff.clefGlyph = #"clefs-F" + \property StaffCombineStaff.clefPosition = #2 + + \key as \major; + \skip 1*9; + \bar "|."; } \context StaffCombineStaff=oneBassi \partcombine StaffCombineStaff @@ -170,7 +176,7 @@ violiniGroup = \context GrandStaff = violini_group < archiGroup = \context StaffGroup = archi_group < \violiniGroup - \violiGroup + \violeGroup \bassiGroup > @@ -190,7 +196,6 @@ archiGroup = \context StaffGroup = archi_group < enteredby = "JCN"; copyright = "public domain"; } - %\paper {} \paper{ \paperSixteen diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index 8507de1598..ecaa2dd769 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -20,7 +20,11 @@ bassiGroup = \context PianoStaff = bassi_group \notes < %\property StaffCombineStaff.instrument = #"Violoncello\ne\nContrabasso" \property StaffCombineStaff.instrument = #'(lines "Violoncello" "e" "Contrabasso") \property StaffCombineStaff.instr = #"Vc." - \clef "bass"; + %\clef "bass"; + % Ugh, clef broken in 1.3.125 + \property StaffCombineStaff.clefGlyph = #"clefs-F" + \property StaffCombineStaff.clefPosition = #2 + \key es \major; \skip 1*314; \bar "|."; @@ -30,7 +34,10 @@ bassiGroup = \context PianoStaff = bassi_group \notes < \property StaffCombineStaff.instrument = #"Contrabasso" \property StaffCombineStaff.instr = #"Cb." % \property StaffCombineStaff.transposing = #-12 - \clef "bass"; + %\clef "bass"; + % Ugh, clef broken in 1.3.125 + \property StaffCombineStaff.clefGlyph = #"clefs-F" + \property StaffCombineStaff.clefPosition = #2 \key es \major; \skip 1*314; \bar "|."; diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 4a50c25d5b..1eba7d32f4 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -16,7 +16,10 @@ fagottiStaff = \context VoiceCombineStaff = fagotti < \property VoiceCombineStaff.midiInstrument = #"bassoon" \property VoiceCombineStaff.instrument = #"2 Fagotti" \property VoiceCombineStaff.instr = #"Fg." - \clef "bass"; + %\clef "bass"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-F" + \property VoiceCombineStaff.clefPosition = #2 \global \context VoiceCombineVoice=one \partcombine VoiceCombineVoice \context VoiceCombineThread=one \fagottoI diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index b5c09cd867..6ec3d680fe 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -51,12 +51,22 @@ fagottoI = \notes \relative c { )d2. es4\sf(| )d4 r r2| R1*9| - \clef "tenor"; + + %\clef "tenor"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-C" + \property VoiceCombineStaff.clefPosition = #2 + \property VoiceCombineVoice.crescendoText = "cresc." \property VoiceCombineVoice.crescendoSpanner = "dashed-line" g'2.(as4 \p\<| g f d)bes - \clef "bass"; + + %\clef "bass"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-F" + \property VoiceCombineStaff.clefPosition = #2 + | \!bes2\ff as| g c~| @@ -220,10 +230,22 @@ fagottoI = \notes \relative c { r4 r8 es\< es4. es8| r4 r8 es es4. es8| r4 r8 % - \clef "tenor"; % + + %\clef "tenor"; % + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-C" + \property VoiceCombineStaff.clefPosition = #2 + + f f4. f8| r4 r8 g g4. g8 % - \clef "bass"; % + + %\clef "bass"; % + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-F" + \property VoiceCombineStaff.clefPosition = #2 + + | \!f2.\ff()es4| d(c d)c| diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 9817c4e488..3c7013fd9e 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -42,13 +42,23 @@ fagottoII = \notes \relative c { )d2. es4\sf(| )d4 r r2| R1*9| - \clef "tenor"; + + %\clef "tenor"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-C" + \property VoiceCombineStaff.clefPosition = #2 + + \property VoiceCombineVoice.crescendoText = "cresc." \property VoiceCombineVoice.crescendoSpanner = "dashed-line" g''2.(as4 \p\<|| g f d)bes|| - \clef "bass"; - + + %\clef "bass"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-F" + \property VoiceCombineStaff.clefPosition = #2 + \!g2\ff f| e c~| c1\p~| @@ -225,10 +235,21 @@ fagottoII = \notes \relative c { \property VoiceCombineVoice.crescendoSpanner = "dashed-line" r4 r8 c\< c4. c8| r4 r8 c c4. c8| - \clef "tenor"; + + %\clef "tenor"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-C" + \property VoiceCombineStaff.clefPosition = #2 + + r4 r8 d d4. d8| r4 r8 es es4. es8| - \clef "bass"; + + %\clef "bass"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-F" + \property VoiceCombineStaff.clefPosition = #2 + \!f,2.\ff()es4| d(c d)c| f2.\ff()es4| diff --git a/mutopia/Coriolan/violi.ly b/mutopia/Coriolan/violi.ly index 7c0a726e6b..2e95f3e925 100644 --- a/mutopia/Coriolan/violi.ly +++ b/mutopia/Coriolan/violi.ly @@ -19,7 +19,12 @@ violiGroup = \context PianoStaff = violi_group \notes < \property StaffCombineStaff.midiInstrument = #"viola" \property StaffCombineStaff.instrument = #"Viola" \property StaffCombineStaff.instr = #"Vla." - \clef "alto"; + + %\clef "alto"; + % Ugh, clef broken in 1.3.125 + \property StaffCombineStaff.clefGlyph = #"clefs-C" + \property StaffCombineStaff.clefPosition = #0 + \key es \major; \skip 1*314; \bar "|."; @@ -28,7 +33,12 @@ violiGroup = \context PianoStaff = violi_group \notes < \property StaffCombineStaff.midiInstrument = #"viola" \property StaffCombineStaff.instrument = #"Viola II" \property StaffCombineStaff.instr = #"Vla. II" - \clef "alto"; + + %\clef "alto"; + % Ugh, clef broken in 1.3.125 + \property StaffCombineStaff.clefGlyph = #"clefs-C" + \property StaffCombineStaff.clefPosition = #0 + \key es \major; \skip 1*314; \bar "|."; @@ -45,7 +55,12 @@ violiGroup = \notes \context VoiceCombineStaff = violi < \property VoiceCombineStaff.midiInstrument = #"viola" \property VoiceCombineStaff.instrument = #"Viola" \property VoiceCombineStaff.instr = #"Vla." - \clef "alto"; + + %\clef "alto"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-C" + \property VoiceCombineStaff.clefPosition = #0 + \key es \major; \skip 1*314; \bar "|."; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly index d075dca779..fbac2107ea 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly @@ -27,5 +27,5 @@ information is taken to the extreme. copyright = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainername + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; maintainer = "janneke@gnu.org"; - lastupdated = "1999/Oct/16"; + lastupdated = "2001/Jan/28"; }