Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 30042de160cfef64d5687736533b5caca4519fc1..9220745507130c1f7aa81d707beffcbe0e4ec2fc 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -1051,6 +1051,19 @@ be added to that context.
 More information about adding and removing engravers can
 be found in @ref{Modifying context plug-ins}.
 
+Instrument names may be changed in the middle of a piece,
+
+@lilypond[quote,fragment,verbatim,ragged-right]
+\set Staff.instrumentName = "First"
+\set Staff.shortInstrumentName = "one"
+c1 c c c \break
+c1 c c c \break
+\set Staff.instrumentName = "Second"
+\set Staff.shortInstrumentName = "two"
+c1 c c c \break
+c1 c c c \break
+@end lilypond
+
 
 @seealso
 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 3b681cb22decee6e4c8f0c2fc42cfac2e1e6af65..1dfaffd479c947cfce38278b5ea17f9bbfc4710d 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -428,6 +428,7 @@ This section describes what contexts are, and how to modify them.
 * Layout tunings within contexts::  
 * Changing context default settings::  
 * Defining new contexts::       
+* Aligning contexts::           
 @end menu
 
 
@@ -1206,6 +1207,30 @@ Then the output at the start of this subsection can be entered as
 @end example
 
 
+@node Aligning contexts
+@subsection Aligning contexts
+
+New contexts may be aligned above or below exisiting contexts.  This
+could be useful in setting up a vocal staff (@ref{Vocal ensembles}) and
+in ossia,
+
+@cindex ossia
+@findex alignAboveContext
+@findex alignBelowContext
+
+@lilypond[quote,ragged-right]
+ossia = { f4 f f f }
+\score{
+  \relative c' \new Staff = "main" {
+    c4 c c c
+    <<
+      \new Staff \with {alignAboveContext=main} \ossia
+      { d8 f d f d f d f }
+    >>
+  }
+}
+@end lilypond
+
 
 
 @node The \override command

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 9bb00d3fa5228fa7b1921e1163bdcf5cb88bbf1a..587df0ee4071f58fd57f4d99ff2537e5d19b51d8 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -829,12 +829,26 @@ output format based on the input filename's extension.
 @end multitable
 @end quotation
 
+
 @node Many quotes of a large score
 @section Many quotes of a large score
 
 If you need to quote many fragments of a large score, you can also use
 the clip systems feature, see @ref{Extracting fragments of notation}.
 
+
+@ignore 
+@n ode Inserting LilyPond output into OpenOffice.org
+@s ection Inserting LilyPond output into OpenOffice.org
+
+@c index OpenOffice.org
+
+LilyPond notation can be added to OpenOffice.org with
+@u ref{http://@/ooolilypond@/.sourceforge@/.net@/,OOoLilyPond}
+
+@end ignore
+
+
 @node Inserting LilyPond output into other programs
 @section Inserting LilyPond output into other programs
 

diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely
index 3e7845709c03c1ebeafe8b6d1b28019b25d9ac16..dbb1490dfd6c76d2876bb724fb041a74b4632efa 100644 (file)
--- a/Documentation/user/templates.itely
+++ b/Documentation/user/templates.itely
@@ -723,6 +723,120 @@ bassWords = \lyricmode {
 }
 @end lilypond
 
+@appendixsubsec SATB with aligned contexts
+
+Here all the lyrics lines are placed using @code{alignAboveContext}
+and @code{alignBelowContext}.
+
+@lilypond[quote,verbatim,ragged-right]
+\version "2.10.0"
+global = {
+  \key c \major
+  \time 4/4
+}
+
+sopMusic = \relative c'' {
+  c4 c c8[( b)] c4
+}
+sopWords = \lyricmode {
+  hi hi hi hi
+}
+
+altoMusic = \relative c' {
+  e4 f d e
+}
+altoWords =\lyricmode {
+  ha ha ha ha
+}
+
+tenorMusic = \relative c' {
+  g4 a f g
+}
+tenorWords = \lyricmode {
+  hu hu hu hu
+}
+
+bassMusic = \relative c {
+  c4 c g c
+}
+bassWords = \lyricmode {
+  ho ho ho ho
+}
+
+\score {
+  \new ChoirStaff <<
+     \new Staff = women <<
+        \new Voice =
+          "sopranos" { \voiceOne << \global \sopMusic >> }
+        \new Voice =
+          "altos" { \voiceTwo << \global \altoMusic >> }
+     >>
+     \new Lyrics \with {alignAboveContext=women} \lyricsto sopranos \sopWords
+     \new Lyrics \with {alignBelowContext=women} \lyricsto altos \altoWords
+% we could remove the line about this with the line below, since we want
+% the alto lyrics to be below the alto Voice anyway.
+%    \new Lyrics \lyricsto altos \altoWords
+
+     \new Staff = men <<
+        \clef bass
+        \new Voice =
+          "tenors" { \voiceOne <<\global \tenorMusic >> }
+        \new Voice =
+          "basses" { \voiceTwo <<\global \bassMusic >> }
+     >>
+
+     \new Lyrics \with {alignAboveContext=men} \lyricsto tenors \tenorWords
+     \new Lyrics \with {alignBelowContext=men} \lyricsto basses \bassWords
+% again, we could replace the line above this with the line below.
+%    \new Lyrics \lyricsto basses \bassWords
+  >>
+
+  \layout {
+     \context {
+        % a little smaller so lyrics
+        % can be closer to the staff
+        \Staff
+        \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
+     }
+  }
+}
+
+
+\score {
+  \new ChoirStaff <<
+     \new Staff = women <<
+        \new Voice =
+          "sopranos" { \voiceOne << \global \sopMusic >> }
+        \new Voice =
+          "altos" { \voiceTwo << \global \altoMusic >> }
+     >>
+
+     \new Lyrics \with {alignAboveContext=women} \lyricsto sopranos \sopWords
+     \new Lyrics \lyricsto altos \altoWords
+
+     \new Staff = men <<
+        \clef bass
+        \new Voice =
+          "tenors" { \voiceOne <<\global \tenorMusic >> }
+        \new Voice =
+          "basses" { \voiceTwo <<\global \bassMusic >> }
+     >>
+
+     \new Lyrics \with {alignAboveContext=men} \lyricsto tenors \tenorWords
+     \new Lyrics \lyricsto basses \bassWords
+  >>
+
+  \layout {
+     \context {
+        % a little smaller so lyrics
+        % can be closer to the staff
+        \Staff
+        \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
+     }
+  }
+} 
+@end lilypond
+
 
 @c bad node name to avoid node name confict
 @node Ancient notation templates

diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index b26704c13c5f28c8cb78ca42e17b466d7868a104..27b74e1fc21f45c9e425674c59f561b9bb664d8a 100644 (file)
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -13,6 +13,7 @@ configurable; virtually every fragment of output may be changed.
 * Default files::               
 * Fitting music onto fewer pages::  
 * Advanced tweaks with Scheme::  
+* Avoiding tweaks with slower processing::  
 @end menu
 
 
@@ -485,3 +486,18 @@ pattern = #(define-music-function (parser location x y) (ly:music? ly:music?)
 }
 @end lilypond
 
+
+@node Avoiding tweaks with slower processing
+@section Avoiding tweaks with slower processing
+
+LilyPond can perform extra checks while it processes files.  These
+commands will take extra time, but the result may require fewer
+manual tweaks.
+
+@example
+%%  makes sure text scripts and lyrics are within the paper margins
+\override Score.PaperColumn #'keep-inside-line = ##t 
+@end example
+
+
+

diff --git a/THANKS b/THANKS
index 2fc217d46d2663ff6ff5cfe87627d83bdbc388b1..0f0504bc43ad4354af830146370163757e1d2ac5 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -25,9 +25,11 @@ BUG HUNTERS/SUGGESTIONS
 Bertalan Fodor
 Benjamin Drung
 Cameron Horsburgh
+Carl Sorensen
 David Bobroff
 Eduardo Vieira
 Jay Anderson
+Jean-Marie Mouchel
 Kazuhiro Suzuki
 Laura Conrad
 Luc Wehli

diff --git a/input/manual/bar-lines.ly b/input/manual/bar-lines.ly
index 73f42ecf83e5351fa1248f695eb62180d46fe219..b5cdc8492d605c552292e3c1636f26863fbdfc16 100644 (file)
--- a/input/manual/bar-lines.ly
+++ b/input/manual/bar-lines.ly
@@ -21,8 +21,8 @@
     c \bar ":|:" \mark \markup {  \simple #":|:" }
     c \bar "|." \mark \markup {  \simple #"|." }
     c \bar ":" \mark \markup {  \simple #":" }
-
-    c c c
+    c c c \bar "dashed" \mark \markup { \simple #"dashed" }
+    c c c c
     \bar "||:" \mark \markup { \tiny \typewriter "unbroken" \simple
 #"||:" }
     c c c c

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 72a17143b8c6e0b374ae62697b3afc6374c40e3e..1b0ec25293b3b8369e8d3f0e4bc3622e949a6e6d 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1280,7 +1280,7 @@
        (font-size . 2)
        (baseline-skip . 2)
        (break-visibility . ,end-of-line-invisible)
-       (break-align-symbol . staff-bar)
+       (break-align-symbol . clef)
        (padding . 0.8)
        (outside-staff-priority . 1500)
        (meta . ((class . Item)