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

diff --cc input/lsr/setting-hairpin-behavior-at-bar-lines.ly
index 0000000000000000000000000000000000000000,b26a86270ac212ab1eaf0e9b99cd4905621814bb..a47d70e1555bf4da5b3c9acb806beabc08f011f2
mode 000000,100644..100644
--- /dev/null
--- 2/input/lsr/setting-hairpin-behavior-at-bar-lines.ly
+++ b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly
@@@ -1,0 -1,19 +1,19 @@@
 -\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
+ %% Do not edit this file; it is auto-generated from input/new
+ %% This file is in the public domain.
++\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\!
++}