Merge with master

[lilypond.git] / input / regression / break.ly

diff --git a/input/regression/break.ly b/input/regression/break.ly
index 49f7ddde61c9e40b5f1d28069cc8379dccc5774c..b3a88c798ee9f08150a94adc0da12b1f97945c3e 100644 (file)
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -1,17 +1,19 @@
+
+\version "2.10.0"
+
 \header{
-texidoc="
-Breaks can be encouraged and discouraged using @code{\break} and
-@code{\noBreak}.  They are abbrevs for @code{\penalty} commands.
-";
+  texidoc="
+Breaks can be encouraged and discouraged using @code{\\break} and
+@code{\\noBreak}."
 }
 
+\layout {
+  indent = 0.0
+  line-width = 4.0\cm
+}
 
-\score{
-       \notes\context Voice{
-       \emptyText
-       c1 c1^"no break after 2nd note"  \noBreak c1 c1
-         
-         c1^"break after this" \break c1 c1 
-       }
-       \paper { linewidth = 4.0\cm;}
+\relative c'' \context Voice {
+  \emptyText
+  c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak
+  c1 \break \mark "break" c1 \break \mark "break" c1 
 }