Bump version and sort out conversion madness

- fix changed command names in translations (somewhat duplicate of
Neil's changes, but I cleaned up a few more details),

- bump version,

- thinko: remove obsolete command \setHairpinDim (replaced with
\dimHairpin),

- update version numbers of ly init files.

diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/user/expressive.itely
index 361a980874d1a15ded30f2899cd4444a82545a3c..1a433fc5eb180e77e55dd64a6555c5b36c9198aa 100644 (file)
--- a/Documentation/de/user/expressive.itely
+++ b/Documentation/de/user/expressive.itely
@@ -226,13 +226,13 @@ Anstelle der Klammern kann auch der Text @emph{cresc.} bzw. @emph{decr.}
 oder @emph{dim.} ausgegeben werden.
 
 @lilypond[quote,ragged-right,fragment,relative=2,verbatim]
-\setTextCresc
+\crescTextCresc
 c\< d e f\!
-\setHairpinCresc
+\crescHairpin
 e\> d c b\!
-\setTextDecresc
+\dimTextDecr
 c\> d e f\!
-\setTextDim
+\dimTextDim
 e\> d c b\!
 @end lilypond
 
@@ -702,9 +702,9 @@ eigene Befehle.
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \new Voice {
-  \arpeggioUp
+  \arpeggioArrowUp
   <c e g c>\arpeggio
-  \arpeggioDown
+  \arpeggioArrowDown
   <c e g c>\arpeggio
 }
 @end lilypond
@@ -730,12 +730,12 @@ Klaviersystem die Eigenschaft
 @predefined
 
 @code{\arpeggio},
-@funindex \arpeggioUp
-@code{\arpeggioUp},
-@funindex \arpeggioDown
-@code{\arpeggioDown},
-@funindex \arpeggioNeutral
-@code{\arpeggioNeutral},
+@funindex \arpeggioArrowUp
+@code{\arpeggioArrowUp},
+@funindex \arpeggioArrowDown
+@code{\arpeggioArrowDown},
+@funindex \arpeggioNormal
+@code{\arpeggioNormal},
 @funindex \arpeggioBracket
 @code{\arpeggioBracket}.
 

diff --git a/Documentation/de/user/keyboards.itely b/Documentation/de/user/keyboards.itely
index d17d7ac202007bc9a6f5aa1dd567fb951443b69f..10e862dfb1e380ab8c5d49f4a2f3e627c0b4d19a 100644 (file)
--- a/Documentation/de/user/keyboards.itely
+++ b/Documentation/de/user/keyboards.itely
@@ -249,14 +249,14 @@ können. Normalerweise besitzt ein Klavier drei Pedale, das linke oder
 Haltepedal, das rechte oder Una-corda-Pedal und das Sostenuto-Pedal.
 
 Spielanweisungen für das Pedal können durch die Befehle 
-@code{\sustainDown} (linkes Pedal), @code{\sustainUp} (linkes Pedal 
+@code{\sustainOn} (linkes Pedal), @code{\sustainOff} (linkes Pedal 
 hoch), @code{\unaCorda} (rechtes Pedal), @code{\treCorde} (rechtes 
-Pedal hoch), @code{\sostenutoDown} (mittleres Pedal) und 
-@code{\sostenutoUp} (mittleres Pedal hoch) anschließend an eine 
+Pedal hoch), @code{\sostenutoOn} (mittleres Pedal) und 
+@code{\sostenutoOff} (mittleres Pedal hoch) anschließend an eine 
 Note oder einen Akkord notiert werden.
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-c'4\sustainDown c'4\sustainUp
+c'4\sustainOn c'4\sustainOff
 @end lilypond
 
 Die Ausgabe kann verändert werden, indem der Wert 
@@ -272,9 +272,9 @@ auf Klammern (eng. bracket) gesetzt wird.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \set Staff.pedalSustainStyle = #'bracket
-c\sustainDown d e
-b\sustainUp\sustainDown
-b g \sustainUp a \sustainDown \bar "|."
+c\sustainOn d e
+b\sustainOff\sustainOn
+b g \sustainOff a \sustainOn \bar "|."
 @end lilypond
 
 Eine dritte Art der Pedalnotation besteht aus einer Mischung von Text 
@@ -283,9 +283,9 @@ und den Pedalklammern. Sie wird durch setzen von
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \set Staff.pedalSustainStyle = #'mixed
-c\sustainDown d e
-b\sustainUp\sustainDown
-b g \sustainUp a \sustainDown \bar "|."
+c\sustainOn d e
+b\sustainOff\sustainOn
+b g \sustainOff a \sustainOn \bar "|."
 @end lilypond
 
 Die Einstellungen für linkes @c ?
@@ -293,7 +293,7 @@ und mittleres Pedal ist üblicherweise ein @code{#'text}-Stil. Für das
 mittlere Pedal ist der gemischte Stil voreingestellt.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
-c\sostenutoDown d e c, f g a\sostenutoUp
+c\sostenutoOn d e c, f g a\sostenutoOff
 @end lilypond
 
 Die Erscheinung der Pedal-Klammer kann mit den Eigenschaften 
@@ -305,7 +305,7 @@ verlängert werden.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \override Staff.PianoPedalBracket #'shorten-pair = #'(0 . -1.0)
-c\sostenutoDown d e c, f g a\sostenutoUp
+c\sostenutoOn d e c, f g a\sostenutoOff
 @end lilypond
 
 @seealso

diff --git a/Documentation/de/user/templates.itely b/Documentation/de/user/templates.itely
index 0e53486349db114f37846fa52488be8d6e3131a8..75e9f7da42ff344f7057c9ac428471ddf38174fc 100644 (file)
--- a/Documentation/de/user/templates.itely
+++ b/Documentation/de/user/templates.itely
@@ -334,7 +334,7 @@ dynamics = {
 }
 
 pedal = {
-  s2\sustainDown s2\sustainUp
+  s2\sustainOn s2\sustainOff
 }
 
 \score {

diff --git a/Documentation/es/user/expressive.itely b/Documentation/es/user/expressive.itely
index aa42230fb1202cca9bfc98724d38e9ce5a3991c2..db2495787adb69e632f7e10a280f49279186307d 100644 (file)
--- a/Documentation/es/user/expressive.itely
+++ b/Documentation/es/user/expressive.itely
@@ -231,30 +231,29 @@ c2 b4 a g1\espressivo
 @cindex crescendo
 @cindex decrescendo
 @cindex diminuendo
-@funindex \setTextCresc
-@funindex \setTextDim
-@funindex \setTextDecresc
-@funindex \setHairpinCresc
-@funindex \setHairpinDim
-@funindex \setHairpinDecresc
+@funindex \crescTextCresc
+@funindex \dimTextDim
+@funindex \dimTextDecr
+@funindex \dimTextDecresc
+@funindex \crescHairpin
+@funindex \dimHairpin
 
 Los @notation{Crescendi} y @notation{decrescendi} se pueden
 tipografiar como marcas textuales en lugar de reguladores.  Las
 instrucciones incorporadaas que activan estos modos de texto son
-@code{\setTextCresc}, @code{\setTextDecresc}, @code{\setTextDecr} y
-@code{\setTextDim}.  Las instrucciones correspondientes
-@code{\setHairpinCresc}, @code{\setHairpinDim} y
-@code{\setHairpinDecresc} hacen que vuelvan a aparecer los reguladores
-de nuevo:
+@code{\crescTextCresc}, @code{\dimTextDecr}, @code{\dimTextDecresc} y
+@code{\dimTextDim}.  Las instrucciones correspondientes
+@code{\crescHairpin} y @code{\dimHairpin} hacen que vuelvan a aparecer
+los reguladores de nuevo:
 
 @lilypond[verbatim,quote,relative=2]
 c\< d e f\!
 e\> d c b\!
-\setTextCresc
+\crescTextCresc
 c\< d e f\!
-\setTextDecresc
+\dimTextDecr
 e\> d c b\!
-\setHairpinCresc
+\crescHairpin
 c\< d e f\!
 @end lilypond
 
@@ -685,16 +684,16 @@ arpegiar el acorde:
 
 La dirección del arpegio se denota a veces mediante la adición de una
 punta de flecha a la línea ondulada.  Esto se hace con las
-instrucciones @code{arpeggioUp} y @code{arpeggioDown}.
-@code{arpeggioNeutral} nos devuelve a la versión sin flecha:
+instrucciones @code{arpeggioArrowUp} y @code{arpeggioArrowDown}.
+@code{arpeggioNormal} nos devuelve a la versión sin flecha:
 
 @lilypond[verbatim,quote,relative=1]
 \new Voice {
-  \arpeggioUp
+  \arpeggioArrowUp
   <c e g c>\arpeggio
-  \arpeggioDown
+  \arpeggioArrowDown
   <c e g c>\arpeggio
-  \arpeggioNeutral
+  \arpeggioNormal
   <c e g c>\arpeggio
 }
 @end lilypond
@@ -707,12 +706,12 @@ consulte @ref{Ties}.
 
 @funindex \arpeggio
 @code{\arpeggio},
-@funindex \arpeggioUp
-@code{\arpeggioUp},
-@funindex \arpeggioDown
-@code{\arpeggioDown},
-@funindex \arpeggioNeutral
-@code{\arpeggioNeutral},
+@funindex \arpeggioArrowUp
+@code{\arpeggioArrowUp},
+@funindex \arpeggioArrowDown
+@code{\arpeggioArrowDown},
+@funindex \arpeggioNormal
+@code{\arpeggioNormal},
 @funindex \arpeggioBracket
 @code{\arpeggioBracket}.
 

diff --git a/Documentation/es/user/keyboards.itely b/Documentation/es/user/keyboards.itely
index 2584ff1458f18f1b5fcfbc81661ea15606ff4195..fc740dedba3e27331687178866c9459c10771790 100644 (file)
--- a/Documentation/es/user/keyboards.itely
+++ b/Documentation/es/user/keyboards.itely
@@ -246,12 +246,12 @@ y tonal (en inglés: sustain, una corda y sostenuto).
 
 
 Se puede expresar una instrucción de pedal de piano adjuntando
-@code{\sustainDown}, @code{\sustainUp}, @code{\unaCorda},
-@code{\treCorde}, @code{\sostenutoDown} y @code{\sostenutoUp} a una
+@code{\sustainOn}, @code{\sustainOff}, @code{\unaCorda},
+@code{\treCorde}, @code{\sostenutoOn} y @code{\sostenutoOff} a una
 nota o acorde
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-c'4\sustainDown c'4\sustainUp
+c'4\sustainOn c'4\sustainOff
 @end lilypond
 
 Es posible modificar lo que se imprime estableciendo @code{pedal@var{X}Strings},
@@ -265,9 +265,9 @@ propiedad @code{pedalSustainStyle} a objetos corchete
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \set Staff.pedalSustainStyle = #'bracket
-c\sustainDown d e
-b\sustainUp\sustainDown
-b g \sustainUp a \sustainDown \bar "|."
+c\sustainOn d e
+b\sustainOff\sustainOn
+b g \sustainOff a \sustainOn \bar "|."
 @end lilypond
 
 Un tercer estilo de notación de pedal es una mezcla de texto y corchetes,
@@ -276,9 +276,9 @@ que se obtiene estableciendo la propiedad @code{pedalSustainStyle} a
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \set Staff.pedalSustainStyle = #'mixed
-c\sustainDown d e
-b\sustainUp\sustainDown
-b g \sustainUp a \sustainDown \bar "|."
+c\sustainOn d e
+b\sustainOff\sustainOn
+b g \sustainOff a \sustainOn \bar "|."
 @end lilypond
 
 El estilo por defecto @q{*Ped.} para los pedales derecho y una corda corresponde al
@@ -286,7 +286,7 @@ estilo @code{#'text}.  El pedal tonal usa el estilo @code{mixed} por
 defecto.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
-c\sostenutoDown d e c, f g a\sostenutoUp
+c\sostenutoOn d e c, f g a\sostenutoOff
 @end lilypond
 
 Para hacer un ajuste fino del aspecto de un corchete de pedal, se
@@ -298,7 +298,7 @@ cabeza de la nota
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \override Staff.PianoPedalBracket #'shorten-pair = #'(0 . -1.0)
-c\sostenutoDown d e c, f g a\sostenutoUp
+c\sostenutoOn d e c, f g a\sostenutoOff
 @end lilypond
 
 @seealso

diff --git a/Documentation/es/user/templates.itely b/Documentation/es/user/templates.itely
index 6869d5873fb7a8608ffb3523d0a1a0c70cc79617..028cf2736e6506a2500b23263ee51ca7bcf917ae 100644 (file)
--- a/Documentation/es/user/templates.itely
+++ b/Documentation/es/user/templates.itely
@@ -327,7 +327,7 @@ dynamics = {
 }
 
 pedal = {
-  s2\sustainDown s2\sustainUp
+  s2\sustainOn s2\sustainOff
 }
 
 \score {

diff --git a/Documentation/es/user/tweaks.itely b/Documentation/es/user/tweaks.itely
index e63aa37eafa4789b54f414aeea643931738d7dd9..3c8401673128eeda4eb1a2cf1c5a0785a98114f4 100644 (file)
--- a/Documentation/es/user/tweaks.itely
+++ b/Documentation/es/user/tweaks.itely
@@ -1568,9 +1568,9 @@ menciona el significado de cada una allí donde no es obvio.
   @tab Arriba o Derecha
   @tab Anular
   @tab Efecto
-@item @code{\arpeggioDown}
-  @tab @code{\arpeggioUp}
-  @tab @code{\arpeggioNeutral}
+@item @code{\arpeggioArrowDown}
+  @tab @code{\arpeggioArrowUp}
+  @tab @code{\arpeggioNormal}
   @tab La flecha está abajo, arriba o no hay flecha
 @item @code{\dotsDown}
   @tab @code{\dotsUp}

diff --git a/Documentation/fr/user/expressive.itely b/Documentation/fr/user/expressive.itely
index 8c5592ac7362547a9885658610fb336acc94eaae..18b81f936d3f8dbb851e6806b6bf17728b8e9b8c 100644 (file)
--- a/Documentation/fr/user/expressive.itely
+++ b/Documentation/fr/user/expressive.itely
@@ -231,13 +231,13 @@ Au lieu d'une notation graphique des crescendos, on peut utiliser
 une notation textuelle.
 
 @lilypond[quote,ragged-right,fragment,relative=2,verbatim]
-\setTextCresc
+\crescTextCresc
 c\< d e f\!
-\setHairpinCresc
+\crescHairpin
 e\> d c b\!
-\setTextDecresc
+\dimTextDecr
 c\> d e f\!
-\setTextDim
+\dimTextDim
 e\> d c b\!
 @end lilypond
 
@@ -705,9 +705,9 @@ de la vaguelette :
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \new Voice {
-  \arpeggioUp
+  \arpeggioArrowUp
   <c e g c>\arpeggio
-  \arpeggioDown
+  \arpeggioArrowDown
   <c e g c>\arpeggio
 }
 @end lilypond
@@ -732,12 +732,12 @@ exemple dans le contexte @rinternals{PianoStaff} :
 @predefined
 
 @code{\arpeggio},
-@funindex \arpeggioUp
-@code{\arpeggioUp},
-@funindex \arpeggioDown
-@code{\arpeggioDown},
-@funindex \arpeggioNeutral
-@code{\arpeggioNeutral},
+@funindex \arpeggioArrowUp
+@code{\arpeggioArrowUp},
+@funindex \arpeggioArrowDown
+@code{\arpeggioArrowDown},
+@funindex \arpeggioNormal
+@code{\arpeggioNormal},
 @funindex \arpeggioBracket
 @code{\arpeggioBracket}.
 

diff --git a/Documentation/fr/user/keyboards.itely b/Documentation/fr/user/keyboards.itely
index 2eb590713a9d5c186f343a71c0cc95c7aad0154a..827d26eeeb945161f7fc245beb3445cc1d690b37 100644 (file)
--- a/Documentation/fr/user/keyboards.itely
+++ b/Documentation/fr/user/keyboards.itely
@@ -245,14 +245,14 @@ Le piano possède deux pédales, parfois trois, permettant de modifier
 l'émission du son.  Il est possible d'indiquer précisément chacune
 d'entre elles, en ajoutant à une note ou un accord les commandes
 suivantes :
-@multitable {enfoncerr} {pédale de tenuee} {pédale una cordaa} {\sostenutoDownnnn}
+@multitable {enfoncerr} {pédale de tenuee} {pédale una cordaa} {\sostenutoOnnnn}
 @item       @tab pédale de tenue @tab pédale @emph{una corda} @tab pédale tonale
-@item enfoncer @tab @code{\sustainDown} @tab @code{\unaCorda} @tab @code{\sostenutoDown}
-@item relâcher @tab @code{\sustainUp}   @tab @code{\treCorde} @tab @code{\sostenutoUp}
+@item enfoncer @tab @code{\sustainOn} @tab @code{\unaCorda} @tab @code{\sostenutoOn}
+@item relâcher @tab @code{\sustainOff}   @tab @code{\treCorde} @tab @code{\sostenutoOff}
 @end multitable
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-c'4\sustainDown c'4\sustainUp
+c'4\sustainOn c'4\sustainOff
 @end lilypond
 
 Les modalités d'impression de ces indications sont définies par la
@@ -266,9 +266,9 @@ pédale, en utilisant des crochets
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \set Staff.pedalSustainStyle = #'bracket
-c\sustainDown d e
-b\sustainUp\sustainDown
-b g \sustainUp a \sustainDown \bar "|."
+c\sustainOn d e
+b\sustainOff\sustainOn
+b g \sustainOff a \sustainOn \bar "|."
 @end lilypond
 
 @noindent
@@ -276,9 +276,9 @@ ou en mélangeant indications textuelles et crochets
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \set Staff.pedalSustainStyle = #'mixed
-c\sustainDown d e
-b\sustainUp\sustainDown
-b g \sustainUp a \sustainDown \bar "|."
+c\sustainOn d e
+b\sustainOff\sustainOn
+b g \sustainOff a \sustainOn \bar "|."
 @end lilypond
 
 @code{text} est le style de notation par défaut pour la pédale de
@@ -286,7 +286,7 @@ tenue --- le traditionnel @q{*Ped.}.  La pédale tonale, en revanche,
 utilise @code{mixed} par défaut.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
-c\sostenutoDown d e c, f g a\sostenutoUp
+c\sostenutoOn d e c, f g a\sostenutoOff
 @end lilypond
 
 Il est possible de d'affiner l'apparence d'un crochet de pédale, au
@@ -298,7 +298,7 @@ jusqu'à l'extrémité droite de la dernière note :
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \override Staff.PianoPedalBracket #'shorten-pair = #'(0 . -1.0)
-c\sostenutoDown d e c, f g a\sostenutoUp
+c\sostenutoOn d e c, f g a\sostenutoOff
 @end lilypond
 
 @seealso

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/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,