From 4548e240a11be82c05ec5f2ed8485678a054c2bf Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Fri, 18 Sep 2009 02:12:06 +0200 Subject: [PATCH] Cleanup: minimum-Y-extent removed, delete duplicate instr. names, remove instr_name_engraver for instruments --- Templates/TEMPLATE_Settings_Global.ily | 6 - oly_settings_instrument.ily | 6 +- oly_settings_instruments.ily | 438 +++++---------------------------- oly_settings_names.ily | 4 +- oly_settings_vocalvoice.ily | 5 + 5 files changed, 66 insertions(+), 393 deletions(-) rewrite oly_settings_instruments.ily (81%) diff --git a/Templates/TEMPLATE_Settings_Global.ily b/Templates/TEMPLATE_Settings_Global.ily index 27a2199..2d5baba 100644 --- a/Templates/TEMPLATE_Settings_Global.ily +++ b/Templates/TEMPLATE_Settings_Global.ily @@ -17,12 +17,6 @@ scorenumber="%(scorenumber)s" %% Possibly adjust the \orchestralScoreStructure here... -\layout { - \context { \Lyrics - \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7) - } -} - %% Add custom keys here, e.g. %% CorKey = \key g \major %% CorIKey = \CorKey diff --git a/oly_settings_instrument.ily b/oly_settings_instrument.ily index b589ff9..b501ac4 100644 --- a/oly_settings_instrument.ily +++ b/oly_settings_instrument.ily @@ -25,15 +25,17 @@ % No instrument names, they are already in the title/header! \remove "Instrument_name_engraver" } + \context { \ChoirStaff + % No instrument names, they are already in the title/header! + \remove "Instrument_name_engraver" + } \context { \RemoveEmptyStaffContext % No instrument names, they are already in the title/header! (Removing % the engraver only from the \Staff context is not sufficient!) \remove "Instrument_name_engraver" } -} -\layout { \context { \Staff \consists "Page_turn_engraver" minimumPageTurnLength = #(ly:make-moment 9 8) diff --git a/oly_settings_instruments.ily b/oly_settings_instruments.ily dissimilarity index 81% index 81f9cbf..b745675 100644 --- a/oly_settings_instruments.ily +++ b/oly_settings_instruments.ily @@ -1,383 +1,55 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%% Defaults for instrument names, short names, cue names, etc. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\addInstrumentDefinition #"clarinetti" - #`((instrumentTransposition . ,(ly:make-pitch 0 5 0)) - (shortInstrumentName . "Cl.") - (instrumentName . "Clarinetti in A") - (clefGlyph . "clefs.G") - (middleCPosition . -6) - (clefPosition . -2) - (instrumentCueName . "Cl. (in A)") - (midiInstrument . "clarinet")) - -\addInstrumentDefinition #"clarinetto1" - #`((instrumentTransposition . ,(ly:make-pitch 0 5 0)) - (shortInstrumentName . "Cl.I") - (instrumentName . "Clarinetto I in A") - (clefGlyph . "clefs.G") - (middleCPosition . -6) - (clefPosition . -2) - (instrumentCueName . "Cl. (in A)") - (midiInstrument . "clarinet")) - -\addInstrumentDefinition #"fagotti" - #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) - (shortInstrumentName . "Fg.") - (instrumentName . "Fagotti") - (clefGlyph . "clefs.F") - (middleCPosition . 2) - (clefPosition . 2) - (instrumentCueName . "Fg.") - (midiInstrument . "bassoon")) - -\addInstrumentDefinition #"oboe1" - #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) - (shortInstrumentName . "Ob.I") - (instrumentName . "Oboe I") - (clefGlyph . "clefs.G") - (middleCPosition . -6) - (clefPosition . -2) - (instrumentCueName . "Ob.I") - (midiInstrument . "oboe")) - -\addInstrumentDefinition #"oboi" - #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) - (shortInstrumentName . "Ob.") - (instrumentName . "Oboi") - (clefGlyph . "clefs.G") - (middleCPosition . -6) - (clefPosition . -2) - (instrumentCueName . "Ob.") - (midiInstrument . "oboe")) - -%%% Clef definitions, either old-style (using the Breitkopf style) or new style -FlClef = \clef "treble" -FlIClef = \FlClef -FlIIClef = \FlClef -ObClef = \clef "treble" -ObIClef = \ObClef -ObIIClef = \ObClef -ClIClef = \clef "treble" -ClIIClef = \ClIClef -FagClef = \clef "bass" -FagIClef = \FagClef -FagIIClef = \FagClef -CFagClef = \clef "bass" -CorClef = \clef "treble" -CorIClef = \CorClef -CorIIClef = \CorClef -TrbClef = \clef "tenor" -TrbIClef = \TrbClef -TrbIIClef = \TrbClef -TrbIIIClef = \clef "bass" -TbeIClef = \clef "treble" -TbeIIClef = \clef "treble" -TimClef = \clef "bass" -VClef = \clef "treble" -VIClef = \VClef -VIIClef = \VClef -VaClef = \clef "alto" -VaIClef = \VaClef -VaIIClef = \VaClef -VcBClef = \clef "bass" -VcClef = \VcBClef -CbClef = \VcBClef -SClef = \clef "treble" -AClef = \clef "treble" -TClef = \clef "treble_8" -BClef = \clef "bass" -SingstimmeClef = \clef "treble" -SSoloClef = \SClef -ASoloClef = \AClef -TSoloClef = \TClef -BSoloClef = \BClef -OIClef = \clef "treble" -OIIClef = \clef "bass" -OIaClef = \clef "treble" -OIIaClef = \clef "bass" -OIbClef = \clef "treble" -OIIbClef = \clef "bass" -BCClef = \clef "bass" -PfeIClef = \clef "treble" -PfeIIClef = \clef "bass" - - - -FlInstrumentName = "Flauti" -FlIInstrumentName = "Flauto I" -FlIIInstrumentName = "Flauto II" -ObInstrumentName = "Oboi" -ObIInstrumentName = "Oboe I" -ObIIInstrumentName = "Oboe II" -ClInstrumentName = "Clarinetti" -ClIInstrumentName = "Clarinetto I" -ClIIInstrumentName = "Clarinetto II" -FagInstrumentName = "Fagotti" -FagIInstrumentName = "Fagotto I" -FagIIInstrumentName = "Fagotto II" -CFagInstrumentName = "Contrafagotto" -CorInstrumentName = "Corni" -CorIInstrumentName = "Corno I" -CorIIInstrumentName = "Corno II" -TrbInstrumentName = "Tromboni" -TrbIInstrumentName = "Trombone I" -TrbIIInstrumentName = "Trombone II" -TrbIIIInstrumentName = "Trombone III" -TbeInstrumentName = "Trombe" -TbeIInstrumentName = "Tromba I" -TbeIIInstrumentName = "Tromba II" -TimInstrumentName = "Timpani" -VIInstrumentName = "Violino I" -VIIInstrumentName = "Violino II" -VaInstrumentName = "Viola" -VaIInstrumentName = "Viola I" -VaIIInstrumentName = "Viola II" -VcBInstrumentName = \markup {\column { "Cello e" "Contrabbasso"}} -VcInstrumentName ="Violoncello" -CbInstrumentName ="Basso" -ChInstrumentName = "Coro" -SingstimmeInstrumentName = "Singstimme" -SInstrumentName = "Soprano" -AInstrumentName = "Alto" -TInstrumentName = "Tenore" -BInstrumentName = "Basso" -SSoloInstrumentName = "Soprano Solo" -TSoloInstrumentName = "Tenore Solo" -BSoloInstrumentName = "Basso Solo" -ASoloInstrumentName = "Alto Solo" -OInstrumentName = "Organo" -BCInstrumentName = "Basso Continuo" -OrganInstrumentName = "Organo" -ContinuoInstrumentName = \OrganInstrumentName -PfeInstrumentName = "Pianoforte" - -ChInstrumentTitle = "Coro" - -OriginalScoreTitle = "Originalpartitur" -FullScoreTitle = "Partitur / FullScore" -LongScoreTitle = "Partitur / FullScore" -OrganScoreTitle = "Orgelauszug / Organ score" -VocalScoreTitle = "Klavierauszug / Vocal score" -ParticellTitle = "Vokalparticell / Vocal particell" -ChoralScoreTitle = "Chorstimmen / Choir voices" -SoloChoralScoreTitle = "Chorstimmen mit Soli / Choir voices with solo parts" -SoloScoreTitle = "Solostimmen / Solo parts" - - -FlShortInstrumentName = "Fl." -FlIShortInstrumentName = "Fl. I" -FlIIShortInstrumentName = "Fl. II" -ObShortInstrumentName = "Ob." -ObIShortInstrumentName = "Ob. I" -ObIIShortInstrumentName = "Ob. II" -ClShortInstrumentName = "Cl." -ClIShortInstrumentName = "Cl.I" -ClIIShortInstrumentName = "Cl.II" -FagShortInstrumentName = "Fag." -FagIShortInstrumentName = "Fag. I" -FagIIShortInstrumentName = "Fag. II" -CFagShortInstrumentName = "Cfag." -CorShortInstrumentName = "Cor." -CorIShortInstrumentName = "Cor.I" -CorIIShortInstrumentName = "Cor.II" -TrbShortInstrumentName = "Tr." -TrbIShortInstrumentName = "Tr. I" -TrbIIShortInstrumentName = "Tr. II" -TrbIIIShortInstrumentName = "Tr. III" -TbeShortInstrumentName = "Tbe." -TbeIShortInstrumentName = "Tbe.I" -TbeIIShortInstrumentName = "Tbe.II" -TimShortInstrumentName = "Tim." -VIShortInstrumentName = "V.I" -VIIShortInstrumentName = "V.II" -VaShortInstrumentName = "Va." -VaIShortInstrumentName = "Va.I" -VaIIShortInstrumentName = "Va.II" -VcBShortInstrumentName = \markup{\column{"Vc." "e B."}} -VcShortInstrumentName = "Vc." -CbShortInstrumentName = "B." -ChShortInstrumentName = "C." -SShortInstrumentName = "S." -% SShortInstrumentName = ##f -AShortInstrumentName = "A." -TShortInstrumentName = "T." -BShortInstrumentName = "B." -SSoloShortInstrumentName = "S.Solo" -ASoloShortInstrumentName = "A.Solo" -TSoloShortInstrumentName = "T.Solo" -BSoloShortInstrumentName = "B.Solo" -OShortInstrumentName = "Org." -OrganShortInstrumentName = "Org." -BCShortInstrumentName = "B.C." -ContinuoShortInstrumentName = \OrganShortInstrumentName - - - -cueFl = "Fl" -cueCl = "Clt" -cueClI = "Clt I" -cueClII = "Clt II" -cueObI = "Ob I" -cueObII = "Ob II" -cueOb = "Ob" -cueCor = "Cor" -cueCorI = "Cor I" -cueCorII = "Cor II" -cueTbe = "Tbe" -cueTbeI = "Tbe I" -cueTbeII = "Tbe II" -cueTim = "Tim" -cueVI = "V I" -cueVII = "V II" -cueVa = "Va" -cueVaI = "Va I" -cueVaII = "Va II" -cueVcB = "Vc/B" -cueArchi = "Archi" -cueCh = "Coro" -cueS = "S" -cueA = "A" -cueT = "T" -cueB = "B" -cueO = "Org" -cueBC = "B.C." - - - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%% SCORE NUMBERS FOR PUBLISHING -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -scorenumber = "0000" -scoreNumber = -#(define-markup-command (scoreNumber layout props nr) (markup?) - (interpret-markup layout props (markup (format "~a-~a" scorenumber nr))) -) - -OriginalScoreNumber = "0" -FullScoreNumber = "1" -LongScoreNumber = "1a" -VocalScoreNumber = "2" -OrganScoreNumber = "2" -ParticellNumber = "3" - -ChoralScoreNumber = "10" -ChNumber = "10" -SNumber = "11" -ANumber = "12" -TNumber = "13" -BNumber = "14" -SingstimmeNumber = "15" -SoloScoreNumber = "15" -SSoloNumber = "16" -ASoloNumber = "17" -TSoloNumber = "18" -BSoloNumber = "19" - -ONumber = "20" -OrganNumber = \ONumber -BCNumber = "21" -ContinuoNumber = \BCNumber - -InstrumentsNumber = "25" -VNumber = "30" -VINumber = "30" -VIINumber = "31" -VaNumber = "32" -VcBNumber = "33" -VcNumber = "34" - -FlNumber = "40" -FlINumber = "40" -FlIINumber = "41" -ObNumber = "42" -ObINumber = "42" -ObIINumber = "43" -ClNumber = "44" -ClINumber = "44" -ClIINumber = "45" -FagNumber = "46" -FagINumber = "46" -FagIINumber = "47" -CFagNumber = "48" - -CorNumber = "50" -CorINumber = "50" -CorIINumber = "51" -TbeNumber = "52" -TbeINumber = "52" -TbeIINumber = "53" -TrbNumber = "54" -TrbINumber = "54" -TrbIINumber = "55" -TrbIIINumber = "56" -TbaNumber = "57" - -TimNumber = "60" -ArpaNumber = "65" - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%% SCORE NUMBERS FOR PUBLISHING -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -FlMidiInstrument = "flute" -FlIMidiInstrument = "flute" -FlIIMidiInstrument = "flute" -ObMidiInstrument = "oboe" -ObIMidiInstrument = "oboe" -ObIIMidiInstrument = "oboe" -ClMidiInstrument = "clarinet" -ClIMidiInstrument = "clarinet" -ClIIMidiInstrument = "clarinet" -FagMidiInstrument = "bassoon" -FagIMidiInstrument = "bassoon" -FagIIMidiInstrument = "bassoon" -CFagMidiInstrument = "bassoon" -CorMidiInstrument = "french horn" -CorIMidiInstrument = "french horn" -CorIIMidiInstrument = "french horn" -TrbMidiInstrument = "trombone" -TrbIMidiInstrument = "trombone" -TrbIIMidiInstrument = "trombone" -TrbIIIMidiInstrument = "trombone" -TbeMidiInstrument = "trumpet" -TbeIMidiInstrument = "trumpet" -TbeIIMidiInstrument = "trumpet" -TimMidiInstrument = "timpani" -VIMidiInstrument = "violin" -VIIMidiInstrument = "violin" -VaMidiInstrument = "viola" -VaIMidiInstrument = "viola" -VaIIMidiInstrument = "viola" -VcBMidiInstrument = "cello" -VcMidiInstrument ="cello" -CbMidiInstrument ="contrabass" - -% ChMidiInstrument = "choir aahs" -% SMidiInstrument = "synth voice" -% AMidiInstrument = "choir aahs" -% TMidiInstrument = "voice oohs" -% BMidiInstrument = "synth voice" -%{SMidiInstrument = "voice aahs" -AMidiInstrument = \SMidiInstrument -TMidiInstrument = "voice oohs" -BMidiInstrument = "voice oohs" -SMidiInstrument = "synth voice" -AMidiInstrument = "choir aahs" -TMidiInstrument = "voice oohs" -BMidiInstrument = "synth voice" -SSoloMidiInstrument = "synth voice" -TSoloMidiInstrument = "synth voice" -BSoloMidiInstrument = "synth voice" -ASoloMidiInstrument = "synth voice"%} -OMidiInstrument = "church organ" +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%% Defaults for instrument names, short names, cue names, etc. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\addInstrumentDefinition #"clarinetti" + #`((instrumentTransposition . ,(ly:make-pitch 0 5 0)) + (shortInstrumentName . "Cl.") + (instrumentName . "Clarinetti in A") + (clefGlyph . "clefs.G") + (middleCPosition . -6) + (clefPosition . -2) + (instrumentCueName . "Cl. (in A)") + (midiInstrument . "clarinet")) + +\addInstrumentDefinition #"clarinetto1" + #`((instrumentTransposition . ,(ly:make-pitch 0 5 0)) + (shortInstrumentName . "Cl.I") + (instrumentName . "Clarinetto I in A") + (clefGlyph . "clefs.G") + (middleCPosition . -6) + (clefPosition . -2) + (instrumentCueName . "Cl. (in A)") + (midiInstrument . "clarinet")) + +\addInstrumentDefinition #"fagotti" + #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) + (shortInstrumentName . "Fg.") + (instrumentName . "Fagotti") + (clefGlyph . "clefs.F") + (middleCPosition . 2) + (clefPosition . 2) + (instrumentCueName . "Fg.") + (midiInstrument . "bassoon")) + +\addInstrumentDefinition #"oboe1" + #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) + (shortInstrumentName . "Ob.I") + (instrumentName . "Oboe I") + (clefGlyph . "clefs.G") + (middleCPosition . -6) + (clefPosition . -2) + (instrumentCueName . "Ob.I") + (midiInstrument . "oboe")) + +\addInstrumentDefinition #"oboi" + #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) + (shortInstrumentName . "Ob.") + (instrumentName . "Oboi") + (clefGlyph . "clefs.G") + (middleCPosition . -6) + (clefPosition . -2) + (instrumentCueName . "Ob.") + (midiInstrument . "oboe")) diff --git a/oly_settings_names.ily b/oly_settings_names.ily index d860585..5975c6a 100644 --- a/oly_settings_names.ily +++ b/oly_settings_names.ily @@ -89,7 +89,7 @@ VaIIInstrumentName = "Viola II" VcBInstrumentName = \markup {\column { "Cello e" "Contrabbasso"}} VcInstrumentName ="Violoncello" CbInstrumentName ="Basso" -ChInstrumentName = "Coro" +% ChInstrumentName = "Coro" SingstimmeInstrumentName = "Singstimme" SInstrumentName = "Soprano" AInstrumentName = "Alto" @@ -150,7 +150,7 @@ VaIIShortInstrumentName = "Va.II" VcBShortInstrumentName = \markup{\column{"Vc." "e B."}} VcShortInstrumentName = "Vc." CbShortInstrumentName = "B." -ChShortInstrumentName = "C." +% ChShortInstrumentName = "C." SShortInstrumentName = "S." % SShortInstrumentName = ##f AShortInstrumentName = "A." diff --git a/oly_settings_vocalvoice.ily b/oly_settings_vocalvoice.ily index 07366c2..e3d2e9f 100644 --- a/oly_settings_vocalvoice.ily +++ b/oly_settings_vocalvoice.ily @@ -11,6 +11,11 @@ \remove "Instrument_name_engraver" \override VerticalAxisGroup #'remove-empty = ##f } + \context { \ChoirStaff + % No instrument names, they are already in the title/header! + \remove "Instrument_name_engraver" + \override VerticalAxisGroup #'remove-empty = ##f + } \context { \RemoveEmptyStaffContext % No instrument names, they are already in the title/header! (Removing -- 2.11.4.GIT