\context => \new update to docs; a few other small changes.

diff --git a/ChangeLog b/ChangeLog
index 78d662f97aafdb5245e075cb580c0c06facfa5c5..81abed7292f092ee0902c98742a5780e9b09921e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-19  Graham Percival  <gpermus@gmail.com>
+
+       * darwin.patch: trivial linenumber update.
+
+       * Documentation/user/ {various}: `\context foo = named' changed
+       to `\new foo = "name"' in docs.
+
 2006-02-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * buildscripts/mf-to-table.py (Char_metric.__init__): remove

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index ea65a21bad937a96b76426cf1ea7412b09df6d97..69692f8a20d4a9845e1580ab8a43d4de190c687e 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -807,6 +807,10 @@ of @code{format-mark-numbers} (the default format), @code{format-mark-box-number
 @code{format-mark-letters} and @code{format-mark-box-letters}.
 These can be used as inspiration for other formatting functions.
 
+You may use @code{format-mark-barnumbers}, @code{format-mark-box-barnumbers},
+and @code{format-mark-circle-barnumbers} to get bar numbers instead of
+incremented numbers or letters.
+
 
 @seealso
 
@@ -1424,7 +1428,7 @@ smaller = {
 \new Staff \relative  <<
 
   % setup a context for  cue  notes.
-  \context Voice = cue { \smaller \skip 1*21 }
+  \new Voice = "cue" { \smaller \skip 1*21 }
   
   \set Score.skipBars = ##t
   
@@ -1788,7 +1792,7 @@ of differing lengths.  The following fermatas are supported
     _\verylongfermata
     r
   }
-  \context Lyrics \lyricmode {
+  \new Lyrics \lyricmode {
     \override LyricText #'font-family = #'typewriter
     "shortfermata" "fermata" "longfermata" "verylongfermata"
   }
@@ -1920,7 +1924,7 @@ balloon.  The primary purpose of this feature is to explain notation.
 The following example demonstrates its use.
 
 @lilypond[quote,verbatim,fragment,ragged-right,relative=2]
-\context Voice {
+\new Voice {
   \applyOutput
     #(add-balloon-text 'NoteHead "heads, or tails?"
     '(1 . -3))
@@ -1964,8 +1968,8 @@ emptymusic = {
   defaultBarType = #""
   \remove Bar_number_engraver
 } <<
-  \context Staff \emptymusic
-  \context TabStaff \emptymusic
+  \new Staff \emptymusic
+  \new TabStaff \emptymusic
 >>
 @end lilypond
 
@@ -2229,7 +2233,7 @@ As a result, accidentals from one voice do not get canceled in other
 voices, which is often an unwanted result
 
 @lilypond[quote,ragged-right,relative=1,fragment,verbatim]
-\context Staff <<
+\new Staff <<
   #(set-accidental-style 'voice)
   <<
     { es g } \\

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 0b7aa6a932d17d28f982dca88b44f6a28555ab4e..5c3d193464ceba54c69e40c344434c44c1794d75 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -715,7 +715,7 @@ version will print flats
 
 @lilypond[quote,ragged-right,verbatim]
 mus = { \key d \major cis d fis g }
-\context Staff {
+\new Staff {
   \clef "F" \mus
   \clef "G"
   \transpose c g' \mus
@@ -1247,7 +1247,7 @@ connected between different staves of a StaffGroup
 
 @lilypond[quote,ragged-right,fragment,verbatim]
 <<
-  \context StaffGroup <<
+  \new StaffGroup <<
     \new Staff {
       e'4 d'
       \bar "||"
@@ -1849,7 +1849,7 @@ will put the grace note at 7/8 of the main note.
 The same effect can be achieved manually by doing
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
-\context Voice {
+\new Voice {
   << { d1^\trill_( }
      { s2 \grace { c16[ d] } } >>
   c4)
@@ -1909,7 +1909,7 @@ Program reference: @internalsref{GraceMusic}.
 @refbugs
 
 A score that starts with a @code{\grace} section needs an explicit
-@code{\context Voice} declaration, otherwise the main note and the grace
+@code{\new Voice} declaration, otherwise the main note and the grace
 note end up on different staves.
 
 Grace note synchronization can also lead to surprises.  Staff notation,
@@ -2350,7 +2350,7 @@ The direction of the arpeggio is sometimes denoted by adding an
 arrowhead to the wiggly line
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
-\context Voice {
+\new Voice {
   \arpeggioUp
   <c e g c>\arpeggio
   \arpeggioDown
@@ -2366,7 +2366,7 @@ in both staves and set
 @internalsref{PianoStaff}.@code{connectArpeggios}
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
-\context PianoStaff <<
+\new PianoStaff <<
   \set PianoStaff.connectArpeggios = ##t
   \new Staff { <c' e g c>\arpeggio }
   \new Staff { \clef bass <c,, e g>\arpeggio }
@@ -2502,8 +2502,8 @@ is equivalent to
 
 @example
 <<
-  \context Voice = "1" @{ \voiceOne \upper @}
-  \context Voice = "2" @{ \voiceTwo \lower @}
+  \new Voice = "1" @{ \voiceOne \upper @}
+  \new Voice = "2" @{ \voiceTwo \lower @}
 >>
 @end example
 
@@ -2594,7 +2594,7 @@ Normally, note heads with a different number of dots are not merged, but
 when the object property @code{merge-differently-dotted} is set in
 the @internalsref{NoteCollision} object, they are merged
 @lilypond[quote,verbatim,fragment,ragged-right,relative=2]
-\context Voice << {
+\new Voice << {
   g8 g8
   \override Staff.NoteCollision
     #'merge-differently-dotted = ##t
@@ -2605,7 +2605,7 @@ the @internalsref{NoteCollision} object, they are merged
 Similarly, you can merge half note heads with eighth notes, by setting
 @code{merge-differently-headed}
 @lilypond[quote,ragged-right,fragment,relative=2,verbatim]
-\context Voice << {
+\new Voice << {
   c8 c4.
   \override Staff.NoteCollision
     #'merge-differently-headed = ##t
@@ -2616,7 +2616,7 @@ LilyPond also vertically shifts rests that are opposite of a stem,
 for example
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-\context Voice << c''4 \\ r4 >>
+\new Voice << c''4 \\ r4 >>
 @end lilypond
 
 
@@ -2784,7 +2784,7 @@ c1
 @end lilypond
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
-\context Staff {
+\new Staff {
   \partial 4
   \repeat volta 4 { e | c2 d2 | e2 f2 | }
   \alternative { { g4 g g } { a | a a a a | b2. } }

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index 2a53385e693918c63b04838c08902dc0cc0e246d..741a4cb3ac1ff9994733b1a173e04c9ebe3a0cf2 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -68,7 +68,7 @@ text = \lyricmode {
 
 \score{
    <<
-      \context Voice = "one" {
+      \new Voice = "one" {
          \autoBeamOff
          \melody
       }
@@ -100,11 +100,11 @@ harmonies = \chordmode {
 
 \score {
    <<
-      \context ChordNames {
+      \new ChordNames {
          \set chordChanges = ##t
          \harmonies
       }
-   \context Staff = one \melody
+   \new Staff \melody
    >>
 
    \layout{ }
@@ -136,11 +136,11 @@ harmonies = \chordmode {
 
 \score {
    <<
-      \context ChordNames {
+      \new ChordNames {
          \set chordChanges = ##t
          \harmonies
       }
-   \context Voice = "one" {
+   \new Voice = "one" {
       \autoBeamOff
       \melody
    }
@@ -176,10 +176,10 @@ lower = \relative c {
 }
 
 \score {
-   \context PianoStaff <<
+   \new PianoStaff <<
       \set PianoStaff.instrument = "Piano  "
-      \context Staff = upper \upper
-      \context Staff = lower \lower
+      \new Staff = "upper" \upper
+      \new Staff = "lower" \lower
    >>
    \layout { }
    \midi { \tempo 4=60 }
@@ -223,15 +223,15 @@ lower = \relative c {
 
 \score {
    <<
-      \context Voice = "mel" {
+      \new Voice = "mel" {
           \autoBeamOff
           \melody
       }
       \new Lyrics \lyricsto mel \text
 
-      \context PianoStaff <<
-         \context Staff = upper \upper
-         \context Staff = lower \lower
+      \new PianoStaff <<
+         \new Staff = "upper" \upper
+         \new Staff = "lower" \lower
       >>
    >>
    \layout {
@@ -270,10 +270,10 @@ text = \lyricmode {
 }
 
 \score {
-  \context GrandStaff <<
-    \context Staff = upper { \context Voice = "singer" \upper }
+  \new GrandStaff <<
+    \new Staff = upper { \new Voice = "singer" \upper }
     \new Lyrics \lyricsto "singer" \text
-    \context Staff = lower {
+    \new Staff = lower {
       \clef bass
       \lower
     }
@@ -322,14 +322,14 @@ pedal = {
 }
 
 \score {
-  \context PianoStaff <<
-    \context Staff=upper \upper
-    \context Dynamics=dynamics \dynamics
-    \context Staff=lower <<
+  \new PianoStaff <<
+    \new Staff = "upper" \upper
+    \new Dynamics = "dynamics" \dynamics
+    \new Staff = "lower" <<
       \clef bass
       \lower
     >>
-    \context Dynamics=pedal \pedal
+    \new Dynamics = "pedal" \pedal
   >>
   \layout {
     \context {
@@ -364,10 +364,10 @@ pedal = {
   }
 }
 \score {
-  \context PianoStaff <<
-    \context Staff=upper << \upper \dynamics >>
-    \context Staff=lower << \lower \dynamics >>
-    \context Dynamics=pedal \pedal
+  \new PianoStaff <<
+    \new Staff = "upper" << \upper \dynamics >>
+    \new Staff = "lower" << \lower \dynamics >>
+    \n ew Dynamics = "pedal" \pedal
   >>
   \midi {
     \context {
@@ -591,24 +591,25 @@ bassWords = \lyricmode {
 }
 
 \score {
-   \context ChoirStaff <<
-      \context Lyrics = sopranos { s1 }
-      \context Staff = women <<
-         \context Voice =
-           sopranos { \voiceOne << \global \sopMusic >> }
-         \context Voice =
-           altos { \voiceTwo << \global \altoMusic >> }
+   \new ChoirStaff <<
+      \new Lyrics = sopranos { s1 }
+      \new Staff = women <<
+         \new Voice =
+           "sopranos" { \voiceOne << \global \sopMusic >> }
+         \new Voice =
+           "altos" { \voiceTwo << \global \altoMusic >> }
       >>
-      \context Lyrics = altos { s1 }
-      \context Lyrics = tenors { s1 }
-      \context Staff = men <<
+      \new Lyrics = "altos" { s1 }
+      \new Lyrics = "tenors" { s1 }
+      \new Staff = men <<
          \clef bass
-         \context Voice =
-           tenors { \voiceOne <<\global \tenorMusic >> }
-         \context Voice =
-           basses { \voiceTwo <<\global \bassMusic >> }
+         \new Voice =
+           "tenors" { \voiceOne <<\global \tenorMusic >> }
+         \new Voice =
+           "basses" { \voiceTwo <<\global \bassMusic >> }
       >>
-      \context Lyrics = basses { s1 }
+      \new Lyrics = basses { s1 }
+
       \context Lyrics = sopranos \lyricsto sopranos \sopWords
       \context Lyrics = altos \lyricsto altos \altoWords
       \context Lyrics = tenors \lyricsto tenors \tenorWords
@@ -662,6 +663,7 @@ tenorMusic = \relative c' {
 tenorWords = \lyricmode {
    hu hu hu hu
 }
+
 bassMusic = \relative c {
    c4 c g c
 }
@@ -669,42 +671,33 @@ bassWords = \lyricmode {
    ho ho ho ho
 }
 
-\layout {
-  \context {
-         % a little smaller so lyrics
-         % can be closer to the staff
-         \Staff
-          \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-  }
-}
-
-<<
-  \context ChoirStaff
+\score {
   <<
-    \context Lyrics = sopranos { s1 }
-    \context Staff = women <<
-      \context Voice =
-        sopranos { \voiceOne << \global \sopMusic >> }
-      \context Voice =
-        altos { \voiceTwo << \global \altoMusic >> }
-    >>
-    \context Lyrics = altos { s1 }
-    \context Lyrics = tenors { s1 }
-    \context Staff = men <<
-      \clef bass
-      \context Voice =
-        tenors { \voiceOne <<\global \tenorMusic >> }
-      \context Voice =
-        basses { \voiceTwo <<\global \bassMusic >> }
+    \new ChoirStaff <<
+      \new Lyrics = sopranos { s1 }
+      \new Staff = women <<
+        \new Voice =
+          "sopranos" { \voiceOne << \global \sopMusic >> }
+        \new Voice =
+          "altos" { \voiceTwo << \global \altoMusic >> }
+      >>
+      \new Lyrics = "altos" { s1 }
+      \new Lyrics = "tenors" { s1 }
+      \new Staff = men <<
+        \clef bass
+        \new Voice =
+          "tenors" { \voiceOne <<\global \tenorMusic >> }
+        \new Voice =
+          "basses" { \voiceTwo <<\global \bassMusic >> }
+      >>
+      \new Lyrics = basses { s1 }
+
+      \context Lyrics = sopranos \lyricsto sopranos \sopWords
+      \context Lyrics = altos \lyricsto altos \altoWords
+      \context Lyrics = tenors \lyricsto tenors \tenorWords
+      \context Lyrics = basses \lyricsto basses \bassWords
     >>
-    \context Lyrics = basses { s1 }
-    \context Lyrics = sopranos \lyricsto sopranos \sopWords
-    \context Lyrics = altos \lyricsto altos \altoWords
-    \context Lyrics = tenors \lyricsto tenors \tenorWords
-    \context Lyrics = basses \lyricsto basses \bassWords
-  >>
-  \new PianoStaff
-  <<
+  \new PianoStaff <<
     \new Staff <<
       \set Staff.printPartCombineTexts = ##f
       \partcombine
@@ -719,7 +712,15 @@ bassWords = \lyricmode {
       << \global \bassMusic >>
     >>
   >>
->>
+  \layout {
+    \context {
+      % a little smaller so lyrics
+      % can be closer to the staff
+      \Staff
+        \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
+    }
+  }
+}
 @end lilypond
 
 
@@ -923,23 +924,23 @@ bassusLyrics = \lyricmode {
 }
 
 \score {
-  \context StaffGroup = choirStaff <<
-    \context Voice =
-      discantusNotes << \global \discantusNotes >>
-    \context Lyrics =
-      discantusLyrics \lyricsto discantusNotes { \discantusLyrics }
-    \context Voice =
-      altusNotes << \global \altusNotes >>
-    \context Lyrics =
-      altusLyrics \lyricsto altusNotes { \altusLyrics }
-    \context Voice =
-      tenorNotes << \global \tenorNotes >>
-    \context Lyrics =
-      tenorLyrics \lyricsto tenorNotes { \tenorLyrics }
-    \context Voice =
-      bassusNotes << \global \bassusNotes >>
-    \context Lyrics =
-      bassusLyrics \lyricsto bassusNotes { \bassusLyrics }
+  \new StaffGroup = choirStaff <<
+    \Voice =
+      "discantusNotes" << \global \discantusNotes >>
+    \new Lyrics =
+      "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics }
+    \new Voice =
+      "altusNotes" << \global \altusNotes >>
+    \new Lyrics =
+      "altusLyrics" \lyricsto altusNotes { \altusLyrics }
+    \new Voice =
+      "tenorNotes" << \global \tenorNotes >>
+    \new Lyrics =
+      "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics }
+    \new Voice =
+      "bassusNotes" << \global \bassusNotes >>
+    \new Lyrics =
+      "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics }
   >>
   \layout {
     \context {
@@ -1032,7 +1033,7 @@ trumpet = {
   \global
   \set Staff.instrument = #"Trumpet"
   \clef treble
-  \context Staff <<
+  \new Staff <<
     \trpt
   >>
 }
@@ -1049,7 +1050,7 @@ altosax = {
   \global
   \set Staff.instrument = #"Alto Sax"
   \clef treble
-  \context Staff <<
+  \new Staff <<
     \alto
   >>
 }
@@ -1066,7 +1067,7 @@ barisax = {
   \global
   \set Staff.instrument = #"Bari Sax"
   \clef treble
-  \context Staff <<
+  \new Staff <<
     \bari
   >>
 }
@@ -1083,7 +1084,7 @@ trombone = {
   \global
   \set Staff.instrument = #"Trombone"
   \clef bass
-  \context Staff <<
+  \new Staff <<
     \tbone
   >>
 }
@@ -1103,7 +1104,7 @@ guitar = {
   \global
   \set Staff.instrument = #"Guitar"
   \clef treble
-  \context Staff <<
+  \new Staff <<
     \gtr
   >>
 }
@@ -1135,26 +1136,26 @@ PianoRH = {
   \clef treble
   \global
   \set Staff.midiInstrument = "acoustic grand"
-  \context Staff <<
-    \context Voice = one \rhUpper
-    \context Voice = two \rhLower
+  \new Staff <<
+    \new Voice = "one" \rhUpper
+    \new Voice = "two" \rhLower
   >>
 }
 PianoLH = {
   \clef bass
   \global
   \set Staff.midiInstrument = "acoustic grand"
-  \context Staff <<
-    \context Voice = one \lhUpper
-    \context Voice = two \lhLower
+  \new Staff <<
+    \new Voice = "one" \lhUpper
+    \new Voice = "two" \lhLower
   >>
 }
 
 piano = {
-  \context PianoStaff <<
+  \new PianoStaff <<
     \set PianoStaff.instrument = #"Piano"
-    \context Staff = upper \PianoRH
-    \context Staff = lower \PianoLH
+    \new Staff = "upper" \PianoRH
+    \new Staff = "lower" \PianoLH
   >>
 }
 
@@ -1167,7 +1168,7 @@ bass = {
   \global
   \set Staff.instrument = #"Bass"
   \clef bass
-  \context Staff <<
+  \new Staff <<
     \Bass
   >>
 }
@@ -1197,19 +1198,19 @@ drumContents = {
 
 \score {
   <<
-    \context StaffGroup = horns <<
-      \context Staff = trumpet \trumpet
-      \context Staff = altosax \altosax
-      \context ChordNames = barichords \bariharmony
-      \context Staff = barisax \barisax
-      \context Staff = trombone \trombone
+    \new StaffGroup = "horns" <<
+      \new Staff = "trumpet" \trumpet
+      \new Staff = "altosax" \altosax
+      \new ChordNames = "barichords" \bariharmony
+      \new Staff = "barisax" \barisax
+      \new Staff = "trombone" \trombone
     >>
 
-    \context StaffGroup = rhythm <<
-      \context ChordNames = chords \gtrharmony
-      \context Staff = guitar \guitar
-      \context PianoStaff = piano \piano
-      \context Staff = bass \bass
+    \new StaffGroup = "rhythm" <<
+      \new ChordNames = "chords" \gtrharmony
+      \new Staff = "guitar" \guitar
+      \new PianoStaff = piano" \piano
+      \new Staff = "bass" \bass
       \new DrumStaff { \drumContents }
     >>
   >>

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index e0247942b9927c121112d92a877cf9c84cc53029..59480aabc2d16dc45499e077a8e39d4e18b719a7 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -1104,6 +1104,7 @@ Here is a short example.
 
 If you define the @code{\header} inside the @code{\score} block, then
 normally only the @code{piece} and @code{opus} headers will be printed.
+Note that the music expression must come before the @code{\header}.
 
 @lilypond[quote,verbatim,line-width=11.0\cm]
 \score {

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index d2ed8037fefd86ec4e112e6464c1312b911248dc..4a2337cfb1fab379d32eca8ce21b82d6ae768e8d 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -91,7 +91,7 @@ point), and it looks ahead skipping over rests to switch in
 advance.  Here is a practical example
 
 @lilypond[quote,verbatim,ragged-right]
-\context PianoStaff
+\new PianoStaff
   \autochange \relative c'
   {
     g4 a b c d r4 a g
@@ -136,10 +136,10 @@ usually the setup for a score will start with a setup of the staves,
 
 @example
 <<
-  \context Staff = up @{
+  \new Staff = "up" @{
     \skip 1 * 10  % @emph{keep staff alive}
     @}
-  \context Staff = down @{
+  \new Staff = "down" @{
     \skip 1 * 10  % @emph{idem}
     @}
 >>
@@ -149,7 +149,7 @@ usually the setup for a score will start with a setup of the staves,
 and the @context{Voice} is inserted afterwards
 
 @example
-\context Staff = down
+\new Staff = down
   \new Voice @{ @dots{} \change Staff = up @dots{} @}
 @end example
 
@@ -260,13 +260,13 @@ can be printed automatically.  This is switched on by setting
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \new PianoStaff <<
-  \context Staff=one {
+  \new Staff="one" {
     \set followVoice = ##t
     c1
     \change Staff=two
     b2 a
   }
-  \context Staff=two { \clef bass \skip 1*2 }
+  \new Staff="two" { \clef bass \skip 1*2 }
 >>
 @end lilypond
 
@@ -292,7 +292,7 @@ staff, or vice versa.
 @lilypond[ragged-right,verbatim,quote]
 stemExtend = \once \override Stem #'length = #22
 noFlag = \once \override Stem #'flag-style = #'no-flag
-\context PianoStaff <<
+\new PianoStaff <<
   \new Staff {
     \stemDown \stemExtend
     f'4
@@ -340,8 +340,8 @@ twoWays = \transpose c c' {
   <f bes d'>
 }
 
-<< \context ChordNames \twoWays
-   \context Voice \twoWays >>
+<< \new ChordNames \twoWays
+   \new Voice \twoWays >>
 @end lilypond
 
 This example also shows that the chord printing routines do not try to
@@ -500,8 +500,8 @@ harmonies = {
   \chordmode {a1 b c} <d' f' a'> <e' g' b'>
 }
 <<
-  \context ChordNames \harmonies
-  \context Staff \harmonies
+  \new ChordNames \harmonies
+  \new Staff \harmonies
 >>
 @end lilypond
 
@@ -515,10 +515,10 @@ harmonies = \chordmode {
   c1:m c:m \break c:m c:m d
 }
 <<
-  \context ChordNames {
+  \new ChordNames {
     \set chordChanges = ##t
     \harmonies }
-  \context Staff \transpose c c' \harmonies
+  \new Staff \transpose c c' \harmonies
 >>
 @end lilypond
 
@@ -591,7 +591,7 @@ Different parts of a chord name are normally separated by a
 slash.  By setting @code{chordNameSeparator}, you can specify other
 separators, e.g.,
 @lilypond[quote,ragged-right,fragment,verbatim]
-\context ChordNames \chordmode {
+\new ChordNames \chordmode {
   c:7sus4
   \set chordNameSeparator
     = \markup { \typewriter "|" }
@@ -718,6 +718,18 @@ Checking to make sure that text scripts and lyrics are within the margins is a r
 \override Score.PaperColumn #'keep-inside-line = ##t 
 @end example
 
+To make lyrics avoid barlines as well, use
+@example
+\layout{
+  \context {
+    \Lyrics
+      \consists "Bar_engraver"
+      \consists "Separating_line_group_engraver"
+      \override BarLine #'transparent = ##t
+  }
+}
+@end example
+
 
 @node Setting simple songs
 @subsection Setting simple songs
@@ -768,7 +780,7 @@ it's fleece was white as snow.
 }
 
 \score{ <<
-  \context Voice = "one" { \melody }
+  \new Voice = "one" { \melody }
   \new Lyrics \lyricsto "one" \text
        >>
   \layout { }
@@ -809,7 +821,7 @@ fancy things, in which case you should investigate
 is the same as
 
 @example
-\context Voice = "blah" @{ music @}
+\new Voice = "blah" @{ music @}
 \new Lyrics \lyricsto "blah" @{ LYRICS @}
 @end example
 
@@ -930,7 +942,7 @@ Program reference: @internalsref{LyricHyphen}, @internalsref{LyricExtender}.
 
 Lyrics are printed by interpreting them in a @internalsref{Lyrics} context
 @example
-\context Lyrics \lyricmode @dots{}
+\new Lyrics \lyricmode @dots{}
 @end example
 
 @cindex automatic syllable durations
@@ -956,11 +968,11 @@ then the lyrics are specified with @code{\lyricsto}.  The command
 For different or more complex orderings, the best way is to setup the
 hierarchy of staves and lyrics first, e.g.,
 @example
-\context ChoirStaff <<
-  \context Lyrics = sopranoLyrics @{ s1 @}
-  \context Voice = soprano @{ @emph{music} @}
-  \context Lyrics = tenorLyrics @{ s1 @}
-  \context Voice = tenor @{ @emph{music} @}
+\new ChoirStaff <<
+  \new Lyrics = "sopranoLyrics" @{ s1 @}
+  \new Voice = "soprano" @{ @emph{music} @}
+  \new Lyrics = "tenorLyrics" @{ s1 @}
+  \new Voice = "tenor" @{ @emph{music} @}
 >>
 @end example
 and then combine the appropriate melodies and lyric lines
@@ -973,7 +985,7 @@ and then combine the appropriate melodies and lyric lines
 The final input would resemble
 
 @example
-<<\context ChoirStaff << @emph{setup the music} >>
+<<\new ChoirStaff << @emph{setup the music} >>
   \lyricsto "soprano" @emph{etc}
   \lyricsto "alto" @emph{etc}
   @emph{etc}
@@ -989,7 +1001,7 @@ last one, e.g.,
 
 @lilypond[quote,relative=2,ragged-right,fragment,verbatim]
 <<
-  \context Voice = "lala" {
+  \new Voice = "lala" {
     \time 3/4
     f4 g8
     \melisma
@@ -1041,7 +1053,7 @@ will not be formatted properly.
 Here is an example demonstrating manual lyric durations,
 
 @lilypond[relative=1,ragged-right,verbatim,fragment,quote]
-<< \context Voice = melody {
+<< \new Voice = "melody" {
      \time 3/4
      c2 e4 g2.
   }
@@ -1102,7 +1114,7 @@ in the text, as shown here,
 
 @lilypond[verbatim,ragged-right,quote]
 <<
-  \relative \context Voice = "lahlah" {
+  \relative \new Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
     c4
     \slurDotted
@@ -1149,11 +1161,11 @@ done by setting the @code{associatedVoice} property.  In the example
 
 @lilypond[ragged-right,quote]
 <<
-  \relative \context Voice = "lahlah" {
+  \relative \new Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
     c4
     <<
-      \context Voice = alternative {
+      \new Voice = "alternative" {
         \voiceOne
         \times 2/3 {
           % show associations clearly.
@@ -1319,12 +1331,12 @@ contexts and attaching lyrics to those specific contexts.
 
 @lilypond[verbatim,ragged-right,quote]
 \score{ <<
-  \context Voice = "melody" {
+  \new Voice = "melody" {
     \relative c' {
       c4
       <<
         { \voiceOne c8 e }
-        \context Voice = splitpart { \voiceTwo c4 }
+        \new Voice = "splitpart" { \voiceTwo c4 }
       >>
       \oneVoice c4 c | c
     }
@@ -1340,16 +1352,16 @@ section.
 
 @lilypond[verbatim,ragged-right,quote]
 \score{ <<
-  \context Voice = melody \relative c' {
+  \new Voice = "melody" \relative c' {
     c2 e | g e | c1 |
-    \context Voice = verse \repeat volta 2 {c4 d e f | g1 | }
+    \new Voice = "verse" \repeat volta 2 {c4 d e f | g1 | }
     a2 b | c1}
-  \context Lyrics = mainlyrics \lyricsto melody \lyricmode {
+  \new Lyrics = "mainlyrics" \lyricsto melody \lyricmode {
     do mi sol mi do
     la si do }
-  \context Lyrics = mainlyrics \lyricsto verse \lyricmode {
+  \new Lyrics = "mainlyrics" \lyricsto verse \lyricmode {
    do re mi fa sol }
-  \context Lyrics = repeatlyrics \lyricsto verse \lyricmode {
+  \new Lyrics = "repeatlyrics" \lyricsto verse \lyricmode {
    dodo rere mimi fafa solsol }
 >>
 }
@@ -1471,6 +1483,9 @@ notated by cross noteheads.  This is demonstrated in
 @ref{Special noteheads}.
 
 
+
+
+
 @node Rhythmic music
 @section Rhythmic music
 
@@ -1492,7 +1507,7 @@ can be done with the rhythmic staff.  All pitches of notes on such a
 staff are squashed, and the staff itself has a single line
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
-\context RhythmicStaff {
+\new RhythmicStaff {
   \time 4/4
   c4 e8 f g2 | r4 g r2 | g1:32 | r1 |
 }
@@ -1559,8 +1574,8 @@ the @internalsref{DrumVoice}s are instantiated by hand first.  For example,
 
 @lilypond[quote,ragged-right,fragment,verbatim]
 \new DrumStaff <<
-  \context DrumVoice = "1" { s1 *2 }
-  \context DrumVoice = "2" { s1 *2 }
+  \new DrumVoice = "1" { s1 *2 }
+  \new DrumVoice = "2" { s1 *2 }
   \drummode {
     bd4 sn4 bd4 sn4
     <<
@@ -1596,7 +1611,7 @@ mus = \drummode {
        \override Stem #'Y-extent-callback = ##f
        \override VerticalAxisGroup #'minimum-Y-extent = #'(-4.0 . 5.0)
      } \mus
-     \context Lyrics \nam
+     \new Lyrics \nam
   >>
   \layout {
     \context {
@@ -1621,7 +1636,7 @@ nam = \lyricmode { timh ssh timl ssl cb }
 mus = \drummode { timh ssh timl ssl cb s16 }
 
 <<
-  \context DrumStaff \with {
+  \new DrumStaff \with {
     \remove Bar_engraver
     \remove Time_signature_engraver
     \override Stem #'transparent = ##t
@@ -1631,7 +1646,7 @@ mus = \drummode { timh ssh timl ssl cb s16 }
     \override VerticalAxisGroup #'minimum-Y-extent = #'(-3.0 . 4.0)
     drumStyleTable = #timbales-style
   } \mus
-  \context Lyrics {
+  \new Lyrics {
     \override LyricText #'font-family = #'typewriter
     \nam
   }
@@ -1646,7 +1661,7 @@ nam = \lyricmode { cgh cgho cghm ssh cgl cglo cglm ssl }
 mus = \drummode { cgh cgho cghm ssh cgl cglo cglm ssl s16 }
 
 <<
-  \context DrumStaff \with {
+  \new DrumStaff \with {
     \remove Bar_engraver
     \remove Time_signature_engraver
     drumStyleTable = #congas-style
@@ -1657,7 +1672,7 @@ mus = \drummode { cgh cgho cghm ssh cgl cglo cglm ssl s16 }
     \override Stem #'transparent = ##t
     \override Stem #'Y-extent-callback = ##f
   } \mus
-  \context Lyrics {
+  \new Lyrics {
     \override LyricText #'font-family = #'typewriter
     \nam
   }
@@ -1672,7 +1687,7 @@ nam = \lyricmode { boh boho bohm ssh bol bolo bolm ssl }
 mus = \drummode { boh boho bohm ssh bol bolo bolm ssl s16 }
 
 <<
-  \context DrumStaff\with {
+  \new DrumStaff \with {
     \remove Bar_engraver
     \remove Time_signature_engraver
     \override StaffSymbol #'line-count = #2
@@ -1683,7 +1698,7 @@ mus = \drummode { boh boho bohm ssh bol bolo bolm ssl s16 }
     \override Stem #'transparent = ##t
     \override Stem #'Y-extent-callback = ##f
   } \mus
-  \context Lyrics {
+  \new Lyrics {
     \override LyricText #'font-family = #'typewriter
     \nam
   }
@@ -1698,7 +1713,7 @@ nam = \lyricmode { tri trio trim gui guis guil cb cl tamb cab mar hc }
 mus = \drummode { tri trio trim gui guis guil cb cl tamb cab mar hc s16 }
 
 <<
-  \context DrumStaff\with{
+  \new DrumStaff \with{
     \remove Bar_engraver
     drumStyleTable = #percussion-style
     \override StaffSymbol #'line-count = #1
@@ -1706,7 +1721,7 @@ mus = \drummode { tri trio trim gui guis guil cb cl tamb cab mar hc s16 }
     \override Stem #'transparent = ##t
     \override Stem #'Y-extent-callback = ##f
   } \mus
-  \context Lyrics {
+  \new Lyrics {
     \override LyricText #'font-family = #'typewriter
     \nam
   }
@@ -1799,7 +1814,7 @@ are printed as tablature, by using @internalsref{TabStaff} and
 @internalsref{TabVoice} contexts
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-\context TabStaff {
+\new TabStaff {
   a,4\5 c'\2 a\3 e'\1
   e\4 c'\2 a\3 e'\1
 }
@@ -1825,9 +1840,9 @@ frag = {
   \set TabStaff.minimumFret = #8
   e16 fis gis a b4
 }
-  \context StaffGroup <<
-    \context Staff { \clef "G_8" \frag }
-    \context TabStaff { \frag }
+  \new StaffGroup <<
+    \new Staff { \clef "G_8" \frag }
+    \new TabStaff { \frag }
   >>
 @end lilypond
 
@@ -1858,7 +1873,7 @@ by default middle C, in string order.  In the next example,
 @code{stringTunings} is set for the pitches e, a, d, and g
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-\context TabStaff <<
+\new TabStaff <<
   \set TabStaff.stringTunings = #'(-5 -10 -15 -20)
   {
     a,4 c' a e' e c' a e'
@@ -1885,7 +1900,7 @@ markup contains information about the desired fret diagram, as shown in the
 following example
 
 @lilypond[verbatim, ragged-right, quote]
-\context Voice {
+\new Voice {
   d'^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
   d' d' d'
   fis'^\markup \override #'(size . 0.75) {
@@ -2686,7 +2701,7 @@ Editio Vaticana style.
 @lilypond[quote,ragged-right,verbatim]
 \include "gregorian-init.ly"
 \score {
-  \context VaticanaVoice {
+  \new VaticanaVoice {
     \override Staff.StaffSymbol #'color = #red
     \override Staff.LedgerLineSpanner #'color = #red
     \override TextScript #'font-family = #'typewriter
@@ -3918,7 +3933,7 @@ the following excerpt demonstrates
 \include "gregorian-init.ly"
 \score {
   <<
-    \context VaticanaVoice = "cantus" {
+    \new VaticanaVoice = "cantus" {
       \override Staff.StaffSymbol #'color = #red
       \override Staff.LedgerLineSpanner #'color = #red
       \override Score.BarNumber #'transparent = ##t {
@@ -3954,7 +3969,7 @@ entering the chant, as the following excerpt demonstrates
 @lilypond[quote,ragged-right,verbatim]
 \score {
   <<
-    \context MensuralVoice = "discantus" \transpose c c' {
+    \new MensuralVoice = "discantus" \transpose c c' {
       \override Score.BarNumber #'transparent = ##t {
         c'1\melisma bes a g\melismaEnd
         f\breve
@@ -4009,8 +4024,8 @@ LilyPond has support for figured bass
 
 @lilypond[quote,ragged-right,verbatim,fragment]
 <<
-  \context Voice { \clef bass dis4 c d ais g fis}
-  \context FiguredBass \figuremode {
+  \new Voice { \clef bass dis4 c d ais g fis}
+  \new FiguredBass \figuremode {
     < 6 >4 < 7\+ >8 < 6+ [_!] >
     < 6 >4 <6 5 [3+] >
     < _ >4 < 6 5/>4
@@ -4029,7 +4044,7 @@ In figures input mode, a group of bass figures is delimited by
 <4 6>
 @end example
 @lilypond[quote,ragged-right,fragment]
-\context FiguredBass
+\new FiguredBass
 \figuremode { <4 6> }
 @end lilypond
 
@@ -4052,7 +4067,7 @@ strings and text markups, see @ref{Overview of text markup commands}.
 < [4 6] 8 [_! 12] > < 5 \markup @{ \number 6 \super (1) @} >
 @end example
 @lilypond[quote,ragged-right,fragment]
-\context FiguredBass
+\new FiguredBass
 \figuremode { < [4 6] 8 [_! 12] > < 5 \markup{ \tiny \number 6 \super (1)} > }
 @end lilypond
 

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index 47496aa9d6b36a9a9da8f5173e2d62950d484e89..d67e9002ba370da602a8a7f868d84321fd0b30d0 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -87,11 +87,25 @@ written as
 @{ #(ly:export (make-sequential-music (list newLa))) @}
 @end example
 
+Scheme code is evaluated as soon as the parser encounters it.  To
+define some scheme code in a macro (to be called later), use
+
+@example
+#(define (nopc)
+  (ly:set-option 'point-and-click #f))
+#(nopc)
+
+...
+\nopc
+{ c'4 }
+@end example
+
 @refbugs
 
 Mixing Scheme and LilyPond identifiers is not possible with the
 @code{--safe} option.
 
+
 @node Internal music representation
 @subsection Internal music representation
 

diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely
index e6440dfc76fece33c55f56f72211d44626c6cfb5..8e87ef6464867945c590dbacd160ac17d06b1dca 100644 (file)
--- a/Documentation/user/putting.itely
+++ b/Documentation/user/putting.itely
@@ -114,7 +114,7 @@ text = \lyricmode @{
 
 \score@{
   <<
-    \context Voice = "one" @{
+    \new Voice = "one" @{
       \autoBeamOff
       \melody
     @}
@@ -187,7 +187,7 @@ celloMusic = \relative c @{
 
 \score@{
   <<
-    \context Voice = "one" @{
+    \new Voice = "one" @{
       \autoBeamOff
       \sopranoMusic
     @}
@@ -216,7 +216,7 @@ more than one thing (in this case staff) happening at once.  The
 \score@{
   <<
     <<
-      \context Voice = "one" @{
+      \new Voice = "one" @{
         \autoBeamOff
         \sopranoMusic
       @}
@@ -258,7 +258,7 @@ celloMusic = \relative c {
 \score{
   <<
     <<
-      \context Voice = "one" {
+      \new Voice = "one" {
         \autoBeamOff
         \sopranoMusic
       }
@@ -494,9 +494,9 @@ though.
 \score @{
   @{
     <<
-      \context Staff = singer <<
+      \new Staff = "singer" <<
       >>
-      \context PianoStaff = piano <<
+      \new PianoStaff = piano <<
       >>
     >>
   @}
@@ -512,13 +512,13 @@ the vocal part and piano part at the same time!
 \score @{
   @{
     <<
-      \context Staff = singer <<
-        \context Voice = vocal @{ @}
+      \new Staff = "singer" <<
+        \new Voice = "vocal" @{ @}
       >>
       \new Lyrics \lyricsto vocal \new Lyrics @{ @}
-      \context PianoStaff = piano <<
-        \context Staff = upper @{ @}
-        \context Staff = lower @{ @}
+      \new PianoStaff = "piano" <<
+        \new Staff = "upper" @{ @}
+        \new Staff = "lower" @{ @}
       >>
     >>
   @}
@@ -535,7 +535,7 @@ it contains an upper staff (right hand) and a lower
 staff (left hand).
 
 At this stage, we could start filling in notes.  Inside
-the curly braces next to @code{\context Voice = vocal},
+the curly braces next to @code{\new Voice = vocal},
 we could start writing
 
 @example
@@ -557,13 +557,13 @@ lower = @{ @}
 \score @{
   @{
     <<
-      \context Staff = singer <<
-        \context Voice = vocal @{ \melody @}
+      \new Staff = "singer" <<
+        \new Voice = "vocal" @{ \melody @}
       >>
       \new Lyrics \lyricsto vocal \new Lyrics @{ \text @}
-      \context PianoStaff = piano <<
-        \context Staff = upper @{ \upper @}
-        \context Staff = lower @{ \lower @}
+      \new PianoStaff = "piano" <<
+        \new Staff = "upper" @{ \upper @}
+        \new Staff = "lower" @{ \lower @}
       >>
     >>
   @}

diff --git a/darwin.patch b/darwin.patch
index 1a05815607f4aad42f36dc0c100d6014ca8653a9..fa6942357a4b5b040007a93f929c5318f4467e39 100644 (file)
--- a/darwin.patch
+++ b/darwin.patch
@@ -1,7 +1,7 @@
 diff -ruN stepmake/stepmake/c++-rules.make lilypond-2.7.11/stepmake/stepmake/c++-rules.make
 --- stepmake/stepmake/c++-rules.make   2005-10-02 09:14:45.000000000 -0700
 +++ stepmake/stepmake/c++-rules.make   2005-10-02 09:15:10.000000000 -0700
-@@ -26,6 +26,7 @@
+@@ -17,6 +17,7 @@
  
  $(outdir)/%.cc: %.ll
        $(FLEX) -Cfe -p -p -o$@ $<