From: Trevor Daniels <t.daniels@treda.co.uk>
Date: Tue, 29 Apr 2008 14:11:15 +0000 (+0100)
Subject: Merge branch 'master' of git://git.sv.gnu.org/lilypond.git into td-lily
X-Git-Tag: release/2.11.46-1~33
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a31f7cf42ab5ac512242970e11538b179df01065;p=lilypond.git

Merge branch 'master' of git://git.sv.gnu.org/lilypond.git into td-lily
---

a31f7cf42ab5ac512242970e11538b179df01065
diff --cc input/new/setting-hairpin-behavior-at-bar-lines.ly
index 0000000000,5650871792..864f29184b
mode 000000,100644..100644
--- a/input/new/setting-hairpin-behavior-at-bar-lines.ly
+++ b/input/new/setting-hairpin-behavior-at-bar-lines.ly
@@@ -1,0 -1,17 +1,17 @@@
 -\version "2.11.46"
 -\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\!
 -}
++\version "2.11.46"
++\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\!
++}