From 12fb8869aa8c172eb6dc7bc996e90860013ec270 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Tue, 20 May 2014 22:54:01 -0700 Subject: [PATCH] makelsr and update-with-convert-ly --- .../de/notation/changing-defaults.itely | 8 ++--- .../es/notation/changing-defaults.itely | 6 ++-- .../fr/notation/changing-defaults.itely | 6 ++-- .../ja/notation/changing-defaults.itely | 6 ++-- .../notation/changing-defaults.itely | 6 ++-- ...an-engraver-in-scheme--ambitus-engraver.ly | 4 +-- .../snippets/engravers-one-by-one.ly | 6 ++-- Documentation/snippets/makam-example.ly | 4 +-- ...an-engraver-in-scheme--ambitus-engraver.ly | 4 +-- .../non-traditional-key-signatures.ly | 29 ++++++++++--------- input/regression/key-signature-padding.ly | 4 +-- .../key-signature-scordatura-persist.ly | 6 ++-- input/regression/key-signature-scordatura.ly | 8 ++--- input/regression/keys.ly | 4 +-- 14 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Documentation/de/notation/changing-defaults.itely b/Documentation/de/notation/changing-defaults.itely index f2a3f2a967..f505579762 100644 --- a/Documentation/de/notation/changing-defaults.itely +++ b/Documentation/de/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.2" +@c \version "2.19.7" @c Translators: Till Paala @@ -1817,7 +1817,7 @@ werden muss. Kontexteigenschaften werden üblicherweise mit @code{kleinGroßbuchstabe} benannt. Sie kontrollieren vor allem die Übersetzung von Musik in -Notation, wie etwa @code{localKeySignature}, welche bestimmt, wann +Notation, wie etwa @code{localAlterations}, welche bestimmt, wann ein Taktstrich gesetzt werden muss. Kontexteigenschaften können ihren Wert mit der Zeit ändern, während eine Notationsdatei interpretiert wird. Ein gutes Beispiel dafür ist @code{measurePosition}, was die @@ -2306,7 +2306,7 @@ unterschiedliche Arten von Eigenschaften. Kontexte können Eigenschaften haben, deren Bezeichnungen üblicherweise dem Schema @code{kleinGroß} folgen. Derartige Eigenschaften sind vor allen Dingen für die Übersetzung der -Musik in Notation zuständig, beispielsweise @code{localKeySignature} +Musik in Notation zuständig, beispielsweise @code{localAlterations} (um zu bestimmen, ob Versetzungszeichen ausgegeben werden müssen), @code{measurePosition} (um zu bestimmen, ob eine Taktlinie gesetzt werden muss). Kontexteigenschaften können @@ -2467,7 +2467,7 @@ Es ist also sicherer, geschachtelte Aufrufe zu benutzen, wenn man nicht bewusst alle Werte zurücksetzen will. @warning{Geschachtelte Aufrufe funktionieren nicht mit -Kontexteigenschaften (wie etwa @code{beamExceptions}, @code{keySignature}, +Kontexteigenschaften (wie etwa @code{beamExceptions}, @code{keyAlterations}, @code{timeSignatureSettings}, usw.) Diese Eigenschaften können nur verändert werden, indem man sie vollständig als Alisten umdefiniert.} diff --git a/Documentation/es/notation/changing-defaults.itely b/Documentation/es/notation/changing-defaults.itely index a22450e6ce..d872f33819 100644 --- a/Documentation/es/notation/changing-defaults.itely +++ b/Documentation/es/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Translation of GIT committish: a43fe59b0205af99f84532935b103d0c064b4526 Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.2" +@c \version "2.19.7" @node Cambiar los valores por omisión @chapter Cambiar los valores por omisión @@ -1959,7 +1959,7 @@ carácter almohadilla,@tie{}@code{#}. El nombre de las propiedades de contexto suele ir en minúsculas con mayúscula en medio. Controlan sobre todo la traducción de la música a -la notación, p.ej. @code{localKeySignature} (para determinar si hay +la notación, p.ej. @code{localAlterations} (para determinar si hay que impriir alteraciones o no), o @code{measurePosition} (para determinar cuándo hay que imprimir una línea divisoria). El valor de las propiedades de contexto puede modifcarse con el tiempo durante la @@ -2629,7 +2629,7 @@ individualmente con una declaración anidada. @warning{Las declaraciones anidadas no funcionan para las listas-A de propiedades de contexto (como @code{beamExceptions}, -@code{keySignature}, @code{timeSignatureSettings}, etc.). Estas +@code{keyAlterations}, @code{timeSignatureSettings}, etc.). Estas propiedades sólo se pueden modificar redefiniéndolas completamente como listas-A.} diff --git a/Documentation/fr/notation/changing-defaults.itely b/Documentation/fr/notation/changing-defaults.itely index 94a8f38739..0fe85e1fa1 100644 --- a/Documentation/fr/notation/changing-defaults.itely +++ b/Documentation/fr/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.2" +@c \version "2.19.7" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: Gilles Thibault @@ -2099,7 +2099,7 @@ doit être précédée du caractère @code{#}. Les propriétés des contextes se libellent sous la forme @code{minusculeMajuscule}. Leur rôle consiste principalement à traduire -la musique en notation : par exemple, @code{localKeySignature} +la musique en notation : par exemple, @code{localAlterations} déterminera quand imprimer une altération accidentelle, et @code{measurePosition} quand imprimer une barre de mesure. La valeur des propriétés des contextes peuvent évoluer au fur et à mesure que l'on @@ -2773,7 +2773,7 @@ valeur des clés individuellement par des déclarations imbriquées. @warning{Les déclarations imbriquées ne sont pas fonctionnelles dans le cas des listes associatives des propriétés de contexte -- telles -@code{beamExceptions}, @code{keySignature}, +@code{beamExceptions}, @code{keyAlterations}, @code{timeSignatureSettings}, etc. Ces propriétés ne sont modifiables qu'au travers d'une complète redéfinition de leur liste associative.} diff --git a/Documentation/ja/notation/changing-defaults.itely b/Documentation/ja/notation/changing-defaults.itely index 0947eebd0a..5217952593 100644 --- a/Documentation/ja/notation/changing-defaults.itely +++ b/Documentation/ja/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.2" +@c \version "2.19.7" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -1963,7 +1963,7 @@ Scheme 値の循環参照は、ハング アップまたはクラッシュ、@c 通常、コンテキスト プロパティの名前は、@c 小文字で始まる単語に大文字で始まる単語をつなげたものです。@c これらはたいてい音楽から記譜への翻訳を制御します --- 例えば、@code{localKeySignature} (臨時記号を表示するかどうかを決定します) +-- 例えば、@code{localAlterations} (臨時記号を表示するかどうかを決定します) や、@code{measurePosition} (小節線を表示するタイミングを決定します) です。@c コンテキスト プロパティは、楽曲の解釈をしている間、@c ずっと値を変更しておくことができます。@c @@ -2575,7 +2575,7 @@ property (modified with @code{\set}) was created. ネストされた宣言を用いてキー値を個々に更新する方が安全です。 @warning{ネストされた宣言は、コンテキスト プロパティ連想配列 -(@code{beamExceptions}, @code{keySignature}, @code{timeSignatureSettings} 等) +(@code{beamExceptions}, @code{keyAlterations}, @code{timeSignatureSettings} 等) に対しては機能しません。@c これらのプロパティを変更するには、@c 連想配列として丸ごと再定義するしかありません。} diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index dd6e72cadc..70ffece67e 100644 --- a/Documentation/notation/changing-defaults.itely +++ b/Documentation/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.2" +@c \version "2.19.7" @node Changing defaults @chapter Changing defaults @@ -1939,7 +1939,7 @@ the @code{#}@tie{}character. Contexts properties are usually named in @code{studlyCaps}. They mostly control the translation from -music to notation, e.g. @code{localKeySignature} (for determining +music to notation, e.g. @code{localAlterations} (for determining whether to print accidentals), or @code{measurePosition} (for determining when to print a bar line). Context properties can change value over time while interpreting a piece of music; @@ -2573,7 +2573,7 @@ values. Unless this is the intended result, it is safer to update key-values individually with a nested declaration. @warning{Nested declarations will not work for context property -alists (such as @code{beamExceptions}, @code{keySignature}, +alists (such as @code{beamExceptions}, @code{keyAlterations}, @code{timeSignatureSettings}, etc.). These properties can only be modified by completely re-defining them as alists.} diff --git a/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly b/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly index 88efc8c20f..4deb652211 100644 --- a/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly +++ b/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly @@ -5,7 +5,7 @@ % % This file is in the public domain. %% Note: this file works from version 2.16.0 -\version "2.16.0" +\version "2.19.7" \header { @@ -184,7 +184,7 @@ position of middle C and key signature from @var{translator}'s context." 0)) (set! (ambitus-start-key-sig ambitus) (ly:context-property (ly:translator-context translator) - 'keySignature))))) + 'keyAlterations))))) #(define-method (update-ambitus-notes (ambitus ) note-grob) "Update the upper and lower ambitus pithes of @var{ambitus}, using diff --git a/Documentation/snippets/engravers-one-by-one.ly b/Documentation/snippets/engravers-one-by-one.ly index bae30fb440..68cadaf223 100644 --- a/Documentation/snippets/engravers-one-by-one.ly +++ b/Documentation/snippets/engravers-one-by-one.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.29" +\version "2.19.7" \header { lsrtags = "contexts-and-engravers, specific-notation" @@ -109,7 +109,7 @@ MyStaff = \context { \consists "Pitch_squash_engraver" - localKeySignature = #'() + localAlterations = #'() % explicitly set instrumentName, so we don't get % weird effects when doing instrument names for @@ -135,7 +135,7 @@ MyVoice = \context { You have to instantiate this explicitly if you want to have multiple voices on the same staff." - localKeySignature = #'() + localAlterations = #'() \consists "Font_size_engraver" % must come before all diff --git a/Documentation/snippets/makam-example.ly b/Documentation/snippets/makam-example.ly index b170052daa..0b0b6bba21 100644 --- a/Documentation/snippets/makam-example.ly +++ b/Documentation/snippets/makam-example.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.19.7" \header { lsrtags = "pitches, version-specific, world-music" @@ -23,7 +23,7 @@ details of pitch names and alterations. \include "makam.ly" \relative c' { - \set Staff.keySignature = #`((6 . ,(- KOMA)) (3 . ,BAKIYE)) + \set Staff.keyAlterations = #`((6 . ,(- KOMA)) (3 . ,BAKIYE)) c4 cc db fk gbm4 gfc gfb efk fk4 db cc c diff --git a/Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly b/Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly index 84642a20da..16758381c3 100644 --- a/Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly +++ b/Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.7" \header { @@ -176,7 +176,7 @@ position of middle C and key signature from @var{translator}'s context." 0)) (set! (ambitus-start-key-sig ambitus) (ly:context-property (ly:translator-context translator) - 'keySignature))))) + 'keyAlterations))))) #(define-method (update-ambitus-notes (ambitus ) note-grob) "Update the upper and lower ambitus pithes of @var{ambitus}, using diff --git a/Documentation/snippets/non-traditional-key-signatures.ly b/Documentation/snippets/non-traditional-key-signatures.ly index 188f72b3d6..de513d1681 100644 --- a/Documentation/snippets/non-traditional-key-signatures.ly +++ b/Documentation/snippets/non-traditional-key-signatures.ly @@ -1,28 +1,28 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.dsi.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. -\version "2.16.0" +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.19.7 +\version "2.19.7" \header { lsrtags = "contemporary-notation, pitches, really-cool, staff-notation, version-specific" texidoc = " -The commonly used @code{\\key} command sets the @code{keySignature} +The commonly used @code{\\key} command sets the @code{keyAlterations} property, in the @code{Staff} context. To create non-standard key signatures, set this property directly. The format of this command is a list: -@code{ \\set Staff.keySignature = #`(((octave . step) . alter) ((octave +@code{ \\set Staff.keyAlterations = #`(((octave . step) . alter) ((octave . step) . alter) ...) } where, for each element in the list, @code{octave} specifies the octave (0 being the octave from middle C to the B above), @code{step} specifies the note within the octave (0 means C and 6 means B), and @code{alter} is @code{,SHARP ,FLAT ,DOUBLE-SHARP} -etc. (Note the leading comma.) The accidentals in the key signature -will appear in the reverse order to that in which they are specified. +etc. (Note the leading comma.) Alternatively, for each item in the list, using the more concise format @@ -42,10 +42,11 @@ whole-tone scale: } % begin verbatim + \relative c' { - \set Staff.keySignature = #`(((0 . 6) . ,FLAT) - ((0 . 5) . ,FLAT) - ((0 . 3) . ,SHARP)) + \set Staff.keyAlterations = #`((6 . ,FLAT) + (5 . ,FLAT) + (3 . ,SHARP)) c4 d e fis aes4 bes c2 } diff --git a/input/regression/key-signature-padding.ly b/input/regression/key-signature-padding.ly index 4f46271696..cb7833e4e5 100644 --- a/input/regression/key-signature-padding.ly +++ b/input/regression/key-signature-padding.ly @@ -5,11 +5,11 @@ } -\version "2.17.6" +\version "2.19.7" { \override Staff.KeySignature.padding-pairs = #'((("accidentals.flat" . "accidentals.sharp.slashslash.stemstemstem") . 0.5)) - \set Staff.keySignature = #`((4 . ,FLAT) (6 . ,THREE-Q-SHARP) (2 . ,SEMI-FLAT)) + \set Staff.keyAlterations = #`((4 . ,FLAT) (6 . ,THREE-Q-SHARP) (2 . ,SEMI-FLAT)) e2 } diff --git a/input/regression/key-signature-scordatura-persist.ly b/input/regression/key-signature-scordatura-persist.ly index 6a1e8ffd53..1bae1b68fa 100644 --- a/input/regression/key-signature-scordatura-persist.ly +++ b/input/regression/key-signature-scordatura-persist.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.7" \header { texidoc = "When a custom key signature has entries which are @@ -6,12 +6,12 @@ limited to a particular octave, such alterations should persist indefinitely or until a new key signature is set. Here, only the fis' shows an accidental, since it is outside the -octave defined in @code{keySignature}. +octave defined in @code{keyAlterations}. " } \relative c' { - \set Staff.keySignature = #`(((0 . 3) . ,SHARP) + \set Staff.keyAlterations = #`(((0 . 3) . ,SHARP) ((0 . 5) . ,FLAT) ((0 . 6) . ,FLAT)) fis fis as bes diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index fb51ebaf04..547fe7688e 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,7 +1,7 @@ -\version "2.16.0" +\version "2.19.7" -\header { texidoc = "By setting @code{Staff.keySignature} directly, +\header { texidoc = "By setting @code{Staff.keyAlterations} directly, key signatures can be set invidually per pitch. " @@ -11,9 +11,9 @@ key signatures can be set invidually per pitch. } \relative c' \new Staff { - \set Staff.keySignature = #`(((0 . 3) . ,FLAT) ((1 . 2) . ,SHARP)) + \set Staff.keyAlterations = #`(((0 . 3) . ,FLAT) ((1 . 2) . ,SHARP)) f8 a c e - \set Staff.keySignature = #`(((0 . 4) . ,DOUBLE-SHARP) ((1 . 2) . ,FLAT)) + \set Staff.keyAlterations = #`(((0 . 4) . ,DOUBLE-SHARP) ((1 . 2) . ,FLAT)) e a, g a } diff --git a/input/regression/keys.ly b/input/regression/keys.ly index 46079b264f..3ede492846 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,5 +1,5 @@ -\version "2.17.15" +\version "2.19.7" \header{ texidoc=" Key signatures may appear on key changes, even without a barline. @@ -25,7 +25,7 @@ are created also on a clef change. \break \key bes \major % \major c2 \clef alto c2 \key d \major \clef treble c2 - \set Staff.keySignature = #`((4 . ,FLAT) (6 . ,THREE-Q-SHARP) (2 . ,SEMI-FLAT)) + \set Staff.keyAlterations = #`((4 . ,FLAT) (6 . ,THREE-Q-SHARP) (2 . ,SEMI-FLAT)) e2 } -- 2.39.2