Merge master into nested-bookparts

[lilypond.git] / input / new / setting-hairpin-behavior-at-bar-lines.ly

diff --git a/input/new/setting-hairpin-behavior-at-bar-lines.ly b/input/new/setting-hairpin-behavior-at-bar-lines.ly
index 56508717920968068f70649394c3caf6b81bcd18..46197a7933c1f15379be99cf79c9c863bee9a7d8 100644 (file)
--- a/input/new/setting-hairpin-behavior-at-bar-lines.ly
+++ b/input/new/setting-hairpin-behavior-at-bar-lines.ly
@@ -1,17 +1,17 @@
-\version "2.11.46"\r
-\header {\r
-  lsrtags = "expressive-marks"\r
-  texidoc = "If the note which ends a hairpin falls on a downbeat,\r
-the hairpin stops at the bar line immediately preceding.  This behavior\r
-can be controlled by overriding the @code{'to-barline} property.\r
-"\r
-  doctitle = "Setting hairpin behavior at bar lines"\r
-}\r
-\r
-\relative c'' {\r
-  e4\< e2.\r
-  e1\!\r
-  \override Hairpin #'to-barline = ##f\r
-  e4\< e2.\r
-  e1\!\r
-}\r
+\version "2.11.61"
+\header {
+  lsrtags = "expressive-marks"
+  texidoc = "If the note which ends a hairpin falls on a downbeat,
+the hairpin stops at the bar line immediately preceding.  This behavior
+can be controlled by overriding the @code{'to-barline} property.
+"
+  doctitle = "Setting hairpin behavior at bar lines"
+}
+
+\relative c'' {
+  e4\< e2.
+  e1\!
+  \override Hairpin #'to-barline = ##f
+  e4\< e2.
+  e1\!
+}