X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fcoriolan-margin.ly;h=f29f41090ffbd73429fa0c661025aec73b745394;hb=169a91c8514e3dcea29d1aa01653a684fb60457d;hp=6fa376c4753f8cb0b2937ec4ffb5b7465fd08605;hpb=e1ef1410eeca1c9470c186da306e1f87b1b1a600;p=lilypond.git diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index 6fa376c475..f29f41090f 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,21 +1,32 @@ -\version "1.7.6" + +\version "2.10.0" % Ugh, we need to override some LaTeX titling stuff \header { - title = "Ouvertüre\\vrule width0pt height 0pt depth 1ex" - subtitle = "\\normalsize Zu Heinrich Joseph v. Collins Trauerspiel\\vrule width0pt height 0pt depth 1ex" - subsubtitle = "\\Large\\bf Coriolan" - opus = "Op. 62" - piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio" + title = "Ouvertüre" + subtitle = "Zu Heinrich Joseph v. Collins Trauerspiel" + subsubtitle = \markup { \large \bold "Coriolan" } + opus = "Op. 62" + piece = \markup { \large Allegro con brio } composer = "Ludwig van Beethoven (1770-1827)" - enteredby = "JCN" -} -#(define raisedflat '((raise . 0.4) (music (named "accidentals--1")))) -flauti = \notes \relative c' { - \property Staff.instrument = #"2 Flauti" - \property Staff.instr = #"Fl." +texidoc = "@cindex Orchestra Score +@cindex Coriolan Score +In an orchestral score (Beethoven's Coriolan overture), there are +different instrument groups, and some of the instruments may be +transposed. Instruments are indicated either with a long or short name. +" } + +#(set-global-staff-size 16) + +raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat } + + + +flauti = \relative c' { + \set Staff.instrumentName = #"2 Flauti" + \set Staff.shortInstrumentName = #"Fl." \time 4/4 c1 \break c @@ -24,115 +35,126 @@ flauti = \notes \relative c' { \bar"|." } -oboi = \notes \relative c' { - \property Staff.instrument = #"2 Oboi" - \property Staff.instr = #"Ob." +oboi = \relative c' { + \set Staff.instrumentName = #"2 Oboi" + \set Staff.shortInstrumentName = #"Ob." c1 c } -clarinetti = \notes \relative c' { -% \property Staff.instrument = #`("Clarinetti in B" ,text-flat) - \property Staff.instrument = #`(lines "2 Clarinetti" (columns "(B" ,raisedflat ")")) - \property Staff.instr = #`(lines "Cl." (columns "(B" ,raisedflat ")")) +clarinetti = \relative c' { + \set Staff.instrumentName = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } } + \set Staff.shortInstrumentName = \markup { \smaller { "Cl(B" \raisedFlat ")" } } c1 c } -fagotti = \notes \relative c' { - \property Staff.instrument = #"2 Fagotti" - \property Staff.instr = #"Fg." +fagotti = \relative c' { + \set Staff.instrumentName = #"2 Fagotti" + \set Staff.shortInstrumentName = #"Fg." c1 c } -corni = \notes \relative c' { - \property Staff.instrument = #`(lines "2 Corni" (columns "(E" ,raisedflat ")")) - \property Staff.instr = #`(lines "Cor." (columns "(E" ,raisedflat ")")) +corni = \relative c' { + \set Staff.instrumentName = \markup { \column { "Corni" \line { "in E" \raisedFlat } } } + \set Staff.shortInstrumentName = \markup { \smaller { "Cor(E" \raisedFlat ")" } } c1 c } -trombe = \notes \relative c' { - \property Staff.instrument = #'(lines "2 Trombe" "(C)") - \property Staff.instr = #'(lines "Tbe." "(C)") +trombe = \relative c' { + \set Staff.instrumentName = \markup \column { "2 Trombe" "(C)" } + \set Staff.shortInstrumentName = \markup \column { "Tbe." "(C)" } c1 c } -timpani = \notes \relative c' { - \property Staff.instrument = #'(lines "Timpani" "(C-G)") - \property Staff.instr = #"Timp." +timpani = \relative c' { + \set Staff.instrumentName = \markup \column { "Timpani" "(C-G)" } + \set Staff.shortInstrumentName = #"Timp." c1 c } -violinoI = \notes \relative c' { - \property Staff.instrument = #"Violino I " - \property Staff.instr = #"Vl. I " +violinoI = \relative c' { + \set Staff.instrumentName = #"Violino I " + \set Staff.shortInstrumentName = #"Vl. I " c1 c } -violinoII = \notes \relative c' { - \property Staff.instrument = #"Violino II " - \property Staff.instr = #"Vl. II " +violinoII = \relative c' { + \set Staff.instrumentName = #"Violino II " + \set Staff.shortInstrumentName = #"Vl. II " c1 c } -viola = \notes \relative c' { - \property Staff.instrument = #"Viola" - \property Staff.instr = #"Vla." +viola = \relative c' { + \set Staff.instrumentName = #"Viola" + \set Staff.shortInstrumentName = #"Vla." c1 c %c } -violoncello = \notes \relative c' { - \property Staff.instrument = #'(lines "Violoncello" "e" "Contrabasso") - \property Staff.instr = #'(lines "Vc." "Cb.") +violoncello = \relative c' { + \set Staff.instrumentName = \markup \column { "Violoncello" "e" "Contrabasso" } + \set Staff.shortInstrumentName = \markup \column { "Vc." "Cb." } c1 c } -\include "paper16.ly" - -\score { - < - \context StaffGroup ="legni" < - \context Staff ="flauti" \flauti - \context Staff ="oboi" \oboi - \context Staff ="clarinetti" \clarinetti - \context Staff ="fagotti" \fagotti - > - \context StaffGroup ="ottoni" < - \context Staff ="corni" \corni - \context Staff ="trombe" \trombe - > - \context StaffGroup ="timpani" < - \context Staff ="timpani" \timpani - { - \skip 1 - % Hmm: this forces a staff-bracket, that's good! - % However, I can't find where is decided on staff-bracket yes/no - } - > - \context StaffGroup ="archi" < - \context GrandStaff ="violini" < - \context Staff ="violinoI" \violinoI - \context Staff ="violinoII" \violinoII - > - \context Staff ="viola" \viola - \context Staff ="violoncello" \violoncello - > - > - \paper { - \paperSixteen - indent=100.0\mm - linewidth=150.0\mm - \translator { - \HaraKiriStaffContext + +\paper { + indent=10.0\mm + line-width=150.0\mm + ragged-bottom = ##t +} + +#(set-global-staff-size 16) +\book { + \score { + << + \new StaffGroup = "legni" << + \new Staff = "flauti" \flauti + \new Staff = "oboi" \oboi + \new Staff = "clarinetti" \clarinetti + \new Staff = "fagotti" \fagotti + >> + \new StaffGroup = "ottoni" << + \new Staff = "corni" \corni + \new Staff = "trombe" \trombe + >> + \new StaffGroup = "timpani" << + \new Staff = "timpani" \timpani + { + \skip 1 + % Hmm: this forces a staff-bracket, that's good! + % However, I can't find where is decided on staff-bracket yes/no + } + >> + \new StaffGroup = "archi" << + \new GrandStaff = "violini" << + \new Staff = "violinoI" \violinoI + \new Staff = "violinoII" \violinoII + >> + \new Staff = "viola" \viola + \new Staff = "violoncello" \violoncello + >> + >> + \layout { + \context { + \RemoveEmptyStaffContext + } + \context { + \Score + \override TimeSignature #'style = #'C + } + } } - \translator { - \OrchestralScoreContext - TimeSignature \override #'style = #'C + % this is ignored? + \paper { + indent=10.0\mm + line-width=150.0\mm } - } } -%% new-chords-done %% +%% Local Variables: +%% coding: utf-8 +%% End: