From 3ec271a5093ea9d3150d3dae7c9f7220df03d12f Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Wed, 16 Sep 2015 16:39:48 +0200 Subject: [PATCH] Run scripts/auxiliar/update-with-convert-ly.sh --- Documentation/de/learning/templates.itely | 2 +- Documentation/de/notation/simultaneous.itely | 16 ++++++++-------- Documentation/es/notation/simultaneous.itely | 16 ++++++++-------- Documentation/fr/notation/simultaneous.itely | 16 ++++++++-------- Documentation/it/notation/simultaneous.itely | 16 ++++++++-------- Documentation/ja/notation/simultaneous.itely | 16 ++++++++-------- Documentation/notation/simultaneous.itely | 16 ++++++++-------- input/regression/part-combine-force-once.ly | 18 +++++++++--------- input/regression/part-combine-force.ly | 4 ++-- 9 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Documentation/de/learning/templates.itely b/Documentation/de/learning/templates.itely index bf9b8194a6..9d521b1736 100644 --- a/Documentation/de/learning/templates.itely +++ b/Documentation/de/learning/templates.itely @@ -588,7 +588,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print @ The `line-width' is for \header. @li lypond[quote,verbatim,ragged-right,line-width] -\version "2.19.2" +\version "2.19.25" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/de/notation/simultaneous.itely b/Documentation/de/notation/simultaneous.itely index 7791aa6b05..28e60c0964 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.19.21" +@c \version "2.19.29" @c Translators: Till Paala @@ -1050,28 +1050,28 @@ Note eines musikalischen Ausdrucks. @itemize @item -@code{\partcombineApart} und @code{\partcombineApartOnce} +@code{\partcombineApart} und @code{\once \partcombineApart} erhalten die Noten als zwei unterschiedliche Stimmen, auch wenn sie als Akkord oder Unisono kombiniert werden könnten. @item -@code{\partcombineChords} und @code{\partcombineChordsOnce} +@code{\partcombineChords} und @code{\once \partcombineChords} kombinieren die Noten als Akkord. @item -@code{\partcombineUnisono} und @code{\partcombineUnisonoOnce} +@code{\partcombineUnisono} und @code{\once \partcombineUnisono} kombinieren beide Stimmen als Unisono. @item -@code{\partcombineSoloI} und @code{\partcombineSoloIOnce} +@code{\partcombineSoloI} und @code{\once \partcombineSoloI} setzen nur Stimme eins und markieren sie als @qq{Solo}. @item -@code{\partcombineSoloII} und @code{\partcombineSoloIIOnce} +@code{\partcombineSoloII} und @code{\once \partcombineSoloII} setzen nur Stimme zwei und markieren sie als @qq{Solo}. @item -@code{\partcombineAutomatic} und @code{\partcombineAutomaticOnce} +@code{\partcombineAutomatic} und @code{\once \partcombineAutomatic} beenden die Wirkung der Befehle oben und stellt das normale Verhalten des Kombinationsmechanismus wieder her. @@ -1083,7 +1083,7 @@ instrumentOne = \relative c' { \partcombineAutomatic e2^"auto" e | \partcombineChords e'2^"chord" e | \partcombineAutomatic c2^"auto" c | - \partcombineApart c2^"apart" \partcombineChordsOnce e^"chord once" | + \partcombineApart c2^"apart" \once \partcombineChords e^"chord once" | c2 c | } instrumentTwo = \relative { diff --git a/Documentation/es/notation/simultaneous.itely b/Documentation/es/notation/simultaneous.itely index 423889445f..cc63e37514 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.19.21" +@c \version "2.19.29" @c Translation status: post-GDP @@ -1036,29 +1036,29 @@ exclusivamente a la nota siguiente dentro de la expresión musical. @itemize @item -@code{\partcombineApart} y @code{\partcombineApartOnce} +@code{\partcombineApart} y @code{\once \partcombineApart} mantienen las notas como dos voces separadas incluso si se pueden combinar en un acorde o unísono. @item -@code{\partcombineChords} y @code{\partcombineChordsOnce} +@code{\partcombineChords} y @code{\once \partcombineChords} combinan las notas en un acorde. @item -@code{\partcombineUnisono} y @code{\partcombineUnisonoOnce} +@code{\partcombineUnisono} y @code{\once \partcombineUnisono} combinan las dos voces como unísono y marcan el resultado como @qq{unison}. @item -@code{\partcombineSoloI} y @code{\partcombineSoloIOnce} +@code{\partcombineSoloI} y @code{\once \partcombineSoloI} muestran solo la voz uno y la marcan como @qq{Solo}. @item -@code{\partcombineSoloII} o @code{\partcombineSoloIIOnce} +@code{\partcombineSoloII} o @code{\once \partcombineSoloII} imprimen solo la voz dos y la marcan como @qq{Solo}. @item -@code{\partcombineAutomatic} y @code{\partcombineAutomaticOnce} +@code{\partcombineAutomatic} y @code{\once \partcombineAutomatic} terminan el efecto de las instrucciones anteriores y retornan a la funcionalidad estándar de @code{\partcombine}. @@ -1070,7 +1070,7 @@ instrumentOne = \relative c' { \partcombineAutomatic e2^"auto" e | \partcombineChords e'2^"chord" e | \partcombineAutomatic c2^"auto" c | - \partcombineApart c2^"apart" \partcombineChordsOnce e^"chord once" | + \partcombineApart c2^"apart" \once \partcombineChords e^"chord once" | c2 c | } instrumentTwo = \relative { diff --git a/Documentation/fr/notation/simultaneous.itely b/Documentation/fr/notation/simultaneous.itely index 51996fa2b6..a5685adf1e 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.19.21" +@c \version "2.19.29" @c Translators: Frédéric Chiasson, Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: Jean-Charles Malahieude, John Mandereau @@ -1082,28 +1082,28 @@ note qui les suit directement dans l'expression musicale. @itemize @item -@code{\partcombineApart} et @code{\partcombineApartOnce} maintiennent +@code{\partcombineApart} et @code{\once \partcombineApart} maintiennent les notes dans des voix séparées même si elles peuvent se combiner en accord ou en unisson. @item -@code{\partcombineChords} et @code{\partcombineChordsOnce} combinent les +@code{\partcombineChords} et @code{\once \partcombineChords} combinent les notes en accords. @item -@code{\partcombineUnisono} et @code{\partcombineUnisonoOnce} combinent +@code{\partcombineUnisono} et @code{\once \partcombineUnisono} combinent les voix en un « unisson ». @item -@code{\partcombineSoloI} et @code{\partcombineSoloIOnce} affichent +@code{\partcombineSoloI} et @code{\once \partcombineSoloI} affichent exclusivement la première voix et l'affublent d'un « Solo ». @item -@code{\partcombineSoloII} et @code{\partcombineSoloIIOnce} affichent +@code{\partcombineSoloII} et @code{\once \partcombineSoloII} affichent exclusivement la deuxième voix et l'affublent d'un « Solo ». @item -@code{\partcombineAutomatic} et @code{\partcombineAutomaticOnce} +@code{\partcombineAutomatic} et @code{\once \partcombineAutomatic} annulent les effets des dérogations précédentes et activent le comportement standard de la fonction @code{\partcombine}. @end itemize @@ -1114,7 +1114,7 @@ instrumentOne = \relative c' { \partcombineAutomatic e2^"auto" e | \partcombineChords e'2^"chord" e | \partcombineAutomatic c2^"auto" c | - \partcombineApart c2^"apart" \partcombineChordsOnce e^"chord once" | + \partcombineApart c2^"apart" \once \partcombineChords e^"chord once" | c2 c | } instrumentTwo = \relative { diff --git a/Documentation/it/notation/simultaneous.itely b/Documentation/it/notation/simultaneous.itely index 14646088e3..e751b42443 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.19.21" +@c \version "2.19.29" @c Translators: Federico Bruni @c Translation checkers: Luca Rossetto Casel @@ -1012,28 +1012,28 @@ nota successiva dell'espressione musicale. @itemize @item -@code{\partcombineApart} e @code{\partcombineApartOnce} mantengono le +@code{\partcombineApart} e @code{\once \partcombineApart} mantengono le note su due voci distinte, anche se potrebbero essere combinate in un accordo o in un unisono. @item -@code{\partcombineChords} e @code{\partcombineChordsOnce} uniscono le +@code{\partcombineChords} e @code{\once \partcombineChords} uniscono le note in un accordo. @item -@code{\partcombineUnisono} e @code{\partcombineUnisonoOnce} uniscono +@code{\partcombineUnisono} e @code{\once \partcombineUnisono} uniscono entrambe le voci come @qq{unisono}. @item -@code{\partcombineSoloI} e @code{\partcombineSoloIOnce} stampano soltanto +@code{\partcombineSoloI} e @code{\once \partcombineSoloI} stampano soltanto la prima voce e la contrassegnano come un @qq{Solo}. @item -@code{\partcombineSoloII} o @code{\partcombineSoloIIOnce} stampano soltanto +@code{\partcombineSoloII} o @code{\once \partcombineSoloII} stampano soltanto la seconda voce e la contrassegnano come un @qq{Solo}. @item -@code{\partcombineAutomatic} e @code{\partcombineAutomaticOnce} terminano +@code{\partcombineAutomatic} e @code{\once \partcombineAutomatic} terminano le funzioni dei comandi precedenti e ripristinano il funzionamento predefinito di @code{\partcombine}. @end itemize @@ -1044,7 +1044,7 @@ instrumentOne = \relative c' { \partcombineAutomatic e2^"automatico" e | \partcombineChords e'2^"accordo" e | \partcombineAutomatic c2^"automatico" c | - \partcombineApart c2^"separato" \partcombineChordsOnce e^"accordo una volta sola" | + \partcombineApart c2^"separato" \once \partcombineChords e^"accordo una volta sola" | c2 c | } instrumentTwo = \relative { diff --git a/Documentation/ja/notation/simultaneous.itely b/Documentation/ja/notation/simultaneous.itely index daf15086fc..b15c17a18e 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.19.21" +@c \version "2.19.29" @c Translators: Yoshiki Sawada @@ -1032,28 +1032,28 @@ instrumentTwo = \relative { @itemize @item -@code{\partcombineApart} と @code{\partcombineApartOnce} は@c +@code{\partcombineApart} と @code{\once \partcombineApart} は@c 音符を 2 つの別個のボイスとして譜刻します -- たとえ和音やユニゾンにできる場合であっても分けて譜刻します。 @item -@code{\partcombineChords} と @code{\partcombineChordsOnce} は@c +@code{\partcombineChords} と @code{\once \partcombineChords} は@c 音符を組み合わせて、和音として譜刻します。 @item -@code{\partcombineUnisono} と @code{\partcombineUnisonoOnce} は@c +@code{\partcombineUnisono} と @code{\once \partcombineUnisono} は@c 音符を組み合わせて、@qq{ユニゾン} として譜刻します。 @item -@code{\partcombineSoloI} と @code{\partcombineSoloIOnce} は@c +@code{\partcombineSoloI} と @code{\once \partcombineSoloI} は@c ボイス 1 だけを譜刻して、@qq{Solo} のマークを付けます。 @item -@code{\partcombineSoloII} と @code{\partcombineSoloIIOnce} は@c +@code{\partcombineSoloII} と @code{\once \partcombineSoloII} は@c ボイス 2 だけを譜刻して、@qq{Solo} のマークを付けます。 @item -@code{\partcombineAutomatic} と @code{\partcombineAutomaticOnce}は@c +@code{\partcombineAutomatic} と @code{\once \partcombineAutomatic}は@c 上記のコマンドの効果を終わらせ、標準の @code{\partcombine} に戻します。 @end itemize @@ -1063,7 +1063,7 @@ instrumentOne = \relative c' { \partcombineAutomatic e2^"auto" e | \partcombineChords e'2^"chord" e | \partcombineAutomatic c2^"auto" c | - \partcombineApart c2^"apart" \partcombineChordsOnce e^"chord once" | + \partcombineApart c2^"apart" \once \partcombineChords e^"chord once" | c2 c | } instrumentTwo = \relative { diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely index 8caaaff7e1..d843c29fc3 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.19.21" +@c \version "2.19.29" @node Simultaneous notes @@ -1033,28 +1033,28 @@ music expression. @itemize @item -@code{\partcombineApart} and @code{\partcombineApartOnce} keep the +@code{\partcombineApart} and @code{\once \partcombineApart} keep the notes as two separate voices, even if they can be combined into a chord or unison. @item -@code{\partcombineChords} and @code{\partcombineChordsOnce} combine the +@code{\partcombineChords} and @code{\once \partcombineChords} combine the notes into a chord. @item -@code{\partcombineUnisono} and @code{\partcombineUnisonoOnce} combine +@code{\partcombineUnisono} and @code{\once \partcombineUnisono} combine both voices as @qq{unison}. @item -@code{\partcombineSoloI} and @code{\partcombineSoloIOnce} print only +@code{\partcombineSoloI} and @code{\once \partcombineSoloI} print only voice one, and mark it as a @qq{Solo}. @item -@code{\partcombineSoloII} or @code{\partcombineSoloIIOnce} print only +@code{\partcombineSoloII} or @code{\once \partcombineSoloII} print only voice two and mark it as a @qq{Solo}. @item -@code{\partcombineAutomatic} and @code{\partcombineAutomaticOnce} end +@code{\partcombineAutomatic} and @code{\once \partcombineAutomatic} end the functions of the commands above, and revert back to the standard @code{\partcombine} functionality. @end itemize @@ -1065,7 +1065,7 @@ instrumentOne = \relative c' { \partcombineAutomatic e2^"auto" e | \partcombineChords e'2^"chord" e | \partcombineAutomatic c2^"auto" c | - \partcombineApart c2^"apart" \partcombineChordsOnce e^"chord once" | + \partcombineApart c2^"apart" \once \partcombineChords e^"chord once" | c2 c | } instrumentTwo = \relative { diff --git a/input/regression/part-combine-force-once.ly b/input/regression/part-combine-force-once.ly index ab59c20888..465042786d 100644 --- a/input/regression/part-combine-force-once.ly +++ b/input/regression/part-combine-force-once.ly @@ -8,19 +8,19 @@ \layout { ragged-right = ##t } -\version "2.19.21" +\version "2.19.29" mI = \relative { - e'4 e \partcombineApartOnce c c | - \partcombineApart c \partcombineChordsOnce e e e | - c \partcombineUnisonoOnce c c c | - \partcombineAutomatic \partcombineSoloIOnce r2 c4 c | - \partcombineSoloIIOnce R1 | - d'2 \partcombineChordsOnce d4^"1 chord" d| + e'4 e \once \partcombineApart c c | + \partcombineApart c \once \partcombineChords e e e | + c \once \partcombineUnisono c c c | + \partcombineAutomatic \once \partcombineSoloI r2 c4 c | + \once \partcombineSoloII R1 | + d'2 \once \partcombineChords d4^"1 chord" d| } mII = \relative { - c'4 \partcombineApartOnce c c c | - c c \partcombineAutomaticOnce e e | + c'4 \once \partcombineApart c c c | + c c \once \partcombineAutomatic e e | c c c c | R1 | r2 c4 c | diff --git a/input/regression/part-combine-force.ly b/input/regression/part-combine-force.ly index e988e1e1cc..4a41ae3104 100644 --- a/input/regression/part-combine-force.ly +++ b/input/regression/part-combine-force.ly @@ -1,14 +1,14 @@ \header { texidoc ="Overrides for the part-combiner. All functions like - @code{\\partcombineApart} and @code{\\partcombineApartOnce} are + @code{\\partcombineApart} and @code{\\once \partcombineApart} are internally implemented using a dedicated @code{partCombineForced} context property." } \layout { ragged-right = ##t } -\version "2.19.21" +\version "2.19.29" mI = \relative { e'4 e c2 | -- 2.39.2