X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fcoriolan-margin.ly;h=a950c3a3f6beca94d06640c0ec23b3e358bc8308;hb=6a1bde2b538e6e0feefcc6e0ae03ec9f4cc7a91b;hp=abe8f80e3d0453c292b8e1637716065b291bdfcf;hpb=569f6d76cb725b6d99b4239719d453fdf232b9ab;p=lilypond.git diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index abe8f80e3d..a950c3a3f6 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,30 +1,32 @@ -\version "2.1.11" +\version "2.9.13" % 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)" texidoc = "@cindex Orchestra Score @cindex Coriolan Score -Demonstration of how to set up an orchestral score (Beethoven's Coriolan overture). +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-staff-size 16) +#(set-global-staff-size 16) -raisedFlat = \markup { \raise #0.4 \smaller \smaller \musicglyph #"accidentals--1" } +raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat } -flauti = \notes \relative c' { - \property Staff.instrument = #"2 Flauti" - \property Staff.instr = #"Fl." +flauti = \relative c' { + \set Staff.instrumentName = #"2 Flauti" + \set Staff.shortInstrumentName = #"Fl." \time 4/4 c1 \break c @@ -33,117 +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 - = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > } - \property Staff.instr - = \markup { \smaller { "Cl(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 - = \markup { \column < "Corni" { "in E" \raisedFlat } > } - \property Staff.instr - = \markup { \smaller { "Cor(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 = \markup \column < "2 Trombe" "(C)" > - \property Staff.instr = \markup \column < "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 = \markup \column < "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 = \markup \column < "Violoncello" "e" "Contrabasso" > - \property Staff.instr = \markup \column < "Vc." "Cb." > +violoncello = \relative c' { + \set Staff.instrumentName = \markup \column { "Violoncello" "e" "Contrabasso" } + \set Staff.shortInstrumentName = \markup \column { "Vc." "Cb." } c1 c } -\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 +\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 + >> >> - \context Staff ="viola" \viola - \context Staff ="violoncello" \violoncello - >> - >> - \paper { - \paperSixteen - indent=100.0\mm - linewidth=150.0\mm - \translator { - \RemoveEmptyStaffContext + \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 + } } - +%% Local Variables: +%% coding: utf-8 +%% End: