From: Janek Warchoł Date: Wed, 10 Apr 2013 20:22:10 +0000 (+0200) Subject: Rename OctavateEight to ClefModifier X-Git-Tag: release/2.17.18-1~13 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=94dc452301cc0d1e9983f5aeb784884f7fe8c964;p=lilypond.git Rename OctavateEight to ClefModifier Name "OctavateEight" didn't make any sense. The grob doesn't have to be an eight, and it doesn't describe octavation, but arbitrary transposition (not only whole octaves). Also, the name should reflect its affiliation with Clef grob. The name "ClefTransposition" was also considered, but it was decided that it would be too confusing together with clefTransposition, which is a context property. Also change related context properties. --- diff --git a/Documentation/changes.tely b/Documentation/changes.tely index b2b4c51ea0..2c36d2c132 100644 --- a/Documentation/changes.tely +++ b/Documentation/changes.tely @@ -61,6 +61,11 @@ which scares away people. @end ignore +@item +Grob @code{OctavateEight} was renamed to @code{ClefModifier}. +Related context properties were renamed from @code{xxxOctavationyyy} +to @code{xxxTranspositionyyy}. + @item Horizontal space is allowed for tempo and rehearsal marks, so that these marks do not overlap each other. @@ -259,7 +264,7 @@ than@tie{}0. The byte offset (also part of @code{textedit} @acronym{URI}s) still starts at@tie{}0. @item -The @code{\clef} command supports optional octavation: +The @code{\clef} command supports optional transposition: @lilypond[verbatim,quote,relative=1] \clef "treble_(8)" c2 c diff --git a/Documentation/cs/learning/fundamental.itely b/Documentation/cs/learning/fundamental.itely index c4c5e6eeb5..a0eee4d3a1 100644 --- a/Documentation/cs/learning/fundamental.itely +++ b/Documentation/cs/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @c Translators: Pavel Fric @node Základní pojmy @@ -1940,7 +1940,7 @@ während das dazu dient, sie in allen Systemen auszuschalten: >> @end lilypond -Ein anderes Beispiel ist die Eigenschaft @code{clefOctavation}: +Ein anderes Beispiel ist die Eigenschaft @code{clefTransposition}: wenn sie im @code{Score}-Kontext gesetzt wird, ändert sich sofort der Wert der Oktavierung in allen aktuellen Systemen und wird auf einen neuen Wert gesetzt, der sich auf alle Systeme auswirkt. diff --git a/Documentation/de/learning/fundamental.itely b/Documentation/de/learning/fundamental.itely index f53b326965..bd96bfc91f 100644 --- a/Documentation/de/learning/fundamental.itely +++ b/Documentation/de/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @c Translators: Till Paala, Reinhold Kainhofer @node Grundbegriffe @@ -1975,7 +1975,7 @@ während das dazu dient, sie in allen Systemen auszuschalten: >> @end lilypond -Ein anderes Beispiel ist die Eigenschaft @code{clefOctavation}: +Ein anderes Beispiel ist die Eigenschaft @code{clefTransposition}: wenn sie im @code{Score}-Kontext gesetzt wird, ändert sich sofort der Wert der Oktavierung in allen aktuellen Systemen und wird auf einen neuen Wert gesetzt, der sich auf alle Systeme auswirkt. diff --git a/Documentation/de/notation/changing-defaults.itely b/Documentation/de/notation/changing-defaults.itely index b63b85561e..97585267c0 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.17.6" +@c \version "2.17.18" @c Translators: Till Paala @@ -3328,7 +3328,7 @@ jeweiligen Standardeinstellungen der Eigenschaft: @item @code{KeySignature} (Tonart) @tab @code{Staff} @tab @code{begin-of-line-visible} @c omit LeftEdge until it can be explained -td @c @item @code{LeftEdge} @tab @code{Score} @tab @code{center-invisible} -@item @code{OctavateEight} (Oktavierungs-Acht) @tab @code{Staff} @tab @code{begin-of-line-visible} +@item @code{ClefModifier} (Oktavierungs-Acht) @tab @code{Staff} @tab @code{begin-of-line-visible} @item @code{RehearsalMark} (Übungszeichen) @tab @code{Score} @tab @code{end-of-line-invisible} @item @code{TimeSignature} (Taktart) @tab @code{Staff} @tab @code{all-visible} @@ -3485,10 +3485,10 @@ auftreten. @cindex Schlüssel, Sichtbarkeit der Oktavierung Das kleine Oktavierungssymbol von oktavierten Notenschlüsseln -wird durch das @code{OctavateEight}-Layout-Objekt erstellt. +wird durch das @code{ClefModifier}-Layout-Objekt erstellt. Seine Sichtbarkeit wird automatisch vom @code{Clef}-Objekt geerbt, sodass Veränderungen von @code{break-visibility} -des @code{OctavateEight}-Layout-Objekts nicht auch noch +des @code{ClefModifier}-Layout-Objekts nicht auch noch für unsichtbare Schlüssel zusätzlich vorgenommen werden müssen. Bei expliziten Schlüsseländerungn kontrolliert die diff --git a/Documentation/de/notation/pitches.itely b/Documentation/de/notation/pitches.itely index 5c59324229..70129c81c7 100644 --- a/Documentation/de/notation/pitches.itely +++ b/Documentation/de/notation/pitches.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.18" @c Translators: Till Paala @@ -1230,7 +1230,7 @@ Schnipsel: Referenz der Interna: @rinternals{Clef_engraver}, @rinternals{Clef}, -@rinternals{OctavateEight}, +@rinternals{ClefModifier}, @rinternals{clef-interface}. diff --git a/Documentation/de/notation/vocal.itely b/Documentation/de/notation/vocal.itely index 8c42e5b442..2a9bf9157a 100644 --- a/Documentation/de/notation/vocal.itely +++ b/Documentation/de/notation/vocal.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @c Translators: Till Paala @@ -2559,7 +2559,7 @@ der Figur angezeigt werden kann. #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) (shortInstrumentName . "Kas.") (clefGlyph . "clefs.G") - (clefOctavation . -7) + (clefTransposition . -7) (middleCPosition . 1) (clefPosition . -2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Kaspar")) @@ -2569,7 +2569,7 @@ der Figur angezeigt werden kann. #`((instrumentTransposition . ,(ly:make-pitch 0 0 0)) (shortInstrumentName . "Mel.") (clefGlyph . "clefs.F") - (clefOctavation . 0) + (clefTransposition . 0) (middleCPosition . 6) (clefPosition . 2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Melchior")) diff --git a/Documentation/de/texidocs/tweaking-clef-properties.texidoc b/Documentation/de/texidocs/tweaking-clef-properties.texidoc index 70ec26012b..c2ea8011be 100644 --- a/Documentation/de/texidocs/tweaking-clef-properties.texidoc +++ b/Documentation/de/texidocs/tweaking-clef-properties.texidoc @@ -4,7 +4,7 @@ Der Befehl @code{\\clef \"treble_8\"} ist gleichbedeutend mit einem expliziten Setzen der Eigenschaften von @code{clefGlyph}, @code{clefPosition} (welche die vertikale Position des Schlüssels bestimmt), -@code{middleCPosition} und @code{clefOctavation}. Ein Schlüssel wird +@code{middleCPosition} und @code{clefTransposition}. Ein Schlüssel wird ausgegeben, wenn eine der Eigenschaften außer @code{middleCPosition} sich ändert. @@ -14,7 +14,7 @@ auf dem System: das geschieht nur, wenn auch die Position des eingestrichenen@tie{}C (middleCPosition) angegeben wird. Die Positionsparameter sind relativ zur Mittellinie des Systems, dabei versetzen positive Zahlen die Position nach oben, jeweils eine Zahl für jede Linie -plus Zwischenraum. Der @code{clefOctavation}-Wert ist normalerweise auf 7, +plus Zwischenraum. Der @code{clefTransposition}-Wert ist normalerweise auf 7, -7, 15 oder -15 gesetzt, aber auch andere Werte sind gültig. Wenn ein Schlüsselwechsel an einem Zeilenwechsel geschieht, wird das neue diff --git a/Documentation/es/learning/fundamental.itely b/Documentation/es/learning/fundamental.itely index e597399536..0dd7c709d0 100644 --- a/Documentation/es/learning/fundamental.itely +++ b/Documentation/es/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @node Conceptos fundamentales @@ -1879,7 +1879,7 @@ y esto los desactivará en todos los pentagramas: >> @end lilypond -Como un ejemplo más, si se establece @code{clefOctavation} dentro del +Como un ejemplo más, si se establece @code{clefTransposition} dentro del contexto de @code{Score}, éste cambia inmediatamente el valor de la octavación en todos los pentagramas en curso y establece un nuevo valor predeterminado que se aplicará a todos los pentagramas. diff --git a/Documentation/es/notation/changing-defaults.itely b/Documentation/es/notation/changing-defaults.itely index 466ee24080..7ec80fbc1e 100644 --- a/Documentation/es/notation/changing-defaults.itely +++ b/Documentation/es/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Translation of GIT committish: 91aeca2562af49ff24110e923d5196bebd95f372 Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.18" @node Cambiar los valores por omisión @chapter Cambiar los valores por omisión @@ -3324,7 +3324,7 @@ de presentación de interés que resultan afectados por @item @code{KeySignature} @tab @code{Staff} @tab @code{begin-of-line-visible} @c omit LeftEdge until it can be explained -td @c @item @code{LeftEdge} @tab @code{Score} @tab @code{center-invisible} -@item @code{OctavateEight} @tab @code{Staff} @tab @code{begin-of-line-visible} +@item @code{ClefModifier} @tab @code{Staff} @tab @code{begin-of-line-visible} @item @code{RehearsalMark} @tab @code{Score} @tab @code{end-of-line-invisible} @item @code{TimeSignature} @tab @code{Staff} @tab @code{all-visible} @@ -3357,7 +3357,7 @@ línea a no ser que su valor establecido sea distinto de 1. se suprimen por completo. Utilice begin-of line-invisible para imprimirlas y all-invisible para suprimirlas. @item Armadura: véase más abajo -@item OctavateEight: véase más abajo +@item ClefModifier: véase más abajo @end itemize @@ -3499,11 +3499,11 @@ explícitas. @cindex claves, visibilidad de la octavación El pequeño símbolo de octava sobre las claves en octava alta o baja se -produce por parte del objeto @code{OctavateEight}. Su visibilidad se +produce por parte del objeto @code{ClefModifier}. Su visibilidad se hereda automáticamente de la del objeto @code{Clef}, así que no es necesario aplicar las sobreescrituras correspondientes @code{break-visibility} a los objetos -@code{OctavateEight} para suprimir los símbolos de octavación +@code{ClefModifier} para suprimir los símbolos de octavación para las claves invisibles. Para los cambios de clave explícitos, la propiedad diff --git a/Documentation/es/notation/pitches.itely b/Documentation/es/notation/pitches.itely index 6c2513ed7a..14fb61f468 100644 --- a/Documentation/es/notation/pitches.itely +++ b/Documentation/es/notation/pitches.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.18" @node Alturas @@ -1209,19 +1209,19 @@ Fragmentos de código: Referencia de funcionamiento interno: @rinternals{Clef_engraver}, @rinternals{Clef}, -@rinternals{OctavateEight}, +@rinternals{ClefModifier}, @rinternals{clef-interface}. @knownissues Los números de octavación adjuntos a las claves se tratan como grobs distintos. Así pues, cualquier @code{\override} (sobreescritura) efectuada al objeto @var{Clef} deberá aplicarse -también al grob @var{OctavateEight} como un @code{\override} +también al grob @var{ClefModifier} como un @code{\override} diferente. @lilypond[fragment,quote,relative=1] \new Staff \with { - \override OctavateEight.color = #red + \override ClefModifier.color = #red \override Clef.color = #blue } diff --git a/Documentation/es/notation/vocal.itely b/Documentation/es/notation/vocal.itely index e617026ace..12b63fd7b0 100644 --- a/Documentation/es/notation/vocal.itely +++ b/Documentation/es/notation/vocal.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @node Música vocal @section Música vocal @@ -2566,7 +2566,7 @@ usar @code{\instrumentSwitch} para indicar cada uno de los cambios. #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) (shortInstrumentName . "Kas.") (clefGlyph . "clefs.G") - (clefOctavation . -7) + (clefTransposition . -7) (middleCPosition . 1) (clefPosition . -2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Kaspar")) @@ -2576,7 +2576,7 @@ usar @code{\instrumentSwitch} para indicar cada uno de los cambios. #`((instrumentTransposition . ,(ly:make-pitch 0 0 0)) (shortInstrumentName . "Mel.") (clefGlyph . "clefs.F") - (clefOctavation . 0) + (clefTransposition . 0) (middleCPosition . 6) (clefPosition . 2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Melchior")) diff --git a/Documentation/es/texidocs/tweaking-clef-properties.texidoc b/Documentation/es/texidocs/tweaking-clef-properties.texidoc index 1cf4720d0f..50124fbbb4 100644 --- a/Documentation/es/texidocs/tweaking-clef-properties.texidoc +++ b/Documentation/es/texidocs/tweaking-clef-properties.texidoc @@ -4,7 +4,7 @@ La instrucción @code{\\clef \"treble_8\"} equivale a un ajuste de @code{clefGlyph}, @code{clefPosition} (que controla la posición vertical de la clave), @code{middleCPosition} y -@code{clefOctavation}. Se imprime una clave cada vez que se +@code{clefTransposition}. Se imprime una clave cada vez que se modifica cualquiera de las propiedades excepto @code{middleCPosition}. @@ -14,7 +14,7 @@ notas del pentagrama: para hacer esto también se debe especificar la posición del Do central. Los parámetros posicionales están en relación con la tercera línea del pentagrama, los números positivos desplazan hacia arriba, contando una unidad por cada -línea y espacio. El valor de @code{clefOctavation} se +línea y espacio. El valor de @code{clefTransposition} se establecería normalmente a 7, -7, 15 or -15, pero son válidos otros valores. diff --git a/Documentation/fr/learning/fundamental.itely b/Documentation/fr/learning/fundamental.itely index 1fb40d7459..d0e4523ec8 100644 --- a/Documentation/fr/learning/fundamental.itely +++ b/Documentation/fr/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: John Mandereau @@ -1851,7 +1851,7 @@ et pour toutes les portées : >> @end lilypond -Autre exemple, si la propriété @code{clefOctavation} est déterminée au +Autre exemple, si la propriété @code{clefTransposition} est déterminée au niveau du contexte @code{Score}, elle modifiera la valeur de l'octave en cours pour toutes les portées actives ; cette valeur sera considérée comme étant la nouvelle valeur par défaut pour toutes les portées à diff --git a/Documentation/fr/notation/changing-defaults.itely b/Documentation/fr/notation/changing-defaults.itely index 5aaeb12f52..7778c040f5 100644 --- a/Documentation/fr/notation/changing-defaults.itely +++ b/Documentation/fr/notation/changing-defaults.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.18" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: Gilles Thibault @@ -3494,7 +3494,7 @@ ces réglages par défaut. @item @code{KeySignature} @tab @code{Staff} @tab @code{begin-of-line-visible} @c omit LeftEdge until it can be explained -td @c @item @code{LeftEdge} @tab @code{Score} @tab @code{center-invisible} -@item @code{OctavateEight} @tab @code{Staff} @tab @code{begin-of-line-visible} +@item @code{ClefModifier} @tab @code{Staff} @tab @code{begin-of-line-visible} @item @code{RehearsalMark} @tab @code{Score} @tab @code{end-of-line-invisible} @item @code{TimeSignature} @tab @code{Staff} @tab @code{all-visible} @@ -3636,9 +3636,9 @@ intervenir qu'à l'occasion d'un @code{\bar} explicite. @cindex clef, visibilité de l'octaviation L'indication d'octaviation d'une clef est produite par l'objet de rendu -@code{OctavateEight}. Sa visibilité étant gérée par héritage direct de +@code{ClefModifier}. Sa visibilité étant gérée par héritage direct de l'objet @code{Clef}, nul n'est besoin de forcer un quelconque -@code{break-visibility} au niveau des objets @code{OctavateEight} pour +@code{break-visibility} au niveau des objets @code{ClefModifier} pour éliminer une indication d'octaviation lorsque la clef est invisible. Lors d'un changement explicite de clef, la propriété diff --git a/Documentation/fr/notation/pitches.itely b/Documentation/fr/notation/pitches.itely index dd75e7f743..73238e6e82 100644 --- a/Documentation/fr/notation/pitches.itely +++ b/Documentation/fr/notation/pitches.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.18" @c Translators: Frédéric Chiasson @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude @@ -1178,18 +1178,18 @@ Morceaux choisis: Référence des propriétés internes : @rinternals{Clef_engraver}, @rinternals{Clef}, -@rinternals{OctavateEight}, +@rinternals{ClefModifier}, @rinternals{clef-interface}. @knownissues L'indicateur d'octaviation attaché à la clef est un objet graphique en lui même. Par voie de conséquence, tout @code{\override} affectant l'objet @code{Clef} devra être manuellement répercuté sur l'objet -@code{OctavateEight}. +@code{ClefModifier}. @lilypond[fragment,quote,relative=1] \new Staff \with { - \override OctavateEight.color = #red + \override ClefModifier.color = #red \override Clef.color = #blue } diff --git a/Documentation/fr/notation/vocal.itely b/Documentation/fr/notation/vocal.itely index 8ff1d5998e..1bea70ebdd 100644 --- a/Documentation/fr/notation/vocal.itely +++ b/Documentation/fr/notation/vocal.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: Jean-Jacques Gerbaud @@ -2587,7 +2587,7 @@ définition d'un @qq{instrument} pour chacun des rôles en question : #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) (shortInstrumentName . "Kas.") (clefGlyph . "clefs.G") - (clefOctavation . -7) + (clefTransposition . -7) (middleCPosition . 1) (clefPosition . -2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Kaspar")) @@ -2597,7 +2597,7 @@ définition d'un @qq{instrument} pour chacun des rôles en question : #`((instrumentTransposition . ,(ly:make-pitch 0 0 0)) (shortInstrumentName . "Mel.") (clefGlyph . "clefs.F") - (clefOctavation . 0) + (clefTransposition . 0) (middleCPosition . 6) (clefPosition . 2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Melchior")) diff --git a/Documentation/fr/texidocs/tweaking-clef-properties.texidoc b/Documentation/fr/texidocs/tweaking-clef-properties.texidoc index f77d013490..ec5b16bfd0 100644 --- a/Documentation/fr/texidocs/tweaking-clef-properties.texidoc +++ b/Documentation/fr/texidocs/tweaking-clef-properties.texidoc @@ -2,7 +2,7 @@ texidocfr = " La commande @code{\\clef \"treble_8\"} équivaut à définir @code{clefGlyph}, @code{clefPosition} -- qui contrôle la position verticale de la clef -- -@code{middleCPosition} et @code{clefOctavation}. Une clef est imprimée +@code{middleCPosition} et @code{clefTransposition}. Une clef est imprimée lorsque l'une de ces propriétés, hormis @code{middleCPosition}, est modifiée. Les exemples suivant font apparaître des possibilités de réglage manuel de ces propriétés. @@ -11,7 +11,7 @@ Modifier le glyphe, la position de la clef ou son octaviation ne changera pas la position des notes ; il faut pour y parvenir modifier aussi la position du do médium. Le positionnement est relatif à la ligne médiane, un nombre positif faisant monter, chaque ligne ou -interligne comptant pour 1. La valeur de @code{clefOctavation} +interligne comptant pour 1. La valeur de @code{clefTransposition} devrait être de 7, -7, 15 ou -15, bien que rien n'empêche de lui affecter une autre valeur. diff --git a/Documentation/hu/learning/fundamental.itely b/Documentation/hu/learning/fundamental.itely index eac8db8e06..39a50e5f6e 100644 --- a/Documentation/hu/learning/fundamental.itely +++ b/Documentation/hu/learning/fundamental.itely @@ -10,7 +10,7 @@ @c -*- coding: utf-8; mode: texinfo; -*- -@c \version "2.17.11" +@c \version "2.17.18" @node Alapfogalmak @chapter Alapfogalmak @translationof Fundamental concepts @@ -1939,7 +1939,7 @@ and this turns them off in all staves: >> @end lilypond -As another example, if @code{clefOctavation} is set in +As another example, if @code{clefTransposition} is set in the @code{Score} context this immediately changes the value of the octavation in all current staves and sets a new default value which will be applied to all staves. diff --git a/Documentation/it/learning/fundamental.itely b/Documentation/it/learning/fundamental.itely index fba872ecbc..5d8feca337 100644 --- a/Documentation/it/learning/fundamental.itely +++ b/Documentation/it/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @node Concetti fondamentali @chapter Concetti fondamentali @@ -1799,7 +1799,7 @@ e in questo modo si disattiva in tutti i righi: >> @end lilypond -Un altro esempio: se la proprietà @code{clefOctavation} viene posta +Un altro esempio: se la proprietà @code{clefTransposition} viene posta nel contesto @code{Score}, cambia immediatamente il valore dell'ottavazione in tutti i righi presenti e imposta un nuovo valore predefinito che sarà applicato a tutti i righi. diff --git a/Documentation/it/notation/pitches.itely b/Documentation/it/notation/pitches.itely index b3dd3c025b..68cc589f9f 100644 --- a/Documentation/it/notation/pitches.itely +++ b/Documentation/it/notation/pitches.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.18" @node Altezze @@ -1201,17 +1201,17 @@ Frammenti di codice: Guida al funzionamento interno: @rinternals{Clef_engraver}, @rinternals{Clef}, -@rinternals{OctavateEight}, +@rinternals{ClefModifier}, @rinternals{clef-interface}. @knownissues I numeri di ottavazione assegnati alle chiavi sono trattati come oggetti grafici separati. Quindi qualsiasi @code{\override} all'oggetto @var{Clef} dovrà essere -applicato, con un altro @code{\override}, all'oggetto @var{OctavateEight}. +applicato, con un altro @code{\override}, all'oggetto @var{ClefModifier}. @lilypond[fragment,quote,relative=1] \new Staff \with { - \override OctavateEight.color = #red + \override ClefModifier.color = #red \override Clef.color = #blue } diff --git a/Documentation/it/texidocs/tweaking-clef-properties.texidoc b/Documentation/it/texidocs/tweaking-clef-properties.texidoc index e5576b0d06..c914cd6cc7 100644 --- a/Documentation/it/texidocs/tweaking-clef-properties.texidoc +++ b/Documentation/it/texidocs/tweaking-clef-properties.texidoc @@ -3,7 +3,7 @@ Il comando @code{\\clef \"treble_8\"} equivale a impostare @code{clefGlyph}, @code{clefPosition} (che regola la posizione verticale della chiave), @code{middleCPosition} e -@code{clefOctavation}. Viene stampata una chiave quando cambia una +@code{clefTransposition}. Viene stampata una chiave quando cambia una di queste proprietà, eccetto @code{middleCPosition}. @@ -13,7 +13,7 @@ note che seguono sul rigo: bisogna anche specificare la posizione del Do centrale (middle C). I parametri di posizione sono relativi alla linea centrale del rigo, con i numeri positivi che indicano la parte superiore: ogni linea e spazio valgono uno. Il valore -@code{clefOctavation} di norma è impostato su 7, -7, 15 +@code{clefTransposition} di norma è impostato su 7, -7, 15 o -15, ma altri valori sono considerati validi. diff --git a/Documentation/ja/learning/fundamental.itely b/Documentation/ja/learning/fundamental.itely index 0bf2b28094..8072307308 100644 --- a/Documentation/ja/learning/fundamental.itely +++ b/Documentation/ja/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -1873,7 +1873,7 @@ LilyPond 入力ファイルに対する特別なサポートを持つ@c >> @end lilypond -他の例としては、@code{clefOctavation} が @code{Score} コンテキストに@c +他の例としては、@code{clefTransposition} が @code{Score} コンテキストに@c セットされた場合、直ちにすべての譜でのオクターブの値を変更し、すべての譜に@c 適用される新しいデフォルト値をセットします。 diff --git a/Documentation/ja/notation/changing-defaults.itely b/Documentation/ja/notation/changing-defaults.itely index d698a9d526..41441866bb 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.17.6" +@c \version "2.17.18" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -3445,7 +3445,7 @@ a1 @item @code{KeySignature} @tab @code{Staff} @tab @code{begin-of-line-visible} @c omit LeftEdge until it can be explained -td @c @item @code{LeftEdge} @tab @code{Score} @tab @code{center-invisible} -@item @code{OctavateEight} @tab @code{Staff} @tab @code{begin-of-line-visible} +@item @code{ClefModifier} @tab @code{Staff} @tab @code{begin-of-line-visible} @item @code{RehearsalMark} @tab @code{Score} @tab @code{end-of-line-invisible} @item @code{TimeSignature} @tab @code{Staff} @tab @code{all-visible} @@ -3480,7 +3480,7 @@ f4 g a b 描画するには @code{begin-of-line-invisible} を用い、@c 描画しないのなら @code{all-invisible} を用います。 @item Key signature -- 以下を参照してください -@item OctavateEight -- 以下を参照してください +@item ClefModifier -- 以下を参照してください @end itemize @node 特別な考慮を必要とするもの @@ -3615,16 +3615,16 @@ f4 g a b @subsubsubheading オクターブ移調付きの音部記号 -@cindex octavated clefs, visibility of (オクターブ移調付きの音部記号の可視性) -@cindex visibility of octavated clefs (オクターブ移調付きの音部記号の可視性) -@cindex clefs, visibility of octavation (オクターブ移調付きの音部記号の可視性) +@cindex transposed clefs, visibility of (オクターブ移調付きの音部記号の可視性) +@cindex visibility of transposed clefs (オクターブ移調付きの音部記号の可視性) +@cindex clefs, visibility of transposition (オクターブ移調付きの音部記号の可視性) オクターブ移調付きの音部記号上の小さなオクターブ記号は -@code{OctavateEight} レイアウト オブジェクトによって作り出されます。@c +@code{ClefModifier} レイアウト オブジェクトによって作り出されます。@c このオブジェクトの可視性は @code{Clef} オブジェクトの可視性とは独立して制御されます。@c そのため、各行の先頭においてそのような音部記号を完全に消そうとするなら、@c -@code{Clef} オブジェクトと @code{OctavateEight} オブジェクトの両方に対して@c +@code{Clef} オブジェクトと @code{ClefModifier} オブジェクトの両方に対して@c 必要な @code{break-visibility} のオーバライドを行う必要があります。 明示的な音部記号の変更では、@c diff --git a/Documentation/ja/notation/pitches.itely b/Documentation/ja/notation/pitches.itely index 967daa2a1a..eb6713859b 100644 --- a/Documentation/ja/notation/pitches.itely +++ b/Documentation/ja/notation/pitches.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.18" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -1213,19 +1213,19 @@ c2 c 内部リファレンス: @rinternals{Clef_engraver}, @rinternals{Clef}, -@rinternals{OctavateEight}, +@rinternals{ClefModifier}, @rinternals{clef-interface} @knownissues 音部記号に付けるオクターブ移動の数字は、個別のグラフィカル オブジェクト@c として扱われます。@c このため、@var{Clef} に適用される @code{\override} は、@c -別の @code{\override} で @var{OctavateEight} グラフィカル オブジェクトに@c +別の @code{\override} で @var{ClefModifier} グラフィカル オブジェクトに@c 適用する必要があります。 @lilypond[fragment,quote,relative=1] \new Staff \with { - \override OctavateEight.color = #red + \override ClefModifier.color = #red \override Clef.color = #blue } diff --git a/Documentation/ja/notation/vocal.itely b/Documentation/ja/notation/vocal.itely index ab1ee2d41e..884b10e50f 100644 --- a/Documentation/ja/notation/vocal.itely +++ b/Documentation/ja/notation/vocal.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -2523,7 +2523,7 @@ c c c #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) (shortInstrumentName . "Kas.") (clefGlyph . "clefs.G") - (clefOctavation . -7) + (clefTransposition . -7) (middleCPosition . 1) (clefPosition . -2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Kaspar")) @@ -2533,7 +2533,7 @@ c c c #`((instrumentTransposition . ,(ly:make-pitch 0 0 0)) (shortInstrumentName . "Mel.") (clefGlyph . "clefs.F") - (clefOctavation . 0) + (clefTransposition . 0) (middleCPosition . 6) (clefPosition . 2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Melchior")) diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely index 7e9e60821b..380bc500de 100644 --- a/Documentation/learning/fundamental.itely +++ b/Documentation/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @node Fundamental concepts @chapter Fundamental concepts @@ -1792,9 +1792,9 @@ and this turns them off in all staves: >> @end lilypond -As another example, if @code{clefOctavation} is set in +As another example, if @code{clefTransposition} is set in the @code{Score} context this immediately changes the value -of the octavation in all current staves and sets a new default +of the transposition in all current staves and sets a new default value which will be applied to all staves. The opposite command, @code{\unset}, effectively removes the diff --git a/Documentation/nl/learning/fundamental.itely b/Documentation/nl/learning/fundamental.itely index 967bd3c862..8532ee4dcb 100644 --- a/Documentation/nl/learning/fundamental.itely +++ b/Documentation/nl/learning/fundamental.itely @@ -12,7 +12,7 @@ @c Translation checker: @c Translation checker committish: -@c \version "2.17.11" +@c \version "2.17.18" @node Fundamentele concepten @translationof Fundamental concepts @@ -1817,9 +1817,9 @@ and this turns them off in all staves: >> @end lilypond -As another example, if @code{clefOctavation} is set in +As another example, if @code{clefTransposition} is set in the @code{Score} context this immediately changes the value -of the octavation in all current staves and sets a new default +of the transposition in all current staves and sets a new default value which will be applied to all staves. The opposite command, @code{\unset}, effectively removes the diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index 03727fedd6..5a364f134d 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.17.6" +@c \version "2.17.18" @node Changing defaults @chapter Changing defaults @@ -3283,7 +3283,7 @@ default setting of this property: @item @code{KeySignature} @tab @code{Staff} @tab @code{begin-of-line-visible} @c omit LeftEdge until it can be explained -td @c @item @code{LeftEdge} @tab @code{Score} @tab @code{center-invisible} -@item @code{OctavateEight} @tab @code{Staff} @tab @code{begin-of-line-visible} +@item @code{ClefModifier} @tab @code{Staff} @tab @code{begin-of-line-visible} @item @code{RehearsalMark} @tab @code{Score} @tab @code{end-of-line-invisible} @item @code{TimeSignature} @tab @code{Staff} @tab @code{all-visible} @@ -3316,7 +3316,7 @@ line unless it is set to be different from 1. suppressed. Use begin-of line-invisible to print and all-invisible to suppress. @item Key signature -- see below -@item OctavateEight -- see below +@item ClefModifier -- see below @end itemize @node Special considerations @@ -3445,20 +3445,20 @@ occur only at explicit @code{\bar} commands. @c TODO Add example -@subsubsubheading Octavated clefs +@subsubsubheading Transposed clefs -@cindex octavated clefs, visibility of -@cindex visibility of octavated clefs -@cindex clefs, visibility of octavation +@cindex transposed clefs, visibility of +@cindex visibility of transposed clefs +@cindex clefs, visibility of transposition -The small octavation symbol on octavated clefs is produced by the -@code{OctavateEight} layout object. Its visibility is automatically +The small transposition symbol on transposed clefs is produced by the +@code{ClefModifier} layout object. Its visibility is automatically inherited from the @code{Clef} object, so it is not necessary to apply -any required @code{break-visibility} overrides to the @code{OctavateEight} -layout objects to suppress octavation symbols for invisible clefs. +any required @code{break-visibility} overrides to the @code{ClefModifier} +layout objects to suppress transposition symbols for invisible clefs. For explicit clef changes, the @code{explicitClefVisibility} -property controls both the clef symbol and any octavation symbol +property controls both the clef symbol and any transposition symbol associated with it. @seealso diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely index baf0b95d59..ae9f68c332 100644 --- a/Documentation/notation/pitches.itely +++ b/Documentation/notation/pitches.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.18" @node Pitches @@ -1222,18 +1222,18 @@ Snippets: Internals Reference: @rinternals{Clef_engraver}, @rinternals{Clef}, -@rinternals{OctavateEight}, +@rinternals{ClefModifier}, @rinternals{clef-interface}. @knownissues Ottavation numbers attached to clefs are treated as separate grobs. So any @code{\override} done to the @var{Clef} will also need to be -applied, as a separate @code{\override}, to the @var{OctavateEight} +applied, as a separate @code{\override}, to the @var{ClefModifier} grob. @lilypond[fragment,quote,relative=1] \new Staff \with { - \override OctavateEight.color = #red + \override ClefModifier.color = #red \override Clef.color = #blue } diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely index 3e4d3fd11e..54a6569591 100644 --- a/Documentation/notation/vocal.itely +++ b/Documentation/notation/vocal.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.11" +@c \version "2.17.18" @node Vocal music @section Vocal music @@ -2497,7 +2497,7 @@ indicate each change. #`((instrumentTransposition . ,(ly:make-pitch -1 0 0)) (shortInstrumentName . "Kas.") (clefGlyph . "clefs.G") - (clefOctavation . -7) + (clefTransposition . -7) (middleCPosition . 1) (clefPosition . -2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Kaspar")) @@ -2507,7 +2507,7 @@ indicate each change. #`((instrumentTransposition . ,(ly:make-pitch 0 0 0)) (shortInstrumentName . "Mel.") (clefGlyph . "clefs.F") - (clefOctavation . 0) + (clefTransposition . 0) (middleCPosition . 6) (clefPosition . 2) (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Melchior")) diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly index d4adb18f97..0526c67876 100644 --- a/Documentation/snippets/tweaking-clef-properties.ly +++ b/Documentation/snippets/tweaking-clef-properties.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.18" \header { lsrtags = "pitches, staff-notation, tweaks-and-overrides" @@ -13,7 +13,7 @@ The command @code{\\clef \"treble_8\"} is equivalent to setting @code{clefGlyph}, @code{clefPosition} (which controls the vertical position of the clef), @code{middleCPosition} and -@code{clefOctavation}. A clef is printed when any of the properties +@code{clefTransposition}. A clef is printed when any of the properties except @code{middleCPosition} are changed. @@ -22,7 +22,7 @@ octavation does not in itself change the position of subsequent notes on the staff: the position of middle C must also be specified to do this. The positional parameters are relative to the staff center line, positive numbers displacing upwards, counting one for each line and -space. The @code{clefOctavation} value would normally be set to 7, -7, +space. The @code{clefTransposition} value would normally be set to 7, -7, 15 or -15, but other values are valid. @@ -62,12 +62,12 @@ line, they do not. % The standard choral tenor clef \set Staff.clefGlyph = #"clefs.G" \set Staff.clefPosition = #-2 - \set Staff.clefOctavation = #-7 + \set Staff.clefTransposition = #-7 \set Staff.middleCPosition = #1 c'1 % A non-standard clef \set Staff.clefPosition = #0 - \set Staff.clefOctavation = #0 + \set Staff.clefTransposition = #0 \set Staff.middleCPosition = #-4 c'1 \break @@ -81,9 +81,9 @@ line, they do not. c'1 \set Staff.clefGlyph = #"clefs.C" c'1 - \set Staff.clefOctavation = #7 + \set Staff.clefTransposition = #7 c'1 - \set Staff.clefOctavation = #0 + \set Staff.clefTransposition = #0 \set Staff.clefPosition = #0 c'1 diff --git a/input/regression/clef-oct-visibility.ly b/input/regression/clef-oct-visibility.ly deleted file mode 100644 index c4cfe40992..0000000000 --- a/input/regression/clef-oct-visibility.ly +++ /dev/null @@ -1,28 +0,0 @@ -\version "2.17.6" - -\header { - - texidoc = "Octavation signs may be added to clefs. By default, -their break-visibility is derived from the associated clef, but it may -be overridden explicitly. The initial treble_8 clef should not have an -8, while the treble_8 clef after the tenor clef should. -These settings also need to apply to clefs on new lines." - -} -\layout { ragged-right = ##t } - - -\relative c' { - \override Staff.OctavateEight.break-visibility = #all-invisible - - \clef "treble_8" - c2 c | - c c | \break - c \clef "tenor" c | - \revert Staff.OctavateEight.break-visibility - \clef "treble_8" - c2 c | - c c | \break - c c -} - diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly deleted file mode 100644 index f34eae1228..0000000000 --- a/input/regression/clef-oct.ly +++ /dev/null @@ -1,29 +0,0 @@ - -\version "2.16.0" \header { - - texidoc = "Octavation signs may be added to clefs. These -octavation signs may be placed below or above (meaning an octave -higher or lower), and can take any value, including 15 for two octaves." - -} -\layout { ragged-right = ##t } - - -\relative c'' { - - \clef "G_8" - c4 - \clef "G_15" - c4 - \clef "G_7" - c4 - \clef "G_6" - c4 - \clef "G^8" - c4 - \clef "G^15" - c4 - \clef "G^9" - c4 -} - diff --git a/input/regression/clef-octavation.ly b/input/regression/clef-octavation.ly deleted file mode 100644 index c89a547979..0000000000 --- a/input/regression/clef-octavation.ly +++ /dev/null @@ -1,18 +0,0 @@ -\version "2.16.0" - -\header { - - texidoc="Octavate symbols should be correctly positioned close to -the parent clef." - -} -\score { - << - \new Staff { \clef "G^8" g''1 } - \new Staff { \clef "F^8" c'1 } - \new Staff { \clef "C^8" c''1 } - \new Staff { \clef "G_8" g1 } - \new Staff { \clef "F_8" c,1 } - \new Staff { \clef "C_8" c1 } - >> -} diff --git a/input/regression/clef-optional-octavation.ly b/input/regression/clef-optional-octavation.ly deleted file mode 100644 index 93d60db8f4..0000000000 --- a/input/regression/clef-optional-octavation.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "2.17.7" - -\header { - - texidoc="Octavate symbols may be parenthesized or bracketed by using -parentheses or brackets in the command string." - -} -\score { - \new Staff { - \clef "G^(8)" g''1 | - \clef "bass_[15]" c,,1 | - \clef "C^(8)" c''1 - } -} diff --git a/input/regression/clef-transposition-optional.ly b/input/regression/clef-transposition-optional.ly new file mode 100644 index 0000000000..c7bc4f0d74 --- /dev/null +++ b/input/regression/clef-transposition-optional.ly @@ -0,0 +1,15 @@ +\version "2.17.7" + +\header { + + texidoc="Clef transposition symbols may be parenthesized or +bracketed by using parentheses or brackets in the command string." + +} +\score { + \new Staff { + \clef "G^(8)" g''1 | + \clef "bass_[15]" c,,1 | + \clef "C^(8)" c''1 + } +} diff --git a/input/regression/clef-transposition-placement.ly b/input/regression/clef-transposition-placement.ly new file mode 100644 index 0000000000..119e00a903 --- /dev/null +++ b/input/regression/clef-transposition-placement.ly @@ -0,0 +1,18 @@ +\version "2.16.0" + +\header { + + texidoc="Transposition symbols should be correctly positioned +close to the parent clef." + +} +\score { + << + \new Staff { \clef "G^8" g''1 } + \new Staff { \clef "F^8" c'1 } + \new Staff { \clef "C^8" c''1 } + \new Staff { \clef "G_8" g1 } + \new Staff { \clef "F_8" c,1 } + \new Staff { \clef "C_8" c1 } + >> +} diff --git a/input/regression/clef-transposition-visibility.ly b/input/regression/clef-transposition-visibility.ly new file mode 100644 index 0000000000..ab82c493b1 --- /dev/null +++ b/input/regression/clef-transposition-visibility.ly @@ -0,0 +1,28 @@ +\version "2.17.18" + +\header { + + texidoc = "Clefs may be transposed. By default, break-visibility +of ClefModifiers is derived from the associated clef, but it may +be overridden explicitly. The initial treble_8 clef should not have an +8, while the treble_8 clef after the tenor clef should. +These settings also need to apply to clefs on new lines." + +} +\layout { ragged-right = ##t } + + +\relative c' { + \override Staff.ClefModifier.break-visibility = #all-invisible + + \clef "treble_8" + c2 c | + c c | \break + c \clef "tenor" c | + \revert Staff.ClefModifier.break-visibility + \clef "treble_8" + c2 c | + c c | \break + c c +} + diff --git a/input/regression/clef-transposition.ly b/input/regression/clef-transposition.ly new file mode 100644 index 0000000000..d2ff5730aa --- /dev/null +++ b/input/regression/clef-transposition.ly @@ -0,0 +1,28 @@ + +\version "2.16.0" \header { + + texidoc = "Clefs may be transposed up or down +by arbitrary amount, including 15 for two octaves." + +} +\layout { ragged-right = ##t } + + +\relative c'' { + + \clef "G_8" + c4 + \clef "G_15" + c4 + \clef "G_7" + c4 + \clef "G_6" + c4 + \clef "G^8" + c4 + \clef "G^15" + c4 + \clef "G^9" + c4 +} + diff --git a/input/regression/cue-clef-octavation.ly b/input/regression/cue-clef-octavation.ly deleted file mode 100644 index 73e3302572..0000000000 --- a/input/regression/cue-clef-octavation.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.16.0" - -\header { - texidoc = "Octavation for clefs for cue notes." -} - -vI = \relative c'' { \clef "treble" \repeat unfold 40 g4 } -\addQuote vIQuote { \vI } - -Solo = \relative c' { - \clef "treble_8" c1 | - \cueDuringWithClef #"vIQuote" #UP #"bass^8" { R1 } | - c1 | \break - c c - \clef "bass^8" c1 | - \cueDuringWithClef #"vIQuote" #UP #"treble_8" { R1 R1 } | - c - \cueDuringWithClef #"vIQuote" #UP #"treble_8" { R1 \break R } | - c -} - -\score { - << - \new Staff \new Voice \Solo - >> -} diff --git a/input/regression/cue-clef-optional-octavation.ly b/input/regression/cue-clef-optional-octavation.ly deleted file mode 100644 index cdc6206d49..0000000000 --- a/input/regression/cue-clef-optional-octavation.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.17.7" - -\header { - texidoc = "Optional octavation for clefs for cue notes is -supported by using parentheses or brackets around the octavation number." -} - -vI = \relative c'' { \clef "treble" \repeat unfold 40 g4 } -\addQuote vIQuote { \vI } - -Solo = \relative c' { - \clef "treble_8" c1 | - \cueDuringWithClef #"vIQuote" #UP #"bass^(15)" { R1 } | - c1 | \break - c c - \clef "bass^8" c1 | - \cueDuringWithClef #"vIQuote" #UP #"G_[8]" { R1 R1 } | - c - \cueDuringWithClef #"vIQuote" #UP #"treble_(8)" { R1 \break R } | - c -} - -\score { - << - \new Staff \new Voice \Solo - >> -} diff --git a/input/regression/cue-clef-transposition-optional.ly b/input/regression/cue-clef-transposition-optional.ly new file mode 100644 index 0000000000..caeaf13193 --- /dev/null +++ b/input/regression/cue-clef-transposition-optional.ly @@ -0,0 +1,27 @@ +\version "2.17.7" + +\header { + texidoc = "Optional transposition for clefs for cue notes is supported +by using parentheses or brackets around the transposition number." +} + +vI = \relative c'' { \clef "treble" \repeat unfold 40 g4 } +\addQuote vIQuote { \vI } + +Solo = \relative c' { + \clef "treble_8" c1 | + \cueDuringWithClef #"vIQuote" #UP #"bass^(15)" { R1 } | + c1 | \break + c c + \clef "bass^8" c1 | + \cueDuringWithClef #"vIQuote" #UP #"G_[8]" { R1 R1 } | + c + \cueDuringWithClef #"vIQuote" #UP #"treble_(8)" { R1 \break R } | + c +} + +\score { + << + \new Staff \new Voice \Solo + >> +} diff --git a/input/regression/cue-clef-transposition.ly b/input/regression/cue-clef-transposition.ly new file mode 100644 index 0000000000..dd26c9f25d --- /dev/null +++ b/input/regression/cue-clef-transposition.ly @@ -0,0 +1,26 @@ +\version "2.16.0" + +\header { + texidoc = "Transposition for clefs for cue notes." +} + +vI = \relative c'' { \clef "treble" \repeat unfold 40 g4 } +\addQuote vIQuote { \vI } + +Solo = \relative c' { + \clef "treble_8" c1 | + \cueDuringWithClef #"vIQuote" #UP #"bass^8" { R1 } | + c1 | \break + c c + \clef "bass^8" c1 | + \cueDuringWithClef #"vIQuote" #UP #"treble_8" { R1 R1 } | + c + \cueDuringWithClef #"vIQuote" #UP #"treble_8" { R1 \break R } | + c +} + +\score { + << + \new Staff \new Voice \Solo + >> +} diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly index 66acd5b324..acea89d45b 100644 --- a/input/regression/lyrics-tenor-clef.ly +++ b/input/regression/lyrics-tenor-clef.ly @@ -1,5 +1,6 @@ \header { - texidoc = "Lyrics are not lowered despite the presence of an octavation 8." + texidoc = "Lyrics are not lowered despite the presence of +a clef transposition (8 below the clef)." } \version "2.16.0" diff --git a/input/regression/musicxml/12a-Clefs.xml b/input/regression/musicxml/12a-Clefs.xml index 85be49ec1a..4e03079069 100644 --- a/input/regression/musicxml/12a-Clefs.xml +++ b/input/regression/musicxml/12a-Clefs.xml @@ -5,8 +5,8 @@ Various clefs: G, C, F, percussion, - TAB and none; some are also possible with octavation and on other - staff lines than their default (e.g. soprano/alto/tenor/bariton C + TAB and none; some are also possible with transposition and on other + staff lines than their default (e.g. soprano/alto/tenor/baritone C clefs); Each measure shows a different clef (measure 17 has the "none" clef), only measure 18 has the same treble clef as measure 1. diff --git a/lily/beam-collision-engraver.cc b/lily/beam-collision-engraver.cc index 364d725c9a..9771799c18 100644 --- a/lily/beam-collision-engraver.cc +++ b/lily/beam-collision-engraver.cc @@ -34,7 +34,7 @@ protected: DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (accidental); DECLARE_ACKNOWLEDGER (clef); - DECLARE_ACKNOWLEDGER (octavate_eight); + DECLARE_ACKNOWLEDGER (clef_modifier); DECLARE_ACKNOWLEDGER (key_signature); DECLARE_ACKNOWLEDGER (time_signature); DECLARE_ACKNOWLEDGER (beam); @@ -167,7 +167,7 @@ Beam_collision_engraver::acknowledge_key_signature (Grob_info i) } void -Beam_collision_engraver::acknowledge_octavate_eight (Grob_info i) +Beam_collision_engraver::acknowledge_clef_modifier (Grob_info i) { covered_grobs_.push_back (i); } @@ -199,7 +199,7 @@ ADD_ACKNOWLEDGER (Beam_collision_engraver, accidental); ADD_ACKNOWLEDGER (Beam_collision_engraver, clef); ADD_ACKNOWLEDGER (Beam_collision_engraver, key_signature); ADD_ACKNOWLEDGER (Beam_collision_engraver, time_signature); -ADD_ACKNOWLEDGER (Beam_collision_engraver, octavate_eight); +ADD_ACKNOWLEDGER (Beam_collision_engraver, clef_modifier); ADD_ACKNOWLEDGER (Beam_collision_engraver, flag); ADD_ACKNOWLEDGER (Beam_collision_engraver, beam); diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 1471c481b2..9e2a3eaa7f 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -43,11 +43,11 @@ protected: virtual void derived_mark () const; private: Item *clef_; - Item *octavate_; + Item *modifier_; SCM prev_glyph_; SCM prev_cpos_; - SCM prev_octavation_; + SCM prev_transposition_; void create_clef (); void set_glyph (); void inspect_clef_properties (); @@ -56,7 +56,7 @@ private: void Clef_engraver::derived_mark () const { - scm_gc_mark (prev_octavation_); + scm_gc_mark (prev_transposition_); scm_gc_mark (prev_cpos_); scm_gc_mark (prev_glyph_); } @@ -64,12 +64,12 @@ Clef_engraver::derived_mark () const Clef_engraver::Clef_engraver () { clef_ = 0; - octavate_ = 0; + modifier_ = 0; /* will trigger a clef at the start since #f != ' () */ - prev_octavation_ = prev_cpos_ = prev_glyph_ = SCM_BOOL_F; + prev_transposition_ = prev_cpos_ = prev_glyph_ = SCM_BOOL_F; } void @@ -107,21 +107,21 @@ Clef_engraver::create_clef () if (scm_is_number (cpos)) clef_->set_property ("staff-position", cpos); - SCM oct = get_property ("clefOctavation"); - if (scm_is_number (oct) && scm_to_int (oct)) + SCM transp = get_property ("clefTransposition"); + if (scm_is_number (transp) && scm_to_int (transp)) { - Item *g = make_item ("OctavateEight", SCM_EOL); + Item *g = make_item ("ClefModifier", SCM_EOL); - int abs_oct = scm_to_int (oct); - int dir = sign (abs_oct); - abs_oct = abs (abs_oct) + 1; + int abs_transp = scm_to_int (transp); + int dir = sign (abs_transp); + abs_transp = abs (abs_transp) + 1; - SCM txt = scm_number_to_string (scm_from_int (abs_oct), + SCM txt = scm_number_to_string (scm_from_int (abs_transp), scm_from_int (10)); - SCM style = get_property ("clefOctavationStyle"); + SCM style = get_property ("clefTranspositionStyle"); - SCM formatter = get_property ("clefOctavationFormatter"); + SCM formatter = get_property ("clefTranspositionFormatter"); if (ly_is_procedure (formatter)) g->set_property ("text", scm_call_2 (formatter, txt, style)); @@ -130,7 +130,7 @@ Clef_engraver::create_clef () g->set_parent (clef_, Y_AXIS); g->set_parent (clef_, X_AXIS); g->set_property ("direction", scm_from_int (dir)); - octavate_ = g; + modifier_ = g; } } } @@ -153,13 +153,13 @@ Clef_engraver::inspect_clef_properties () { SCM glyph = get_property ("clefGlyph"); SCM clefpos = get_property ("clefPosition"); - SCM octavation = get_property ("clefOctavation"); + SCM transposition = get_property ("clefTransposition"); SCM force_clef = get_property ("forceClef"); if (clefpos == SCM_EOL || scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F - || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F + || scm_equal_p (transposition, prev_transposition_) == SCM_BOOL_F || to_boolean (force_clef)) { apply_on_children (context (), @@ -174,7 +174,7 @@ Clef_engraver::inspect_clef_properties () prev_cpos_ = clefpos; prev_glyph_ = glyph; - prev_octavation_ = octavation; + prev_transposition_ = transposition; } if (to_boolean (force_clef)) @@ -199,7 +199,7 @@ Clef_engraver::stop_translation_timestep () clef_ = 0; - octavate_ = 0; + modifier_ = 0; } } @@ -210,12 +210,12 @@ ADD_TRANSLATOR (Clef_engraver, /* create */ "Clef " - "OctavateEight ", + "ClefModifier ", /* read */ "clefGlyph " - "clefOctavation " - "clefOctavationStyle " + "clefTransposition " + "clefTranspositionStyle " "clefPosition " "explicitClefVisibility " "forceClef ", diff --git a/lily/cue-clef-engraver.cc b/lily/cue-clef-engraver.cc index 1723964266..aebf071b9e 100644 --- a/lily/cue-clef-engraver.cc +++ b/lily/cue-clef-engraver.cc @@ -46,22 +46,22 @@ protected: virtual void derived_mark () const; private: Item *clef_; - Item *octavate_; + Item *modifier_; SCM prev_glyph_; SCM prev_cpos_; - SCM prev_octavation_; + SCM prev_transposition_; void create_clef (); void create_end_clef (); void set_glyph (); void inspect_clef_properties (); - void create_octavate_eight (SCM oct); + void create_clef_modifier (SCM oct); }; void Cue_clef_engraver::derived_mark () const { - scm_gc_mark (prev_octavation_); + scm_gc_mark (prev_transposition_); scm_gc_mark (prev_cpos_); scm_gc_mark (prev_glyph_); } @@ -69,9 +69,9 @@ Cue_clef_engraver::derived_mark () const Cue_clef_engraver::Cue_clef_engraver () { clef_ = 0; - octavate_ = 0; + modifier_ = 0; - prev_octavation_ = prev_cpos_ = prev_glyph_ = SCM_EOL; + prev_transposition_ = prev_cpos_ = prev_glyph_ = SCM_EOL; } void @@ -100,22 +100,22 @@ Cue_clef_engraver::acknowledge_bar_line (Grob_info info) } void -Cue_clef_engraver::create_octavate_eight (SCM oct) +Cue_clef_engraver::create_clef_modifier (SCM transp) { - if (scm_is_number (oct) && scm_to_int (oct)) + if (scm_is_number (transp) && scm_to_int (transp)) { - Item *g = make_item ("OctavateEight", SCM_EOL); + Item *g = make_item ("ClefModifier", SCM_EOL); - int abs_oct = scm_to_int (oct); - int dir = sign (abs_oct); - abs_oct = abs (abs_oct) + 1; + int abs_transp = scm_to_int (transp); + int dir = sign (abs_transp); + abs_transp = abs (abs_transp) + 1; - SCM txt = scm_number_to_string (scm_from_int (abs_oct), + SCM txt = scm_number_to_string (scm_from_int (abs_transp), scm_from_int (10)); - SCM style = get_property ("cueClefOctavationStyle"); + SCM style = get_property ("cueClefTranspositionStyle"); - SCM formatter = get_property ("cueClefOctavationFormatter"); + SCM formatter = get_property ("cueClefTranspositionFormatter"); if (ly_is_procedure (formatter)) g->set_property ("text", scm_call_2 (formatter, txt, style)); @@ -124,7 +124,7 @@ Cue_clef_engraver::create_octavate_eight (SCM oct) g->set_parent (clef_, Y_AXIS); g->set_parent (clef_, X_AXIS); g->set_property ("direction", scm_from_int (dir)); - octavate_ = g; + modifier_ = g; } } @@ -140,7 +140,7 @@ Cue_clef_engraver::create_clef () if (scm_is_number (cpos)) clef_->set_property ("staff-position", cpos); - create_octavate_eight (get_property ("cueClefOctavation")); + create_clef_modifier (get_property ("cueClefTransposition")); } } @@ -154,7 +154,7 @@ Cue_clef_engraver::create_end_clef () if (scm_is_number (cpos)) clef_->set_property ("staff-position", cpos); - create_octavate_eight (get_property ("clefOctavation")); + create_clef_modifier (get_property ("clefTransposition")); } } @@ -169,11 +169,11 @@ Cue_clef_engraver::inspect_clef_properties () { SCM glyph = get_property ("cueClefGlyph"); SCM clefpos = get_property ("cueClefPosition"); - SCM octavation = get_property ("cueClefOctavation"); + SCM transposition = get_property ("cueClefTransposition"); if (scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F - || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F) + || scm_equal_p (transposition, prev_transposition_) == SCM_BOOL_F) { set_glyph (); if (scm_is_string (glyph)) @@ -187,7 +187,7 @@ Cue_clef_engraver::inspect_clef_properties () prev_cpos_ = clefpos; prev_glyph_ = glyph; - prev_octavation_ = octavation; + prev_transposition_ = transposition; } } @@ -205,7 +205,7 @@ Cue_clef_engraver::stop_translation_timestep () clef_->set_property ("break-visibility", vis); clef_ = 0; - octavate_ = 0; + modifier_ = 0; } } @@ -217,16 +217,16 @@ ADD_TRANSLATOR (Cue_clef_engraver, /* create */ "CueClef " "CueEndClef " - "OctavateEight ", + "ClefModifier ", /* read */ "cueClefGlyph " - "cueClefOctavation " - "cueClefOctavationStyle " + "cueClefTransposition " + "cueClefTranspositionStyle " "cueClefPosition " "explicitCueClefVisibility " "middleCCuePosition " - "clefOctavation ", + "clefTransposition ", /* write */ "" diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index d6036bc4ef..8b5893e223 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -613,8 +613,8 @@ automatically when an output definition (a @code{\\score} or endRepeatType = #":|." barNumberVisibility = #first-bar-number-invisible-and-no-parenthesized-bar-numbers barNumberFormatter = #robust-bar-number-function - clefOctavationFormatter = #clef-octavation-markup - cueClefOctavationFormatter = #clef-octavation-markup + clefTranspositionFormatter = #clef-transposition-markup + cueClefTranspositionFormatter = #clef-transposition-markup automaticBars = ##t explicitClefVisibility = #all-visible @@ -970,7 +970,7 @@ of Editio Vaticana." middleCPosition = #1 middleCClefPosition = #1 clefPosition = #1 - clefOctavation = #0 + clefTransposition = #0 %% Select vaticana style font. \override KeySignature.glyph-name-alist = #alteration-vaticana-glyph-name-alist @@ -1063,7 +1063,7 @@ accommodated for typesetting a piece in mensural style." middleCClefPosition = #-6 middleCPosition = #-6 clefPosition = #-2 - clefOctavation = #0 + clefTransposition = #0 %% Select mensural style font. \override TimeSignature.style = #'mensural @@ -1122,7 +1122,7 @@ accommodated for typesetting a piece in Petrucci style." middleCClefPosition = #-6 middleCPosition = #-6 clefPosition = #-2 - clefOctavation = #0 + clefTransposition = #0 \override Custos.style = #'mensural \override Custos.neutral-position = #3 @@ -1181,7 +1181,7 @@ accommodated for typesetting a piece in Kievan style." middleCClefPosition = #0 middleCPosition = #0 clefPosition = #0 - clefOctavation = #0 + clefTransposition = #0 %% Accidentals are valid only once (if the following note is different) extraNatural = ##f diff --git a/python/convertrules.py b/python/convertrules.py index b0a46ebac8..b64cf75783 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -3547,6 +3547,19 @@ def conv(str): r"\1 " + do + r"\2", str) return str +@rule ((2, 17, 18), + "Rename OctavateEight to ClefModifier, rename related properties.") +def conv(str): + str = re.sub ('OctavateEight', 'ClefModifier', str) + str = re.sub ('octavate-eight-interface', 'clef-modifier-interface', str) + str = re.sub ('clefOctavation', 'clefTransposition', str) + str = re.sub ('clefOctavationFormatter', 'clefTranspositionFormatter', str) + str = re.sub ('clefOctavationStyle', 'clefTranspositionStyle', str) + str = re.sub ('cueClefOctavation', 'cueClefTransposition', str) + str = re.sub ('cueClefOctavationFormatter', 'cueClefTranspositionFormatter', str) + str = re.sub ('cueClefOctavationStyle', 'cueClefTranspositionStyle', str) + 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, diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm index 98f52aaa09..667986d427 100644 --- a/scm/define-context-properties.scm +++ b/scm/define-context-properties.scm @@ -172,11 +172,12 @@ symbol and the prefix of a chord name.") (chordRootNamer ,procedure? "A function that converts from a pitch object to a text markup. Used for chords.") (clefGlyph ,string? "Name of the symbol within the music font.") - (clefOctavation ,integer? "Add this much extra octavation. + (clefTransposition ,integer? "Add this much extra transposition. Values of 7 and -7 are common.") - (clefOctavationFormatter ,procedure? "A procedure that takes the -Octavation number as a string and the style as a symbol and returns a markup.") - (clefOctavationStyle ,symbol? "Determines the way the octavateEight + (clefTranspositionFormatter ,procedure? "A procedure that takes the +Transposition number as a string and the style as a symbol and returns a +markup.") + (clefTranspositionStyle ,symbol? "Determines the way the ClefModifier grob is displayed. Possible values are @samp{default}, @samp{parenthesized} and @samp{bracketed}.") (clefPosition ,number? "Where should the center of the clef @@ -198,11 +199,12 @@ a hairpin crescendo is used.") (crescendoText ,markup? "The text to print at start of non-hairpin crescendo, i.e., @samp{cresc.}.") (cueClefGlyph ,string? "Name of the symbol within the music font.") - (cueClefOctavation ,integer? "Add this much extra octavation. + (cueClefTransposition ,integer? "Add this much extra transposition. Values of 7 and -7 are common.") - (cueClefOctavationFormatter ,procedure? "A procedure that takes the -Octavation number as a string and the style as a symbol and returns a markup.") - (cueClefOctavationStyle ,symbol? "Determines the way the octavateEight + (cueClefTranspositionFormatter ,procedure? "A procedure that +takes the Transposition number as a string and the style as a symbol +and returns a markup.") + (cueClefTranspositionStyle ,symbol? "Determines the way the ClefModifier grob is displayed. Possible values are @samp{default}, @samp{parenthesized} and @samp{bracketed}.") (cueClefPosition ,number? "Where should the center of the clef diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm index 6068579995..d34f026497 100644 --- a/scm/define-grob-interfaces.scm +++ b/scm/define-grob-interfaces.scm @@ -64,6 +64,13 @@ found in @file{scm/bar-line.scm}. "A doit or drop." '(thickness delta-position)) +(ly:add-interface + 'clef-modifier-interface + "The number describing transposition of the clef, placed below +or above clef sign. Usually this is 8 (octave transposition) +or 15 (two octaves), but LilyPond allows any integer here." + '()) + (ly:add-interface 'dynamic-interface "Any kind of loudness sign." @@ -189,14 +196,6 @@ accidentals)." "Note names." '()) -(ly:add-interface - 'octavate-eight-interface - "Interface that permits the nominal identification of the octavian -annotation that multiplies by two the freqency of the pitches present -in a given staff were they played on a clef that lacked said octavian -annotation." - '()) - (ly:add-interface 'only-prebreak-interface "Kill this grob after the line breaking process." diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index aa7c7923a9..8e94dae778 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -373,11 +373,11 @@ (clip-edges . #t) (collision-interfaces . (beam-interface clef-interface + clef-modifier-interface flag-interface inline-accidental-interface key-signature-interface note-head-interface - octavate-eight-interface stem-interface time-signature-interface)) (cross-staff . ,ly:beam::calc-cross-staff) @@ -566,6 +566,31 @@ pure-from-neighbor-interface staff-symbol-referencer-interface)))))) + (ClefModifier + . ( + (break-visibility . ,(grob::inherit-parent-property + X 'break-visibility)) + (font-shape . italic) + (font-size . -4) + (self-alignment-X . ,CENTER) + (staff-padding . 0.2) + (stencil . ,ly:text-interface::print) + (X-offset . ,(ly:make-simple-closure + `(,+ + ,(ly:make-simple-closure + (list ly:self-alignment-interface::x-aligned-on-self)) + ,(ly:make-simple-closure + (list ly:self-alignment-interface::centered-on-x-parent))))) + (Y-offset . ,side-position-interface::y-aligned-side) + (vertical-skylines . ,grob::always-vertical-skylines-from-stencil) + (Y-extent . ,grob::always-Y-extent-from-stencil) + (meta . ((class . Item) + (interfaces . (clef-modifier-interface + font-interface + self-alignment-interface + side-position-interface + text-interface)))))) + (ClusterSpanner . ( (cross-staff . ,ly:cluster::calc-cross-staff) @@ -1622,32 +1647,6 @@ (interfaces . (note-spacing-interface spacing-interface)))))) - - (OctavateEight - . ( - (break-visibility . ,(grob::inherit-parent-property - X 'break-visibility)) - (font-shape . italic) - (font-size . -4) - (self-alignment-X . ,CENTER) - (staff-padding . 0.2) - (stencil . ,ly:text-interface::print) - (X-offset . ,(ly:make-simple-closure - `(,+ - ,(ly:make-simple-closure - (list ly:self-alignment-interface::x-aligned-on-self)) - ,(ly:make-simple-closure - (list ly:self-alignment-interface::centered-on-x-parent))))) - (Y-offset . ,side-position-interface::y-aligned-side) - (vertical-skylines . ,grob::always-vertical-skylines-from-stencil) - (Y-extent . ,grob::always-Y-extent-from-stencil) - (meta . ((class . Item) - (interfaces . (font-interface - octavate-eight-interface - self-alignment-interface - side-position-interface - text-interface)))))) - (OttavaBracket . ( (dash-fraction . 0.3) diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm index dc10fa265f..3677051981 100644 --- a/scm/define-music-display-methods.scm +++ b/scm/define-music-display-methods.scm @@ -956,8 +956,8 @@ Otherwise, return @code{#f}." value ?clef-position symbol 'clefPosition) (music 'PropertySet - value ?clef-octavation - symbol 'clefOctavation) + value ?clef-transposition + symbol 'clefTransposition) (music 'ApplyContext procedure ly:set-middle-C!))))) (let ((clef-name (assoc-get (list ?clef-glyph ?clef-position 0) @@ -965,12 +965,12 @@ Otherwise, return @code{#f}." (if clef-name (format #f "\\clef \"~a~{~a~a~}\"~a" clef-name - (cond ((= 0 ?clef-octavation) + (cond ((= 0 ?clef-transposition) (list "" "")) - ((> ?clef-octavation 0) - (list "^" (1+ ?clef-octavation))) + ((> ?clef-transposition 0) + (list "^" (1+ ?clef-transposition))) (else - (list "_" (- 1 ?clef-octavation)))) + (list "_" (- 1 ?clef-transposition)))) (new-line->lily-string)) #f)))) diff --git a/scm/parser-clef.scm b/scm/parser-clef.scm index 56284f9c4d..5dd09a059d 100644 --- a/scm/parser-clef.scm +++ b/scm/parser-clef.scm @@ -16,10 +16,10 @@ ;;;; along with LilyPond. If not, see . -;; (name . (glyph clef-position octavation)) +;; (name . (glyph clef-position transposition)) ;; -;; -- the name clefOctavation is misleading. The value 7 is 1 octave, -;; not 7 Octaves. +;; -- the name clefTransposition is a bit misleading. Value 7 means +;; a transposition of an octave, not a seventh. (define-public supported-clefs '(("treble" . ("clefs.G" -2 0)) ("violin" . ("clefs.G" -2 0)) @@ -144,14 +144,14 @@ (cadr e) (assoc-get (car e) c0-pitch-alist)))) ((symbol . clefPosition) (value . ,(cadr e))) - ((symbol . clefOctavation) (value . ,(- oct))))) - ;; the clefOctavationStyle property is set only when + ((symbol . clefTransposition) (value . ,(- oct))))) + ;; the clefTranspositionStyle property is set only when ;; not 'default to calm display-lily-tests.scm (prop-list (if (eq? style 'default) prop-list (append prop-list - `(((symbol . clefOctavationStyle) + `(((symbol . clefTranspositionStyle) (value . ,style)))))) (musics (map make-prop-set prop-list)) (recalc-mid-C (make-music 'ApplyContext)) @@ -174,8 +174,8 @@ '((clefGlyph . cueClefGlyph) (middleCClefPosition . middleCCuePosition) (clefPosition . cueClefPosition) - (clefOctavation . cueClefOctavation) - (clefOctavationStyle . cueClefOctavationStyle))) + (clefTransposition . cueClefTransposition) + (clefTranspositionStyle . cueClefTranspositionStyle))) (let ((clef (make-clef-set clef-name))) (for-each (lambda (m) @@ -196,10 +196,10 @@ (make-cue-clef-set "treble_(8)"))) ;; a function to add new clefs at runtime -(define-public (add-new-clef clef-name clef-glyph clef-position octavation c0-position) +(define-public (add-new-clef clef-name clef-glyph clef-position transposition c0-position) "Append the entries for a clef symbol to supported clefs and @code{c0-pitch-alist}." (set! supported-clefs - (acons clef-name (list clef-glyph clef-position octavation) supported-clefs)) + (acons clef-name (list clef-glyph clef-position transposition) supported-clefs)) (set! c0-pitch-alist (acons clef-glyph c0-position c0-pitch-alist))) diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm index 5877674d10..49d8768eb4 100644 --- a/scm/translation-functions.scm +++ b/scm/translation-functions.scm @@ -20,10 +20,10 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; clefs -(define-public (clef-octavation-markup oct style) - "The octavation sign formatting function. @var{oct} is supposed to be -a string holding the octavation number, @var{style} determines the -way the octavation number is displayed." +(define-public (clef-transposition-markup oct style) + "The transposition sign formatting function. @var{oct} is supposed to be +a string holding the transposition number, @var{style} determines the +way the transposition number is displayed." (let* ((delim (if (symbol? style) (case style ((parenthesized) (cons "(" ")"))