Run scripts/auxiliar/update-with-convert-ly.sh

34 files changed, 104 insertions, 104 deletions

diff --git a/Documentation/cs/learning/common-notation.itely b/Documentation/cs/learning/common-notation.itely
index aefd911aa1..b17443a46c 100644
--- a/Documentation/cs/learning/common-notation.itely
+++ b/Documentation/cs/learning/common-notation.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @ignore
 Tutorial guidelines:
@@ -316,7 +316,7 @@ Běžná @notation{artikulační znaménka} mohou být zadána pomocí
 doplnění minus (@q{-}) a odpovídajícího znaménka:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/de/learning/common-notation.itely b/Documentation/de/learning/common-notation.itely
index a9ad8b0859..f07eda95c3 100644
--- a/Documentation/de/learning/common-notation.itely
+++ b/Documentation/de/learning/common-notation.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @ignore
 Tutorial guidelines:
@@ -324,7 +324,7 @@ Glossar:
 (@q{-}) und einem entsprechenden Zeichen eingegeben werden:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/de/notation/expressive.itely b/Documentation/de/notation/expressive.itely
index 7ba6667e4f..4642922195 100644
--- a/Documentation/de/notation/expressive.itely
+++ b/Documentation/de/notation/expressive.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @c Translators: Till Paala
 
@@ -152,7 +152,7 @@ und @notation{portato}.  Die ihnen entsprechenden Symbole
 werden also folgendermaßen notiert:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely
index 7590ab331d..07ae0def72 100644
--- a/Documentation/de/notation/rhythms.itely
+++ b/Documentation/de/notation/rhythms.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @c Translators: Till Paala
 
@@ -1310,7 +1310,7 @@ e4. d8 c2
 Metronombezeichnungen können auch für einen Zahlenbereich notiert werden:
 
 @lilypond[verbatim,quote,relative=1]
-\tempo 4 = 40 ~ 46
+\tempo 4 = 40 - 46
 c4. e8 a4 g
 b,2 d4 r
 @end lilypond
@@ -3057,19 +3057,19 @@ ausgegeben.  Damit wird die Warnung auf den Ursprung de Fehlers
 fokussiert.
 
 @funindex |
-@funindex pipeSymbol
+@funindex "|"
 
 Es ist auch möglich, die Bedeutung des Symbols @code{|} (Pipe)
 umzudefinieren, so dass hiermit eine andere Aktion als eine
 Taktüberprüfung erreicht wird.
-Das geschieht, indem man der Pipe (@code{pipeSymbol} einen musikalischen
+Das geschieht, indem man der Pipe (@code{"|"} einen musikalischen
 Ausdruck zuweist.  Im nächsten Beispiel wird @code{|} dazu
 verwendet, eine doppelte Taktlinie auszugeben, woimmer man
 das Zeichen auch setzt.  Gleichzeitig hört das Zeichen auf,
 als Taktüberprüfung zu funktionieren.
 
 @lilypond[quote,verbatim]
-pipeSymbol = \bar "||"
+"|" = \bar "||"
 {
   c'2 c' |
   c'2 c'
diff --git a/Documentation/de/notation/simultaneous.itely b/Documentation/de/notation/simultaneous.itely
index 08c3a81a90..e938e80e16 100644
--- a/Documentation/de/notation/simultaneous.itely
+++ b/Documentation/de/notation/simultaneous.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @c Translators: Till Paala
 
@@ -67,7 +67,7 @@ Akkorde können auch von Artikulationen gefolgt werden, genau wie
 auch einfache Noten.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^| <g c e>16-.
+<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^! <g c e>16-.
 @end lilypond
 
 Die Noten innerhalb der Akkorde konnen auch von Artikulationen oder
@@ -173,7 +173,7 @@ Balken usw. benutzt werden, weil nur die Tonhöhen des vorangehenden
 Akkordes wiederholgt werden.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\p^"text" q2\<( q8)[-| q8.]\! q16-1-2-3 q8\prall
+<a c e>1\p^"text" q2\<( q8)[-! q8.]\! q16-1-2-3 q8\prall
 @end lilypond
 
 Das Akkordwiederholungssymbol erinnert sich an das letzte Vorkommen
diff --git a/Documentation/es/learning/common-notation.itely b/Documentation/es/learning/common-notation.itely
index 0d51e2c8bc..b59ab15346 100644
--- a/Documentation/es/learning/common-notation.itely
+++ b/Documentation/es/learning/common-notation.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
@@ -343,7 +343,7 @@ Las @notation{articulaciones} más corrientes se pueden añadir a las
 notas utilizando un guión @code{-} seguido de un carácter único:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/es/notation/expressive.itely b/Documentation/es/notation/expressive.itely
index 5f2c5b4e68..91eaeea28b 100644
--- a/Documentation/es/notation/expressive.itely
+++ b/Documentation/es/notation/expressive.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @node Expresiones
 @section Expresiones
@@ -157,7 +157,7 @@ salida correspondiente a estas articulaciones aparece de la siguiente
 manera:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely
index 42e033bd40..fd23a526cb 100644
--- a/Documentation/es/notation/rhythms.itely
+++ b/Documentation/es/notation/rhythms.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @node Duraciones
 @section Duraciones
@@ -1331,7 +1331,7 @@ También se pueden imprimir indicaciones metronómicas
 como un intervalo entre dos números:
 
 @lilypond[verbatim,quote,relative=1]
-\tempo 4 = 40 ~ 46
+\tempo 4 = 40 - 46
 c4. e8 a4 g
 b,2 d4 r
 @end lilypond
@@ -3175,19 +3175,19 @@ permite que la advertencia se centre en la fuente del error de cuenta
 de tiempo.
 
 @funindex |
-@funindex pipeSymbol
+@funindex "|"
 
 También es posible redefinir la acción que se lleva a cabo cuando se
 encuentra un símbolo de comprobación de compás o «símbolo de tubería»,
 @code{|}, en el código de entrada, de forma que haga algo distinto a
 una comprobación de compás.  Se hace asignando una expresión musical a
-@code{pipeSymbol} («símbolo de tubería»).  En el ejemplo siguiente se
+@code{"|"} («símbolo de tubería»).  En el ejemplo siguiente se
 establece @code{|} de forma que inserte una doble línea divisoria
 cuando aparece en el código de entrada, en vez de comprobar el final
 de un compás.
 
 @lilypond[quote,verbatim]
-pipeSymbol = \bar "||"
+"|" = \bar "||"
 {
   c'2 c' |
   c'2 c'
diff --git a/Documentation/es/notation/simultaneous.itely b/Documentation/es/notation/simultaneous.itely
index 92d94686e0..a58c0b98a5 100644
--- a/Documentation/es/notation/simultaneous.itely
+++ b/Documentation/es/notation/simultaneous.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @c Translation status: post-GDP
 
@@ -62,7 +62,7 @@ Los acordes también pueden ir seguidos de articulaciones, de nuevo como
 si fueran simples notas.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^| <g c e>16-.
+<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^! <g c e>16-.
 @end lilypond
 
 Las notas dentro del propio acorde también pueden ir seguidas
@@ -173,7 +173,7 @@ puede usarse con duraciones, articulaciones, elementos de marcado, ligaduras
 de expresión, barras, etc., pues sólo se duplican las notas del acorde precedente.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\p^"text" q2\<( q8)[-| q8.]\! q16-1-2-3 q8\prall
+<a c e>1\p^"text" q2\<( q8)[-! q8.]\! q16-1-2-3 q8\prall
 @end lilypond
 
 El símbolo de repetición de acordes
diff --git a/Documentation/fr/learning/common-notation.itely b/Documentation/fr/learning/common-notation.itely
index 4a2638c249..7985efe78f 100644
--- a/Documentation/fr/learning/common-notation.itely
+++ b/Documentation/fr/learning/common-notation.itely
@@ -26,7 +26,7 @@ Tutorial guidelines:  (different from policy.txt!)
 
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @c Translators: Nicolas Grandclaude, Ludovic Sardain, Gauvain Pocentek
 @c Translation checkers: Jean-Charles Malahieude, Valentin Villenave, John Mandereau
@@ -350,7 +350,7 @@ Des @notation{articulations} peuvent être ajoutées à une note, au moyen
 d'un tiret @code{-} suivi d'un caractère :
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/fr/notation/expressive.itely b/Documentation/fr/notation/expressive.itely
index fea1f50b1a..20add5f572 100644
--- a/Documentation/fr/notation/expressive.itely
+++ b/Documentation/fr/notation/expressive.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @c Translators: Valentin Villenave, Jean-Charles Malahieude
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
@@ -151,7 +151,7 @@ l'articulation désirée.  C'est entre autres le cas pour
 @notation{portato}, comme l'illustre l'exemple ci-dessous.
 
 @lilypond[verbatim,quote,relative=2]
-c4-^  c-+  c--  c-|
+c4-^  c-+  c--  c-!
 c4->  c-.  c2-_
 @end lilypond
 
diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely
index 8798722a71..4a1869c5c1 100644
--- a/Documentation/fr/notation/rhythms.itely
+++ b/Documentation/fr/notation/rhythms.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.15"
+@c \version "2.17.25"
 
 @c Translators: Frédéric Chiasson, Jean-Charles Malahieude
 @c Translation checkers: Valentin Villenave, François Martin, Xavier Scheuer
@@ -1333,7 +1333,7 @@ Lorsque le réglage précis du métronome est laissé à l'appréciation de
 l'exécutant, vous pouvez cependant lui fournir une plage :
 
 @lilypond[verbatim,quote,relative=1]
-\tempo 4 = 40 ~ 46
+\tempo 4 = 40 - 46
 c4. e8 a4 g
 b,2 d4 r
 @end lilypond
@@ -3200,16 +3200,16 @@ message d'avertissement concernant la première occurrence est affiché.
 L'origine du problème est de fait plus évidente.
 
 @funindex |
-@funindex pipeSymbol
+@funindex "|"
 
 Il est aussi possible d'attribuer une autre valeur au
 symbole @code{|}, en assignant une expression musicale à
-@code{pipeSymbol}.  Dans l'exemple suivant, le @code{|} servira à
+@code{"|"}.  Dans l'exemple suivant, le @code{|} servira à
 insérer une double barre là où il apparaît, au lieu de simplement
 vérifier que la fin de la mesure est atteinte.
 
 @lilypond[quote,verbatim]
-pipeSymbol = \bar "||"
+"|" = \bar "||"
 {
   c'2 c' |
   c'2 c'
diff --git a/Documentation/fr/notation/simultaneous.itely b/Documentation/fr/notation/simultaneous.itely
index f218a961a8..abf8a4104e 100644
--- a/Documentation/fr/notation/simultaneous.itely
+++ b/Documentation/fr/notation/simultaneous.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @c Translators: Frédéric Chiasson, Valentin Villenave, Jean-Charles Malahieude
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
@@ -67,7 +67,7 @@ Un accord peut être suivi d'une indication d'articulation comme une
 simple note.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^| <g c e>16-.
+<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^! <g c e>16-.
 @end lilypond
 
 Certaines notes, au sein même d'un accord, peuvent être affectées d'une
@@ -179,7 +179,7 @@ ligatures@dots{}  En fait, c'est la structure du dernier accord qui est
 dupliquée.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\p^"text" q2\<( q8)[-| q8.]\! q16-1-2-3 q8\prall
+<a c e>1\p^"text" q2\<( q8)[-! q8.]\! q16-1-2-3 q8\prall
 @end lilypond
 
 Dans la mesure où le symbole de répétition d'accord enregistre la
diff --git a/Documentation/it/learning/common-notation.itely b/Documentation/it/learning/common-notation.itely
index 677b9a7d4b..3b025e052d 100644
--- a/Documentation/it/learning/common-notation.itely
+++ b/Documentation/it/learning/common-notation.itely
@@ -9,7 +9,7 @@
 @end ignore
 
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
@@ -318,7 +318,7 @@ Le @notation{articolazioni} di uso comune possono essere aggiunte a una nota
 con una lineetta @code{-} e un singolo carattere:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/it/notation/expressive.itely b/Documentation/it/notation/expressive.itely
index 008ab923b8..747460d316 100644
--- a/Documentation/it/notation/expressive.itely
+++ b/Documentation/it/notation/expressive.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @c Translators: Federico Bruni
 @c Translation checkers:
@@ -155,7 +155,7 @@ che indica l'articolazione.  Esistono abbreviazioni predefinite per
 L'output corrispondente è:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/it/notation/rhythms.itely b/Documentation/it/notation/rhythms.itely
index 07c6550935..deb6a487b9 100644
--- a/Documentation/it/notation/rhythms.itely
+++ b/Documentation/it/notation/rhythms.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @c Translators: Federico Bruni
 @c Translation checkers:
@@ -1306,7 +1306,7 @@ Le indicazioni metronomiche si possono rappresentare anche come una gamma
 di due numeri:
 
 @lilypond[verbatim,quote,relative=1]
-\tempo 4 = 40 ~ 46
+\tempo 4 = 40 - 46
 c4. e8 a4 g
 b,2 d4 r
 @end lilypond
@@ -3131,18 +3131,18 @@ avviso.  Così l'avvertimento si concentra sulla causa dell'errore
 di tempo.
 
 @funindex |
-@funindex pipeSymbol
+@funindex "|"
 
 È anche possibile ridefinire l'azione da prendere quando si incontra
 un controllo di battuta o simbolo di barra verticale, @code{|}, nell'input,
 in modo che faccuia qualcosa di diverso dal controllo di battuta.  Si può
-fare assegnando un'espressione musicale a @code{pipeSymbol}.
+fare assegnando un'espressione musicale a @code{"|"}.
 Nell'esempio seguente @code{|}, invece di controllare la fine di una
 battuta, viene usato per inserire una stanghetta doppia ovunque appaia
 nell'input.
 
 @lilypond[quote,verbatim]
-pipeSymbol = \bar "||"
+"|" = \bar "||"
 {
   c'2 c' |
   c'2 c'
diff --git a/Documentation/it/notation/simultaneous.itely b/Documentation/it/notation/simultaneous.itely
index 707c0520a7..5d42e85ff3 100644
--- a/Documentation/it/notation/simultaneous.itely
+++ b/Documentation/it/notation/simultaneous.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @c Translators: Federico Bruni
 @c Translation checkers:
@@ -66,7 +66,7 @@ Proprio come per le note, si possono specificare delle articolazioni che si
 riferiscono all'accordo.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^| <g c e>16-.
+<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^! <g c e>16-.
 @end lilypond
 
 Si possono specificare abbellimenti e articolazioni per ogni nota interna
@@ -174,7 +174,7 @@ di portamento, le travature, etc. dato che solo le altezze dell'accordo
 precedente vengono duplicate.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\p^"text" q2\<( q8)[-| q8.]\! q16-1-2-3 q8\prall
+<a c e>1\p^"text" q2\<( q8)[-! q8.]\! q16-1-2-3 q8\prall
 @end lilypond
 
 Il simbolo di ripetizione dell'accordo ricorda sempre l'ultimo accordo
diff --git a/Documentation/ja/learning/common-notation.itely b/Documentation/ja/learning/common-notation.itely
index 8afcc389bd..e6b9f50d3a 100644
--- a/Documentation/ja/learning/common-notation.itely
+++ b/Documentation/ja/learning/common-notation.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
@@ -328,7 +328,7 @@ c4~( c8 d~ d4 e)
 使うことで音符に付け加えることができます:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/ja/notation/expressive.itely b/Documentation/ja/notation/expressive.itely
index 31057c6512..97973e4d2b 100644
--- a/Documentation/ja/notation/expressive.itely
+++ b/Documentation/ja/notation/expressive.itely
@@ -6,7 +6,7 @@
     version that you are working on.  For details, see the Contributors'
     Guide, node Updating translation committishes..@end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 
 @c Translators: Yoshiki Sawada
@@ -161,7 +161,7 @@ c1\fermata
 これらの出力は以下のように表示されます:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^  c-+  c--  c-|
+c4-^  c-+  c--  c-!
 c4->  c-.  c2-_
 @end lilypond
 
diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely
index 7ab58951ac..2afa1464fa 100644
--- a/Documentation/ja/notation/rhythms.itely
+++ b/Documentation/ja/notation/rhythms.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -1270,7 +1270,7 @@ e4. d8 c2
 メトロノーム記号を 2 つの数の範囲として譜刻することもできます:
 
 @lilypond[verbatim,quote,relative=1]
-\tempo 4 = 40 ~ 46
+\tempo 4 = 40 - 46
 c4. e8 a4 g
 b,2 d4 r
 @end lilypond
@@ -2945,17 +2945,17 @@ c1 | c | c | c
 
 
 @funindex |
-@funindex pipeSymbol
+@funindex "|"
 
 入力の中で小節チェックあるいはパイプ記号 @code{|} に遭遇した場合にとられる@c
 アクションを再定義することも可能です。@c
 これにより、小節チェック以外のことを行うことができます。@c
-再定義は音楽表記を @code{pipeSymbol} に代入することによって行います。@c
+再定義は音楽表記を @code{"|"} に代入することによって行います。@c
 以下の例では、@code{|} は小節の終わりをチェックするのではなく、@c
 それが現れた場所に 2 重線の小節線を挿入するようセットされています。
 
 @lilypond[quote,verbatim]
-pipeSymbol = \bar "||"
+"|" = \bar "||"
 {
   c'2 c' |
   c'2 c'
diff --git a/Documentation/ja/notation/simultaneous.itely b/Documentation/ja/notation/simultaneous.itely
index 883005d595..b447af7167 100644
--- a/Documentation/ja/notation/simultaneous.itely
+++ b/Documentation/ja/notation/simultaneous.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 
 @c Translators: Yoshiki Sawada
@@ -64,7 +64,7 @@ LilyPond の中で多声部は同じ譜にある複数のボイスを参照し�
 続くかもしれません:
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^| <g c e>16-.
+<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^! <g c e>16-.
 @end lilypond
 
 和音の中にある音符自体にもアーティキュレーションや装飾を付けることができます。
@@ -171,7 +171,7 @@ LilyPond の中で多声部は同じ譜にある複数のボイスを参照し�
 アーティキュレーション、マークアップ、スラー、連桁などを使うことができます。
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\p^"text" q2\<( q8)[-| q8.]\! q16-1-2-3 q8\prall
+<a c e>1\p^"text" q2\<( q8)[-! q8.]\! q16-1-2-3 q8\prall
 @end lilypond
 
 和音繰り返しのシンボルは常に最後の和音を覚えているため、@c
diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely
index 55f91d6673..fe0f12acb0 100644
--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
@@ -307,7 +307,7 @@ Common @notation{articulations} can be added to a note using a
 dash @code{-} and a single character:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/nl/learning/common-notation.itely b/Documentation/nl/learning/common-notation.itely
index 13401a5b8b..743b318663 100644
--- a/Documentation/nl/learning/common-notation.itely
+++ b/Documentation/nl/learning/common-notation.itely
@@ -12,7 +12,7 @@
 @c Translation checker:
 @c Translation checker committish:
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
@@ -340,7 +340,7 @@ aan een noot met een streepje @code{-} en een enkel
 karakter:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index d1a4ad7fe0..96c1449e91 100644
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 @node Expressive marks
 @section Expressive marks
@@ -148,7 +148,7 @@ articulation.  Predefined shorthands exist for @notation{marcato},
 Their corresponding output appears as follows:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-|
+c4-^ c-+ c-- c-!
 c4-> c-. c2-_
 @end lilypond
 
diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index e7168b8977..d4f8964825 100644
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.17.25"
 
 @node Rhythms
 @section Rhythms
@@ -1296,7 +1296,7 @@ e4. d8 c2
 Metronome marks may also be printed as a range of two numbers:
 
 @lilypond[verbatim,quote,relative=1]
-\tempo 4 = 40 ~ 46
+\tempo 4 = 40 - 46
 c4. e8 a4 g
 b,2 d4 r
 @end lilypond
@@ -3110,18 +3110,18 @@ warning to focus on the source of the timing error.
 
 
 @funindex |
-@funindex pipeSymbol
+@funindex "|"
 
 It is also possible to redefine the action taken when a bar check
 or pipe symbol, @code{|}, is encountered in the input, so that
 it does something other than a bar check.  This is done by
-assigning a music expression to @code{pipeSymbol}.
+assigning a music expression to @code{"|"}.
 In the following example @code{|} is set to insert a double bar
 line wherever it appears in the input, rather than checking
 for end of bar.
 
 @lilypond[quote,verbatim]
-pipeSymbol = \bar "||"
+"|" = \bar "||"
 {
   c'2 c' |
   c'2 c'
diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely
index a08fa9fff0..ba0ea2ffb2 100644
--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.25"
 
 
 @node Simultaneous notes
@@ -60,7 +60,7 @@ Chords may also be followed by articulations, again just like simple
 notes.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^| <g c e>16-.
+<a c e>1\fermata <a c e>2-> <f a c e>4\prall <a c>8.^! <g c e>16-.
 @end lilypond
 
 The notes within the chord themselves can also be followed by articulation
@@ -167,7 +167,7 @@ durations, articulations, markups, slurs, beams, etc. as only the
 pitches of the previous chord are duplicated.
 
 @lilypond[verbatim,quote,relative=2]
-<a c e>1\p^"text" q2\<( q8)[-| q8.]\! q16-1-2-3 q8\prall
+<a c e>1\p^"text" q2\<( q8)[-! q8.]\! q16-1-2-3 q8\prall
 @end lilypond
 
 The chord repetition symbol always remembers the last instance of
diff --git a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
index ea6f338123..a2553ad84e 100644
--- a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
+++ b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.25"
 
 \header {
   lsrtags = "expressive-marks"
@@ -12,7 +12,7 @@
   texidoc = "
 The shorthands are defined in @samp{ly/script-init.ly}, where the
 variables @code{dashHat}, @code{dashPlus}, @code{dashDash},
-@code{dashBar}, @code{dashLarger}, @code{dashDot}, and
+@code{dashBang}, @code{dashLarger}, @code{dashDot}, and
 @code{dashUnderscore} are assigned default values.  The default values
 for the shorthands can be modified. For example, to associate the
 @code{-+} (@code{dashPlus}) shorthand with the trill symbol instead of
diff --git a/input/regression/accidental-suggestions.ly b/input/regression/accidental-suggestions.ly
index 3cef967242..6e0a867ffa 100644
--- a/input/regression/accidental-suggestions.ly
+++ b/input/regression/accidental-suggestions.ly
@@ -7,7 +7,7 @@ denoting Musica Ficta."
  
 }
 
-\version "2.17.6"
+\version "2.17.25"
 \paper {
   ragged-right = ##t
 }
@@ -15,7 +15,7 @@ denoting Musica Ficta."
 \relative c'' {
   \time 2/4 
   \set suggestAccidentals = ##t 
-  cis^> gis'-|
+  cis^> gis'-!
   \override AccidentalSuggestion.parenthesized = ##t
   cis,_"paren" gis'
 
diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly
index 6fde50c37e..11d0690743 100644
--- a/input/regression/bar-check-redefine.ly
+++ b/input/regression/bar-check-redefine.ly
@@ -1,10 +1,10 @@
-\version "2.16.0"
+\version "2.17.25"
 \header {
     texidoc = "The meaning of @code{|} is stored in the
-identifier @code{pipeSymbol}."
+identifier @code{\"|\"}."
 }
 
-pipeSymbol = \bar "||"
+"|" = \bar "||"
 
 \layout { ragged-right = ##t }
 
diff --git a/input/regression/chord-repetition.ly b/input/regression/chord-repetition.ly
index 524a3bd4e5..52d001d273 100644
--- a/input/regression/chord-repetition.ly
+++ b/input/regression/chord-repetition.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.17.25"
 
 \header {
   texidoc = "
@@ -9,5 +9,5 @@ fingerings, etc are not repeated.
 }
 
 \relative c' {
-  <c-1 e-3 g-5>8\p( q) q4-| q8.\(^"text" q16 q4-|\)
+  <c-1 e-3 g-5>8\p( q) q4-! q8.\(^"text" q16 q4-!\)
 }
diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index 65aa7703be..a4abc604d1 100644
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -1,4 +1,4 @@
-\version "2.17.11"
+\version "2.17.25"
 #(use-modules (srfi srfi-13)
               (ice-9 format))
 
@@ -111,7 +111,7 @@ stderr of this run."
 \test ##[ { c-^ c^^ c_^ } #]				% ArticulationEvent
 \test ##[ { c-+ c^+ c_+ } #]
 \test ##[ { c-- c^- c_- } #]
-\test ##[ { c-| c^| c_| } #]
+\test ##[ { c-! c^! c_! } #]
 \test ##[ { c-> c^> c_> } #]
 \test ##[ { c-. c^. c_. } #]
 \test ##[ { c-_ c^_ c__ } #]
@@ -159,7 +159,7 @@ stderr of this run."
 \test ##[ \mark \default #]			% MarkEvent
 \test ##[ \mark "Allegro" #]
 \test ##[ \tempo 4 = 120 #]			% MetronomeChangeEvent
-\test ##[ \tempo 4 = 108 ~ 116 #]
+\test ##[ \tempo 4 = 108 - 116 #]
 \test ##[ \tempo "Allegro" 4 = 132 #]
 \test ##[ \tempo "Andante" #]
 
diff --git a/input/regression/metronome-range.ly b/input/regression/metronome-range.ly
index d692c22359..e85394570e 100644
--- a/input/regression/metronome-range.ly
+++ b/input/regression/metronome-range.ly
@@ -1,4 +1,4 @@
-\version "2.17.11"
+\version "2.17.25"
 
 \header {
   texidoc = "
@@ -8,7 +8,7 @@ printed with an en-dash character, separated by thin-spaces.
 }
 
 \relative c'' {
-  \tempo 4 = 66 ~ 72
+  \tempo 4 = 66 - 72
   c1 | c
   $(make-event-chord (list (make-music 'TempoChangeEvent
                                         'tempo-unit (ly:make-duration 2 0 1/1)
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 0b8ab2c95c..f3f5eef668 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -16,7 +16,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.17.6"
+\version "2.17.25"
 
 %% named durations
 breve = #(ly:make-duration -1 0)
@@ -74,17 +74,17 @@ startStaff = #(make-span-event 'StaffSpanEvent START)
 % Code articulation definitions
 %
 noBeam = #(make-music 'BeamForbidEvent)
-pipeSymbol = #(make-music 'BarCheck)
-bracketOpenSymbol = #(make-span-event 'BeamEvent START)
-bracketCloseSymbol = #(make-span-event 'BeamEvent STOP)
-tildeSymbol = #(make-music 'TieEvent)
-parenthesisOpenSymbol =  #(make-span-event 'SlurEvent START)
-parenthesisCloseSymbol = #(make-span-event 'SlurEvent STOP)
-escapedExclamationSymbol = #(make-span-event 'CrescendoEvent STOP)
-escapedParenthesisOpenSymbol = #(make-span-event 'PhrasingSlurEvent START)
-escapedParenthesisCloseSymbol = #(make-span-event 'PhrasingSlurEvent STOP)
-escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START)
-escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
+"|" = #(make-music 'BarCheck)
+"[" = #(make-span-event 'BeamEvent START)
+"]" = #(make-span-event 'BeamEvent STOP)
+"~" = #(make-music 'TieEvent)
+"(" =  #(make-span-event 'SlurEvent START)
+")" = #(make-span-event 'SlurEvent STOP)
+"\\!" = #(make-span-event 'CrescendoEvent STOP)
+"\\(" = #(make-span-event 'PhrasingSlurEvent START)
+"\\)" = #(make-span-event 'PhrasingSlurEvent STOP)
+"\\>" = #(make-span-event 'DecrescendoEvent START)
+"\\<" = #(make-span-event 'CrescendoEvent START)
 "\\[" = #(make-span-event 'LigatureEvent START)
 "\\]" = #(make-span-event 'LigatureEvent STOP)
 "\\~" = #(make-music 'PesOrFlexaEvent)
diff --git a/ly/script-init.ly b/ly/script-init.ly
index 5d33decace..0cb37947e7 100644
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -1,12 +1,12 @@
 % script-init.ly
 
-\version "2.16.0"
+\version "2.17.25"
 
 % code char abbreviations
 dashHat = "marcato"
 dashPlus = "stopped"
 dashDash = "tenuto"
-dashBar = "staccatissimo"
+dashBang = "staccatissimo"
 dashLarger = "accent"
 dashDot = "staccato"
 dashUnderscore = "portato"