@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.
@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
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
>>
@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.
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
>>
@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.
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.6"
+@c \version "2.17.18"
@c Translators: Till Paala
@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}
@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
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.6"
+@c \version "2.17.18"
@c Translators: Till Paala
Referenz der Interna:
@rinternals{Clef_engraver},
@rinternals{Clef},
-@rinternals{OctavateEight},
+@rinternals{ClefModifier},
@rinternals{clef-interface}.
Guide, node Updating translation committishes.
@end ignore
-@c \version "2.17.11"
+@c \version "2.17.18"
@c Translators: Till Paala
#`((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"))
#`((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"))
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.
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
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.11"
+@c \version "2.17.18"
@node Conceptos fundamentales
>>
@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.
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
@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}
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
@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
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.6"
+@c \version "2.17.18"
@node Alturas
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
}
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
#`((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"))
#`((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"))
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}.
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.
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
>>
@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 à
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
@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}
@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é
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
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
}
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
#`((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"))
#`((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"))
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.
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.
@c -*- coding: utf-8; mode: texinfo; -*-
-@c \version "2.17.11"
+@c \version "2.17.18"
@node Alapfogalmak
@chapter Alapfogalmak
@translationof Fundamental concepts
>>
@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.
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.11"
+@c \version "2.17.18"
@node Concetti fondamentali
@chapter Concetti fondamentali
>>
@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.
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.6"
+@c \version "2.17.18"
@node Altezze
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
}
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}.
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.
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
>>
@end lilypond
-他の例としては、@code{clefOctavation} が @code{Score} コンテキストに@c
+他の例としては、@code{clefTransposition} が @code{Score} コンテキストに@c
セットされた場合、直ちにすべての譜でのオクターブの値を変更し、すべての譜に@c
適用される新しいデフォルト値をセットします。
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
@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}
描画するには @code{begin-of-line-invisible} を用い、@c
描画しないのなら @code{all-invisible} を用います。
@item Key signature -- 以下を参照してください
-@item OctavateEight -- 以下を参照してください
+@item ClefModifier -- 以下を参照してください
@end itemize
@node 特別な考慮を必要とするもの
@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
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
内部リファレンス:
@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
}
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
#`((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"))
#`((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"))
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.11"
+@c \version "2.17.18"
@node Fundamental concepts
@chapter Fundamental concepts
>>
@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
@c Translation checker:
@c Translation checker committish:
-@c \version "2.17.11"
+@c \version "2.17.18"
@node Fundamentele concepten
@translationof Fundamental concepts
>>
@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
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.6"
+@c \version "2.17.18"
@node Changing defaults
@chapter Changing defaults
@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}
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
@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
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.6"
+@c \version "2.17.18"
@node Pitches
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
}
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.17.11"
+@c \version "2.17.18"
@node Vocal music
@section Vocal music
#`((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"))
#`((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"))
%% 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"
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.
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.
% 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
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
+++ /dev/null
-\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
-}
-
+++ /dev/null
-
-\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
-}
-
+++ /dev/null
-\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 }
- >>
-}
+++ /dev/null
-\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
- }
-}
--- /dev/null
+\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
+ }
+}
--- /dev/null
+\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 }
+ >>
+}
--- /dev/null
+\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
+}
+
--- /dev/null
+
+\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
+}
+
+++ /dev/null
-\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
- >>
-}
+++ /dev/null
-\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
- >>
-}
--- /dev/null
+\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
+ >>
+}
--- /dev/null
+\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
+ >>
+}
\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"
<identification>
<miscellaneous>
<miscellaneous-field name="description">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.</miscellaneous-field>
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);
}
void
-Beam_collision_engraver::acknowledge_octavate_eight (Grob_info i)
+Beam_collision_engraver::acknowledge_clef_modifier (Grob_info i)
{
covered_grobs_.push_back (i);
}
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);
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 ();
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_);
}
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
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));
g->set_parent (clef_, Y_AXIS);
g->set_parent (clef_, X_AXIS);
g->set_property ("direction", scm_from_int (dir));
- octavate_ = g;
+ modifier_ = g;
}
}
}
{
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 (),
prev_cpos_ = clefpos;
prev_glyph_ = glyph;
- prev_octavation_ = octavation;
+ prev_transposition_ = transposition;
}
if (to_boolean (force_clef))
clef_ = 0;
- octavate_ = 0;
+ modifier_ = 0;
}
}
/* create */
"Clef "
- "OctavateEight ",
+ "ClefModifier ",
/* read */
"clefGlyph "
- "clefOctavation "
- "clefOctavationStyle "
+ "clefTransposition "
+ "clefTranspositionStyle "
"clefPosition "
"explicitClefVisibility "
"forceClef ",
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_);
}
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
}
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));
g->set_parent (clef_, Y_AXIS);
g->set_parent (clef_, X_AXIS);
g->set_property ("direction", scm_from_int (dir));
- octavate_ = g;
+ modifier_ = g;
}
}
if (scm_is_number (cpos))
clef_->set_property ("staff-position", cpos);
- create_octavate_eight (get_property ("cueClefOctavation"));
+ create_clef_modifier (get_property ("cueClefTransposition"));
}
}
if (scm_is_number (cpos))
clef_->set_property ("staff-position", cpos);
- create_octavate_eight (get_property ("clefOctavation"));
+ create_clef_modifier (get_property ("clefTransposition"));
}
}
{
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))
prev_cpos_ = clefpos;
prev_glyph_ = glyph;
- prev_octavation_ = octavation;
+ prev_transposition_ = transposition;
}
}
clef_->set_property ("break-visibility", vis);
clef_ = 0;
- octavate_ = 0;
+ modifier_ = 0;
}
}
/* create */
"CueClef "
"CueEndClef "
- "OctavateEight ",
+ "ClefModifier ",
/* read */
"cueClefGlyph "
- "cueClefOctavation "
- "cueClefOctavationStyle "
+ "cueClefTransposition "
+ "cueClefTranspositionStyle "
"cueClefPosition "
"explicitCueClefVisibility "
"middleCCuePosition "
- "clefOctavation ",
+ "clefTransposition ",
/* write */
""
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
middleCPosition = #1
middleCClefPosition = #1
clefPosition = #1
- clefOctavation = #0
+ clefTransposition = #0
%% Select vaticana style font.
\override KeySignature.glyph-name-alist = #alteration-vaticana-glyph-name-alist
middleCClefPosition = #-6
middleCPosition = #-6
clefPosition = #-2
- clefOctavation = #0
+ clefTransposition = #0
%% Select mensural style font.
\override TimeSignature.style = #'mensural
middleCClefPosition = #-6
middleCPosition = #-6
clefPosition = #-2
- clefOctavation = #0
+ clefTransposition = #0
\override Custos.style = #'mensural
\override Custos.neutral-position = #3
middleCClefPosition = #0
middleCPosition = #0
clefPosition = #0
- clefOctavation = #0
+ clefTransposition = #0
%% Accidentals are valid only once (if the following note is different)
extraNatural = ##f
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,
(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
(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
"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."
"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."
(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)
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)
(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)
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)
(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))))
;;;; along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-;; (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))
(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))
'((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)
(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)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 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 "(" ")"))
projects / lilypond.git / commitdiff