rule.
2006-08-08 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * input/regression/*.ly: apply it.
+
+ * python/convertrules.py (conv): better instrumentName conversion
+ rule.
+
* scm/define-music-types.scm (music-descriptions): add
line-break-event to LineBreakEvent music
-\version "2.7.39"
+\version "2.9.13"
\header {
title = "Puer natus est nobis"
subtitle = "Antiphona ad introitum VII"
%%% global search/replace operations in emacs).
cantus = \new VaticanaVoice = "cantus" {
- \set Staff.instrument = \markup {
+ \set Staff.instrumentName = \markup {
\column {
" " " " " " " " "VII" " "
{
}
-\version "2.7.39"
+\version "2.9.13"
#(set-global-staff-size 13)
\new Staff { c1 c c }
\new PianoStaff <<
\new Voice {
- \set PianoStaff.instrument = #"piano"
- \set PianoStaff.instr = #"pn"
+ \set PianoStaff.instrumentName = #"piano"
+ \set PianoStaff.shortInstrumentName = #"pn"
c1_"normal"
\overrideProperty
-\version "2.7.39"
+\version "2.9.13"
\header{
texidoc="
\layout { ragged-right = ##t }
onestaff = \new Staff\relative c'' {
- \set Staff.instr = instr
- \set Staff.instrument = instrument \mark "B"
+ \set Staff.shortInstrumentName = instr
+ \set Staff.instrumentName = instrument \mark "B"
c1 \mark "A" \break c2 c2 \break
}
\context GrandStaff <<
\new Staff {
- \set Staff.instr = instr
+ \set Staff.shortInstrumentName = instr
\mark "B" \break c1 \mark "A" c2 }
\new Staff { c1 c2 }
}
-\version "2.7.39"
+\version "2.9.13"
drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
\override StaffSymbol #'line-count = #2
\override BarLine #'bar-size = #2
} <<
- \set Staff.instrument = "timbales"
+ \set Staff.instrumentName = "timbales"
\timb
>>
\new DrumStaff <<
- \set Staff.instrument = "drums"
+ \set Staff.instrumentName = "drums"
\new DrumVoice {\stemUp \drh }
\new DrumVoice {\stemDown \drl }
>>
}
-\version "2.7.39"
+\version "2.9.13"
\new PianoStaff <<
\new Staff {
\override Staff.VerticalAxisGroup #'remove-empty = ##t
- \set PianoStaff.instrument="up"
- \set PianoStaff.instr="u"
+ \set PianoStaff.instrumentName ="up"
+ \set PianoStaff.shortInstrumentName ="u"
c'1\break R
}
>>
\layout { ragged-right = ##t }
-\version "2.7.39"
+\version "2.9.13"
textFlat = \markup {\smaller \flat}
\new Staff {
- \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \textFlat } } }
- \set Staff.instr = \markup { \smaller { "Cl(B" \textFlat ")" } }
+ \set Staff.instrumentName = \markup { \column { "Clarinetti" \line { "in B" \textFlat } } }
+ \set Staff.shortInstrumentName = \markup { \smaller { "Cl(B" \textFlat ")" } }
{ c''1 \break c'' }
}
-\version "2.7.39"
+\version "2.9.13"
\header {
texidoc = "Instrument names are also printed on partial starting measures."
}
-\relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 }
+\relative c'' { \set Staff.instrumentName = "foo" \partial 4 c4 c1 }
-\version "2.7.39"
+\version "2.9.13"
\header{
texidoc="
Staff margins are also markings attached to barlines. They should be
\new StaffGroup <<
\context PianoStaff <<
\new Staff {
- \set PianoStaff.instrument = "Piano"
- \set Staff.instrument = "Right" { c''4 }}
+ \set PianoStaff.instrumentName = "Piano"
+ \set Staff.instrumentName = "Right" { c''4 }}
\new Staff {
- \set Staff.instrument = "Left"
+ \set Staff.instrumentName = "Left"
\clef bass c4
}
>>
-\version "2.7.39"
+\version "2.9.13"
\header {
texidoc = "There are both long and short instrument names.
\context Staff <<
- \set Staff.instrument = "instrument"
- \set Staff.instr = "instr"
+ \set Staff.instrumentName = "instrument"
+ \set Staff.shortInstrumentName = "instr"
{c''1 \break R1 }
>>
-\version "2.7.39"
+\version "2.9.13"
\header {
texidoc = "Distances between prefatory items (e.g. clef, bar,
}
\relative c'' {
- \set Staff.instrument = "fobar"
+ \set Staff.instrumentName = "fobar"
\bar "||:"
\key cis \major
cis4 cis4 cis4 cis4 \clef bass cis,1
@code{rest-event} is not in @code{quotedEventTypes}."
}
-\version "2.7.39"
+\version "2.9.13"
\layout {
ragged-right = ##t
}
<<
\new Staff {
- \set Staff.instrument = "quoteMe"
+ \set Staff.instrumentName = "quoteMe"
\quoteMe
}
\new Staff {
- \set Staff.instrument = "orig"
+ \set Staff.instrumentName = "orig"
\original
}
\new Staff \relative c'' <<
- \set Staff.instrument = "orig+quote"
+ \set Staff.instrumentName = "orig+quote"
\set Staff.quotedEventTypes = #'(note-event articulation-event)
\original
{ s4 \quoteDuring #"quoteMe" { s2. } }
}
\paper { ragged-right= ##t }
-\version "2.7.39"
+\version "2.9.13"
quoted = \relative c'' {
R1
\grace g16 f4 \grace a16 bes4 \grace b16 c4 c4
<<
\new Staff {
- \set Staff.instrument = "quoted"
+ \set Staff.instrumentName = "quoted"
\quoted
}
\new Staff \new Voice \relative c'' {
- \set Staff.instrument = "quoted"
+ \set Staff.instrumentName = "quoted"
R1
\cueDuring #"quoted" #1 { \grace s16. r2 }
c2^"original"
@code{rest-event} is not in @code{quotedEventTypes}."
}
-\version "2.7.39"
+\version "2.9.13"
\layout {
ragged-right = ##t
}
<<
\new Staff {
- \set Staff.instrument = "quoteMe"
+ \set Staff.instrumentName = "quoteMe"
\quoteMe
}
\new Staff {
- \set Staff.instrument = "orig"
+ \set Staff.instrumentName = "orig"
\original
}
\new Staff \relative c'' <<
- \set Staff.instrument = "orig+quote"
+ \set Staff.instrumentName = "orig+quote"
\set Staff.quotedEventTypes = #'(note-event articulation-event)
\original
\new Voice {
-\version "2.7.39"
+\version "2.9.13"
\header {
texidoc = "The @code{\\tag} command marks music expressions with a
\simultaneous {
\new Staff {
- \set Staff.instrument = #"both"
+ \set Staff.instrumentName = #"both"
\common
}
\new Staff {
- \set Staff.instrument = #"part"
+ \set Staff.instrumentName = #"part"
\keepWithTag #'part \common
}
\new Staff {
- \set Staff.instrument = #"score"
+ \set Staff.instrumentName = #"score"
\keepWithTag #'score \common
}
}
-\version "2.7.39"
+\version "2.9.13"
\header {
texidoc ="Broken volta spanners behave correctly at their left edge in all cases."
voiceB = {
\clef bass
- \set Staff.instrument = "Bass"
- \set Staff.instr = "B"
+ \set Staff.instrumentName = "Bass"
+ \set Staff.shortInstrumentName = "B"
\key f \minor
\time 4/4
f1
-\version "2.7.39"
+\version "2.9.13"
% Ugh, we need to override some LaTeX titling stuff
flauti = \relative c' {
- \set Staff.instrument = #"2 Flauti"
- \set Staff.instr = #"Fl."
+ \set Staff.instrumentName = #"2 Flauti"
+ \set Staff.shortInstrumentName = #"Fl."
\time 4/4
c1
\break c
}
oboi = \relative c' {
- \set Staff.instrument = #"2 Oboi"
- \set Staff.instr = #"Ob."
+ \set Staff.instrumentName = #"2 Oboi"
+ \set Staff.shortInstrumentName = #"Ob."
c1 c
}
clarinetti = \relative c' {
- \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } }
- \set Staff.instr = \markup { \smaller { "Cl(B" \raisedFlat ")" } }
+ \set Staff.instrumentName = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } }
+ \set Staff.shortInstrumentName = \markup { \smaller { "Cl(B" \raisedFlat ")" } }
c1 c
}
fagotti = \relative c' {
- \set Staff.instrument = #"2 Fagotti"
- \set Staff.instr = #"Fg."
+ \set Staff.instrumentName = #"2 Fagotti"
+ \set Staff.shortInstrumentName = #"Fg."
c1 c
}
corni = \relative c' {
- \set Staff.instrument = \markup { \column { "Corni" \line { "in E" \raisedFlat } } }
- \set Staff.instr = \markup { \smaller { "Cor(E" \raisedFlat ")" } }
+ \set Staff.instrumentName = \markup { \column { "Corni" \line { "in E" \raisedFlat } } }
+ \set Staff.shortInstrumentName = \markup { \smaller { "Cor(E" \raisedFlat ")" } }
c1 c
}
trombe = \relative c' {
- \set Staff.instrument = \markup \column { "2 Trombe" "(C)" }
- \set Staff.instr = \markup \column { "Tbe." "(C)" }
+ \set Staff.instrumentName = \markup \column { "2 Trombe" "(C)" }
+ \set Staff.shortInstrumentName = \markup \column { "Tbe." "(C)" }
c1 c
}
timpani = \relative c' {
- \set Staff.instrument = \markup \column { "Timpani" "(C-G)" }
- \set Staff.instr = #"Timp."
+ \set Staff.instrumentName = \markup \column { "Timpani" "(C-G)" }
+ \set Staff.shortInstrumentName = #"Timp."
c1 c
}
violinoI = \relative c' {
- \set Staff.instrument = #"Violino I "
- \set Staff.instr = #"Vl. I "
+ \set Staff.instrumentName = #"Violino I "
+ \set Staff.shortInstrumentName = #"Vl. I "
c1 c
}
violinoII = \relative c' {
- \set Staff.instrument = #"Violino II "
- \set Staff.instr = #"Vl. II "
+ \set Staff.instrumentName = #"Violino II "
+ \set Staff.shortInstrumentName = #"Vl. II "
c1 c
}
viola = \relative c' {
- \set Staff.instrument = #"Viola"
- \set Staff.instr = #"Vla."
+ \set Staff.instrumentName = #"Viola"
+ \set Staff.shortInstrumentName = #"Vla."
c1 c
%c
}
violoncello = \relative c' {
- \set Staff.instrument = \markup \column { "Violoncello" "e" "Contrabasso" }
- \set Staff.instr = \markup \column { "Vc." "Cb." }
+ \set Staff.instrumentName = \markup \column { "Violoncello" "e" "Contrabasso" }
+ \set Staff.shortInstrumentName = \markup \column { "Vc." "Cb." }
c1 c
}
-\version "2.7.39"
+\version "2.9.13"
\header { texidoc = "@cindex Instrument Name Grandstaff
You can have a name for the whole @code{GrandStaff} in addition to
individual @code{Staff}s. " }
\new GrandStaff <<
\new Staff = "treble" {
- \set GrandStaff.instrument = "Violini "
- \set Staff.instrument = " vn I" { c''4 }}
- \new Staff = "bass" { \set Staff.instrument = " vn II" c''4 }>>
+ \set GrandStaff.instrumentName = "Violini "
+ \set Staff.instrumentName = " vn I" { c''4 }}
+ \new Staff = "bass" { \set Staff.instrumentName = " vn II" c''4 }>>
\layout {
def conv (str):
str = re.sub ('vocNam', 'shortVocalName', str)
- str = re.sub (r'([^a-z])instr\s*=', r'\1shortInstrumentName =', str)
- str = re.sub (r'([^a-z])instrument\s*=', r'\1instrumentName =', str)
+ str = re.sub (r'\.instr\s*=', r'.shortInstrumentName =', str)
+ str = re.sub (r'\.instrument\s*=', r'.instrumentName =', str)
return str
conversions.append (((2, 9, 13), conv, """instrument -> instrumentName, instr -> shortInstrumentName, vocNam -> shortVocalName"""))