Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/Documentation/es/user/expressive.itely b/Documentation/es/user/expressive.itely
index fdf3fa1979d05d3f8ba4f327d0a1a51cd8d82371..53e56f219ab006874422d4b3c3a830fecac4fa7c 100644 (file)
--- a/Documentation/es/user/expressive.itely
+++ b/Documentation/es/user/expressive.itely
@@ -233,9 +233,9 @@ c2 b4 a g1\espressivo
 @cindex diminuendo
 @funindex \crescTextCresc
 @funindex \dimTextDim
+@funindex \dimTextDecr
 @funindex \dimTextDecresc
 @funindex \crescHairpin
-@funindex \setHairpinDim
 @funindex \dimHairpin
 
 Los @notation{Crescendi} y @notation{decrescendi} se pueden
@@ -243,9 +243,8 @@ tipografiar como marcas textuales en lugar de reguladores.  Las
 instrucciones incorporadaas que activan estos modos de texto son
 @code{\crescTextCresc}, @code{\dimTextDecresc}, @code{\dimTextDecr} y
 @code{\dimTextDim}.  Las instrucciones correspondientes
-@code{\crescHairpin}, @code{\setHairpinDim} y
-@code{\dimHairpin} hacen que vuelvan a aparecer los reguladores
-de nuevo:
+@code{\crescHairpin} y @code{\dimHairpin} hacen que vuelvan a aparecer
+los reguladores de nuevo:
 
 @lilypond[verbatim,quote,relative=2]
 c\< d e f\!

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 8ee73dfc5655d9606df9e7da349007f3fdc68737..60744dc1a1e7f7c2e4443c93c03f77ee272dd018 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -239,8 +239,8 @@ Crescendos and decrescendos can be engraved as textual markings
 instead of hairpins.  The built-in commands that enable these text
 modes are @code{\crescTextCresc}, @code{\dimTextDecresc},
 @code{\dimTextDecr}, and @code{\dimTextDim}.  The corresponding
-@code{\crescHairpin}, @code{\setHairpinDim}, and
-@code{\dimHairpin} commands will revert to hairpins again:
+@code{\crescHairpin} and @code{\dimHairpin} commands will revert to
+hairpins again:
 
 @lilypond[verbatim,quote,relative=2]
 c4\< d e f\!
@@ -278,8 +278,6 @@ Vertical positioning of dynamics is handled by
 @code{\dimTextDecresc},
 @funindex \crescHairpin
 @code{\crescHairpin},
-@funindex \setHairpinDim
-@code{\setHairpinDim},
 @funindex \dimHairpin
 @code{\dimHairpin}.
 

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index ffd64f48679277cfff6cf40ae0c16d63a0c81bf5..8431acfb4c641137edded9bdeea97a701584ab0b 100644 (file)
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -1445,12 +1445,12 @@ indication to be printed:
 @example
 \score @{
   @var{...music...}
-   \midi @{
-     \context @{
-       \Score
-       tempoWholesPerMinute = #(ly:make-moment 72 4)
-       @}
-     @}
+  \midi @{
+    \context @{
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 72 4)
+    @}
+  @}
 @}
 @end example
 
@@ -1470,8 +1470,9 @@ tempoWholesPerMinute = #(ly:make-moment 270 8)
 Context definitions follow precisely the same syntax as those
 within a @code{\layout} block.  Translation modules for sound are
 called performers.  The contexts for MIDI output are defined in
-@file{ly/@/performer@/-init@/.ly} (see @rlearning{Other sources
-of information}.  For example, to remove the effect of dynamics
+@file{ly/@/performer@/-init@/.ly},
+see @rlearning{Other sources of information}.
+For example, to remove the effect of dynamics
 from the MIDI output, insert the following lines in the
 @code{\midi@{ @}} block.
 
@@ -1501,7 +1502,6 @@ in a @code{\score} block.
 
 @snippets
 
-@c TODO Check header and text appear in this example
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {changing-midi-output-to-one-channel-per-voice.ly}
 

diff --git a/VERSION b/VERSION
index 455fbfc60353343b58a88410956e75eeed10907d..4310f09a00e092ace341e0346259e2cdb356eac0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=11
-PATCH_LEVEL=51
+PATCH_LEVEL=52
 MY_PATCH_LEVEL=
 

diff --git a/ly/property-init.ly b/ly/property-init.ly
index f15dacf8de5b2eea1a1f8ac18b25a35fb5ba15d2..9f9d1d27853525fd67e3e9ada73d588bda8f58fc 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.11.38"
+\version "2.11.52"
 
 stemUp = \override Stem  #'direction = #UP
 stemDown = \override Stem  #'direction = #DOWN 

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index b67deb117af2e80c25791a3b846804651239b89f..e86ea4ea748e4c5669c4ac80ddc495f25ef99c22 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.52"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -83,14 +83,7 @@ dimHairpin = {
     \unset decrescendoSpanner 
 }
 
-setHairpinDim = {
-    \unset decrescendoText 
-    \unset decrescendoSpanner 
-}
-
-
 
-% better name sustainstart/stop? 
 sustainOff = #(make-span-event 'SustainEvent STOP)
 sustainOn = #(make-span-event 'SustainEvent START)
 

diff --git a/python/convertrules.py b/python/convertrules.py
index a747371145abf1a62a0241180ebb209cff64ae23..852bf15ba5d2b46025befb29c5b870875bb2844c 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2780,6 +2780,11 @@ def conv (str):
     str = re.sub (r"sostenutoUp", r"sostenutoOff", str)
     return str
 
+@rule ((2, 11, 52), "\\setHairpinDim -> \\dimHairpin")
+def conv (str):
+    str = str.replace ("setHairpinDim", "dimHairpin")
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,