diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-02-13 09:28:59 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-02-13 09:28:59 +0000 |
| commit | 052eddb409fd6b556fbf2bcd37c9ab07f226a154 (patch) | |
| tree | fa19376688a7948b70128cbd06b4de6143667395 | |
| parent | f1ba395ada75b219b7522841f3dd51dcffd2bd8f (diff) | |
*** empty log message ***
57 files changed, 173 insertions, 156 deletions
@@ -1,6 +1,6 @@ 2006-02-13 Han-Wen Nienhuys <hanwen@xs4all.nl> - * THANKS: add Don. +` * THANKS: add Don. * lily/slur-scoring.cc (get_base_attachments): use robust_relative_extent. This fixes problems with empty paper-columns. @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=7 -PATCH_LEVEL=33 +PATCH_LEVEL=34 MY_PATCH_LEVEL= diff --git a/input/bach-schenker.ly b/input/bach-schenker.ly index bafec344be..64f3ed902c 100644 --- a/input/bach-schenker.ly +++ b/input/bach-schenker.ly @@ -21,7 +21,7 @@ staffPiano = \new PianoStaff { \set PianoStaff.followVoice = ##t << - \context Staff = "RH" { % Right hand + \new Staff { % Right hand \clef treble \key g \major \relative c'' { @@ -147,7 +147,7 @@ staffPiano = \new PianoStaff { \bar "|." } } - \context Staff = "LH" { % Left hand + \new Staff { % Left hand \clef bass \key g \major \relative c' { diff --git a/input/les-nereides.ly b/input/les-nereides.ly index a9e367f27f..226a8c3de2 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -240,14 +240,14 @@ middleDynamics = { theScore = \score{ \context PianoStaff << - \context Staff = "treble" << + \new Staff = "treble" << \treble \trebleTwo >> \new Dynamics << \middleDynamics >> - \context Staff = "bass" << + \new Staff = "bass" << \clef bass \bass \bassTwo diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index 0b344044e7..3cf0aa2ff8 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -30,8 +30,7 @@ global = { \bar "|." } -i = \context Staff \relative c''{ - \context Voice = "i" +i = \context Staff \relative c''\new Voice { \voiceOne c8.( es16 bes4 ~ | bes8) r c8.( bes16 | des4 c8. bes16 | c4 ~ c8) r | @@ -58,8 +57,7 @@ i = \context Staff \relative c''{ } -ii = \context Staff \relative c'{ - \context Voice = "ii" +ii = \context Staff \relative c'\new Voice{ \voiceTwo r8 <es as> r <des f> | r <es g> r <es as> | r <f as> r <f as> | @@ -96,8 +94,7 @@ ii = \context Staff \relative c'{ } -lower = \context Staff \relative c{ - \context Voice = "iii" +lower = \context Staff \relative c \new Voice{ <as as'>4 <es es'> | r <as as'> | <des, des'> <f f'> | <c c'> r | <as as'> <des des'> | <bes bes'> r | <des des'> <bes bes'> | @@ -126,13 +123,13 @@ lower = \context Staff \relative c{ \score { \context PianoStaff << - \context Staff = "treble" << + \new Staff = "treble" << \global \clef violin \i \ii >> - \context Staff = "bass" << + \new Staff = "bass" << \global \clef bass \lower diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 4d14401521..731a483f67 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -50,7 +50,7 @@ modernAccidentals = { } -melody = \relative c'' \repeat volta 2 \context Voice = "singer" { +melody = \relative c'' \repeat volta 2 \new Voice = "singer" { \time 6/8 \autoBeamOff s1*0^\markup { \bold \large\bigger\bigger { \hspace #-3.0 Lieblich, etwas geschwind } } diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 321d71602c..4f14b8eb0d 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -381,7 +381,7 @@ allLyrics = { \lyricThrough } } -vocals = \context Voice = "leise" { +vocals = \new Voice = "leise" { \clef treble % certainly no auto-beaming for vocals \autoBeamOff @@ -396,7 +396,7 @@ vocals = \context Voice = "leise" { R1 * 3/4 * 6 } -trebleStaff = \context Staff = "treble"<< +trebleStaff = \new Staff = "treble"<< \set Staff.midiInstrument = "acoustic grand" \global { @@ -410,7 +410,7 @@ trebleStaff = \context Staff = "treble"<< } >> -bassStaff = \context Staff = "bass"<< +bassStaff = \new Staff = "bass"<< \set Staff.midiInstrument = "acoustic grand" \global \clef bass diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index 8ca4e3f359..1a60e954b7 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -12,6 +12,8 @@ %} + + \header{ title = "Praeludium" composer = "Johann Sebastian Bach (1685-1750)" @@ -136,17 +138,17 @@ global = { \score{ % Allegretto - \context PianoStaff << - \context Staff = "upper" << + \new PianoStaff << + \new Staff = "upper" << \global - \context Voice = "i"\one - \context Voice = "ii" \two + \new Voice = "i"\one + \new Voice = "ii" \two >> - \context Staff = "lower" << + \new Staff = "lower" << \global \clef "bass" - \context Voice = "iii" \three - \context Voice = "iv" \four + \new Voice = "iii" \three + \new Voice = "iv" \four >> >> \layout{ diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 23fed9746f..d960317fd2 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -83,7 +83,7 @@ righta = \transpose c cis' { f) f'-5( e'-5 d'-4 c'-3 f')-5 <f^4 a^5>4( <e^3 g^5>8 | <a, f^4>4 <g, e^3>8 f16^4 d'^5~ d'8.[ c'16^4] | \forcedBreak - << f8)^3_\pp \context Voice = "another" { \m a,16[ \u c8 c16] } >> \m g,[ \u c_3] \m b,[^\markup { \finger "2-1" } \u c8 c16] \m a,[ \u c]~ | \stemNeutral + << f8)^3_\pp \new Voice = "another" { \m a,16[ \u c8 c16] } >> \m g,[ \u c_3] \m b,[^\markup { \finger "2-1" } \u c8 c16] \m a,[ \u c]~ | \stemNeutral c16 c8_4 c c16~c c8_2 c c16~ | c16 c8 c c16~c c8 c c16~ | c16 c8 c c16 r4^\fermata r8 | \bar "|." @@ -163,7 +163,7 @@ lefta = \transpose c cis { g4 a8~a f g | a4 g8~g f e | d4 g8~g es f | g4 f8~f es d | c4 r8 f4 as8~ | as g b as4 ces'8~ | - ces' b des' c'4 \context Voice = "another" { \stemUp \tieUp <es' es>8~ | + ces' b des' c'4 \new Voice = "another" { \stemUp \tieUp <es' es>8~ | es' des'4^1~ \stemDown des'8.[ c'16] } } \transpose c' c, { @@ -256,23 +256,23 @@ leftb = \transpose c cis { \override PianoStaff.InstrumentName #'font-magnification = #3 \set PianoStaff.instrument = " 2." - \context Staff = "up" { + \new Staff = "up" { \override Staff.DynamicLineSpanner #'direction = #DOWN - \clef G <<\global \context Voice = "upv" \righta >> + \clef G <<\global \new Voice = "upv" \righta >> } - \context Staff = "mid" { + \new Staff = "mid" { \override Staff.InstrumentName #'font-size = #0 \override Staff.InstrumentName #'font-shape = #'upright \override Staff.InstrumentName #'font-magnification = #1 \override Staff.InstrumentName #'extra-offset = #'(0 . 6) % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" \set Staff.instrument = \markup { \column { Rechte Hand } \hspace #2 } - \clef F <<\global \context Voice = "midv" \rightb>> + \clef F <<\global \new Voice = "midv" \rightb>> } - \context Staff = "down" { + \new Staff = "down" { \override Staff.DynamicLineSpanner #'direction = #UP \clef F - << \global \context Voice = "lva" \lefta \context Voice = "lvb" \leftb >> + << \global \new Voice \lefta \new Voice \leftb >> } >> \layout { diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly index 9fe6d9a365..dd7e80f264 100644 --- a/input/no-notation/denneboom.ly +++ b/input/no-notation/denneboom.ly @@ -66,7 +66,7 @@ verseOne = { \oden } -verseOneStaff = \context Lyrics = "one" +verseOneStaff = \new Lyrics = "one" \verseOne @@ -77,7 +77,7 @@ verseTwo = { \oden } -verseTwoStaff = \context Lyrics = "two" +verseTwoStaff = \new Lyrics = "two" \verseTwo diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly index 6b0d8e7bc8..531806abc2 100644 --- a/input/no-notation/die-staff.ly +++ b/input/no-notation/die-staff.ly @@ -5,17 +5,17 @@ texidoc = "a staff should really die, if no one's referencing it." } \score { { - \context Staff = "q" { + \new Staff = "q" { { a' b' c' d' } } \break \context PianoStaff << - \context Staff = "i" { + \new Staff = "i" { { a' b' c' d' } } - \context Staff = "ii" { + \new Staff = "ii" { { \clef "bass" a b c d } } >> diff --git a/input/no-notation/display-lily-tests.ly b/input/no-notation/display-lily-tests.ly index 40f7b7e8cd..1585c734eb 100644 --- a/input/no-notation/display-lily-tests.ly +++ b/input/no-notation/display-lily-tests.ly @@ -221,6 +221,7 @@ test = #(def-music-function (parser location result-info strings) (string? pair? %% Context creation \test #"" ##[ \new Staff { c d } #] % ContextSpeccedMusic + \test #"" ##[ \new Staff = "up" { c d } #] % ContextSpeccedMusic \test #"" ##[ \context Staff { c d } #] \test #"" ##[ \context Staff = "up" { c d } #] \test #"" ##[ diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly index 1afc4a235a..917694660c 100644 --- a/input/no-notation/midi-grace.ly +++ b/input/no-notation/midi-grace.ly @@ -4,7 +4,7 @@ \score { \context Voice \relative c { - \context Voice=VoiceOne + \new Voice = VoiceOne \grace { \override Stem #'stroke-style = #"grace" c8 diff --git a/input/no-notation/midi-lyric-barcheck.ly b/input/no-notation/midi-lyric-barcheck.ly index 62d8e76dae..3514a860e1 100644 --- a/input/no-notation/midi-lyric-barcheck.ly +++ b/input/no-notation/midi-lyric-barcheck.ly @@ -9,7 +9,7 @@ this examples causes no bar checks in MIDI. } \score { - <<\relative c'' \context Voice = A { + <<\relative c'' \new Voice = A { \autoBeamOff c8[ c] c2. c1~c4 c2. diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly index f6d2c2dbd4..60259c5ba6 100644 --- a/input/no-notation/midi-volume-equaliser.ly +++ b/input/no-notation/midi-volume-equaliser.ly @@ -117,31 +117,31 @@ violoncello = \relative c' { \score { << - \context StaffGroup ="legni" << - \context Staff ="flauti" \flauti - \context Staff ="oboi" \oboi - \context Staff ="clarinetti" \clarinetti - \context Staff ="fagotti" \fagotti + \new StaffGroup = "legni" << + \new Staff = "flauti" \flauti + \new Staff = "oboi" \oboi + \new Staff = "clarinetti" \clarinetti + \new Staff = "fagotti" \fagotti >> - \context StaffGroup ="ottoni" << - \context Staff ="corni" \corni - \context Staff ="trombe" \trombe + \new StaffGroup = "ottoni" << + \new Staff = "corni" \corni + \new Staff = "trombe" \trombe >> - \context StaffGroup ="timpani" << - \context Staff ="timpani" \timpani + \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 } >> - \context StaffGroup ="archi" << - \context GrandStaff ="violini" << - \context Staff ="violino1" \violinoI - \context Staff ="violino2" \violinoII + \new StaffGroup = "archi" << + \new GrandStaff = "violini" << + \new Staff = "violino1" \violinoI + \new Staff = "violino2" \violinoII >> - \context Staff ="viola" \viola - \context Staff ="violoncello" \violoncello + \new Staff = "viola" \viola + \new Staff = "violoncello" \violoncello >> >> diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index bdb7fa86f4..c378c2ed73 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -24,7 +24,7 @@ before the ligature (not demonstrated in this example)." %%% but this is intentional for editorial purposes (simplifies some %%% global search/replace operations in emacs). -cantus = \context VaticanaVoice = "cantus" { +cantus = \new VaticanaVoice = "cantus" { \[ g4\melisma %%% Pu- \pes d'\melismaEnd @@ -75,7 +75,7 @@ cantus = \context VaticanaVoice = "cantus" { \divisioMaxima } -verba = \context Lyrics = "verba" \lyricmode { +verba = \new Lyrics = "verba" \lyricmode { Pu -- er na -- tus est no -- bis, et fi -- li -- us da -- tus est no -- bis: } diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 451305fdc7..a1f31cc6f0 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -9,8 +9,8 @@ \transpose c c' \context Staff << \key g \major - \context Voice = "va" { \stemUp c' fis! } - \context Voice = "vb" { \stemDown c fis! } + \new Voice { \stemUp c' fis! } + \new Voice { \stemDown c fis! } >> diff --git a/input/regression/alignment-order.ly b/input/regression/alignment-order.ly index 3fb5d76e72..2e0eb83ac4 100644 --- a/input/regression/alignment-order.ly +++ b/input/regression/alignment-order.ly @@ -10,9 +10,9 @@ anywhere in the vertical alignment. " } \relative << - \context Staff = "1" { c4 c s2 } - \context Staff = "2" { c4 c s2 } - \context Staff = "3" { c4 c s2 } + \new Staff = "1" { c4 c s2 } + \new Staff = "2" { c4 c s2 } + \new Staff = "3" { c4 c s2 } { \skip 2 << \lyrics { diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 14ab804e6a..f72c8fa0ba 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -12,10 +12,10 @@ note. When central C is reached, staff is not yet switched (by default). \layout { ragged-right= ##t } \context PianoStaff << - \context Staff = "up" { - \autochange \context Voice = VA << \relative c' { g4 c e d c r4 a g } >> + \new Staff = "up" { + \autochange \new Voice << \relative c' { g4 c e d c r4 a g } >> } - \context Staff = "down" { + \new Staff = "down" { \clef bass s1*2 } diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index 85fe59300d..7a433135eb 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -13,12 +13,12 @@ produced with explicit staff switches)." } \context PianoStaff << - \context Staff = "up" \relative c''{ + \new Staff = "up" \relative c''{ b8[ \change Staff="down" d,, ] c[ \change Staff="up" c'' ] b,[ \change Staff="down" d^"no knee" ] } - \context Staff = "down" { + \new Staff = "down" { \clef bass s2. } diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index 71814b3949..157eb72457 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -6,7 +6,7 @@ \layout { ragged-right = ##t} \context PianoStaff << - \context Staff = "up" + \new Staff = "up" \relative c'' << { \stemDown @@ -25,7 +25,7 @@ } \\ >> - \context Staff = "down" { + \new Staff = "down" { \time 3/8 \clef bass s4.*3 } >> diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index f0417f975e..d1b5a81900 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -9,7 +9,7 @@ behave well, wherever the switching point is. } \context PianoStaff << - \context Staff = "one" \relative c'{ + \new Staff = "one" \relative c'{ \stemUp c8[ c \change Staff=two \stemUp c c] c[ c c c] \change Staff=one @@ -21,7 +21,7 @@ behave well, wherever the switching point is. \stemUp c8[ c \change Staff=one \stemDown c c] r2 } - \context Staff = "two" \relative c'{ + \new Staff = "two" \relative c'{ \clef bass s1 s1 diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly index cb99101c38..771b49cb84 100644 --- a/input/regression/beam-isknee.ly +++ b/input/regression/beam-isknee.ly @@ -14,10 +14,10 @@ Beams can be placed across a @code{PianoStaff}. } \context PianoStaff << - \context Staff = "one" \relative c'{ + \new Staff = "one" \relative c'{ s1 } - \context Staff = "two" \relative c'{ + \new Staff = "two" \relative c'{ \clef bass % no knee \stemUp c8[ \change Staff=one \stemDown g'16 f] diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index 07500e0003..8f8a87a6bc 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -13,13 +13,13 @@ to the last beam. } \context PianoStaff \relative c' << - \context Staff = SA { + \new Staff = SA { \stemDown c8[ c16 \change Staff = SB \stemUp c16 ] \stemNeutral f[ g \change Staff = SA a c] } - \context Staff = SB \relative c' { + \new Staff = SB \relative c' { \clef bass b8[ b16 \stemUp b,,16 ] diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly index c42385c256..97f6613c47 100644 --- a/input/regression/cluster-cross-staff.ly +++ b/input/regression/cluster-cross-staff.ly @@ -10,10 +10,10 @@ \version "2.7.32" \new PianoStaff << - \context Staff = "up" { + \new Staff = "up" { s1 *2 } - \context Staff = "down" << + \new Staff = "down" << \applyMusic #notes-to-clusters \relative c { <c e>4 <f a> <b e> \change Staff = up <e a> <a d> <d g> } diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index 8ba853a129..e7b0b9837b 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -15,12 +15,12 @@ printed. \context PianoStaff << \set PianoStaff.followVoice = ##t - \context Staff = "one" \relative c''{ + \new Staff = "one" \relative c''{ a1 \break \change Staff=two a, } - \context Staff = "two" { \clef bass \skip 1*2 } + \new Staff = "two" { \clef bass \skip 1*2 } >> diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly index 6d0a7842cc..32ee2fd898 100644 --- a/input/regression/fret-diagrams.ly +++ b/input/regression/fret-diagrams.ly @@ -13,7 +13,7 @@ << \chords {s2 c c c d} - \context Voice=mel { + \new Voice =mel { %% A chord for ukelele a'2 ^\markup diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index 3eced93ace..28fb9d87aa 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -12,7 +12,7 @@ The engraver does no time-keeping, so it involves some trickery to get } -\context Staff = "one" \relative c''{ +\new Staff \relative c''{ % gliss non gliss and c4 \glissando d e \glissando f \glissando \break % consecutive @@ -22,9 +22,10 @@ The engraver does no time-keeping, so it involves some trickery to get \override Glissando #'style = #'zigzag c4 \glissando c,, \glissando c' \glissando d } + \layout{ - line-width = 50.\mm indent = 0 - + line-width = 50.\mm + indent = 0 } diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 9236991865..fd7c290a4a 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -14,7 +14,7 @@ Main note scripts do not end up on the grace note. \layout {ragged-right = ##t} -\context Voice = VA \relative c'' { +\new Voice \relative c'' { \grace b8 c4\fermata \grace { c32[ cis32] } gis4 \grace { cis32[ dis32] } e4 diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index 2d1efa6151..43d67de2a5 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -19,10 +19,10 @@ PianoStaff. \new StaffGroup << \context PianoStaff << - \context Staff = "treble" { + \new Staff { \set PianoStaff.instrument = "Piano" \set Staff.instrument = "Right" { c''4 }} - \context Staff = "bass" { + \new Staff { \set Staff.instrument = "Left" \clef bass c4 } diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index 7e72bcfd5c..80f14916c0 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -9,7 +9,7 @@ << - \context Voice = "bla" \relative c'' { + \new Voice = "bla" \relative c'' { \autoBeamOff c2( d4) e8[ c b c] f4 } diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 91f9801e37..e078a3e4b8 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -16,12 +16,12 @@ \lyricsto "one" \new Lyrics { Do mi nus ex } - \context Voice = "one" { + \new Voice = "one" { \voiceOne bes'4 bes'4 bes'4 bes'4 } - \context Voice = "two" { + \new Voice = "two" { \voiceTwo ees'8 r8 r8 r8 ees' r8 r8 r8 } diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly index 388d066c8e..fce2953446 100644 --- a/input/regression/lyric-extender-broken.ly +++ b/input/regression/lyric-extender-broken.ly @@ -10,7 +10,7 @@ of the melisma." << - \context Voice=A { + \new Voice =A { a1 ( a1 \break a) a2( b) \break a2 diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 0ab67dd364..87f4304eee 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -14,7 +14,7 @@ << - \relative c' \context Voice = "bla" { + \relative c' \new Voice = "bla" { \autoBeamOff c4( c16 d c b) c4 d16[ e f g] diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index 74eed40f87..4f29303dbd 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -12,7 +12,7 @@ lyrics do not collide with barlines. } << - \context Staff = "foo" \with + \new Staff \with { % \remove "Bar_engraver" } @@ -29,7 +29,7 @@ lyrics do not collide with barlines. \lyrics { no Bar_Engraver_Bar_Engraver_Bar_Engraver } - \context Staff = "bar" \with { + \new Staff \with { % \remove "Bar_engraver" } { b1 b1 } >> diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly index a60fef8645..a292e39ecc 100644 --- a/input/regression/multi-measure-rest-spacing.ly +++ b/input/regression/multi-measure-rest-spacing.ly @@ -13,7 +13,7 @@ extra spacing column is created. This should not cause problems." << \set Score.skipBars = ##t - \context Staff = "flute" \new Voice { + \new Staff \new Voice { << { R1*40 } { s1*0_"bla" }>> } >> diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index 0f0ac0ea55..f4e66639b1 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -11,13 +11,13 @@ sd = { \change Staff = down} \context PianoStaff << - \context Staff = "up" { + \new Staff = "up" { \set PianoStaff.connectArpeggios = ##t \showStaffSwitch \clef F c4 d \sd b a g8 f16 e32 d \su g2 \glissando a,4 \sd \break a2. \su g4 \glissando f1 } - \context Staff = "down" { + \new Staff = "down" { \clef F s1*4 } >> diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly index e18f678706..094de9a1bb 100644 --- a/input/regression/quote-cyclic.ly +++ b/input/regression/quote-cyclic.ly @@ -17,6 +17,6 @@ B = \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c | } \layout { ragged-right = ##t } << - \context Staff = "A" \A - \context Staff = "B" \B + \new Staff \A + \new Staff \B >> diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index e1ef90fee3..55a27bc8a1 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -9,7 +9,7 @@ Slurs behave decently when broken across a linebreak. \context PianoStaff << - \context Staff = "one" \relative c'{ + \new Staff = "one" \relative c'{ \stemUp \slurUp c4( c \change Staff=two c c) | \change Staff=one @@ -39,7 +39,7 @@ Slurs behave decently when broken across a linebreak. c4( \change Staff=one c c \change Staff=two c) r1 } - \context Staff = "two" \relative c'{ + \new Staff = "two" \relative c'{ \clef bass s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 } diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly index 233de803d7..345273c9a4 100644 --- a/input/regression/span-bar-break.ly +++ b/input/regression/span-bar-break.ly @@ -11,11 +11,11 @@ barline is drawn between the staves, but the @code{:|} is not." \new PianoStaff << - \context Staff = "up" { + \new Staff = "up" { \bar "|:" r1 \bar ":|" \break r1 } - \context Staff = "down" { r r } + \new Staff = "down" { r r } >> diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 228b43982b..0e04f36b65 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -16,12 +16,12 @@ can be printed automatically. This is enabled if the property \relative c' \context PianoStaff << \set PianoStaff.followVoice = ##t - \context Staff = "one" \context Voice { + \new Staff = "one" \context Voice { c1 \change Staff=two b2 a } - \context Staff = "two" {\clef bass \skip 1*2 } + \new Staff = "two" {\clef bass \skip 1*2 } >> diff --git a/input/screech-boink.ly b/input/screech-boink.ly index 619d0c68a1..bea1733581 100644 --- a/input/screech-boink.ly +++ b/input/screech-boink.ly @@ -7,7 +7,7 @@ \score { \context PianoStaff << - \context Staff = "up" { + \new Staff = "up" { \time 4/8 \key c \minor @@ -32,7 +32,7 @@ >> } - \context Staff = "down" { + \new Staff = "down" { \clef bass \key c \minor \set subdivideBeams = ##f diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 08a376f573..fc0cdf0fe4 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -9,7 +9,7 @@ included in LilyPond's support of ancient notation. } -upperStaff = \context GregorianStaff = "upperStaff" << +upperStaff = \new GregorianStaff = "upperStaff" << \context GregorianVoice << \set Score.timing = ##f % \set Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property? @@ -112,7 +112,7 @@ upperStaff = \context GregorianStaff = "upperStaff" << >> >> -lowerStaff = \context MensuralStaff = "lowerStaff" << +lowerStaff = \new MensuralStaff = "lowerStaff" << \context MensuralVoice << % this is broken until further notice -- see refman diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index 5dd0737396..d888a0f6a7 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -111,31 +111,31 @@ violoncello = \relative c' { \book { \score { << - \context StaffGroup ="legni" << - \context Staff ="flauti" \flauti - \context Staff ="oboi" \oboi - \context Staff ="clarinetti" \clarinetti - \context Staff ="fagotti" \fagotti + \new StaffGroup = "legni" << + \new Staff = "flauti" \flauti + \new Staff = "oboi" \oboi + \new Staff = "clarinetti" \clarinetti + \new Staff = "fagotti" \fagotti >> - \context StaffGroup ="ottoni" << - \context Staff ="corni" \corni - \context Staff ="trombe" \trombe + \new StaffGroup = "ottoni" << + \new Staff = "corni" \corni + \new Staff = "trombe" \trombe >> - \context StaffGroup ="timpani" << - \context Staff ="timpani" \timpani + \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 } >> - \context StaffGroup ="archi" << - \context GrandStaff ="violini" << - \context Staff ="violinoI" \violinoI - \context Staff ="violinoII" \violinoII + \new StaffGroup = "archi" << + \new GrandStaff = "violini" << + \new Staff = "violinoI" \violinoI + \new Staff = "violinoII" \violinoII >> - \context Staff ="viola" \viola - \context Staff ="violoncello" \violoncello + \new Staff = "viola" \viola + \new Staff = "violoncello" \violoncello >> >> \layout { diff --git a/input/test/fret-diagram.ly b/input/test/fret-diagram.ly index 1db6b9db3f..8fd5381266 100644 --- a/input/test/fret-diagram.ly +++ b/input/test/fret-diagram.ly @@ -9,7 +9,7 @@ << \chords {d2 d d s fis fis fis s c c c} - \context Voice = "mel" { + \new Voice = "mel" { % simple D chord d'2 ^\markup \fret-diagram-verbose #'((mute 6) (mute 5) (open 4) (place-fret 3 2) (place-fret 2 3) (place-fret 1 2)) diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index 0087b47192..a231b5f3f8 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -5,11 +5,11 @@ individual @code{Staff}s. " } \score { - \context GrandStaff << - \context Staff = "treble" { + \new GrandStaff << + \new Staff = "treble" { \set GrandStaff.instrument = "Violini " \set Staff.instrument = " vn I" { c''4 }} - \context Staff = "bass" { \set Staff.instrument = " vn II" c''4 }>> + \new Staff = "bass" { \set Staff.instrument = " vn II" c''4 }>> \layout { diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly index 079bd8eeea..ed44d74a8f 100644 --- a/input/test/ligature-vaticana.ly +++ b/input/test/ligature-vaticana.ly @@ -7,7 +7,7 @@ calligraphic notes. " \include "gregorian-init.ly" -cantus = \context VaticanaVoice = "cantus" { +cantus = \new VaticanaVoice = "cantus" { \clef "vaticana-fa2" \[ f\melisma \quilisma g \auctum \descendens a\melismaEnd \] \[ \virga a\melisma g \pes a \inclinatum f \inclinatum d @@ -17,7 +17,7 @@ cantus = \context VaticanaVoice = "cantus" { \[ e\melisma \flexa d\melismaEnd \] } -verba = \context Lyrics = "verba" \lyricmode { +verba = \new Lyrics = "verba" \lyricmode { Al- le- lu- ia. } diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 43baa88b3f..177cd34a90 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -73,8 +73,8 @@ endc = {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } \score { \transpose c c' \context PianoStaff << - \context Staff = "up" { \clef "G" } - \context Staff = "down" { \clef "F" } + \new Staff = "up" { \clef "G" } + \new Staff = "down" { \clef "F" } { \applyMusic #transform { \pat {c e g c' e' } \pat {c d a d' f' } diff --git a/input/test/slur-manual.ly b/input/test/slur-manual.ly index 12ff85356f..93d4f69467 100644 --- a/input/test/slur-manual.ly +++ b/input/test/slur-manual.ly @@ -13,11 +13,11 @@ \score { \new PianoStaff << - \context Staff = "up" { + \new Staff = "up" { \clef bass s1 * 4 } - \context Staff = "down" \relative c << + \new Staff = "down" \relative c << s1*4 { \clef bass diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly index 8ffeacbb24..4a4cd8abaa 100644 --- a/input/test/temporary-stave.ly +++ b/input/test/temporary-stave.ly @@ -13,10 +13,10 @@ time and key signatures and clef at the beginning of the extra stave. \score { { \relative c' { - \context Staff = One { c4 d e f } + \new Staff = One { c4 d e f } << {c d e f | c d e f | c c c c | c c c c } - \context TemporaryStaff = Two { c4 c8 d e4 f | c d e f | + \new TemporaryStaff = Two { c4 c8 d e4 f | c d e f | c c c c | c c c8 b c b |} >> c4 d e f | diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 78232a7731..38d281e065 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -20,7 +20,7 @@ melodie = \relative c'' { | f4 f | e e | d d | c2 \bar "|." } -acc = \chordmode { +acc = \chords { c2 c f c f c g:7 c g f c g:7 @@ -30,7 +30,7 @@ acc = \chordmode { f c g:7 c } -text = \lyricmode{ +text = \lyrics { \override LyricText #'font-shape = #'italic Ah!4 vous dir -- ai -- je ma man2 @@ -44,9 +44,9 @@ text = \lyricmode{ \score { << - \context ChordNames \acc - \context Staff = "melody" \melodie - \context Lyrics \text + \acc + \new Staff = "melody" \melodie + \text >> \header{ title = "Ah, vous dirais-je, maman " diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly index 5c334ceac2..2cbc5f8417 100644 --- a/input/wilhelmus.ly +++ b/input/wilhelmus.ly @@ -177,8 +177,8 @@ oneHalfNoteTime = \markup { \override Staff.TimeSignature #'text = #oneHalfNoteTime \noclefs - \context Voice = "voice" \voice - \context Voice = "stich" \stich + \new Voice = "voice" \voice + \new Voice = "stich" \stich >> \lyricsto "voice" \new Lyrics { \override VerticalAxisGroup #'minimum-Y-extent = #'(2 . 2) diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index 8e215863a6..52eee67268 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -180,15 +180,18 @@ Box Modified_font_metric::text_dimension (string text) const { SCM stext = scm_makfrom0str (text.c_str ()); - Box b = lookup_tex_text_dimension (orig_, stext); - if (!b[Y_AXIS].is_empty ()) - { - b.scale (magnification_); - return b; - } - + + Box b; if (output_backend_global == "tex") { + b = lookup_tex_text_dimension (orig_, stext); + + if (!b[Y_AXIS].is_empty ()) + { + b.scale (magnification_); + return b; + } + b = tex_kludge (text); return b; } diff --git a/lily/text-metrics.cc b/lily/text-metrics.cc index 2b6d57e538..164d0062ff 100644 --- a/lily/text-metrics.cc +++ b/lily/text-metrics.cc @@ -18,6 +18,10 @@ lookup_tex_text_dimension (Font_metric *font, SCM text) { Box b; + /* + Actually, it's defined in framework-texstr, but let's see how long + it takes before we get a bugreport. HWN 13/2/2006. + */ SCM limit = ly_lily_module_constant ("TEX_STRING_HASHLIMIT"); string key_str = ly_scm2string (font->font_file_name ()); int hash_code = scm_to_int (scm_hash (text, limit)); diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 7157fcba4d..3ac61bc13d 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -732,6 +732,7 @@ (self-alignment-Y . ,CENTER) (meta . ((class . Spanner) (interfaces . (system-start-text-interface + system-start-delimiter-interface side-position-interface font-interface)))))) diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 899e2c26f3..eee2783965 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -549,10 +549,16 @@ line-width, where X is the number of staff spaces." (def-markup-command (column layout props args) (markup-list?) "Stack the markups in @var{args} vertically. The property @code{baseline-skip} determines the space between each markup in @var{args}." - (stack-lines - -1 0.0 (chain-assoc-get 'baseline-skip props) - (remove ly:stencil-empty? - (map (lambda (m) (interpret-markup layout props m)) args)))) + + (let* + ((arg-stencils (map (lambda (m) (interpret-markup layout props m)) args)) + (skip (chain-assoc-get 'baseline-skip props))) + + + (stack-lines + -1 0.0 skip + (remove ly:stencil-empty? arg-stencils)))) + (def-markup-command (dir-column layout props args) (markup-list?) "Make a column of args, going up or down, depending on the setting diff --git a/scm/output-texstr.scm b/scm/output-texstr.scm index 62fe1547a4..6d82d6ec05 100644 --- a/scm/output-texstr.scm +++ b/scm/output-texstr.scm @@ -27,7 +27,9 @@ what "")) -(define TEX_STRING_HASHLIMIT 10000000) + +;; TeX C++ code actually hooks into TEX_STRING_HASHLIMIT +(define-public TEX_STRING_HASHLIMIT 10000000) (define-public (text font str) (call-with-output-string (lambda (port) |