From d4695990e1da37b5552f25305b65cabe660a167c Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Tue, 8 Jul 2008 16:45:07 +0200 Subject: [PATCH] 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. --- Documentation/de/user/expressive.itely | 24 ++++++------- Documentation/de/user/keyboards.itely | 24 ++++++------- Documentation/de/user/templates.itely | 2 +- Documentation/es/user/expressive.itely | 49 +++++++++++++------------- Documentation/es/user/keyboards.itely | 22 ++++++------ Documentation/es/user/templates.itely | 2 +- Documentation/es/user/tweaks.itely | 6 ++-- Documentation/fr/user/expressive.itely | 24 ++++++------- Documentation/fr/user/keyboards.itely | 24 ++++++------- Documentation/user/expressive.itely | 6 ++-- VERSION | 2 +- ly/property-init.ly | 2 +- ly/spanners-init.ly | 9 +---- python/convertrules.py | 5 +++ 14 files changed, 98 insertions(+), 103 deletions(-) diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/user/expressive.itely index 361a980874..1a433fc5eb 100644 --- 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 \arpeggio - \arpeggioDown + \arpeggioArrowDown \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 d17d7ac202..10e862dfb1 100644 --- 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 0e53486349..75e9f7da42 100644 --- 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 aa42230fb1..db2495787a 100644 --- 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 \arpeggio - \arpeggioDown + \arpeggioArrowDown \arpeggio - \arpeggioNeutral + \arpeggioNormal \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 2584ff1458..fc740dedba 100644 --- 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 6869d5873f..028cf2736e 100644 --- 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 e63aa37eaf..3c84016731 100644 --- 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 8c5592ac73..18b81f936d 100644 --- 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 \arpeggio - \arpeggioDown + \arpeggioArrowDown \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 2eb590713a..827d26eeeb 100644 --- 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 8ee73dfc56..60744dc1a1 100644 --- 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 455fbfc603..4310f09a00 100644 --- 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 f15dacf8de..9f9d1d2785 100644 --- 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 b67deb117a..e86ea4ea74 100644 --- 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 a747371145..852bf15ba5 100644 --- 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, -- 2.39.5