From b648a5977005a4c7a655d8612ea2cbdb6b0f9284 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 6 Feb 2001 15:35:58 +0100 Subject: [PATCH] patch::: 1.3.128.jcn2 1.3.128.jcn2 ============ * Small doco fixes. * Removed duplicated engraver hieararchies from coriolan and orchestral examples. * Changed defaults for devNullThread, devNullVoice from 'unisolo to '(). --- CHANGES | 10 ++ VERSION | 2 +- input/tutorial/orchestral-score.ly | 50 ++++------ lily/thread-devnull-engraver.cc | 2 +- lily/voice-devnull-engraver.cc | 4 +- ly/engraver.ly | 2 - mutopia/Coriolan/GNUmakefile | 9 ++ mutopia/Coriolan/bassi-part.ly | 4 +- mutopia/Coriolan/bassi.ly | 42 ++++----- mutopia/Coriolan/c-midi.ly | 94 ------------------- mutopia/Coriolan/clarinetti-part.ly | 4 +- mutopia/Coriolan/clarinetti.ly | 18 ++-- mutopia/Coriolan/clarinetto-1.ly | 32 +++---- mutopia/Coriolan/clarinetto-2.ly | 16 ++-- mutopia/Coriolan/contrabasso.ly | 48 +++++----- mutopia/Coriolan/coriolan-midi.ly | 35 ------- mutopia/Coriolan/coriolan-paper.ly | 77 +++++---------- .../Coriolan/coriolan-part-combine-paper.ly | 75 --------------- mutopia/Coriolan/coriolan-part-paper.ly | 41 +++++++- mutopia/Coriolan/coriolan.ly | 4 +- mutopia/Coriolan/corni-part.ly | 4 +- mutopia/Coriolan/corni.ly | 18 ++-- mutopia/Coriolan/corno-1.ly | 8 +- mutopia/Coriolan/corno-2.ly | 16 ++-- mutopia/Coriolan/fagotti-part.ly | 4 +- mutopia/Coriolan/fagotti.ly | 21 ++--- mutopia/Coriolan/fagotto-1.ly | 82 ++++++++-------- mutopia/Coriolan/fagotto-2.ly | 70 +++++++------- mutopia/Coriolan/flauti-part.ly | 4 +- mutopia/Coriolan/flauti.ly | 14 +-- mutopia/Coriolan/flauto-1.ly | 48 +++++----- mutopia/Coriolan/flauto-2.ly | 8 +- mutopia/Coriolan/global.ly | 12 +++ mutopia/Coriolan/header.ly | 4 +- mutopia/Coriolan/oboe-1.ly | 52 +++++----- mutopia/Coriolan/oboe-2.ly | 16 ++-- mutopia/Coriolan/oboi-part.ly | 4 +- mutopia/Coriolan/oboi.ly | 14 +-- mutopia/Coriolan/timpani-part.ly | 2 + mutopia/Coriolan/timpani.ly | 2 +- mutopia/Coriolan/trombe-part.ly | 4 +- mutopia/Coriolan/trombe.ly | 16 ++-- mutopia/Coriolan/trombo-1.ly | 12 +-- mutopia/Coriolan/trombo-2.ly | 12 +-- mutopia/Coriolan/viola-1.ly | 60 ++++++------ mutopia/Coriolan/viola-2.ly | 60 ++++++------ mutopia/Coriolan/viole-part.ly | 4 +- mutopia/Coriolan/viole.ly | 59 ++++++------ mutopia/Coriolan/violino-1-part.ly | 2 + mutopia/Coriolan/violino-1.ly | 1 + mutopia/Coriolan/violino-2-part.ly | 2 + mutopia/Coriolan/violoncello.ly | 58 ++++++------ .../J.S.Bach/Solo-Cello-Suites/GNUmakefile | 4 +- scm/translator-description.scm | 2 +- scm/translator-property-description.scm | 6 +- 55 files changed, 551 insertions(+), 723 deletions(-) diff --git a/CHANGES b/CHANGES index 31c283a9e7..812cec848a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +1.3.128.jcn2 +============ + +* Small doco fixes. + +* Removed duplicated engraver hieararchies from coriolan and +orchestral examples. + +* Changed defaults for devNullThread, devNullVoice from 'unisolo to '(). + 1.3.128.jcn1 ============ diff --git a/VERSION b/VERSION index a09032fb64..0b5f07b0fc 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=128 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/tutorial/orchestral-score.ly b/input/tutorial/orchestral-score.ly index 0b0585013f..64f7ba7f15 100644 --- a/input/tutorial/orchestral-score.ly +++ b/input/tutorial/orchestral-score.ly @@ -5,31 +5,18 @@ % #(set! point-and-click #t) #(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) -staffCombineStaffProperties = { - \property Staff.devNullThread = #'unisolo - \property Staff.soloADue = ##t - \property Staff.soloText = #"" - \property Staff.soloIIText = #"" +staffCombinePianoStaffProperties = { + \property PianoStaff.devNullThread = #'() + \property PianoStaff.soloADue = ##t + \property PianoStaff.soloText = #"" + \property PianoStaff.soloIIText = #"" % This is non-conventional, but currently it is % the only way to tell the difference. - \property Staff.aDueText = #"\\`a2" - \property Staff.splitInterval = #'(1 . 0) - \property Staff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + \property PianoStaff.aDueText = #"\\`a2" + \property PianoStaff.splitInterval = #'(1 . 0) + \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) } -staffCombineVoiceProperties = { - \property Voice.devNullThread = #'unisolo - \property Voice.soloADue = ##t - \property Voice.soloText = #"" - \property Voice.soloIIText = #"" - % This is non-conventional, but currently it is - % the only way to tell the difference. - \property Voice.aDueText = #"\\`a2" - \property Voice.splitInterval = #'(1 . 0) - \property Voice.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) -} - - % Coriolan 218-222 flautoI = \notes\relative c'' { \property Score.currentBarNumber = #218 @@ -213,9 +200,9 @@ contrabasso = \notes\relative c { \context Thread=one \violaI \context Thread=two \violaII > - \context GrandStaff=bass < + \context PianoStaff=bass < + \staffCombinePianoStaffProperties \context Staff=one < - %\staffCombineStaffProperties \property Staff.midiInstrument = #"cello" \property Staff.instrument = #'((kern . 0.5) (lines "Violoncello" (rows " e") (rows "Contrabasso"))) @@ -223,7 +210,6 @@ contrabasso = \notes\relative c { \clef bass; > \context Staff=two < - %\staffCombineStaffProperties \property Staff.midiInstrument = #"contrabass" \property Staff.instrument = "Contrabasso" \property Staff.instr = "C.B." @@ -231,8 +217,8 @@ contrabasso = \notes\relative c { \skip 1*4; % sustain clef > \context Staff=one \partcombine Staff - \context Voice=one { \staffCombineVoiceProperties \violoncello } - \context Voice=two { \staffCombineVoiceProperties \contrabasso } + \context Voice=one \violoncello + \context Voice=two \contrabasso > > > @@ -251,9 +237,11 @@ contrabasso = \notes\relative c { % The staff combine (bassi part) needs a % thread_devnull_engraver here. % Instead of maintaining two separate hierarchies, - % we switch add it, but switch it off immideately. - % The staff combine parts switch it on. - devNullThread = #'never + % we switch add it, but switch it off immediately. + % --> move to Score level to be able to override + % The staff combine part switches it on. + + %% devNullThread = #'never \consists "Thread_devnull_engraver"; } \translator{ @@ -262,16 +250,16 @@ contrabasso = \notes\relative c { } \translator { \OrchestralScoreContext - skipBars = ##t + % skipBars = ##t soloText = #"I." soloIIText = #"II." + devNullThread = #'never % Hmm currentBarNumber = #218 BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 - marginScriptHorizontalAlignment = #1 TimeSignature \override #'style = #'C } } diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc index 14f6754e0e..398a332600 100644 --- a/lily/thread-devnull-engraver.cc +++ b/lily/thread-devnull-engraver.cc @@ -33,7 +33,7 @@ Thread_devnull_engraver::acknowledge_grob (Grob_info i) #endif if (gh_equal_p (s, ly_symbol2scm ("allways")) - || (gh_equal_p (s, ly_symbol2scm ("unisolo")) + || (s = SCM_EOL && daddy_trans_l_->id_str_.left_str (3) == "two" && (to_boolean (get_property ("unison")) || to_boolean (get_property ("unisilence"))) diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc index ed34540a4b..b3414f531d 100644 --- a/lily/voice-devnull-engraver.cc +++ b/lily/voice-devnull-engraver.cc @@ -43,8 +43,8 @@ Voice_devnull_engraver::try_music (Music *m) #endif if (gh_equal_p (s, ly_symbol2scm ("allways")) - || (gh_equal_p (s, ly_symbol2scm ("unisolo")) - &&daddy_trans_l_->id_str_.left_str (3) == "two" + || (s == SCM_EOL + && daddy_trans_l_->id_str_.left_str (3) == "two" && (to_boolean (get_property ("unison")) || to_boolean (get_property ("unisilence"))))) { diff --git a/ly/engraver.ly b/ly/engraver.ly index 01a00e1bb5..a54fe7ba84 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -116,7 +116,6 @@ VoiceContext = \translator { \consists "Melisma_engraver"; \consists "Text_engraver"; \consists "A2_engraver"; - devNullVoice = #'unisolo \consists "Voice_devnull_engraver"; \consists "Script_engraver"; @@ -182,7 +181,6 @@ ThreadContext = \translator{ \type Engraver_group_engraver; \name Thread; - devNullThread = #'unisolo \consists "Thread_devnull_engraver"; \consists "Note_heads_engraver"; \consists "Note_head_line_engraver"; diff --git a/mutopia/Coriolan/GNUmakefile b/mutopia/Coriolan/GNUmakefile index 5ce44985d0..529facd769 100644 --- a/mutopia/Coriolan/GNUmakefile +++ b/mutopia/Coriolan/GNUmakefile @@ -10,3 +10,12 @@ LOCALSTEPMAKE_TEMPLATES=mutopia include $(depth)/make/stepmake.make +parts=$(patsubst %.ly,%,$(wildcard *-part.ly)) + +tarball=coriolan +mutopia-examples=coriolan $(parts) +mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz) + +mutopia: + $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter) + diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index 88cf4ea3c8..aeb07de094 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -1,12 +1,14 @@ \version "1.3.120"; +instrument = "Violoncello and Contrabass" + \include "header.ly" \include "global.ly" \include "bassi.ly" \score{ \bassiGroup - \include "coriolan-part-combine-paper.ly" + \include "coriolan-part-paper.ly" \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index 6e440d6b9e..07f834a6cf 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -4,33 +4,31 @@ \include "contrabasso.ly" bassiGroup = \context PianoStaff = bassi_group \notes < - \context StaffCombineStaff=oneBassi { - \property StaffCombineStaff.midiInstrument = #"cello" - \property StaffCombineStaff.instrument = #'((kern . 0.5) + \staffCombinePianoStaffProperties + \context Staff=oneBassi { + \property Staff.midiInstrument = #"cello" + \property Staff.instrument = #'((kern . 0.5) (lines "Violoncello" (rows " e") (rows "Contrabasso"))) - \property StaffCombineStaff.instr = #"Vc." - %\clef "bass"; - % Ugh, clef broken in 1.3.125 - \property StaffCombineStaff.clefGlyph = #"clefs-F" - \property StaffCombineStaff.clefPosition = #2 + \property Staff.instr = #"Vc." + \clef "bass"; + %\property Staff.clefGlyph = #"clefs-F" + %\property Staff.clefPosition = #2 \global } - \context StaffCombineStaff=twoBassi { - \property StaffCombineStaff.midiInstrument = #"contrabass" - \property StaffCombineStaff.instrument = #"Contrabasso" - \property StaffCombineStaff.instr = #"Cb." -% \property StaffCombineStaff.transposing = #-12 - %\clef "bass"; - % Ugh, clef broken in 1.3.125 - \property StaffCombineStaff.clefGlyph = #"clefs-F" - \property StaffCombineStaff.clefPosition = #2 + \context Staff=twoBassi { + \property Staff.midiInstrument = #"contrabass" + \property Staff.instrument = #"Contrabasso" + \property Staff.instr = #"Cb." +% \property Staff.transposing = #-12 + \clef "bass"; + %\property Staff.clefGlyph = #"clefs-F" + %\property Staff.clefPosition = #2 \global } - - \context StaffCombineStaff=oneBassi \partcombine StaffCombineStaff - \context StaffCombineVoice=oneBassi \violoncello - \context StaffCombineVoice=twoBassi \contrabasso -> + \context Staff=oneBassi \partcombine Staff + \context Voice=oneBassi \violoncello + \context Voice=twoBassi \contrabasso +> \ No newline at end of file diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly index 99e7919cc0..e69de29bb2 100644 --- a/mutopia/Coriolan/c-midi.ly +++ b/mutopia/Coriolan/c-midi.ly @@ -1,94 +0,0 @@ - - -%% -%% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. -%% - -\version "1.3.120"; - -\include "global.ly" - -\include "flauto-1.ly" -\include "flauto-2.ly" -\include "oboe-1.ly" -\include "oboe-2.ly" -\include "clarinetto-1.ly" -\include "clarinetto-2.ly" -\include "fagotto-1.ly" -\include "fagotto-2.ly" -\include "corno-1.ly" -\include "corno-2.ly" -\include "trombo-1.ly" -\include "trombo-2.ly" -\include "timpani.ly" -\include "violino-1.ly" -\include "violino-2.ly" -\include "viola-1.ly" -\include "viola-2.ly" -\include "violoncello.ly" -\include "contrabasso.ly" - - - -\score{ - < - \global; - \context Staff=flauti < - \property VoiceCombineStaff.midiInstrument = #"flute" - \flautoI - \flautoII - > - \context Staff=oboi < - \property VoiceCombineStaff.midiInstrument = #"oboe" - \oboeI - \oboeII - > - \context Staff=clarinetti < - \property VoiceCombineStaff.midiInstrument = #"clarinet" - \property VoiceCombineStaff.transposing = #-2 - \clarinettoI - \clarinettoII - > - \context Staff=fagotti < - \property VoiceCombineStaff.midiInstrument = #"bassoon" - \fagottoI - \fagottoII - > - \context Staff=corni < - \property VoiceCombineStaff.midiInstrument = #"french horn" - \property VoiceCombineStaff.transposing = #3 - \cornoI - \cornoII - > - \context Staff=trombe < - \property VoiceCombineStaff.midiInstrument = #"trumpet" - \tromboI - \tromboII - > - \context Staff=timpani < - \property Staff.midiInstrument = #"timpani" - \timpani - > - \context Staff=violini < - \property Staff.midiInstrument = #"violin" - \violinoI - \violinoII - > - \context Staff=viole < - \property VoiceCombineStaff.midiInstrument = #"viola" - \violaI - \violaII - > - \context Staff=violoncello < - \property StaffCombineStaff.midiInstrument = #"cello" - \violoncello - > - \context Staff=contrabasso < - \property StaffCombineStaff.midiInstrument = #"contrabass" - \property StaffCombineStaff.transposing = #-12 - \contrabasso - > - > - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index a14cc0cde1..653fa57f15 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -1,13 +1,15 @@ \version "1.3.120"; +instrument = "Clarinet" + \include "header.ly" \include "global.ly" \include "clarinetti.ly" \score{ \clarinettiStaff - \include "coriolan-part-combine-paper.ly" + \include "coriolan-part-paper.ly" \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 64356c25f8..b3e1ad1967 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -4,24 +4,24 @@ \include "clarinetto-1.ly" \include "clarinetto-2.ly" -clarinettiStaff = \context VoiceCombineStaff = clarinetti < - \property VoiceCombineStaff.midiInstrument = #"clarinet" +clarinettiStaff = \context Staff = clarinetti < + \property Staff.midiInstrument = #"clarinet" - \property VoiceCombineStaff.instrument = #`((kern . 0.5) + \property Staff.instrument = #`((kern . 0.5) (lines "2 Clarinetti" (rows "(B" ,text-flat ")"))) - \property VoiceCombineStaff.instr = #`((kern . 0.5) + \property Staff.instr = #`((kern . 0.5) (lines "Cl." (rows "(B" ,text-flat ")"))) % urg: can't; only My_midi_lexer: () parses pitch? - %\property VoiceCombineStaff.transposing = "bes" - \property VoiceCombineStaff.transposing = #-2 + %\property Staff.transposing = "bes" + \property Staff.transposing = #-2 \Time \notes { \key f \major; } \End - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \clarinettoI - \context VoiceCombineThread=two \clarinettoII + \context Voice=one \partcombine Voice + \context Thread=one \clarinettoI + \context Thread=two \clarinettoII > diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 87ca0befa0..907ee9bb5d 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -12,8 +12,8 @@ clarinettoI = \notes \relative c { f4-. r r2| e4-. r r2| R1 *4| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line bes2\p\< ( a| )gis2. \!a4-.\f| R1*13| @@ -35,8 +35,8 @@ clarinettoI = \notes \relative c { c2. c4\sf| c4 r r2| R1*5| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line a'2.\p\< ( bes4| a g e)c| c'2.( d4| @@ -49,8 +49,8 @@ clarinettoI = \notes \relative c { d~| d~| d| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line bes2.\<( c4| bes a fis)d| \!d'2\ff f| @@ -132,8 +132,8 @@ clarinettoI = \notes \relative c { )e2. f4\sf(| )e4 r r2| R1*9| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line fis2.\p\<(g4| fis e cis)a| \!a2\ff c| @@ -152,8 +152,8 @@ clarinettoI = \notes \relative c { r2 r4 d(| )cis r r2| r r4 r8 cis| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d4\< r r2| r r4 r8 d| e4 r r r8 e| @@ -186,8 +186,8 @@ clarinettoI = \notes \relative c { d4 r8 g f4 r8 c| bes4 r r2| R1*11| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line f'2.\p\<(g4| f e cis)a| a1| @@ -196,8 +196,8 @@ clarinettoI = \notes \relative c { c\f~| c\p| d\f~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d\p\<~| d~| d~| @@ -227,8 +227,8 @@ clarinettoI = \notes \relative c { R1| d4-. d-. r2| d4-. d-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line d4\> r e r| R1| \!a,4\p r r2| diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 3b55f39758..795abe0ce9 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -41,8 +41,8 @@ clarinettoII = \notes \relative c { d~| d| %a deux| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line bes'2.\<(c4| bes a fis)d| \!d'2\ff f,| @@ -113,8 +113,8 @@ clarinettoII = \notes \relative c { )e2. f4\sf(| )e4 r r2| R1*9| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line fis2.\p\<( g4| fis e cis)a| %a deux; urg| @@ -161,8 +161,8 @@ clarinettoII = \notes \relative c { c1\f~| c\p| a1\f| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d,\p\<~| d~| d~| @@ -194,8 +194,8 @@ clarinettoII = \notes \relative c { R1| a4-. c-. r2| bes4-. c-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line bes4\> r a r| R1| \!a4\p r r2| diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index ae44067f9c..2846c70995 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -21,8 +21,8 @@ contrabasso = \notes \relative c { c4 r4 r2| c4 r4 r2| R1| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c'4.\< c8 bes4. bes8| %20 @@ -37,8 +37,8 @@ contrabasso = \notes \relative c { % copied 14 from cello - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line bes'4.\< bes8 as4. as8| g4 \!g4-.\f r2| R1 @@ -73,8 +73,8 @@ contrabasso = \notes \relative c { )as,4 r r r8 as(| )g4 r r r8 g(| )d'4 r r r8 d(| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )es4\< r r r8 es(| )as,4 r r r8 as(| )g4 r r r8 g(| @@ -89,15 +89,15 @@ contrabasso = \notes \relative c { )bes4 r r r8 bes(| )as4 r r r8 as(| )e4 r r r8 e(| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )f4\< r r r8 f(| )bes4 r r r8 bes(| %70 \!)as2\ff g| fis d'| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g,4\p\< r r r8 g(| )c4 r r r8 c(| % ) { s2 s4 \!s8}>| @@ -110,8 +110,8 @@ contrabasso = \notes \relative c { d4\pp r d r| d r d r| %80 - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d r d\< r| d r d r| d r d r| @@ -208,8 +208,8 @@ contrabasso = \notes \relative c { %180 )e4 r r r8 e(| )b'4 r r r8 b(| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )c4\< r r r8 c(| )f,4 r r r8 f(| )e4 r r r8 e'(| @@ -224,8 +224,8 @@ contrabasso = \notes \relative c { )g,4 r r r8 g(| )f4 r r r8 f(| )cis'4 r r r8 cis(| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )d4\< r r r8 d(| %195 @@ -247,8 +247,8 @@ contrabasso = \notes \relative c { %205 g r g r| g r g r| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g r g\< r| g r g r| @@ -307,8 +307,8 @@ contrabasso = \notes \relative c { %250 )es4 r r r8 es(| )b4 r r r8 b(| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )c4\< r r r8 c(| )f4 r r r8 f,(| )es1| @@ -321,8 +321,8 @@ contrabasso = \notes \relative c { bes\f| %260 - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line as4.\p\< as'8 g4. g8| f4. f8 es4. es8| as4. as8 g4. g8| @@ -365,8 +365,8 @@ contrabasso = \notes \relative c { f,4-. g-. r2| %290 - \property StaffCombineVoice.decrescendoText = #"dim." - \property StaffCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line as4\> r b r| R1| \!c4\p r r2| diff --git a/mutopia/Coriolan/coriolan-midi.ly b/mutopia/Coriolan/coriolan-midi.ly index a552d6bc99..85b6ea4ea4 100644 --- a/mutopia/Coriolan/coriolan-midi.ly +++ b/mutopia/Coriolan/coriolan-midi.ly @@ -1,39 +1,4 @@ \version "1.3.120" \midi{ \tempo 4 = 150; - - \translator { - \ThreadContext - \name "VoiceCombineThread"; - } - \translator { - \VoiceContext - \name "VoiceCombineVoice"; - \accepts "VoiceCombineThread"; - } - \translator { - \StaffContext - \name "VoiceCombineStaff"; - \accepts "VoiceCombineVoice"; - } - - \translator { - \ThreadContext - \name "StaffCombineThread"; - } - \translator { - \VoiceContext - \name "StaffCombineVoice"; - \accepts "StaffCombineThread"; - } - \translator { - \StaffContext - \name "StaffCombineStaff"; - \accepts "StaffCombineVoice"; - } - \translator { - \ScoreContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; - } } diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly index 60d89d56e5..6e6a43e10e 100644 --- a/mutopia/Coriolan/coriolan-paper.ly +++ b/mutopia/Coriolan/coriolan-paper.ly @@ -2,75 +2,44 @@ \paper{ \paperSixteen - %textheight = 290.0\mm; - %linewidth = 195.0\mm; - textheight = 285.0\mm; - linewidth = 190.0\mm; + % Fine for my a4 laserprinter: + %textheight = 285.0\mm; + %linewidth = 190.0\mm; + + % Mandatory Mutopia settings: + textheight = 270.0\mm; + linewidth = 180.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"; + % The staff combine (bassi part) needs a + % thread_devnull_engraver here. + % Instead of maintaining two separate hierarchies, + % we switch add it, but switch it off immediately. + % --> move to Score level to be able to override + % The staff combine part switches it on. + + %% devNullThread = #'never \consists "Thread_devnull_engraver"; } - \translator { + \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"; + \consists "Mark_engraver"; } - \translator{ \HaraKiriStaffContext } - \translator { - %\ScoreContext \OrchestralScoreContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; - skipBars = ##t + % skipBars = ##t + + soloText = #"I." + soloIIText = #"II." + devNullThread = #'never + TimeSignature \override #'style = #'C BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 diff --git a/mutopia/Coriolan/coriolan-part-combine-paper.ly b/mutopia/Coriolan/coriolan-part-combine-paper.ly index 74589e23ec..e69de29bb2 100644 --- a/mutopia/Coriolan/coriolan-part-combine-paper.ly +++ b/mutopia/Coriolan/coriolan-part-combine-paper.ly @@ -1,75 +0,0 @@ -\version "1.3.120" -\paper{ - - textheight = 295.0\mm; - linewidth = 180.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 - TimeSignature \override #'style = #'C - BarNumber \override #'padding = #3 - RestCollision \override #'maximum-rest-count = #1 - } -} diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly index 3b362e9041..743641dc13 100644 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ b/mutopia/Coriolan/coriolan-part-paper.ly @@ -1,14 +1,45 @@ \version "1.3.120" -\paper { - textheight = 295.0\mm; +\paper{ + %\paperSixteen + + % Fine for my a4 laserprinter: + %textheight = 285.0\mm; + %linewidth = 190.0\mm; + + % Mandatory Mutopia settings: + textheight = 270.0\mm; linewidth = 180.0\mm; - \translator{ \HaraKiriStaffContext } + \translator{ + \ThreadContext + \consists "Rest_engraver"; + } + \translator{ + \VoiceContext + \remove "Rest_engraver"; + % The staff combine (bassi part) needs a + % thread_devnull_engraver here. + % Instead of maintaining two separate hierarchies, + % we switch add it, but switch it off immediately. + % --> move to Score level to be able to override + % The staff combine part switches it on. + + %% devNullThread = #'never + \consists "Thread_devnull_engraver"; + } + \translator{ + \HaraKiriStaffContext + \consists "Mark_engraver"; + } \translator { - \ScoreContext - %\OrchestralScoreContext + \OrchestralScoreContext skipBars = ##t + + soloText = #"I." + soloIIText = #"II." + devNullThread = #'never + TimeSignature \override #'style = #'C BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 33e03aad8c..76167b981c 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -7,6 +7,8 @@ \version "1.3.120"; +instrument = "Orchestra" + \include "header.ly" \include "global.ly" @@ -71,6 +73,6 @@ archiGroup = \context StaffGroup = archi_group < copyright = "public domain"; } \include "coriolan-paper.ly" -% \include "coriolan-midi.ly" + \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 5b0c630a45..86a85f65ab 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -1,13 +1,15 @@ \version "1.3.120"; +instrument = "French Horn" + \include "header.ly" \include "global.ly" \include "corni.ly" \score{ \corniStaff - \include "coriolan-part-combine-paper.ly" + \include "coriolan-part-paper.ly" \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 5b2147d374..644a66753e 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -4,23 +4,23 @@ \include "corno-1.ly" \include "corno-2.ly" -corniStaff = \context VoiceCombineStaff = corni < - \property VoiceCombineStaff.midiInstrument = #"french horn" +corniStaff = \context Staff = corni < + \property Staff.midiInstrument = #"french horn" - \property VoiceCombineStaff.instrument = #`((kern . 0.5) + \property Staff.instrument = #`((kern . 0.5) (lines "2 Corni" (rows "(E" ,text-flat ")"))) - \property VoiceCombineStaff.instr = #`((kern . 0.5) + \property Staff.instr = #`((kern . 0.5) (lines "Cor." (rows "(E" ,text-flat ")"))) % urg: can't; only My_midi_lexer: () parses pitch? - %\property VoiceCombineStaff.transposing = "es" - \property VoiceCombineStaff.transposing = #3 + %\property Staff.transposing = "es" + \property Staff.transposing = #3 \Time \notes { \key c \major; } \End - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \cornoI - \context VoiceCombineThread=two \cornoII + \context Voice=one \partcombine Voice + \context Thread=one \cornoI + \context Thread=two \cornoII > diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 20812fcb68..4ca1482ccf 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -17,8 +17,8 @@ cornoI = \notes \relative c { r4 g-.\f r2| R1*2| % `a 2 - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r8 f\p\< f2 e4| r8 f f2 e4| f4. e8 f4. e8| @@ -164,8 +164,8 @@ cornoI = \notes \relative c { e~| e~| e~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line e\<~| e~| e| diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index 3dec8f7b7b..f718a3ebab 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -18,8 +18,8 @@ cornoII = \notes \relative c { R1*2| % `a 2 % urg, yes this is a-deux, but lily doesn't know about I. / a2 yet. - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r8 f'\p\< f2 e4| r8 f f2 e4| f4. e8 f4. e8| @@ -121,8 +121,8 @@ cornoII = \notes \relative c { e~| e~| e~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line e\<~| e~| e~| @@ -134,8 +134,8 @@ cornoII = \notes \relative c { %a deux| r4 r8 e,\p e4. e8| r4 r8 e e4. e8| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r4 r8 e\< e4. e8| r4 r8 e e4. e8| r4 r8 e e4. e8| @@ -181,8 +181,8 @@ cornoII = \notes \relative c { e~| e~| e~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line e\<~| e~| e| diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 39c1912d22..76b4f2bcbb 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -1,13 +1,15 @@ \version "1.3.120"; +instrument = "Bassoon" + \include "header.ly" \include "global.ly" \include "fagotti.ly" \score{ \fagottiStaff - \include "coriolan-part-combine-paper.ly" + \include "coriolan-part-paper.ly" \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index bfd0d1fc3c..a5226850a4 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -4,17 +4,16 @@ \include "fagotto-1.ly" \include "fagotto-2.ly" -fagottiStaff = \context VoiceCombineStaff = fagotti < - \property VoiceCombineStaff.midiInstrument = #"bassoon" - \property VoiceCombineStaff.instrument = #"2 Fagotti" - \property VoiceCombineStaff.instr = #"Fg." - %\clef "bass"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-F" - \property VoiceCombineStaff.clefPosition = #2 +fagottiStaff = \context Staff = fagotti < + \property Staff.midiInstrument = #"bassoon" + \property Staff.instrument = #"2 Fagotti" + \property Staff.instr = #"Fg." + \clef "bass"; + %\property Staff.clefGlyph = #"clefs-F" + %\property Staff.clefPosition = #2 \global - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \fagottoI - \context VoiceCombineThread=two \fagottoII + \context Voice=one \partcombine Voice + \context Thread=one \fagottoI + \context Thread=two \fagottoII > diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index f14ac3e426..61d3bbf3ba 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -14,14 +14,14 @@ fagottoI = \notes \relative c { R1*5| r2 r4 g4-.\f| R1*5| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line ges'2\p\< f2 ~| f4 \!e-.\f r2| R1| f2\p()es| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d1\<| d| d2 d| @@ -44,20 +44,18 @@ fagottoI = \notes \relative c { )d4 r r2| R1*9| - %\clef "tenor"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-C" - \property VoiceCombineStaff.clefPosition = #2 + \clef "tenor"; + %\property Staff.clefGlyph = #"clefs-C" + %\property Staff.clefPosition = #2 - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g'2.(as4 \p\<| g f d)bes - %\clef "bass"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-F" - \property VoiceCombineStaff.clefPosition = #2 + \clef "bass"; + %\property Staff.clefGlyph = #"clefs-F" + %\property Staff.clefPosition = #2 | \!bes2\ff as| @@ -66,8 +64,8 @@ fagottoI = \notes \relative c { c~| c~| c~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c\<~| c| \!c2\ff bes| @@ -80,8 +78,8 @@ fagottoI = \notes \relative c { bes(a bes)g| fis r8 a\pp a4. a8| r4 r8 a a4. a8| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r4 r8 bes\< bes4. bes8| r4 r8 bes bes4. bes8| r4 r8 c8 c4. c8| @@ -112,7 +110,7 @@ fagottoI = \notes \relative c { [g8 bes d es][f, a cis d]| [es,8:8 g: b: c!:][d,: f: a: bes:]| [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]|| + [d,: g: bes: d:][d,: fis: a: d:]| g,2 ~ g4. g8| %115| g2 ~ g4. g8| @@ -129,8 +127,8 @@ fagottoI = \notes \relative c { e4 r r2| R1*3| r4 r8 f' es4 r8 bes| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c4\< r4 r2| R1*2| r4 r8 ges' f4 r8 c| @@ -149,8 +147,8 @@ fagottoI = \notes \relative c { [g,: bes: c: des:][f,: bes: c: des:]| [e,: g: bes: des:][c: e: g: c:]| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c1\p\< ~| c1~| c1~| @@ -217,25 +215,23 @@ fagottoI = \notes \relative c { es(d es)c| b r8 d\p d4. d8| r4 r8 d d4. d8| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r4 r8 es\< es4. es8| r4 r8 es es4. es8| - r4 r8 % + r4 r8 - %\clef "tenor"; % - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-C" - \property VoiceCombineStaff.clefPosition = #2 + \clef "tenor"; + %\property Staff.clefGlyph = #"clefs-C" + %\property Staff.clefPosition = #2 f f4. f8| r4 r8 g g4. g8 % - %\clef "bass"; % - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-F" - \property VoiceCombineStaff.clefPosition = #2 + \clef "bass"; + %\property Staff.clefGlyph = #"clefs-F" + %\property Staff.clefPosition = #2 | @@ -271,8 +267,8 @@ fagottoI = \notes \relative c { es d b)g| g'2.(as4| g2)f| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line es2.\<( f4| es d b)g| R1| @@ -281,8 +277,8 @@ fagottoI = \notes \relative c { d\f| es\p| e\f| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line as,4.\p\< as8 g4. g8| f4. f8 es4. es8| as4. as8 g4. g8| @@ -318,8 +314,8 @@ fagottoI = \notes \relative c { R1| g,4-. g-. r2| as4-. bes-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line c4\> r d r| R1| \!c,4\p r r2| @@ -327,10 +323,10 @@ fagottoI = \notes \relative c { g4 r r2| R1| c4\pp r r2| - \property VoiceCombineVoice.decrescendoText = #"sempre pi\\`u piano" + \property Voice.decrescendoText = #"sempre pi\\`u piano" % urg, "" is assumed to be hairpin... - %\property VoiceCombineVoice.decrescendoSpanner = #"" - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + %\property Voice.decrescendoSpanner = #"" + \property Voice.decrescendoSpanner = #'dashed-line r r4 g\p\>~| g1~| g~| diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 5530b17dd8..59b624f56b 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -35,21 +35,19 @@ fagottoII = \notes \relative c { )d4 r r2| R1*9| - %\clef "tenor"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-C" - \property VoiceCombineStaff.clefPosition = #2 + \clef "tenor"; + %\property Staff.clefGlyph = #"clefs-C" + %\property Staff.clefPosition = #2 - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g''2.(as4 \p\<| g f d)bes| - %\clef "bass"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-F" - \property VoiceCombineStaff.clefPosition = #2 + \clef "bass"; + %\property Staff.clefGlyph = #"clefs-F" + %\property Staff.clefPosition = #2 \!g2\ff f| e c~| @@ -57,14 +55,14 @@ fagottoII = \notes \relative c { c~| c~| c~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c\<~| c| \!c2\ff g'| fis d| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g,4 \p\< r r r8 g(| )c4 r r r8 c(| \!)b1\sf\>| @@ -72,8 +70,8 @@ fagottoII = \notes \relative c { R1*2| r4 r8 fis\pp fis4. fis8| r4 r8 fis fis4. fis8| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r4 r8 g\< g4. g8| r4 r8 g g4. g8| r4 r8 a a4. a8| @@ -111,7 +109,7 @@ fagottoII = \notes \relative c { [g8 bes d es][f, a cis d]| [es,8:8 g: b: c!:][d,: f: a: bes:]| [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]|| + [d,: g: bes: d:][d,: fis: a: d:]| g,,2 ~ g4. g8| %115| g2 ~ g4. g8| @@ -132,8 +130,8 @@ fagottoII = \notes \relative c { e| f| g| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line as\<| g| as| @@ -193,8 +191,8 @@ fagottoII = \notes \relative c { g~| g~| g~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g\<~| g~| g~| @@ -207,8 +205,8 @@ fagottoII = \notes \relative c { a~| a~| a~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line a\<~| a| \!f'2\ff e| @@ -221,24 +219,22 @@ fagottoII = \notes \relative c { R1*3| r4 r8 b'' b4. b8| r4 r8 b b4. b8| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r4 r8 c\< c4. c8| r4 r8 c c4. c8| - %\clef "tenor"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-C" - \property VoiceCombineStaff.clefPosition = #2 + \clef "tenor"; + %\property Staff.clefGlyph = #"clefs-C" + %\property Staff.clefPosition = #2 r4 r8 d d4. d8| r4 r8 es es4. es8| - %\clef "bass"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-F" - \property VoiceCombineStaff.clefPosition = #2 + \clef "bass"; + %\property Staff.clefGlyph = #"clefs-F" + %\property Staff.clefPosition = #2 \!f,2.\ff()es4| d(c d)c| @@ -282,8 +278,8 @@ fagottoII = \notes \relative c { g\p| bes\f| %a deux| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line as4.\p\< as8 g4. g8| f4. f8 es4. es8| as4. as8 g4. g8| @@ -320,8 +316,8 @@ fagottoII = \notes \relative c { R1| es,4-. e-. r2| f4-. g-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line as4\> r b r| R1| %a deux| diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index b78a17ec46..31a71c2007 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -1,13 +1,15 @@ \version "1.3.120"; +instrument = "Flute" + \include "header.ly" \include "global.ly" \include "flauti.ly" \score{ \flautiStaff - \include "coriolan-part-combine-paper.ly" + \include "coriolan-part-paper.ly" \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 7d894fd715..d0994194f6 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -4,13 +4,13 @@ \include "flauto-1.ly" \include "flauto-2.ly" -flautiStaff = \notes \context VoiceCombineStaff = flauti < - \property VoiceCombineStaff.midiInstrument = #"flute" - \property VoiceCombineStaff.instrument = #"2 Flauti" - \property VoiceCombineStaff.instr = #"Fl." +flautiStaff = \notes \context Staff = flauti < + \property Staff.midiInstrument = #"flute" + \property Staff.instrument = #"2 Flauti" + \property Staff.instr = #"Fl." \global - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \flautoI - \context VoiceCombineThread=two \flautoII + \context Voice=one \partcombine Voice + \context Thread=one \flautoI + \context Thread=two \flautoII > diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 827f3f28b4..8f813bb7be 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -12,19 +12,19 @@ flautoI = \notes \relative c { g4-. r r2| b,4-. r r2| R1 *4| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r2 g'\p\< (| )fis2. \!g4-.\f| R1*5| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r2 f\p\< ~| f4 \!e-.\f r2| R1| f2\p()es| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d1\<| d1| d2 d2| @@ -47,8 +47,8 @@ flautoI = \notes \relative c { )f2. ges4\sf| f4 r r2| R1*9| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g2.\p\<(f4| as g d)bes \!bes2\ff des| @@ -57,14 +57,14 @@ flautoI = \notes \relative c { c~| c~| c~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c\<~| c~| \!c2\ff es| d1~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d\p\<~| d~| d2.()f4| @@ -74,8 +74,8 @@ flautoI = \notes \relative c { \!fis\pp r r2| r2 r4 r8 a| bes4 r r2| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r r4 r8 bes\<| c4 r r r8 c| d4 r r r8 d| @@ -121,8 +121,8 @@ flautoI = \notes \relative c { r4 r8 f' es4 r8 bes| c4 r r2| R1*2| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r4 r8 ges'\< f4 r8 c| \!des4 r r2| R1*5| @@ -156,15 +156,15 @@ flautoI = \notes \relative c { )d2. es4\sf(| )d r r2| R1*9| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line e2.\p\<(f4| e d b )g| \!g2\ff bes| a1~a4\p r r2| R1*3| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line a1\<~| a| \!a2\ff c| @@ -207,8 +207,8 @@ flautoI = \notes \relative c { c r8 f8 es4 r8 bes| as4-. des4-. r2| R1*11| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line es2.\p\<(f4| es d b)g| g1| @@ -247,8 +247,8 @@ flautoI = \notes \relative c { R1| c4-. c4-. r2| c4-. c4-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line c4\> r d r| R1| \!es4\p r r2| diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index ceeecc5177..e134aa1160 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -123,8 +123,8 @@ flautoII = \notes \relative c { bes\f~| bes\p| c1\f~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c\p\<~| c~| c~| @@ -158,8 +158,8 @@ flautoII = \notes \relative c { R1| c4-. g'-. r2| as4-. e-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line f4\> r f r| R1| \!es4\p r r2| diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 766949eecc..24d8575ffa 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -11,6 +11,18 @@ global = \notes { \End } +staffCombinePianoStaffProperties = { + \property PianoStaff.devNullThread = #'() + \property PianoStaff.soloADue = ##t + \property PianoStaff.soloText = #"" + \property PianoStaff.soloIIText = #"" + % This is non-conventional, but currently it is + % the only way to tell the difference. + \property PianoStaff.aDueText = #"\\`a2" + \property PianoStaff.splitInterval = #'(1 . 0) + \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) +} + #(set! point-and-click #t) #(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) diff --git a/mutopia/Coriolan/header.ly b/mutopia/Coriolan/header.ly index 6774cba1bf..dec1d9fae6 100644 --- a/mutopia/Coriolan/header.ly +++ b/mutopia/Coriolan/header.ly @@ -4,12 +4,13 @@ opus = "Op. 62"; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; + instrument = \instrument; % mutopia headers. mutopiatitle = "Ouverture Coriolan"; mutopiacomposer = "L.v.Beethoven (1770-1827)"; mutopiaopus = "O62"; - mutopiainstrument = "Orchestra"; + mutopiainstrument = \instrument; date = "1807"; source = "Edition Dr. Max Unger 1936 from original published parts and autograph."; style = "Classical"; @@ -24,4 +25,5 @@ ".\\\\Unrestricted modification and redistribution is permitted and encouraged---copy this music and share it!}"; tagline = \mutopiapublicdomain; + footer = "pre-Mutopia-200y/mm/dd-nr"; } diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index a3aaf027dc..5da1133ee6 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -12,19 +12,19 @@ oboeI = \notes \relative c'' { g4-. r r2| g4-. r r2| R1 *4| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line as2\p\< ( g| )fis2. \!g4-.\f| R1*5| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line ges2\p\< f ~| f4 \!e\f r2| R1| f2\p()es| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d1\<| d| d2 d| @@ -47,22 +47,22 @@ oboeI = \notes \relative c'' { )f2. ges4(| )f4 r r2| R1*9| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g2.\p\<( as4| g f d)bes| \!bes'2\ff des| c bes| as4\p r r2| R1*3| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line as2.\p\<( bes4| as g e)c| \!c'2\ff es,| d1~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line d\p\< ~| d~| \!d2.\sf\>()f4| @@ -72,8 +72,8 @@ oboeI = \notes \relative c'' { fis\pp r r2| r r4 r8 fis'| g4 r r2| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r r4 r8 g\<| a4 r r r8 a| bes4 r r r8 bes| @@ -119,8 +119,8 @@ oboeI = \notes \relative c'' { des4 r r r8 c| bes4 r8 es f4 r8 f| g4 r8 g e4 r 8 e| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c'1\p\< ~| c~| c~| @@ -150,8 +150,8 @@ oboeI = \notes \relative c'' { )g2. fis4\sf(| )g4 r r2| R1*5| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line e2.\p\< (f4| e d b)g| g'2.(a4 g2)f| @@ -163,8 +163,8 @@ oboeI = \notes \relative c'' { a~| a~| a| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line f2.\<( g4| f e cis)a| \!a'2\ff c| @@ -179,8 +179,8 @@ oboeI = \notes \relative c'' { es(d es)c| b r r2| r r4 r8 d| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line es4\< r r2| r r4 r8 es| f4 r r r8 f| @@ -216,8 +216,8 @@ oboeI = \notes \relative c'' { es d b)g| g'2.(as4| g2)f| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line es2.\<( f4| es d b)g| c1| @@ -226,8 +226,8 @@ oboeI = \notes \relative c'' { f\f| g\p| g\f| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c\p\<~| c~| c~| diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index fc9541ee84..ac8e9c3bb0 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -66,8 +66,8 @@ oboeII = \notes \relative c{ bes4 r8 bes bes4 r8 bes| bes4\p r r2| R1*15| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r4 r8 as'\< ges4 r8 des| es4 r8 bes' as4 r8 es| f4 r r2| @@ -77,8 +77,8 @@ oboeII = \notes \relative c{ des4 r r r8 c| bes4 r8 bes bes4 r8 bes| bes4 r8 bes bes4 r8 bes| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c1\p\< ~| c~| c~| @@ -142,8 +142,8 @@ oboeII = \notes \relative c{ d\f| es\p| e\f| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c\p\< ~| c~| c~| @@ -175,8 +175,8 @@ oboeII = \notes \relative c{ R1| c4-. c-. r2| c4-. c-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line c4\> r d r| R1| \!c4\p r r2| diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index aac07ab385..a7df6c4802 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -1,13 +1,15 @@ \version "1.3.120"; +instrument = "Oboe" + \include "header.ly" \include "global.ly" \include "oboi.ly" \score{ \oboiStaff - \include "coriolan-part-combine-paper.ly" + \include "coriolan-part-paper.ly" \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 9ae055b36c..2db8749438 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -4,12 +4,12 @@ \include "oboe-1.ly" \include "oboe-2.ly" -oboiStaff = \context VoiceCombineStaff = oboi < - \property VoiceCombineStaff.midiInstrument = #"oboe" - \property VoiceCombineStaff.instrument = #"2 Oboi" - \property VoiceCombineStaff.instr = #"Ob." +oboiStaff = \context Staff = oboi < + \property Staff.midiInstrument = #"oboe" + \property Staff.instrument = #"2 Oboi" + \property Staff.instr = #"Ob." \global - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \oboeI - \context VoiceCombineThread=two \oboeII + \context Voice=one \partcombine Voice + \context Thread=one \oboeI + \context Thread=two \oboeII > diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index 4d9a9eb2e8..80fcd99dac 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -1,6 +1,8 @@ \version "1.3.120"; +instrument = "Timpani" + \include "header.ly" \include "global.ly" \include "timpani.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 539732b093..c01276cf7e 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -137,7 +137,7 @@ timpani = \notes \relative c { timpaniStaff = \context Staff = timpani < \property Staff.midiInstrument = #"timpani" - \property VoiceCombineStaff.instrument = #'((kern . 0.5) + \property Staff.instrument = #'((kern . 0.5) (lines "2 Timpani" "(C-G)")) \property Staff.instr = #"Timp." \clef "bass"; diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index ca48a00e5a..8d80cf6884 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -1,13 +1,15 @@ \version "1.3.120"; +instrument = "Trumpet" + \include "header.ly" \include "global.ly" \include "trombe.ly" \score{ \trombeStaff - \include "coriolan-part-combine-paper.ly" + \include "coriolan-part-paper.ly" \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 9a8745d891..39e21e435b 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -4,20 +4,20 @@ \include "trombo-1.ly" \include "trombo-2.ly" -trombeStaff = \context VoiceCombineStaff = trombe < - \context VoiceCombineStaff=trombe { - \property VoiceCombineStaff.midiInstrument = #"trumpet" +trombeStaff = \context Staff = trombe < + \context Staff=trombe { + \property Staff.midiInstrument = #"trumpet" - \property VoiceCombineStaff.instrument = #`((kern . 0.5) + \property Staff.instrument = #`((kern . 0.5) (lines "2 Trombe" (rows "(C)"))) - \property VoiceCombineStaff.instr = #`((kern . 0.5) + \property Staff.instr = #`((kern . 0.5) (lines "Tbe." (rows "(C)"))) \notes { \key c \major; } \End } - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \tromboI - \context VoiceCombineThread=two \tromboII + \context Voice=one \partcombine Voice + \context Thread=one \tromboI + \context Thread=two \tromboII > diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 85420657e7..1d8b306125 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -16,8 +16,8 @@ tromboI = \notes \relative c { R1*6| r4 c-.\f r2| R1*2| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r2 c4\p\< r| r2 c4 r| r2 c4 r| @@ -108,8 +108,8 @@ tromboI = \notes \relative c { c4 r r2| R1*18| e1\f(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )c\p\< ~| c~| c~| @@ -141,8 +141,8 @@ tromboI = \notes \relative c { R1| c4-. c-. r2| c4-. c-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line c4\> r g r| R1| \!g4\p r r2| diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 40bd7f5ae9..1ecdc4bee0 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -16,8 +16,8 @@ tromboII = \notes \relative c { R1*6| r4 c-.\f r2| R1*2| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r2 c4\p\< r| r2 c4 r| r2 c4 r| @@ -108,8 +108,8 @@ tromboII = \notes \relative c { c4 r r2| R1*18| c1\f~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c\p\< ~| c~| c~| @@ -141,8 +141,8 @@ tromboII = \notes \relative c { R1| c,4-. c-. r2| c4-. c-. r2| - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line c4\> r g r| R1| \!g4\p r r2| diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index 72d7bba1ad..16113333c1 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -24,8 +24,8 @@ violaI = \notes \relative c { [c,8-. es-.] [es()d] [d-. g-.] g4-"ten."| [c,8-. es-.] [es()d] [d-. as'-.] [as()g]| [g8-. c-.] [c()b] [b-. f'-.] [f()es]| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line es4.\< es8 d4. d8| %20 c4. c8 \!b4\f r4| @@ -35,15 +35,15 @@ violaI = \notes \relative c { r4 [des8\p()c][c-. ges'-.][ges()f]| %25 [f-. bes-.][bes()a][a-. es'-.][es()des]| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line des4.\< des8 c4. c8| bes4 \!bes4-.\f r2| R1 % same rhythm as violins... r8 c-.\p c4. c8-. c4~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [c8\< c-.]c2.~| %30 [c8 c-.]c2.~| @@ -76,8 +76,8 @@ violaI = \notes \relative c { )g4 r r r8 g(| %55 )d4 r r r8 d(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )es4 r\< r r8 es(| )as4 r r r8 as(| )g4 r r r8 g(| @@ -92,15 +92,15 @@ violaI = \notes \relative c { )bes4 r r r8 bes(| )as4 r r r8 as(| )e4 r r r8 e(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )f4\< r r r8 f(| )bes4 r r r8 bes| %70 \!c2:\ff bes:| a: fis:| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g4\p\< r r r8 g(| )c,4 r r r8 c| [\!f8\sf(\>as f as][f g d)\!g]| @@ -111,8 +111,8 @@ violaI = \notes \relative c { [d,-.\pp d'-.] es4. es8-. d4 ~| [d8 d-.] es4. es8-. d4 ~| %80 - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [d8\< d-.] es4. es8-. d4 ~| [d8 d-.] es4. es8-. d4 ~| [d8 d-.] es4. es8-. d4 ~| @@ -179,8 +179,8 @@ violaI = \notes \relative c { [e g b c][des c g e]| [f as c des][c des as f]| [g bes d es][d es bes g]| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [as\< c d es][f es c as]| %131 [g bes d es][f es bes g]| @@ -203,8 +203,8 @@ violaI = \notes \relative c { [g,: bes: c: des:][f,: bes: c: des:]| [e,: g: bes: des:][c,: e: g: c:]| %shared with cello from here on - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [f,8\p\< as c des][es, g b c]| [des, f a bes][c, es g as]| % uhuh, still 'same as cello'; @@ -260,8 +260,8 @@ violaI = \notes \relative c { %180 )e4 r r r8 e8(| )b'4 r r r8 b8(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )c4 r\< r r8 c,8(| % copied )f4 r r r8 f8(| @@ -276,8 +276,8 @@ violaI = \notes \relative c { d,4\p r r r8 d8(| )g4 r r r8 g8(| )f4 r r r8 f8(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )cis4\< r r r8 cis8(| )d4 r r r8 d8(| %195 @@ -298,8 +298,8 @@ violaI = \notes \relative c { r[c\p(as)c]r[c(a)c]| [b-. g'-.] as4. as8-. g4 ~| [g8 g-.] as4. as8-. g4 ~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [g8 g-.\<] as4. as8-. g4 ~| [g8 g-.] as4. as8-. g4 ~| %210 @@ -342,8 +342,8 @@ violaI = \notes \relative c { %240 f,4 r r2| R1*11| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c'4\p\< r r r8 c8(| )f4 r r r8 f,8(| )es1| @@ -356,8 +356,8 @@ violaI = \notes \relative c { e'2:16\f e:| %260 - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [as,8\p\< f']f4. es8 es4 ~| [es8 as]as4. g8 g4 ~| [g8 f]f4. es8 es4 ~| @@ -392,8 +392,8 @@ violaI = \notes \relative c { es4-. e-. r2| f4-. g-. r2| %290 - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line as4\> r g r| R1| \!c4\p r r2| diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index 9f90c1d844..8fe53abc31 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -24,8 +24,8 @@ violaII = \notes \relative c { [c,8-. es-.] [es()d] [d-. g-.] g4-"ten."| [c,8-. es-.] [es()d] [d-. as'-.] [as()g]| [g8-. c-.] [c()b] [b-. f'-.] [f()es]| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line es4.\< es8 d4. d8| %20 c4. c8 \!b4\f r4| @@ -35,15 +35,15 @@ violaII = \notes \relative c { r4 [des8\p()c][c-. ges'-.][ges()f]| %25 [f-. bes-.][bes()a][a-. es'-.][es()des]| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line des4.\< des8 c4. c8| bes4 \!bes4-.\f r2| R1 % same rhythm as violins... r8 c,-.\p c4. c8-. c4~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [c8\< c-.]c2.~| %30 [c8 c-.]c2.~| @@ -76,8 +76,8 @@ violaII = \notes \relative c { )g4 r r r8 g(| %55 )d4 r r r8 d(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )es4 r\< r r8 es(| )as4 r r r8 as(| )g4 r r r8 g(| @@ -92,15 +92,15 @@ violaII = \notes \relative c { )bes4 r r r8 bes(| )as4 r r r8 as(| )e4 r r r8 e(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )f4\< r r r8 f(| )bes4 r r r8 bes| %70 \!as2:\ff g:| fis: d:| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g4\p\< r r r8 g(| )c,4 r r r8 c| [\!f8\sf(\>as f as][f g d)\!g]| @@ -111,8 +111,8 @@ violaII = \notes \relative c { [d-.\pp d'-.] es4. es8-. d4 ~| [d8 d-.] es4. es8-. d4 ~| %80 - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [d8\< d-.] es4. es8-. d4 ~| [d8 d-.] es4. es8-. d4 ~| [d8 d-.] es4. es8-. d4 ~| @@ -179,8 +179,8 @@ violaII = \notes \relative c { [e g b c][des c g e]| [f as c des][c des as f]| [g bes d es][d es bes g]| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [as\< c d es][f es c as]| %131 [g bes d es][f es bes g]| @@ -203,8 +203,8 @@ violaII = \notes \relative c { [g,: bes: c: des:][f,: bes: c: des:]| [e,: g: bes: des:][c,: e: g: c:]| %shared with cello from here on - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [f,8\p\< as c des][es, g b c]| [des, f a bes][c, es g as]| % uhuh, still 'same as cello'; @@ -260,8 +260,8 @@ violaII = \notes \relative c { %180 )e4 r r r8 e8(| )b'4 r r r8 b8(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )c4 r\< r r8 c,8(| % copied )f4 r r r8 f8(| @@ -276,8 +276,8 @@ violaII = \notes \relative c { d,4\p r r r8 d8(| )g4 r r r8 g8(| )f4 r r r8 f8(| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )cis4\< r r r8 cis8(| )d4 r r r8 d8(| %195 @@ -298,8 +298,8 @@ violaII = \notes \relative c { r[as\p(d,)as']r[a(es)a]| [g-. g'-.] as4. as8-. g4 ~| [g8 g-.] as4. as8-. g4 ~| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [g8 g-.\<] as4. as8-. g4 ~| [g8 g-.] as4. as8-. g4 ~| %210 @@ -342,8 +342,8 @@ violaII = \notes \relative c { %240 f,4 r r2| R1*11| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c'4\p\< r r r8 c8(| )f4 r r r8 f,8(| )es1| @@ -356,8 +356,8 @@ violaII = \notes \relative c { bes2:16\f bes:| %260 - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [as8\p\< f']f4. es8 es4 ~| [es8 as]as4. g8 g4 ~| [g8 f]f4. es8 es4 ~| @@ -392,8 +392,8 @@ violaII = \notes \relative c { es4-. e-. r2| f4-. g-. r2| %290 - \property VoiceCombineVoice.decrescendoText = #"dim." - \property VoiceCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line as4\> r g r| R1| \!c4\p r r2| diff --git a/mutopia/Coriolan/viole-part.ly b/mutopia/Coriolan/viole-part.ly index 37b94deb79..4b43332ce2 100644 --- a/mutopia/Coriolan/viole-part.ly +++ b/mutopia/Coriolan/viole-part.ly @@ -1,13 +1,15 @@ \version "1.3.120"; +instrument = "Viola" + \include "header.ly" \include "global.ly" \include "viole.ly" \score{ \violeGroup - \include "coriolan-part-combine-paper.ly" + \include "coriolan-part-paper.ly" \include "coriolan-midi.ly" } diff --git a/mutopia/Coriolan/viole.ly b/mutopia/Coriolan/viole.ly index 75a29090af..1f72a246e0 100644 --- a/mutopia/Coriolan/viole.ly +++ b/mutopia/Coriolan/viole.ly @@ -6,52 +6,49 @@ %{ violeGroup = \context PianoStaff = viole_group \notes < - \context StaffCombineStaff=oneViole { - \property StaffCombineStaff.midiInstrument = #"viola" - \property StaffCombineStaff.instrument = #"Viola" - \property StaffCombineStaff.instr = #"Vla." + \context Staff=oneViole { + \property Staff.midiInstrument = #"viola" + \property Staff.instrument = #"Viola" + \property Staff.instr = #"Vla." - %\clef "alto"; - % Ugh, clef broken in 1.3.125 - \property StaffCombineStaff.clefGlyph = #"clefs-C" - \property StaffCombineStaff.clefPosition = #0 + \clef "alto"; + %\property Staff.clefGlyph = #"clefs-C" + %\property Staff.clefPosition = #0 \global } - \context StaffCombineStaff=twoViole { - \property StaffCombineStaff.midiInstrument = #"viola" - \property StaffCombineStaff.instrument = #"Viola II" - \property StaffCombineStaff.instr = #"Vla. II" + \context Staff=twoViole { + \property Staff.midiInstrument = #"viola" + \property Staff.instrument = #"Viola II" + \property Staff.instr = #"Vla. II" - %\clef "alto"; - % Ugh, clef broken in 1.3.125 - \property StaffCombineStaff.clefGlyph = #"clefs-C" - \property StaffCombineStaff.clefPosition = #0 + \clef "alto"; + %\property Staff.clefGlyph = #"clefs-C" + %\property Staff.clefPosition = #0 \global } - \context StaffCombineStaff=oneViole \partcombine StaffCombineStaff - \context StaffCombineVoice=one \violaI - \context StaffCombineVoice=two \violaII + \context Staff=oneViole \partcombine Staff + \context Voice=one \violaI + \context Voice=two \violaII > %} -violeGroup = \notes \context VoiceCombineStaff = viole < - \context VoiceCombineStaff=viole { - \property VoiceCombineStaff.midiInstrument = #"viola" - \property VoiceCombineStaff.instrument = #"Viola" - \property VoiceCombineStaff.instr = #"Vla." +violeGroup = \notes \context Staff = viole < + \context Staff=viole { + \property Staff.midiInstrument = #"viola" + \property Staff.instrument = #"Viola" + \property Staff.instr = #"Vla." - %\clef "alto"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-C" - \property VoiceCombineStaff.clefPosition = #0 + \clef "alto"; + %\property Staff.clefGlyph = #"clefs-C" + %\property Staff.clefPosition = #0 \global } - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \violaI - \context VoiceCombineThread=two \violaII + \context Voice=one \partcombine Voice + \context Thread=one \violaI + \context Thread=two \violaII > diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index 2253baa977..fa881001a4 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -1,6 +1,8 @@ \version "1.3.120"; +instrument = "Violin I" + \include "header.ly" \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index da0f4ee50a..6d56bf22cd 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -456,3 +456,4 @@ violinoIStaff = \context Staff = violino1 < \violinoI > > + diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index d1085fc5a6..5ea5093f07 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -1,6 +1,8 @@ \version "1.3.120"; +instrument = "Violin II" + \include "header.ly" \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 88fce58207..fc09b8232f 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -20,8 +20,8 @@ violoncello = \notes \relative c { c4 r4 r2| c4 r4 r2| R1| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line c'4.\< c8 bes4. bes8| %20 @@ -34,8 +34,8 @@ violoncello = \notes \relative c { %25 [f-. bes-.][bes()a][a-. es'-.][es()des]| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line bes4.\< bes8 as4. as8| g4 \!g4-.\f r2| R1 @@ -76,8 +76,8 @@ violoncello = \notes \relative c { %55 [bes(as'f as][bes as f)bes,~]| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [bes\<(g'es g][bes g es)bes~]| [bes(f'd f][bes f d)bes~]| [bes(g'es g][bes g es)bes~]| @@ -98,8 +98,8 @@ violoncello = \notes \relative c { %70 as2\ff g| fis d| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [g8\p\<(bes' g bes][d bes g)d~]| [d8(a' fis a][d a fis)d]| [\!f!8\sf\>(as f as][f g d)g]| @@ -112,8 +112,8 @@ violoncello = \notes \relative c { r4 r8 d d4. d8| %80 - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line r4 r8 d d4.\< d8| r4 r8 d d4. d8| r4 r8 d d4. d8| @@ -189,8 +189,8 @@ violoncello = \notes \relative c { [e g b c][des c g e]| [f as c des][c des as f]| [g bes d es][d es bes g]| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [as\< c d es][f es c as]| %131 @@ -214,8 +214,8 @@ violoncello = \notes \relative c { [g,: bes: c: des:][f,: bes: c: des:]| [e,: g: bes: des:][c: e: g: c:]| %shared with cello from here on - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [f,8\p\< as c des][es, g b c]| [des, f a bes][c, es g as]| % uhuh, still 'same as cello'; @@ -275,8 +275,8 @@ violoncello = \notes \relative c { %180 [g(e' c d][g e c )g~]| [g(f' d f][g f d )g,~]| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [g\<(e' c d][g e c )g~]| [g(d' b d][g d b )g~]| @@ -295,8 +295,8 @@ violoncello = \notes \relative c { [a( g' e g][a g e )a,!~]| %195 - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line [a8\<( f' d f][a f d )a!~]| [a( e' cis e][a e c )g]| \!f2\ff e| @@ -315,8 +315,8 @@ violoncello = \notes \relative c { f r fis r| g r g r| g r g r| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line g r g\< r| %210 @@ -377,8 +377,8 @@ violoncello = \notes \relative c { %250 )es4 r r r8 es(| )b4 r r r8 b(| - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line )c4\< r r r8 c(| )f4 r r r8 f,(| )es1| @@ -391,8 +391,8 @@ violoncello = \notes \relative c { bes\f| %260 - \property StaffCombineVoice.crescendoText = #"cresc." - \property StaffCombineVoice.crescendoSpanner = #'dashed-line + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line as4.\p\< as'8 g4. g8| f4. f8 es4. es8| as4. as8 g4. g8| @@ -435,8 +435,8 @@ violoncello = \notes \relative c { f,4-. g-. r2| %290 - \property StaffCombineVoice.decrescendoText = #"dim." - \property StaffCombineVoice.decrescendoSpanner = #'dashed-line + \property Voice.decrescendoText = #"dim." + \property Voice.decrescendoSpanner = #'dashed-line as4\> r b r| R1| \!c4\p r r2| @@ -448,10 +448,10 @@ violoncello = \notes \relative c { c4 r r2| [c8-.-"arco" es-.][es()d][d-. as'-.][as()g]| R1 - \property StaffCombineVoice.decrescendoText = #"sempre pi\\`u piano" + \property Voice.decrescendoText = #"sempre pi\\`u piano" % urg, "" is assumed to be hairpin... - %\property StaffCombineVoice.decrescendoSpanner = #"" - \property StaffCombineVoice.decrescendoSpanner = #'dashed-line + %\property Voice.decrescendoSpanner = #"" + \property Voice.decrescendoSpanner = #'dashed-line \times 2/3 { c,4\> ( es c ~ } \times 2/3 { c as' )g }| %300 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile b/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile index f58014df7c..7671f8003b 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile @@ -10,7 +10,9 @@ LOCALSTEPMAKE_TEMPLATES=mutopia include $(depth)/make/stepmake.make tarball=solo-cello-suite-ii +mutopia-examples=scsii-cello scsii-viola +mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz) mutopia: - $(MAKE) examples="scsii-cello scsii-viola" PAPERSIZE=letter local-WWW out-letter/scsii-cello.ps.gz out-letter/scsii-viola.ps.gz + $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter) diff --git a/scm/translator-description.scm b/scm/translator-description.scm index e2e34ad6cf..1f0e15218c 100644 --- a/scm/translator-description.scm +++ b/scm/translator-description.scm @@ -424,7 +424,7 @@ measurePosition and currentBarNumber to determine what number to print over the "Note_head_line_engraver" "Engrave a line between two note heads, for example a glissando. If followThread is set, staff switches also generate a line." - '(Glissando) + '(Glissando FollowThread) '(followThread))) (cons diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index 4e5ab9c7fd..549b54fad9 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -118,8 +118,8 @@ arpeggios that cross staffs. (translator-property-description 'decrescendoText string? "Text to print at start of non-hairpin decrecscendo, ie: @samp{dim.}") (translator-property-description 'devNullThread symbol? "User control of Thread_devnull_engraver: one of @table @samp -@item unisolo -Behave in normal way: remove one set of grobs when threads are in unisolo. +@item (), or unset +Behave in normal way: remove one set of grobs when in unisolo. @item allways: Remove any grob that comes along. @item never: @@ -128,7 +128,7 @@ Do nothing. ") (translator-property-description 'devNullVoice symbol? "User control of Voice_devnull_engraver: one of @table @samp -@item unisolo +@item (), or unset Behave in normal way: remove spanners when in unisolo. @item allways: Remove any spanners that come along. -- 2.39.5