@end ignore
+@item
+Note names can be selected with a new
+@code{@bs{}language "italiano"} command, which
+can be used in safe mode. The old
+@code{@bs{}include "italiano.ly"} syntax is
+still supported for now, but will be deprecated
+in the future.
+
@item
auotbeaming is now disabled by @code{\cadenzaOn} and enabled by
@code{\cadenzaOff}. Beaming in cadenzas should be indicated manually.
@subheading Updating doc with @command{convert-ly}
-cd into @file{Documentation/} and run
-
-@example
-find . -name '*.itely' | xargs convert-ly -e
-@end example
-
-@noindent
-This also updates translated documentation.
-
+Don't. This should be done by programmers when they add new
+features. If you notice that it hasn't been done, complain to
+@code{lilypond-devel}.
@node Docstrings in scheme
* Write the code::
* Write regression tests::
* Write convert-ly rule::
-* Automatically update auxiliary information::
-* Manually update auxiliary information::
+* Automatically update documentation::
+* Manually update documentation::
* Edit changes.tely::
* Verify successful build::
* Verify regression tests::
the resulting diff.
-@node Automatically update auxiliary information
-@subsection Automatically update auxiliary information
+@node Automatically update documentation
+@subsection Automatically update documentation
-convert-ly should be used to update the documentation, the snippets,
-and the regression tests. This not only makes the necessary syntax
-changes, it also tests the convert-ly rules.
+@command{convert-ly} should be used to update the documentation,
+the snippets, and the regression tests. This not only makes the
+necessary syntax changes, it also tests the @command{convert-ly}
+rules.
-The automatic updating is a three step process. First, be sure you
-are in the top-level source directory. Then, for the
-documentation, do:
+The automatic updating is performed by moving to the top-level
+source directory, then running:
@example
-find Documentation/ -name '*.itely' | xargs convert-ly -e --from @qq{@var{X.Y.Z}}
+scripts/auxiliar/update-with-convert-ly.sh
@end example
-@noindent
-where @var{X.Y.Z} is the version number of the last released development
-version.
-
-Next, for the snippets, do:
+If you did an out-of-tree build, pass in the relative path:
@example
-find Documentation/snippets/ -name '*.ly' | xargs convert-ly -e --from @qq{@var{X.Y.Z}}
-@end example
-
-Finally, for the regression tests, do:
-
-@example
-find input/regression/ -name '*.ly' | xargs convert-ly -e --from @qq{@var{X.Y.Z}}
-
+BUILD_DIR=../build-lilypond/ scripts/auxiliar/update-with-convert-ly.sh
@end example
-@node Manually update auxiliary information
-@subsection Manually update auxiliary information
+@node Manually update documentation
+@subsection Manually update documentation
Where the convert-ly rule is not able to automatically update the inline
lilypond code in the documentation (i.e. if a NOT_SMART rule is used), the
* Relative Oktavenbezeichnung::
* Versetzungszeichen::
* Notenbezeichnungen in anderen Sprachen::
-* Nichteuropäische Notenbezeichnungen und Versetzungszeichen::
@end menu
@node Absolute Oktavenbezeichnung
Notendefinitionen für die deutsche Sprache am Anfang der Datei
hinzu
-@warning{Weil in einigen @code{\include}-Dateien (wie
-beispielsweise @code{@w{predefined-fretboards.ly}}) die niederländischen
-(Standard-)Notenbezeichnungen benutzt werden, muss der
-@code{@bs{}include}-Befehl für die Sprachdatei nach allen
-anderen LilyPond-eigenen Dateien gesetzt werden.}
-
In der Tabelle sind die existierenden Sprachdefinitionen
mit den dazugehörigen Notenbezeichnungen dargestellt.
Glossar:
@rglos{Pitch names}.
+Notationsreferenz:
+@ref{Nichteuropäische Notenbezeichnungen und Versetzungszeiche}.
+
Schnipsel:
@rlsr{Pitches}.
-@node Nichteuropäische Notenbezeichnungen und Versetzungszeichen
-@unnumberedsubsubsec Nichteuropäische Notenbezeichnungen und Versetzungszeichen
-@translationof Non-Western note names and accidentals
-
-Viele nicht-europäische Musik (und auch manche europäische Volksmusik)
-benutzt alternative oder erweiterte Skalen (Tonleitern), die man
-nicht mit der normalen westlichen Notation notieren kann.
-
-In einigen Fällen wird die klassische Notation dennoch benutzt,
-wobei man die Tonhöhenunterschiede implizit mitliest. Beispielsweise
-arabische Musik wird mit normalen Halb- und Vierteltonversetzungszeichen
-notiert und die exakte Tonhöhe (die etwas von der notierten abeweichen
-kann) dann aus dem Kontext erschlossen. Andere Tonsysteme brauchen
-erweiterte odert vollständige andere Notation.
-
-Die klassische Musik der Türkei, oder ottomanische Musik, benutzt
-melodische Formen, die als @notation{makamlar} bekannt sind und
-deren Intervalle auf 1/9-Bruchteilen des Ganztones beruhen. Die
-moderne nationale Lösung ist es, die normale europäische Notation
-auf dem System mit normalen Noten zu benutzen und ihnen spezielle
-türkische Versetzungszeichen hinzuzufügen. Diese Versetzungszeichen
-sind in der Datei @file{makam.ly} definiert. (Wie Sie diese Datei
-finden können, wird erklärt in @rlearning{Mehr Information}. Die
-folgende Tabelle zeigt ihre Bezeichnungen, die Versetzungszeichen-Endung,
-die an die Noten gefügt werden müssen und die Tonhöhenveränderung
-in einem Bruchteil eines Ganztones.
-
-@c TODO: can we include the actual accidentals in this table?
-@quotation
-@multitable {@b{büyük mücenneb (sharp)}} {@b{suffix}} {@b{pitch alteration}}
-@headitem Bezeichnung
- @tab Endung @tab Tonhöhenveränderung
-
-@item büyük mücenneb (sharp)
- @tab -bm @tab +8/9
-@item kücük mücenneb (sharp)
- @tab -k @tab +5/9
-@item bakiye (sharp)
- @tab -b @tab +4/9
-@item koma (sharp)
- @tab -c @tab +1/9
-
-@item koma (flat)
- @tab -fc @tab -1/9
-@item bakiye (flat)
- @tab -fb @tab -4/9
-@item kücük mücenneb (flat)
- @tab -fk @tab -5/9
-@item büyük mücenneb (flat)
- @tab -fbm @tab -8/9
-@end multitable
-@end quotation
-
-Zu mehr Information über die klassische türkische Musik und
-makamlar, siehe @ref{Türkische klassische Musik}.
-
-
-@snippets
-
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{makam-example.ly}
-
-
@node Viele Tonhöhen gleichzeitig verändern
@subsection Viele Tonhöhen gleichzeitig verändern
@translationof Changing multiple pitches
@menu
+* Nichteuropäische Notenbezeichnungen und Versetzungszeichen::
* Arabische Musik::
* Türkische klassische Musik::
@end menu
+
+@node Nichteuropäische Notenbezeichnungen und Versetzungszeichen
+@subsection Nichteuropäische Notenbezeichnungen und Versetzungszeichen
+@translationof Non-Western notation and tuning systems
+
+Viele nicht-europäische Musik (und auch manche europäische Volksmusik)
+benutzt alternative oder erweiterte Skalen (Tonleitern), die man
+nicht mit der normalen westlichen Notation notieren kann.
+
+In einigen Fällen wird die klassische Notation dennoch benutzt,
+wobei man die Tonhöhenunterschiede implizit mitliest. Beispielsweise
+arabische Musik wird mit normalen Halb- und Vierteltonversetzungszeichen
+notiert und die exakte Tonhöhe (die etwas von der notierten abeweichen
+kann) dann aus dem Kontext erschlossen. Andere Tonsysteme brauchen
+erweiterte odert vollständige andere Notation.
+
+Die klassische Musik der Türkei, oder ottomanische Musik, benutzt
+melodische Formen, die als @notation{makamlar} bekannt sind und
+deren Intervalle auf 1/9-Bruchteilen des Ganztones beruhen. Die
+moderne nationale Lösung ist es, die normale europäische Notation
+auf dem System mit normalen Noten zu benutzen und ihnen spezielle
+türkische Versetzungszeichen hinzuzufügen. Diese Versetzungszeichen
+sind in der Datei @file{makam.ly} definiert. (Wie Sie diese Datei
+finden können, wird erklärt in @rlearning{Mehr Information}. Die
+folgende Tabelle zeigt ihre Bezeichnungen, die Versetzungszeichen-Endung,
+die an die Noten gefügt werden müssen und die Tonhöhenveränderung
+in einem Bruchteil eines Ganztones.
+
+@c TODO: can we include the actual accidentals in this table?
+@quotation
+@multitable {@b{büyük mücenneb (sharp)}} {@b{suffix}} {@b{pitch alteration}}
+@headitem Bezeichnung
+ @tab Endung @tab Tonhöhenveränderung
+
+@item büyük mücenneb (sharp)
+ @tab -bm @tab +8/9
+@item kücük mücenneb (sharp)
+ @tab -k @tab +5/9
+@item bakiye (sharp)
+ @tab -b @tab +4/9
+@item koma (sharp)
+ @tab -c @tab +1/9
+
+@item koma (flat)
+ @tab -fc @tab -1/9
+@item bakiye (flat)
+ @tab -fb @tab -4/9
+@item kücük mücenneb (flat)
+ @tab -fk @tab -5/9
+@item büyük mücenneb (flat)
+ @tab -fbm @tab -8/9
+@end multitable
+@end quotation
+
+Zu mehr Information über die klassische türkische Musik und
+makamlar, siehe @ref{Türkische klassische Musik}.
+
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{makam-example.ly}
+
+
@node Arabische Musik
@subsection Arabische Musik
@translationof Arabic music
* Escritura de octava relativa::
* Alteraciones accidentales::
* Nombres de las notas en otros idiomas::
-* Nombres de las notas y alteraciones no occidentales::
@end menu
abajo. Por ejemplo, para usar los nombres de las notas en español,
inserte @code{@w{\include "espanol.ly"}} en el archivo de entrada.
-@warning{A causa de que alguno de los otros archivos de inclusión
-(como @code{@w{predefined-fretboards.ly}}) utilizan los nombres de
-nota predeterminados (holandeses), la instrucción @code{@bs{}include}
-para el archivo de idioma se debe colocar después de todos los demás
-archivos de la distribución de LilyPond.}
-
Los archivos de idioma disponibles y los nombres de las notas que
definen son los siguientes:
Glosario musical:
@rglos{Pitch names}.
+Referencia de la notación:
+@ref{Nombres de las notas y alteraciones no occidentales}.
+
Fragmentos de código:
@rlsr{Pitches}.
-@node Nombres de las notas y alteraciones no occidentales
-@unnumberedsubsubsec Nombres de las notas y alteraciones no occidentales
-@translationof Non-Western note names and accidentals
-
-Muchas músicas no occidentales (y algunas folclóricas y tradicionales
-occidentales) emplean sistemas de afinación alternativos o extendidos
-que no encajan directamente dentro de la notación clásica estándar.
-
-En algunos casos aún se usa la notación estándar estando implícitas
-las diferencias de afinación. Por ejemplo, la notación de la música
-árabe se hace con alteraciones estándar de semitono y de cuarto de
-tono, estando las modificaciones de altura exactas determinadas por el
-contexto. Otras necesitan notaciones ampliadas o específicas.
-
-@notation{La música clásica turca}, o música otomana, emplea formas
-melódicas conocidas como @notation{makamlar}, cuyos intervalos están
-basados en divisiones del tono en novenos. Desde el punto de vista de
-la notación moderna, es conveniente utilizar las notas (do, re, mi,
-...) de un pentagrama occidental estándar con alteraciones
-accidentales específicas de la música turca. Estas alteraciones están
-definidas en @file{makam.ly} (para encontrar este archivo en su
-sistema, consulte @rlearning{Otras fuentes de información}). La tabla
-siguiente relaciona sus nombres, el sufijo de la alteración que se
-debe escribir detrás de las notas, y su alteración de altura como una
-fracción del tono.
-
-@c TODO: can we include the actual accidentals in this table?
-@quotation
-@multitable {@b{büyük mücenneb (sostenido)}} {@b{suffix}} {@b{alteración de altura}}
-@headitem Nombre de la alteración
- @tab Sufijo @tab Alteración de altura
-
-@item büyük mücenneb (sostenido)
- @tab -bm @tab +8/9
-@item kücük mücenneb (sostenido)
- @tab -k @tab +5/9
-@item bakiye (sostenido)
- @tab -b @tab +4/9
-@item koma (sostenido)
- @tab -c @tab +1/9
-
-@item koma (bemol)
- @tab -fc @tab -1/9
-@item bakiye (bemol)
- @tab -fb @tab -4/9
-@item kücük mücenneb (bemol)
- @tab -fk @tab -5/9
-@item büyük mücenneb (bemol)
- @tab -fbm @tab -8/9
-@end multitable
-@end quotation
-
-Para ver más información sobre la música clásica turca y los makamlar,
-consulte @ref{Música clásica de Turquía}.
-
-
-@snippets
-
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{makam-example.ly}
-
-
@node Modificación de varias notas a la vez
@subsection Modificación de varias notas a la vez
@translationof Changing multiple pitches
occidental.
@menu
+* Nombres de las notas y alteraciones no occidentales::
* Música árabe::
* Música clásica de Turquía::
@end menu
+
+@node Nombres de las notas y alteraciones no occidentales
+@subsection Nombres de las notas y alteraciones no occidentales
+@translationof Non-Western notation and tuning systems
+
+Muchas músicas no occidentales (y algunas folclóricas y tradicionales
+occidentales) emplean sistemas de afinación alternativos o extendidos
+que no encajan directamente dentro de la notación clásica estándar.
+
+En algunos casos aún se usa la notación estándar estando implícitas
+las diferencias de afinación. Por ejemplo, la notación de la música
+árabe se hace con alteraciones estándar de semitono y de cuarto de
+tono, estando las modificaciones de altura exactas determinadas por el
+contexto. Otras necesitan notaciones ampliadas o específicas.
+
+@notation{La música clásica turca}, o música otomana, emplea formas
+melódicas conocidas como @notation{makamlar}, cuyos intervalos están
+basados en divisiones del tono en novenos. Desde el punto de vista de
+la notación moderna, es conveniente utilizar las notas (do, re, mi,
+...) de un pentagrama occidental estándar con alteraciones
+accidentales específicas de la música turca. Estas alteraciones están
+definidas en @file{makam.ly} (para encontrar este archivo en su
+sistema, consulte @rlearning{Otras fuentes de información}). La tabla
+siguiente relaciona sus nombres, el sufijo de la alteración que se
+debe escribir detrás de las notas, y su alteración de altura como una
+fracción del tono.
+
+@c TODO: can we include the actual accidentals in this table?
+@quotation
+@multitable {@b{büyük mücenneb (sostenido)}} {@b{suffix}} {@b{alteración de altura}}
+@headitem Nombre de la alteración
+ @tab Sufijo @tab Alteración de altura
+
+@item büyük mücenneb (sostenido)
+ @tab -bm @tab +8/9
+@item kücük mücenneb (sostenido)
+ @tab -k @tab +5/9
+@item bakiye (sostenido)
+ @tab -b @tab +4/9
+@item koma (sostenido)
+ @tab -c @tab +1/9
+
+@item koma (bemol)
+ @tab -fc @tab -1/9
+@item bakiye (bemol)
+ @tab -fb @tab -4/9
+@item kücük mücenneb (bemol)
+ @tab -fk @tab -5/9
+@item büyük mücenneb (bemol)
+ @tab -fbm @tab -8/9
+@end multitable
+@end quotation
+
+Para ver más información sobre la música clásica turca y los makamlar,
+consulte @ref{Música clásica de Turquía}.
+
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{makam-example.ly}
+
+
@node Música árabe
@subsection Música árabe
@translationof Arabic music
* Octaves relatives::
* Altérations::
* Nom des notes dans d'autres langues::
-* Noms de note et altérations non-occidentaux::
@end menu
@node Hauteurs avec octave absolue
spécifique à la langue voulue. Par exemple, pour les langues romanes,
ajoutez @w{@code{\include "italiano.ly"}} au début du fichier source.
-@warning{Dans la mesure où certains fichiers d'initialisation, comme
-@w{@code{predefined-fretboards.ly}}, utilisent les conventions bataves,
-la commande @code{@bs{}include} concernant la langue que vous désirez
-utiliser doît intervenir après toutes les autres inclusions de fichier
-d'initialisation de LilyPond.}
-
Les fichiers de langue disponibles ainsi que les noms de note utilisés
sont les suivants@tie{}:
Glossaire musicologique :
@rglosnamed{Pitch names,Nom des notes}.
+Manuel de notation :
+@ref{Noms de note et altérations non-occidentaux}.
+
Morceaux choisis :
@rlsrnamed{Pitches,Hauteurs}.
-
-@node Noms de note et altérations non-occidentaux
-@unnumberedsubsubsec Noms de note et altérations non-occidentaux
-@translationof Non-Western note names and accidentals
-
-De nombreuses musiques autres qu'occidentales -- et même certaines
-formes de musique traditionnelle occidentales -- ont recours à des
-systèmes de notation alternatifs ou étendus, qui ne s'intègrent pas
-forcément dans notre système standard.
-
-Sans certains cas où la notation standard est utilisée, ces différences
-de hauteurs seront implicites. Par exemple, la musique arabe est
-reproduite en notation standard, et utilise des quarts de ton,
-l'altération réelle dépendant du contexte. D'autres, par contre, font
-appel à une notation étendue, voire toute particulière.
-
-La @notation{musique classique turque}, ou musique ottomane, utilise des
-formes mélodiques appelées @notation{makamlar}, dans laquelle les
-tons sont divisés en 9 intervalles. Du point de vue actuel des
-pratiques de notation, il est possible d'utiliser les notes occidentales
-(do, ré, mi@dots{}) auxquelles on ajoutera l'atlération spécifique à la
-musique turque. Ces différentes altérations sont définies dans le
-fichier @file{makam.ly} -- reportez vous au chapitre
-@rlearning{Autres sources de documentation} pour le localiser sur votre
-système. Vous trouverez, dans le tableau suivant, le nom de ces
-altérations, le suffixe à utiliser, ainsi que la fraction de ton entier
-à laquelle elles conrrespondent.
-
-@c TODO: can we include the actual accidentals in this table?
-@quotation
-@multitable {@b{büyük mücenneb (dièse)}} {@b{suffixe}} {@b{altération}}
-@headitem Nom d'altération
- @tab suffixe @tab altération
-
-@item büyük mücenneb (dièse)
- @tab -bm @tab +8/9
-@item kücük mücenneb (dièse)
- @tab -k @tab +5/9
-@item bakiye (dièse)
- @tab -b @tab +4/9
-@item koma (dièse)
- @tab -c @tab +1/9
-
-@item koma (bémol)
- @tab -fc @tab -1/9
-@item bakiye (bémol)
- @tab -fb @tab -4/9
-@item kücük mücenneb (bémol)
- @tab -fk @tab -5/9
-@item büyük mücenneb (bémol)
- @tab -fbm @tab -8/9
-@end multitable
-@end quotation
-
-Pour plus d'information sur la musique classique turque et les
-makamlar, reportez-vous au chapitre @ref{Musique classique turque}.
-
-
-@snippets
-
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{makam-example.ly}
-
-
@node Modification de plusieurs hauteurs
@subsection Modification de plusieurs hauteurs
@translationof Changing multiple pitches
musiques traditionnelles autres qu'occidentales.
@menu
+* Noms de note et altérations non-occidentaux::
* Musique arabe::
* Musique classique turque::
@end menu
+
+@node Noms de note et altérations non-occidentaux
+@subsection Noms de note et altérations non-occidentaux
+@translationof Non-Western notation and tuning systems
+
+De nombreuses musiques autres qu'occidentales -- et même certaines
+formes de musique traditionnelle occidentales -- ont recours à des
+systèmes de notation alternatifs ou étendus, qui ne s'intègrent pas
+forcément dans notre système standard.
+
+Sans certains cas où la notation standard est utilisée, ces différences
+de hauteurs seront implicites. Par exemple, la musique arabe est
+reproduite en notation standard, et utilise des quarts de ton,
+l'altération réelle dépendant du contexte. D'autres, par contre, font
+appel à une notation étendue, voire toute particulière.
+
+La @notation{musique classique turque}, ou musique ottomane, utilise des
+formes mélodiques appelées @notation{makamlar}, dans laquelle les
+tons sont divisés en 9 intervalles. Du point de vue actuel des
+pratiques de notation, il est possible d'utiliser les notes occidentales
+(do, ré, mi@dots{}) auxquelles on ajoutera l'atlération spécifique à la
+musique turque. Ces différentes altérations sont définies dans le
+fichier @file{makam.ly} -- reportez vous au chapitre
+@rlearning{Autres sources de documentation} pour le localiser sur votre
+système. Vous trouverez, dans le tableau suivant, le nom de ces
+altérations, le suffixe à utiliser, ainsi que la fraction de ton entier
+à laquelle elles conrrespondent.
+
+@c TODO: can we include the actual accidentals in this table?
+@quotation
+@multitable {@b{büyük mücenneb (dièse)}} {@b{suffixe}} {@b{altération}}
+@headitem Nom d'altération
+ @tab suffixe @tab altération
+
+@item büyük mücenneb (dièse)
+ @tab -bm @tab +8/9
+@item kücük mücenneb (dièse)
+ @tab -k @tab +5/9
+@item bakiye (dièse)
+ @tab -b @tab +4/9
+@item koma (dièse)
+ @tab -c @tab +1/9
+
+@item koma (bémol)
+ @tab -fc @tab -1/9
+@item bakiye (bémol)
+ @tab -fb @tab -4/9
+@item kücük mücenneb (bémol)
+ @tab -fk @tab -5/9
+@item büyük mücenneb (bémol)
+ @tab -fbm @tab -8/9
+@end multitable
+@end quotation
+
+Pour plus d'information sur la musique classique turque et les
+makamlar, reportez-vous au chapitre @ref{Musique classique turque}.
+
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{makam-example.ly}
+
+
@node Musique arabe
@subsection Musique arabe
@translationof Arabic music
* cluster::
* comma::
* common meter::
+* Common Practice Period::
* common time::
* complement::
* compound interval::
@ref{common time}, @ref{meter}.
+@node Common Practice Period
+@section Common Practice Period
+
+ES: ?,
+I: ?,
+F: ?,
+D: ?,
+NL: ?,
+DK: ?,
+S: ?,
+FI: ?.
+
+@c TODO:
+This is a stubs for Common Practice Period (CPP).
+
+@seealso
+@ruser{Note names in other languages}.
+
+
@node common time
@section common time
* Relative octave entry::
* Accidentals::
* Note names in other languages::
-* Non-Western note names and accidentals::
@end menu
@cindex language, pitch names in other
There are predefined sets of note and accidental names for various
-other languages. To use them, include the language-specific init
-file listed below. For example, to use English note names, add
-@code{@w{\include "english.ly"}} to the input file.
+other languages. Selecting the note name language is usually done
+at the beginning of the file; the following example is written
+using Italian note names:
-@warning{Because some other include files (such as @code{@w{predefined-fretboards.ly}})
-use default (Nederlands) note names, the @code{@bs{}include}
-command for the language file should be placed after all other
-LilyPond distribution files.}
+@lilypond[quote,verbatim]
+\language "italiano"
-The available language files and the note names they define are:
+\relative do' {
+ do re mi sib
+}
+@end lilypond
+
+The available languages and the note names they define are:
@quotation
-@multitable {@file{nederlands.ly}} {do re mi fa sol la sib si}
+@multitable {@code{nederlands}} {do re mi fa sol la sib si}
@headitem Language File
@tab Note Names
-@item @file{nederlands.ly}
+@item @code{nederlands}
@tab c d e f g a bes b
-@item @file{arabic.ly}
+@item @code{catalan}
@tab do re mi fa sol la sib si
-@item @file{catalan.ly}
- @tab do re mi fa sol la sib si
-@item @file{deutsch.ly}
+@item @code{deutsch}
@tab c d e f g a b h
-@item @file{english.ly}
+@item @code{english}
@tab c d e f g a bf b
-@item @file{espanol.ly}
+@item @code{espanol}
@tab do re mi fa sol la sib si
-@item @file{italiano.ly}
+@item @code{italiano}
@tab do re mi fa sol la sib si
-@item @file{norsk.ly}
+@item @code{norsk}
@tab c d e f g a b h
-@item @file{portugues.ly}
+@item @code{portugues}
@tab do re mi fa sol la sib si
-@item @file{suomi.ly}
+@item @code{suomi}
@tab c d e f g a b h
-@item @file{svenska.ly}
+@item @code{svenska}
@tab c d e f g a b h
-@item @file{vlaams.ly}
+@item @code{vlaams}
@tab do re mi fa sol la sib si
@end multitable
@end quotation
-@noindent
-and the accidental suffixes they define are:
+In addition to note names, accidental suffixes may
+also vary depending on the language:
@quotation
-@multitable {@file{nederlands.ly}} {-s/-sharp} {-ess/-es} {-ss/-x/-sharpsharp} {-essess/-eses}
+@multitable {@code{nederlands}} {-s/-sharp} {-ess/-es} {-ss/-x/-sharpsharp} {-essess/-eses}
@headitem Language File
@tab sharp @tab flat @tab double sharp @tab double flat
-@item @file{nederlands.ly}
+@item @code{nederlands}
@tab -is @tab -es @tab -isis @tab -eses
-@item @file{arabic.ly}
- @tab -d @tab -b @tab -dd @tab -bb
-@item @file{catalan.ly}
+@item @code{catalan}
@tab -d/-s @tab -b @tab -dd/-ss @tab -bb
-@item @file{deutsch.ly}
+@item @code{deutsch}
@tab -is @tab -es @tab -isis @tab -eses
-@item @file{english.ly}
+@item @code{english}
@tab -s/-sharp @tab -f/-flat @tab -ss/-x/-sharpsharp
@tab -ff/-flatflat
-@item @file{espanol.ly}
+@item @code{espanol}
@tab -s @tab -b @tab -ss/-x @tab -bb
-@item @file{italiano.ly}
+@item @code{italiano}
@tab -d @tab -b @tab -dd @tab -bb
-@item @file{norsk.ly}
+@item @code{norsk}
@tab -iss/-is @tab -ess/-es @tab -ississ/-isis
@tab -essess/-eses
-@item @file{portugues.ly}
+@item @code{portugues}
@tab -s @tab -b @tab -ss @tab -bb
-@item @file{suomi.ly}
+@item @code{suomi}
@tab -is @tab -es @tab -isis @tab -eses
-@item @file{svenska.ly}
+@item @code{svenska}
@tab -iss @tab -ess @tab -ississ @tab -essess
-@item @file{vlaams.ly}
+@item @code{vlaams}
@tab -k @tab -b @tab -kk @tab -bb
@end multitable
@end quotation
@cindex sesqui-flat
Some music uses microtones whose alterations are fractions of a
-@q{normal} sharp or flat. The note names for quarter-tones
-defined in the various language files are listed in the following
-table. Here the prefixes @notation{semi-} and @notation{sesqui-}
-mean @q{half} and @q{one and a half}, respectively. For the other
-languages, no special names have been defined yet.
+@q{normal} sharp or flat. The following table lists note names
+for quarter-tone accidentals in various languages; here the prefixes
+@notation{semi-} and @notation{sesqui-} respectively
+mean @q{half} and @q{one and a half}. Languages that do not
+appear in this table do not provide special note names yet.
@quotation
-@multitable {@file{nederlands.ly}} {@b{semi-sharp}} {@b{semi-flat}} {@b{sesqui-sharp}} {@b{sesqui-flat}}
+@multitable {@code{nederlands}} {@b{semi-sharp}} {@b{semi-flat}} {@b{sesqui-sharp}} {@b{sesqui-flat}}
@headitem Language File
@tab semi-sharp @tab semi-flat @tab sesqui-sharp @tab sesqui-flat
-@item @file{nederlands.ly}
+@item @code{nederlands}
@tab -ih @tab -eh @tab -isih @tab -eseh
-@item @file{arabic.ly}
- @tab -sd @tab -sb @tab -dsd @tab -bsb
-@item @file{deutsch.ly}
+@item @code{deutsch}
@tab -ih @tab -eh @tab -isih @tab -eseh
-@item @file{english.ly}
+@item @code{english}
@tab -qs @tab -qf @tab -tqs @tab -tqf
-@item @file{espanol.ly}
+@item @code{espanol}
@tab -cs @tab -cb @tab -tcs @tab -tcb
-@item @file{italiano.ly}
+@item @code{italiano}
@tab -sd @tab -sb @tab -dsd @tab -bsb
-@item @file{portugues.ly}
+@item @code{portugues}
@tab -sqt @tab -bqt @tab -stqt @tab -btqt
@end multitable
@end quotation
+Most languages presented here are commonly associated with
+Western classical music, also referred to as
+@notation{Common Practice Period}. However, alternate
+pitches and tuning systems are also supported: see
+@ref{Non-Western notation and tuning systems}.
+
@seealso
Music Glossary:
-@rglos{Pitch names}.
+@rglos{Pitch names},
+@rglos{Common Practice Period}.
+
+Notation Reference:
+@ref{Non-Western notation and tuning systems}.
Snippets:
@rlsr{Pitches}.
-@node Non-Western note names and accidentals
-@unnumberedsubsubsec Non-Western note names and accidentals
-
-Many non-Western musics (and some Western folk and
-traditional musics) employ alternative or extended tuning
-systems that do not fit readily into standard classical
-notation.
-
-In some cases standard notation is still used, with the
-pitch differences being implicit. For example, Arabic
-music is notated with standard semitone and quarter-tone
-accidentals, with the precise pitch alterations being
-determined by context. Others require extended or unique
-notations.
-
-@notation{Turkish classical music}, or Ottoman music,
-employs melodic forms known as @notation{makamlar}, whose
-intervals are based on 1/9 divisions of the whole tone.
-From a modern notational point of view, it is convenient
-to use the standard Western staff notes (c, d, e, ...)
-with special accidentals unique to Turkish music. These
-accidentals are defined in @file{makam.ly} (to locate this
-file on your system, see
-@rlearning{Other sources of information}). The following
-table gives their names, the accidental suffix that must
-be added to notes, and their pitch alteration as a
-fraction of one whole tone.
-
-@c TODO: can we include the actual accidentals in this table?
-@quotation
-@multitable {@b{büyük mücenneb (sharp)}} {@b{suffix}} {@b{pitch alteration}}
-@headitem Accidental name
- @tab suffix @tab pitch alteration
-
-@item büyük mücenneb (sharp)
- @tab -bm @tab +8/9
-@item kücük mücenneb (sharp)
- @tab -k @tab +5/9
-@item bakiye (sharp)
- @tab -b @tab +4/9
-@item koma (sharp)
- @tab -c @tab +1/9
-
-@item koma (flat)
- @tab -fc @tab -1/9
-@item bakiye (flat)
- @tab -fb @tab -4/9
-@item kücük mücenneb (flat)
- @tab -fk @tab -5/9
-@item büyük mücenneb (flat)
- @tab -fbm @tab -8/9
-@end multitable
-@end quotation
-
-For further information on Turkish classical music and
-makamlar, see @ref{Turkish classical music}.
-
-
-@snippets
-
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{makam-example.ly}
-
-
@node Changing multiple pitches
@subsection Changing multiple pitches
e8
}
\new Lyrics \lyricsto "melody" {
- Ki -- ri -- e __
+ Ky -- ri -- e __
}
>>
@end lilypond
e8 ( d e2 )
}
\new Lyrics \lyricsto "melody" {
- Ki -- ri -- e __
+ Ky -- ri -- e __
}
>>
@end lilypond
e2.
}
\new Lyrics \lyricsto "melody" {
- Ki -- ri -- e
+ Ky -- ri -- e
}
>>
@end lilypond
e2.
}
\new Lyrics \lyricsto "melody" {
- Ki -- ri -- e
+ Ky -- ri -- e
}
>>
@end lilypond
e8 d e2
}
\new Lyrics \lyricsto "melody" {
- Ki -- ri -- _ _ _ e __ _ _
+ Ky -- ri -- _ _ _ e __ _ _
}
>>
@end lilypond
that are relevant to traditions outside the Western tradition.
@menu
+* Non-Western notation and tuning systems::
* Arabic music::
* Turkish classical music::
@end menu
+
+@node Non-Western notation and tuning systems
+@subsection Non-Western notation and tuning systems
+
+@c TODO: adapt & expand. -vv
+
+Many non-Western musics (and some Western folk and
+traditional musics) employ alternative or extended tuning
+systems that do not fit readily into standard classical
+notation.
+
+In some cases standard notation is still used, with the
+pitch differences being implicit. For example, Arabic
+music is notated with standard semitone and quarter-tone
+accidentals, with the precise pitch alterations being
+determined by context. Others require extended or unique
+notations.
+
+@notation{Turkish classical music}, or Ottoman music,
+employs melodic forms known as @notation{makamlar}, whose
+intervals are based on 1/9 divisions of the whole tone.
+From a modern notational point of view, it is convenient
+to use the standard Western staff notes (c, d, e, ...)
+with special accidentals unique to Turkish music. These
+accidentals are defined in @file{makam.ly} (to locate this
+file on your system, see
+@rlearning{Other sources of information}). The following
+table gives their names, the accidental suffix that must
+be added to notes, and their pitch alteration as a
+fraction of one whole tone.
+
+@c TODO: can we include the actual accidentals in this table?
+@quotation
+@multitable {@b{büyük mücenneb (sharp)}} {@b{suffix}} {@b{pitch alteration}}
+@headitem Accidental name
+ @tab suffix @tab pitch alteration
+
+@item büyük mücenneb (sharp)
+ @tab -bm @tab +8/9
+@item kücük mücenneb (sharp)
+ @tab -k @tab +5/9
+@item bakiye (sharp)
+ @tab -b @tab +4/9
+@item koma (sharp)
+ @tab -c @tab +1/9
+
+@item koma (flat)
+ @tab -fc @tab -1/9
+@item bakiye (flat)
+ @tab -fb @tab -4/9
+@item kücük mücenneb (flat)
+ @tab -fk @tab -5/9
+@item büyük mücenneb (flat)
+ @tab -fbm @tab -8/9
+@end multitable
+@end quotation
+
+For further information on Turkish classical music and
+makamlar, see @ref{Turkish classical music}.
+
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{makam-example.ly}
+
+
@node Arabic music
@subsection Arabic music
@itemize
@item Note names and accidentals (including quarter tones) can be
-tailored as discussed in @ref{Note names in other languages}.
+tailored as discussed in @ref{Non-Western notation and tuning systems}.
@item Additional key signatures can also be tailored as described
in @ref{Key signature}.
@seealso
Notation Reference:
-@ref{Note names in other languages},
+@ref{Non-Western notation and tuning systems},
@ref{Key signature},
@ref{Manual beams}.
used. English note names are not very familiar in Arabic music
education, so Italian or Solfege note names (@code{do, re, mi, fa,
sol, la, si}) are used instead. Modifiers (accidentals) can also
-be used, as discussed in @ref{Note names in other languages}.
+be used, as discussed in
+@ref{Non-Western notation and tuning systems}.
For example, this is how the Arabic @notation{rast} scale can be
notated:
@seealso
Notation Reference:
-@ref{Note names in other languages}.
+@ref{Non-Western notation and tuning systems}.
Snippets:
@rlsr{World music}.
@itemize
@item Note names and accidentals are provided in
-@ref{Non-Western note names and accidentals}.
+@ref{Non-Western notation and tuning systems}.
@end itemize
defined in the file @file{makam.ly} (to locate this file on
your system, see @rlearning{Other sources of information}).
A more detailed description is provided in
-@ref{Non-Western note names and accidentals}.
+@ref{Non-Western notation and tuning systems}.
+
@c used for news about the upcoming release; see CG 10.2
+@newsItem
+@subsubheading Alpha test four of 2.14 -- LilyPond 2.13.38 released! @emph{Oct 31, 2010}
+
+LilyPond 2.13.38 is out; this is the fourth alpha test of the
+upcoming 2.14 stable release. Users are invited to experiment
+with this version. New features since 2.12.3 are listed in the
+@qq{Changes} manual on the website section about
+@ref{Development}.
+
+There are still some Critical problems with this release: the
+vertical spacing is suspicious in two cases, and lilypond can
+crash with some odd input. If you decide to test 2.13.38, do not
+be surprised to discover problems; just send us polite
+@ref{Bug reports}.
+
+@newsEnd
+
+
@newsItem
@subsubheading Alpha test three of 2.14 -- LilyPond 2.13.37 released! @emph{Oct 25, 2010}
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=13
-PATCH_LEVEL=38
+PATCH_LEVEL=39
MY_PATCH_LEVEL=
VERSION_STABLE=2.12.3
-VERSION_DEVEL=2.13.37
+VERSION_DEVEL=2.13.38
-\version "2.13.19"
+\version "2.13.36"
\header {
texidoc = "The \cresc, \dim and \decresc spanners are now postfix operators
--- /dev/null
+\version "2.13.38"
+
+\header {
+ texidoc = "Various languages are supported for note names input.
+Selecting another language within a music expression is possible,
+and doesn't break point-and-click abilities.
+"
+}
+
+
+%% Old syntax.
+\include "english.ly"
+
+\relative c'' {
+ g4 bf d c
+
+ %% Manual override of the pitchnames variable
+ %% and the parser note names:
+ #(begin
+ (set! pitchnames (ly:assoc-get 'nederlands language-pitch-names))
+ (ly:parser-set-note-names parser pitchnames))
+ bes4 a g fis
+
+ %% The \language command acts in the same way:
+ \language "italiano"
+ sol4 fa mib re
+}
--- /dev/null
+\version "2.13.38"
+
+\header {
+ texidoc = "Setting individual nested paper properties does not
+remove existing settings or break spacing annotation."
+}
+
+\book {
+ \paper {
+ annotate-spacing = ##t
+ system-system-spacing = #'((space . 12) (minimum-distance . 8))
+ system-system-spacing #'padding = #1
+ }
+ \relative c' {
+ \repeat unfold 10 { a4 d e f }
+ }
+}
--- /dev/null
+\version "2.13.38"
+
+\header {
+ texidoc = "Stencils can be scaled using @code{ly:stencil-scale}.
+Negative values will flip or mirror the stencil without changing its origin; this
+may result in collisions unless the scaled stencil is realigned (e.g., the time
+signature in this test)."
+}
+
+\relative c' {
+ \override Staff.Clef #'stencil =
+ #(lambda (grob)
+ (ly:stencil-scale (ly:clef::print grob) 1 -1))
+ \override Staff.TimeSignature #'stencil =
+ #(lambda (grob)
+ (ly:stencil-aligned-to
+ (ly:stencil-scale (ly:time-signature::print grob) -2 1)
+ X LEFT))
+ \override MultiMeasureRestText #'stencil =
+ #(lambda (grob)
+ (ly:stencil-scale (ly:text-interface::print grob) 2 1.6))
+ R1\fermataMarkup
+}
LY_DEFINE (ly_axis_group_interface__add_element, "ly:axis-group-interface::add-element",
2, 0, 0, (SCM grob, SCM grob_element),
"Set @var{grob} the parent of @var{grob-element} on all axes of"
- "@var{grob}.")
+ " @var{grob}.")
{
LY_ASSERT_SMOB (Grob, grob, 1);
LY_ASSERT_SMOB (Grob, grob_element, 2);
LY_DEFINE (ly_book_add_bookpart_x, "ly:book-add-bookpart!",
2, 0, 0, (SCM book_smob, SCM book_part),
- "Add @var{book_part} to @var{book-smob} book part list.")
+ "Add @var{book-part} to @var{book-smob} book part list.")
{
LY_ASSERT_SMOB (Book, book_smob, 1);
Book *book = unsmob_book (book_smob);
LY_DEFINE (ly_book_book_parts, "ly:book-book-parts",
1, 0, 0, (SCM book),
- "Return book parts in book.")
+ "Return book parts in @var{book}.")
{
LY_ASSERT_SMOB (Book, book, 1);
Book *b = unsmob_book (book);
LY_DEFINE (ly_book_paper, "ly:book-paper",
1, 0, 0, (SCM book),
- "Return paper in book.")
+ "Return paper in @var{book}.")
{
LY_ASSERT_SMOB (Book, book, 1);
Book *b = unsmob_book (book);
LY_DEFINE (ly_book_scores, "ly:book-scores",
1, 0, 0, (SCM book),
- "Return scores in book.")
+ "Return scores in @var{book}.")
{
LY_ASSERT_SMOB (Book, book, 1);
Book *b = unsmob_book (book);
LY_DEFINE (ly_context_id, "ly:context-id",
1, 0, 0, (SCM context),
"Return the ID string of @var{context},"
- " i.e., for @code{\\context Voice = one @dots{}}"
+ " i.e., for @code{\\context Voice = \"one\" @dots{}}"
" return the string @code{one}.")
{
Context *tr = unsmob_context (context);
LY_DEFINE (ly_context_name, "ly:context-name",
1, 0, 0, (SCM context),
"Return the name of @var{context},"
- " i.e., for @code{\\context Voice = one @dots{}}"
+ " i.e., for @code{\\context Voice = \"one\" @dots{}}"
" return the symbol @code{Voice}.")
{
LY_ASSERT_SMOB (Context, context, 1);
*/
LY_DEFINE (ly_gulp_file, "ly:gulp-file",
1, 1, 0, (SCM name, SCM size),
- "Read the file @var{name}, and return its contents in a string."
+ "Read @var{size} characters from the file @var{name},"
+ " and return its contents in a string."
+ " If @var{size} is undefined, the entire file is read."
" The file is looked up using the search path.")
{
LY_ASSERT_TYPE (scm_is_string, name, 1);
LY_DEFINE (ly_number_2_string, "ly:number->string",
1, 0, 0, (SCM s),
- "Convert @var{num} to a string without generating many decimals.")
+ "Convert @var{s} to a string without generating many decimals.")
{
LY_ASSERT_TYPE (scm_is_number, s, 1);
LY_DEFINE (ly_make_global_context, "ly:make-global-context",
1, 0, 0, (SCM output_def),
"Set up a global interpretation context, using the output"
- " block @var{output_def}. The context is returned.")
+ " block @var{output-def}. The context is returned.")
{
LY_ASSERT_SMOB (Output_def, output_def, 1);
Output_def *odef = unsmob_output_def (output_def);
LY_DEFINE (ly_grob_object, "ly:grob-object",
2, 0, 0, (SCM grob, SCM sym),
- "Return the value of a pointer in grob@tie{}@var{g} of property"
+ "Return the value of a pointer in grob @var{grob} of property"
" @var{sym}. It returns @code{'()} (end-of-list) if @var{sym}"
- " is undefined in@tie{}@var{g}.")
+ " is undefined in @var{grob}.")
{
Grob *sc = unsmob_grob (grob);
LY_DEFINE (ly_grob_translate_axis_x, "ly:grob-translate-axis!",
3, 0, 0, (SCM grob, SCM d, SCM a),
- "Translate @var{g} on axis@tie{}@var{a} over"
+ "Translate @var{grob} on axis@tie{}@var{a} over"
" distance@tie{}@var{d}.")
{
Grob *me = unsmob_grob (grob);
LY_DEFINE (ly_grob_default_font, "ly:grob-default-font",
1, 0, 0, (SCM grob),
- "Return the default font for grob @var{gr}.")
+ "Return the default font for grob @var{grob}.")
{
Grob *gr = unsmob_grob (grob);
void rotate_degrees_absolute (Real, Offset);
void align_to (Axis a, Real x);
void translate_axis (Real, Axis);
+ void scale (Real, Real);
Interval extent (Axis) const;
Box extent_box () const;
if (scm_is_pair (path))
{
- SCM prev = scm_module_lookup (mod, sym);
- if (prev != SCM_UNDEFINED)
- val = nested_property_alist (prev, path, val);
+ SCM prev = ly_module_lookup (mod, sym);
+ if (prev != SCM_BOOL_F)
+ val = nested_property_alist (scm_variable_ref (prev), path, val);
}
scm_module_define (mod, sym, val);
}
LY_DEFINE (ly_note_column_accidentals, "ly:note-column-accidentals",
1, 0, 0, (SCM note_column),
- "Return the @code{AccidentalPlacement} grob from @var{note_column}"
- "if any, or @code{SCM_EOL} otherwise.")
+ "Return the @code{AccidentalPlacement} grob from @var{note-column}"
+ " if any, or @code{SCM_EOL} otherwise.")
{
Grob *grob = unsmob_grob (note_column);
LY_ASSERT_SMOB (Grob, note_column, 1);
LY_DEFINE (ly_note_column_dot_column, "ly:note-column-dot-column",
1, 0, 0, (SCM note_column),
- "Return the @code{DotColumn} grob from @var{note_column}"
- "if any, or @code{SCM_EOL} otherwise.")
+ "Return the @code{DotColumn} grob from @var{note-column}"
+ " if any, or @code{SCM_EOL} otherwise.")
{
Grob *grob = unsmob_grob (note_column);
LY_ASSERT_SMOB (Grob, note_column, 1);
LY_DEFINE (ly_make_page_label_marker, "ly:make-page-label-marker",
1, 0, 0,
(SCM label),
- "Return page marker with label.")
+ "Return page marker with label @var{label}.")
{
LY_ASSERT_TYPE (ly_is_symbol, label, 1);
Page_marker *page_marker = new Page_marker ();
LY_DEFINE (ly_pfb_2_pfa, "ly:pfb->pfa",
1, 0, 0, (SCM pfb_file_name),
- "Convert the contents of a PFB file to PFA.")
+ "Convert the contents of a Type@tie{}1 font in PFB format"
+ " to PFA format.")
{
LY_ASSERT_TYPE (scm_is_string, pfb_file_name, 1);
*/
LY_DEFINE (ly_prob_property_p, "ly:prob-property?",
2, 1, 0, (SCM obj, SCM sym),
- "Is boolean prop @var{sym} set?")
+ "Is boolean prop @var{sym} of @var{sym} set?")
{
return scm_equal_p (SCM_BOOL_T, ly_prob_property (obj, sym, SCM_BOOL_F));
}
LY_DEFINE (ly_prob_immutable_properties, "ly:prob-immutable-properties",
1, 0, 0,
(SCM prob),
- "Retrieve an alist of mutable properties.")
+ "Retrieve an alist of immutable properties.")
{
LY_ASSERT_SMOB (Prob, prob, 1);
Prob *ps = unsmob_prob (prob);
LY_DEFINE (ly_make_score, "ly:make-score",
1, 0, 0,
(SCM music),
- "Return score with @var{music} encapsulated in @var{score}.")
+ "Return score with @var{music} encapsulated in it.")
{
LY_ASSERT_SMOB (Music, music, 1);
LY_DEFINE (ly_make_simple_closure, "ly:make-simple-closure",
1, 0, 0, (SCM expr),
"Make a simple closure. @var{expr} should be form of"
- " @code{(@var{func} @var{a1} @var{A2} @dots{})}, and will be"
+ " @code{(@var{func} @var{a1} @var{a2} @dots{})}, and will be"
" invoked as @code{(@var{func} @var{delayed-arg} @var{a1}"
" @var{a2} @dots{})}.")
{
interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
(*func) (func_arg, scm_list_4 (ly_symbol2scm ("resetrotation"), angle, x, y));
+ return;
+ }
+ else if (head == ly_symbol2scm ("scale-stencil"))
+ {
+ SCM args = scm_cadr (expr);
+ SCM x_scale = scm_car (args);
+ SCM y_scale = scm_cadr (args);
+ Offset unscaled = o.scale (Offset (1 / scm_to_double (x_scale),
+ 1 / scm_to_double (y_scale)));
+
+ (*func) (func_arg, scm_list_3 (ly_symbol2scm ("setscale"), x_scale,
+ y_scale));
+ interpret_stencil_expression (scm_caddr (expr), func, func_arg,
+ unscaled);
+ (*func) (func_arg, scm_list_1 (ly_symbol2scm ("resetscale")));
+
return;
}
else
{
return all_stencil_heads ();
}
+
+LY_DEFINE (ly_stencil_scale, "ly:stencil-scale",
+ 3, 0, 0, (SCM stil, SCM x, SCM y),
+ "Scale @var{stil} using the horizontal and vertical scaling"
+ " factors @var{x} and @var{y}.")
+{
+ Stencil *s = unsmob_stencil (stil);
+ LY_ASSERT_SMOB (Stencil, stil, 1);
+ LY_ASSERT_TYPE (scm_is_number, x, 2);
+ LY_ASSERT_TYPE (scm_is_number, y, 3);
+
+ SCM new_s = s->smobbed_copy ();
+ Stencil *q = unsmob_stencil (new_s);
+
+ q->scale (scm_to_double (x), scm_to_double (y));
+ return new_s;
+}
translate (o);
}
+void
+Stencil::scale (Real x, Real y)
+{
+ expr_ = scm_list_3 (ly_symbol2scm ("scale-stencil"),
+ scm_list_2 (scm_from_double (x),
+ scm_from_double (y)),
+ expr_);
+ dim_[X_AXIS] *= x;
+ dim_[Y_AXIS] *= y;
+}
+
void
Stencil::add_stencil (Stencil const &s)
{
\version "2.12.0"
-\include "italiano.ly"
+\language "italiano"
%%%%%%%
%
%%%% common Catalan names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 1998--2010 Jaume Obrador <jobrador@ipc4.uib.es>
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- b = flat (bemoll)
- bb = double-flat
+\language "catalan"
- d = sharp (diesi)
- dd = double-sharp
-
- s = sharp (sostingut)
- ss = double-sharp
-
- English: c d e f g a b
- Catalan: do re mi fa sol la si
-
- Adapted from italiano.ly.
-
-%}
-
-pitchnamesCatalan = #`(
- (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (dob . ,(ly:make-pitch -1 0 FLAT))
- (do . ,(ly:make-pitch -1 0 NATURAL))
- (dod . ,(ly:make-pitch -1 0 SHARP))
- (dodd . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (reb . ,(ly:make-pitch -1 1 FLAT))
- (re . ,(ly:make-pitch -1 1 NATURAL))
- (red . ,(ly:make-pitch -1 1 SHARP))
- (redd . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (mib . ,(ly:make-pitch -1 2 FLAT))
- (mi . ,(ly:make-pitch -1 2 NATURAL))
- (mid . ,(ly:make-pitch -1 2 SHARP))
- (midd . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fab . ,(ly:make-pitch -1 3 FLAT))
- (fa . ,(ly:make-pitch -1 3 NATURAL))
- (fad . ,(ly:make-pitch -1 3 SHARP))
- (fadd . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (solb . ,(ly:make-pitch -1 4 FLAT))
- (sol . ,(ly:make-pitch -1 4 NATURAL))
- (sold . ,(ly:make-pitch -1 4 SHARP))
- (soldd . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (lab . ,(ly:make-pitch -1 5 FLAT))
- (la . ,(ly:make-pitch -1 5 NATURAL))
- (lad . ,(ly:make-pitch -1 5 SHARP))
- (ladd . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (sib . ,(ly:make-pitch -1 6 FLAT))
- (si . ,(ly:make-pitch -1 6 NATURAL))
- (sid . ,(ly:make-pitch -1 6 SHARP))
- (sidd . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-
- ;; Now that we have espanol.ly, should these be junked? --jcn
- (dos . ,(ly:make-pitch -1 0 SHARP))
- (doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (res . ,(ly:make-pitch -1 1 SHARP))
- (ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (mis . ,(ly:make-pitch -1 2 SHARP))
- (miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (fas . ,(ly:make-pitch -1 3 SHARP))
- (fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (sols . ,(ly:make-pitch -1 4 SHARP))
- (solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (las . ,(ly:make-pitch -1 5 SHARP))
- (lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (sis . ,(ly:make-pitch -1 6 SHARP))
- (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-pitchnames = \pitchnamesCatalan
-
-#(ly:parser-set-note-names parser pitchnames)
\include "music-functions-init.ly"
\include "toc-init.ly"
-%% default note names are dutch
-\include "nederlands.ly"
+\include "language-init.ly"
+pitchnames = #default-language
+#(ly:parser-set-note-names parser pitchnames)
\include "drumpitch-init.ly"
\include "chord-modifiers-init.ly"
%%%% common German names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 1997--2010 Roland Meier <meier@informatik.th-darmstadt.de>
-%%%% Bjoern Jacke <bjoern.jacke@gmx.de>
-%%%% (added asas; added comment to ases)
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- es = flat
- eses = double-flat
- eh = quarter-tone flat
- eseh = three-quarter-tones flat
+\language "deutsch"
- is = sharp
- isis = double-sharp
- ih = quarter-tone sharp
- isih = three-quarter-tones sharp
-
- English: c d e f g a bf b
- German: c d e f g a b h
-
- Adapted from svenska.ly
-
-%}
-
-pitchnamesDeutsch = #`(
- (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (ceseh . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
- (ces . ,(ly:make-pitch -1 0 FLAT))
- (ceh . ,(ly:make-pitch -1 0 SEMI-FLAT))
- (c . ,(ly:make-pitch -1 0 NATURAL))
- (cih . ,(ly:make-pitch -1 0 SEMI-SHARP))
- (cis . ,(ly:make-pitch -1 0 SHARP))
- (cisih . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
- (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-
- (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (deseh . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
- (des . ,(ly:make-pitch -1 1 FLAT))
- (deh . ,(ly:make-pitch -1 1 SEMI-FLAT))
- (d . ,(ly:make-pitch -1 1 NATURAL))
- (dih . ,(ly:make-pitch -1 1 SEMI-SHARP))
- (dis . ,(ly:make-pitch -1 1 SHARP))
- (disih . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
- (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-
- (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (eseh . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
- (es . ,(ly:make-pitch -1 2 FLAT))
- (eeh . ,(ly:make-pitch -1 2 SEMI-FLAT))
- (e . ,(ly:make-pitch -1 2 NATURAL))
- (eih . ,(ly:make-pitch -1 2 SEMI-SHARP))
- (eis . ,(ly:make-pitch -1 2 SHARP))
- (eisih . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
- (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-
- (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (feseh . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
- (fes . ,(ly:make-pitch -1 3 FLAT))
- (feh . ,(ly:make-pitch -1 3 SEMI-FLAT))
- (f . ,(ly:make-pitch -1 3 NATURAL))
- (fih . ,(ly:make-pitch -1 3 SEMI-SHARP))
- (fis . ,(ly:make-pitch -1 3 SHARP))
- (fisih . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
- (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-
- (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (geseh . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
- (ges . ,(ly:make-pitch -1 4 FLAT))
- (geh . ,(ly:make-pitch -1 4 SEMI-FLAT))
- (g . ,(ly:make-pitch -1 4 NATURAL))
- (gih . ,(ly:make-pitch -1 4 SEMI-SHARP))
- (gis . ,(ly:make-pitch -1 4 SHARP))
- (gisih . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
- (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-
- (asas . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (asah . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
- (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT)) ;;non-standard name for asas
- (aseh . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
- (as . ,(ly:make-pitch -1 5 FLAT))
- (aeh . ,(ly:make-pitch -1 5 SEMI-FLAT))
- (a . ,(ly:make-pitch -1 5 NATURAL))
- (aih . ,(ly:make-pitch -1 5 SEMI-SHARP))
- (ais . ,(ly:make-pitch -1 5 SHARP))
- (aisih . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
- (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-
- (heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (heseh . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
- (b . ,(ly:make-pitch -1 6 FLAT))
- (beh . ,(ly:make-pitch -1 6 SEMI-FLAT))
- (h . ,(ly:make-pitch -1 6 NATURAL))
- (hih . ,(ly:make-pitch -1 6 SEMI-SHARP))
- (his . ,(ly:make-pitch -1 6 SHARP))
- (hisih . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
- (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-
-pitchnames = \pitchnamesDeutsch
-
-#(ly:parser-set-note-names parser pitchnames)
%%%% common English names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- f = flat
- ff = double-flat
- qf = quarter[-tone] flat
- tqf = three-quarter[-tones] flat
+\language "english"
- s = sharp
- x = double-sharp
- ss = double-sharp
- qs = quarter[-tone] sharp
- tqs = three-quarter[-tones] sharp
-
-%}
-
-pitchnamesEnglish = #`(
- (cflatflat . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (cflat . ,(ly:make-pitch -1 0 FLAT))
- (c . ,(ly:make-pitch -1 0 NATURAL))
- (csharp . ,(ly:make-pitch -1 0 SHARP))
- (csharpsharp . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (dflatflat . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (dflat . ,(ly:make-pitch -1 1 FLAT))
- (d . ,(ly:make-pitch -1 1 NATURAL))
- (dsharp . ,(ly:make-pitch -1 1 SHARP))
- (dsharpsharp . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (eflatflat . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (eflat . ,(ly:make-pitch -1 2 FLAT))
- (e . ,(ly:make-pitch -1 2 NATURAL))
- (esharp . ,(ly:make-pitch -1 2 SHARP))
- (esharpsharp . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (fflatflat . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fflat . ,(ly:make-pitch -1 3 FLAT))
- (f . ,(ly:make-pitch -1 3 NATURAL))
- (fsharp . ,(ly:make-pitch -1 3 SHARP))
- (fsharpsharp . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (gflatflat . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (gflat . ,(ly:make-pitch -1 4 FLAT))
- (g . ,(ly:make-pitch -1 4 NATURAL))
- (gsharp . ,(ly:make-pitch -1 4 SHARP))
- (gsharpsharp . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (aflatflat . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (aflat . ,(ly:make-pitch -1 5 FLAT))
- (a . ,(ly:make-pitch -1 5 NATURAL))
- (asharp . ,(ly:make-pitch -1 5 SHARP))
- (asharpsharp . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (bflatflat . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (bflat . ,(ly:make-pitch -1 6 FLAT))
- (b . ,(ly:make-pitch -1 6 NATURAL))
- (bsharp . ,(ly:make-pitch -1 6 SHARP))
- (bsharpsharp . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-
- (cff . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (ctqf . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
- (cf . ,(ly:make-pitch -1 0 FLAT))
- (cqf . ,(ly:make-pitch -1 0 SEMI-FLAT))
- (c . ,(ly:make-pitch -1 0 NATURAL))
- (cqs . ,(ly:make-pitch -1 0 SEMI-SHARP))
- (cs . ,(ly:make-pitch -1 0 SHARP))
- (ctqs . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
- (css . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (cx . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-
- (dff . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (dtqf . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
- (df . ,(ly:make-pitch -1 1 FLAT))
- (dqf . ,(ly:make-pitch -1 1 SEMI-FLAT))
- (d . ,(ly:make-pitch -1 1 NATURAL))
- (dqs . ,(ly:make-pitch -1 1 SEMI-SHARP))
- (ds . ,(ly:make-pitch -1 1 SHARP))
- (dtqs . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
- (dss . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (dx . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-
- (eff . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (etqf . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
- (ef . ,(ly:make-pitch -1 2 FLAT))
- (eqf . ,(ly:make-pitch -1 2 SEMI-FLAT))
- (e . ,(ly:make-pitch -1 2 NATURAL))
- (eqs . ,(ly:make-pitch -1 2 SEMI-SHARP))
- (es . ,(ly:make-pitch -1 2 SHARP))
- (etqs . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
- (ess . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (ex . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-
- (fff . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (ftqf . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
- (ff . ,(ly:make-pitch -1 3 FLAT))
- (fqf . ,(ly:make-pitch -1 3 SEMI-FLAT))
- (f . ,(ly:make-pitch -1 3 NATURAL))
- (fqs . ,(ly:make-pitch -1 3 SEMI-SHARP))
- (fs . ,(ly:make-pitch -1 3 SHARP))
- (ftqs . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
- (fss . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (fx . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-
- (gff . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (gtqf . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
- (gf . ,(ly:make-pitch -1 4 FLAT))
- (gqf . ,(ly:make-pitch -1 4 SEMI-FLAT))
- (g . ,(ly:make-pitch -1 4 NATURAL))
- (gqs . ,(ly:make-pitch -1 4 SEMI-SHARP))
- (gs . ,(ly:make-pitch -1 4 SHARP))
- (gtqs . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
- (gss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (gx . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-
- (aff . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (atqf . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
- (af . ,(ly:make-pitch -1 5 FLAT))
- (aqf . ,(ly:make-pitch -1 5 SEMI-FLAT))
- (a . ,(ly:make-pitch -1 5 NATURAL))
- (aqs . ,(ly:make-pitch -1 5 SEMI-SHARP))
- (as . ,(ly:make-pitch -1 5 SHARP))
- (atqs . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
- (ass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (ax . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-
- (bff . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (btqf . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
- (bf . ,(ly:make-pitch -1 6 FLAT))
- (bqf . ,(ly:make-pitch -1 6 SEMI-FLAT))
- (b . ,(ly:make-pitch -1 6 NATURAL))
- (bqs . ,(ly:make-pitch -1 6 SEMI-SHARP))
- (bs . ,(ly:make-pitch -1 6 SHARP))
- (btqs . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
- (bss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
- (bx . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-pitchnames = \pitchnamesEnglish
-
-#(ly:parser-set-note-names parser pitchnames)
%%%% common Spanish names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 2002--2010 Carlos García Suárez <cgscqmp@terra.es>
-%%%% Maximiliano G. G. <mxgdvg@yahoo.it>
-%%%% (double-flats, double-sharps, quarter-tones, etc.)
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- b = flat (bemol)
- bb = double-flat
- cb = quarter-tone flat (cuarto [de tono de] bemol)
- tcb = three-quarter-tones flat (tres cuartos [de tonos de] bemol)
+\language "espanol"
- s = sharp (sostenido)
- x = double-sharp
- ss = double-sharp
- cs = quarter-tone sharp (cuarto [de tono de] sostenido)
- tcs = three-quarter-tones sharp (tres cuartos [de tonos de] sostenido)
-
- English: c d e f g a b
- Spanish: do re mi fa sol la si
-
- Adapted from italiano.ly.
-
-%}
-
-pitchnamesEspanol = #`(
- (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (dotcb . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
- (dob . ,(ly:make-pitch -1 0 FLAT))
- (docb . ,(ly:make-pitch -1 0 SEMI-FLAT))
- (do . ,(ly:make-pitch -1 0 NATURAL))
- (docs . ,(ly:make-pitch -1 0 SEMI-SHARP))
- (dos . ,(ly:make-pitch -1 0 SHARP))
- (dotcs . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
- (doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (dox . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-
- (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (retcb . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
- (reb . ,(ly:make-pitch -1 1 FLAT))
- (recb . ,(ly:make-pitch -1 1 SEMI-FLAT))
- (re . ,(ly:make-pitch -1 1 NATURAL))
- (recs . ,(ly:make-pitch -1 1 SEMI-SHARP))
- (res . ,(ly:make-pitch -1 1 SHARP))
- (retcs . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
- (ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (rex . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-
- (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (mitcb . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
- (mib . ,(ly:make-pitch -1 2 FLAT))
- (micb . ,(ly:make-pitch -1 2 SEMI-FLAT))
- (mi . ,(ly:make-pitch -1 2 NATURAL))
- (mics . ,(ly:make-pitch -1 2 SEMI-SHARP))
- (mis . ,(ly:make-pitch -1 2 SHARP))
- (mitcs . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
- (miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (mix . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-
- (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fatcb . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
- (fab . ,(ly:make-pitch -1 3 FLAT))
- (facb . ,(ly:make-pitch -1 3 SEMI-FLAT))
- (fa . ,(ly:make-pitch -1 3 NATURAL))
- (facs . ,(ly:make-pitch -1 3 SEMI-SHARP))
- (fas . ,(ly:make-pitch -1 3 SHARP))
- (fatcs . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
- (fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (fax . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-
- (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (soltcb . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
- (solb . ,(ly:make-pitch -1 4 FLAT))
- (solcb . ,(ly:make-pitch -1 4 SEMI-FLAT))
- (sol . ,(ly:make-pitch -1 4 NATURAL))
- (solcs . ,(ly:make-pitch -1 4 SEMI-SHARP))
- (sols . ,(ly:make-pitch -1 4 SHARP))
- (soltcs . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
- (solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (solx . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-
- (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (latcb . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
- (lab . ,(ly:make-pitch -1 5 FLAT))
- (lacb . ,(ly:make-pitch -1 5 SEMI-FLAT))
- (la . ,(ly:make-pitch -1 5 NATURAL))
- (lacs . ,(ly:make-pitch -1 5 SEMI-SHARP))
- (las . ,(ly:make-pitch -1 5 SHARP))
- (latcs . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
- (lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (lax . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-
- (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (sitcb . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
- (sib . ,(ly:make-pitch -1 6 FLAT))
- (sicb . ,(ly:make-pitch -1 6 SEMI-FLAT))
- (si . ,(ly:make-pitch -1 6 NATURAL))
- (sics . ,(ly:make-pitch -1 6 SEMI-SHARP))
- (sis . ,(ly:make-pitch -1 6 SHARP))
- (sitcs . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
- (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
- (six . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-
-)
-
-pitchnames = \pitchnamesEspanol
-
-#(ly:parser-set-note-names parser pitchnames)
%%%% common Italian names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 1998--2010 Paolo Zuliani <zuliap@easynet.it>
-%%%% Eric Wurbel <wurbel@univ-tln.fr>
-%%%% (additions for semi-sharps and semi-flats)
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- b = flat (bemolle)
- bb = double-flat
- sb = quarter-tone flat (semi-bemolle)
- bsb = three-quarter-tones flat
+\language "italiano"
- d = sharp (diesis)
- dd = double-sharp
- sd = quarter-tone sharp (semi-diesis)
- dsd = three-quarter-tones sharp
-
- English: c d e f g a b
- Italian: do re mi fa sol la si
-
- Adapted from nederlands.ly.
-
- For french naming just change 'do' to 'ut'.
-
-%}
-
-pitchnamesItaliano = #`(
- (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (dobsb . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
- (dob . ,(ly:make-pitch -1 0 FLAT))
- (dosb . ,(ly:make-pitch -1 0 SEMI-FLAT))
- (do . ,(ly:make-pitch -1 0 NATURAL))
- (dosd . ,(ly:make-pitch -1 0 SEMI-SHARP))
- (dod . ,(ly:make-pitch -1 0 SHARP))
- (dodsd . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
- (dodd . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-
- (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (rebsb . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
- (reb . ,(ly:make-pitch -1 1 FLAT))
- (resb . ,(ly:make-pitch -1 1 SEMI-FLAT))
- (re . ,(ly:make-pitch -1 1 NATURAL))
- (resd . ,(ly:make-pitch -1 1 SEMI-SHARP))
- (red . ,(ly:make-pitch -1 1 SHARP))
- (redsd . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
- (redd . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-
- (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (mibsb . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
- (mib . ,(ly:make-pitch -1 2 FLAT))
- (misb . ,(ly:make-pitch -1 2 SEMI-FLAT))
- (mi . ,(ly:make-pitch -1 2 NATURAL))
- (misd . ,(ly:make-pitch -1 2 SEMI-SHARP))
- (mid . ,(ly:make-pitch -1 2 SHARP))
- (midsd . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
- (midd . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-
- (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fabsb . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
- (fab . ,(ly:make-pitch -1 3 FLAT))
- (fasb . ,(ly:make-pitch -1 3 SEMI-FLAT))
- (fa . ,(ly:make-pitch -1 3 NATURAL))
- (fasd . ,(ly:make-pitch -1 3 SEMI-SHARP))
- (fad . ,(ly:make-pitch -1 3 SHARP))
- (fadsd . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
- (fadd . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-
- (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (solbsb . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
- (solb . ,(ly:make-pitch -1 4 FLAT))
- (solsb . ,(ly:make-pitch -1 4 SEMI-FLAT))
- (sol . ,(ly:make-pitch -1 4 NATURAL))
- (solsd . ,(ly:make-pitch -1 4 SEMI-SHARP))
- (sold . ,(ly:make-pitch -1 4 SHARP))
- (soldsd . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
- (soldd . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-
- (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (labsb . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
- (lab . ,(ly:make-pitch -1 5 FLAT))
- (lasb . ,(ly:make-pitch -1 5 SEMI-FLAT))
- (la . ,(ly:make-pitch -1 5 NATURAL))
- (lasd . ,(ly:make-pitch -1 5 SEMI-SHARP))
- (lad . ,(ly:make-pitch -1 5 SHARP))
- (ladsd . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
- (ladd . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-
- (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (sibsb . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
- (sib . ,(ly:make-pitch -1 6 FLAT))
- (sisb . ,(ly:make-pitch -1 6 SEMI-FLAT))
- (si . ,(ly:make-pitch -1 6 NATURAL))
- (sisd . ,(ly:make-pitch -1 6 SEMI-SHARP))
- (sid . ,(ly:make-pitch -1 6 SHARP))
- (sidsd . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
- (sidd . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-
-)
-
-pitchnames = \pitchnamesItaliano
-
-#(ly:parser-set-note-names parser pitchnames)
--- /dev/null
+%%%% Common note names in various languages.
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net> et al:
+%%%%
+%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl> (Nederlands)
+%%%% Copyright (C) 1998--2010 Jaume Obrador <jobrador@ipc4.uib.es> (Catalan)
+%%%% Copyright (C) 1997--2010 Roland Meier <meier@informatik.th-darmstadt.de>
+%%%% Bjoern Jacke <bjoern.jacke@gmx.de> (Deutsch)
+%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl> (English)
+%%%% Copyright (C) 2002--2010 Carlos García Suárez <cgscqmp@terra.es>
+%%%% Maximiliano G. G. <mxgdvg@yahoo.it> (Espanol)
+%%%% Copyright (C) 1998--2010 Paolo Zuliani <zuliap@easynet.it>
+%%%% Eric Wurbel <wurbel@univ-tln.fr> (Italiano)
+%%%% Copyright (C) 1998--2010 Arvid Grøtting <arvidg@ifi.uio.no> (Norsk)
+%%%% Copyright (C) 2004--2010 Pedro Kröger <kroeger@pedrokroeger.net> (Portugues)
+%%%% Copyright (C) 2001--2010 Heikki Junes <heikki.junes@hut.fi> (Suomi)
+%%%% Copyright (C) 1997--2010 Mats Bengtsson <mabe@violin.s3.kth.se> (Svenska)
+%%%% Copyright (C) 2004--2010 Hendrik Maryns <hendrik.maryns@ugent.be> (Vlaams)
+%%%%
+%%%% LilyPond is free software: you can redistribute it and/or modify
+%%%% it under the terms of the GNU General Public License as published by
+%%%% the Free Software Foundation, either version 3 of the License, or
+%%%% (at your option) any later version.
+%%%%
+%%%% LilyPond is distributed in the hope that it will be useful,
+%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%%%% GNU General Public License for more details.
+%%%%
+%%%% You should have received a copy of the GNU General Public License
+%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
+
+
+\version "2.13.37"
+
+#(define language-pitch-names
+ `(
+ ;; Language: Nederlands --------------------------------------------;
+ ;; Dutch note names -- LilyPond's default language.
+ ;; Han-Wen Nienhuys <hanwen@xs4all.nl>
+ ;;
+ ;; es = flat
+ ;; eses = double-flat
+ ;; eh = quarter-tone flat
+ ;; eseh = three-quarter-tones flat
+ ;;
+ ;; is = sharp
+ ;; isis = double-sharp
+ ;; ih = quarter-tone sharp
+ ;; isih = three-quarter-tones sharp
+ ;;
+ ;; English: c d e f g a bf b
+ ;; Dutch: c d e f g a b h
+
+ (nederlands . (
+ (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (ceh . ,(ly:make-pitch -1 0 SEMI-FLAT))
+ (ces . ,(ly:make-pitch -1 0 FLAT))
+ (ceseh . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cis . ,(ly:make-pitch -1 0 SHARP))
+ (cih . ,(ly:make-pitch -1 0 SEMI-SHARP))
+ (cisih . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
+ (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+
+ (deh . ,(ly:make-pitch -1 1 SEMI-FLAT))
+ (des . ,(ly:make-pitch -1 1 FLAT))
+ (deseh . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dis . ,(ly:make-pitch -1 1 SHARP))
+ (dih . ,(ly:make-pitch -1 1 SEMI-SHARP))
+ (disih . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
+ (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eeses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+
+ (eeh . ,(ly:make-pitch -1 2 SEMI-FLAT))
+ (ees . ,(ly:make-pitch -1 2 FLAT))
+ (eeseh . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
+ (es . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eis . ,(ly:make-pitch -1 2 SHARP))
+ (eih . ,(ly:make-pitch -1 2 SEMI-SHARP))
+ (eisih . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
+ (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+
+ (feh . ,(ly:make-pitch -1 3 SEMI-FLAT))
+ (fes . ,(ly:make-pitch -1 3 FLAT))
+ (feseh . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fis . ,(ly:make-pitch -1 3 SHARP))
+ (fih . ,(ly:make-pitch -1 3 SEMI-SHARP))
+ (fisih . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
+ (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+
+ (geh . ,(ly:make-pitch -1 4 SEMI-FLAT))
+ (ges . ,(ly:make-pitch -1 4 FLAT))
+ (geseh . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gis . ,(ly:make-pitch -1 4 SHARP))
+ (gih . ,(ly:make-pitch -1 4 SEMI-SHARP))
+ (gisih . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
+ (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (aeses . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+
+ (aeh . ,(ly:make-pitch -1 5 SEMI-FLAT))
+ (aes . ,(ly:make-pitch -1 5 FLAT))
+ (aeseh . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+ (as . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (ais . ,(ly:make-pitch -1 5 SHARP))
+ (aih . ,(ly:make-pitch -1 5 SEMI-SHARP))
+ (aisih . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
+ (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (beses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+
+ (beh . ,(ly:make-pitch -1 6 SEMI-FLAT))
+ (bes . ,(ly:make-pitch -1 6 FLAT))
+ (beseh . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
+ (b . ,(ly:make-pitch -1 6 NATURAL))
+ (bis . ,(ly:make-pitch -1 6 SHARP))
+ (bih . ,(ly:make-pitch -1 6 SEMI-SHARP))
+ (bisih . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
+ (bisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+
+
+ ;; Language: Catalan -----------------------------------------------;
+ ;; Jaume Obrador <jobrador@ipc4.uib.es>
+ ;;
+ ;; b = flat (bemoll)
+ ;; bb = double-flat
+ ;;
+ ;; d = sharp (diesi)
+ ;; dd = double-sharp
+ ;;
+ ;; s = sharp (sostingut)
+ ;; ss = double-sharp
+ ;;
+ ;; English: c d e f g a b
+ ;; Catalan: do re mi fa sol la si
+
+ (catalan . (
+ (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (dob . ,(ly:make-pitch -1 0 FLAT))
+ (do . ,(ly:make-pitch -1 0 NATURAL))
+ (dod . ,(ly:make-pitch -1 0 SHARP))
+ (dodd . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (reb . ,(ly:make-pitch -1 1 FLAT))
+ (re . ,(ly:make-pitch -1 1 NATURAL))
+ (red . ,(ly:make-pitch -1 1 SHARP))
+ (redd . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (mib . ,(ly:make-pitch -1 2 FLAT))
+ (mi . ,(ly:make-pitch -1 2 NATURAL))
+ (mid . ,(ly:make-pitch -1 2 SHARP))
+ (midd . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fab . ,(ly:make-pitch -1 3 FLAT))
+ (fa . ,(ly:make-pitch -1 3 NATURAL))
+ (fad . ,(ly:make-pitch -1 3 SHARP))
+ (fadd . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (solb . ,(ly:make-pitch -1 4 FLAT))
+ (sol . ,(ly:make-pitch -1 4 NATURAL))
+ (sold . ,(ly:make-pitch -1 4 SHARP))
+ (soldd . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (lab . ,(ly:make-pitch -1 5 FLAT))
+ (la . ,(ly:make-pitch -1 5 NATURAL))
+ (lad . ,(ly:make-pitch -1 5 SHARP))
+ (ladd . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (sib . ,(ly:make-pitch -1 6 FLAT))
+ (si . ,(ly:make-pitch -1 6 NATURAL))
+ (sid . ,(ly:make-pitch -1 6 SHARP))
+ (sidd . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+
+ ;; Now that we have espanol.ly, should these be junked? --jcn
+ (dos . ,(ly:make-pitch -1 0 SHARP))
+ (doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (res . ,(ly:make-pitch -1 1 SHARP))
+ (ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (mis . ,(ly:make-pitch -1 2 SHARP))
+ (miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fas . ,(ly:make-pitch -1 3 SHARP))
+ (fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (sols . ,(ly:make-pitch -1 4 SHARP))
+ (solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (las . ,(ly:make-pitch -1 5 SHARP))
+ (lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (sis . ,(ly:make-pitch -1 6 SHARP))
+ (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+
+
+ ;; Language: Deutsch -----------------------------------------------;
+ ;; Roland Meier <meier@informatik.th-darmstadt.de>,
+ ;; Bjoern Jacke <bjoern.jacke@gmx.de>
+ ;;
+ ;; es = flat
+ ;; eses = double-flat
+ ;; eh = quarter-tone flat
+ ;; eseh = three-quarter-tones flat
+ ;;
+ ;; is = sharp
+ ;; isis = double-sharp
+ ;; ih = quarter-tone sharp
+ ;; isih = three-quarter-tones sharp
+ ;;
+ ;; English: c d e f g a bf b
+ ;; German: c d e f g a b h
+
+ (deutsch . (
+ (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (ceseh . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
+ (ces . ,(ly:make-pitch -1 0 FLAT))
+ (ceh . ,(ly:make-pitch -1 0 SEMI-FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cih . ,(ly:make-pitch -1 0 SEMI-SHARP))
+ (cis . ,(ly:make-pitch -1 0 SHARP))
+ (cisih . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
+ (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+
+ (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (deseh . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
+ (des . ,(ly:make-pitch -1 1 FLAT))
+ (deh . ,(ly:make-pitch -1 1 SEMI-FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dih . ,(ly:make-pitch -1 1 SEMI-SHARP))
+ (dis . ,(ly:make-pitch -1 1 SHARP))
+ (disih . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
+ (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+
+ (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (eseh . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
+ (es . ,(ly:make-pitch -1 2 FLAT))
+ (eeh . ,(ly:make-pitch -1 2 SEMI-FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eih . ,(ly:make-pitch -1 2 SEMI-SHARP))
+ (eis . ,(ly:make-pitch -1 2 SHARP))
+ (eisih . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
+ (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+
+ (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (feseh . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
+ (fes . ,(ly:make-pitch -1 3 FLAT))
+ (feh . ,(ly:make-pitch -1 3 SEMI-FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fih . ,(ly:make-pitch -1 3 SEMI-SHARP))
+ (fis . ,(ly:make-pitch -1 3 SHARP))
+ (fisih . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
+ (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+
+ (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (geseh . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
+ (ges . ,(ly:make-pitch -1 4 FLAT))
+ (geh . ,(ly:make-pitch -1 4 SEMI-FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gih . ,(ly:make-pitch -1 4 SEMI-SHARP))
+ (gis . ,(ly:make-pitch -1 4 SHARP))
+ (gisih . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
+ (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+
+ (asas . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (asah . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+ (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT)) ;;non-standard name for asas
+ (aseh . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+ (as . ,(ly:make-pitch -1 5 FLAT))
+ (aeh . ,(ly:make-pitch -1 5 SEMI-FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (aih . ,(ly:make-pitch -1 5 SEMI-SHARP))
+ (ais . ,(ly:make-pitch -1 5 SHARP))
+ (aisih . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
+ (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+
+ (heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (heseh . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (beh . ,(ly:make-pitch -1 6 SEMI-FLAT))
+ (h . ,(ly:make-pitch -1 6 NATURAL))
+ (hih . ,(ly:make-pitch -1 6 SEMI-SHARP))
+ (his . ,(ly:make-pitch -1 6 SHARP))
+ (hisih . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
+ (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+
+
+ ;; Language: English -----------------------------------------------;
+ ;; Han-Wen Nienhuys <hanwen@xs4all.nl>
+ ;;
+ ;; f = flat
+ ;; ff = double-flat
+ ;; qf = quarter[-tone] flat
+ ;; tqf = three-quarter[-tones] flat
+ ;;
+ ;; s = sharp
+ ;; x = double-sharp
+ ;; ss = double-sharp
+ ;; qs = quarter[-tone] sharp
+ ;; tqs = three-quarter[-tones] sharp
+
+ (english . (
+ (cflatflat . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (cflat . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (csharp . ,(ly:make-pitch -1 0 SHARP))
+ (csharpsharp . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (dflatflat . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (dflat . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dsharp . ,(ly:make-pitch -1 1 SHARP))
+ (dsharpsharp . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eflatflat . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (eflat . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (esharp . ,(ly:make-pitch -1 2 SHARP))
+ (esharpsharp . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fflatflat . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fflat . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fsharp . ,(ly:make-pitch -1 3 SHARP))
+ (fsharpsharp . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (gflatflat . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (gflat . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gsharp . ,(ly:make-pitch -1 4 SHARP))
+ (gsharpsharp . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (aflatflat . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (aflat . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (asharp . ,(ly:make-pitch -1 5 SHARP))
+ (asharpsharp . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (bflatflat . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (bflat . ,(ly:make-pitch -1 6 FLAT))
+ (b . ,(ly:make-pitch -1 6 NATURAL))
+ (bsharp . ,(ly:make-pitch -1 6 SHARP))
+ (bsharpsharp . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+
+ (cff . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (ctqf . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
+ (cf . ,(ly:make-pitch -1 0 FLAT))
+ (cqf . ,(ly:make-pitch -1 0 SEMI-FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cqs . ,(ly:make-pitch -1 0 SEMI-SHARP))
+ (cs . ,(ly:make-pitch -1 0 SHARP))
+ (ctqs . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
+ (css . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (cx . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+
+ (dff . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (dtqf . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
+ (df . ,(ly:make-pitch -1 1 FLAT))
+ (dqf . ,(ly:make-pitch -1 1 SEMI-FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dqs . ,(ly:make-pitch -1 1 SEMI-SHARP))
+ (ds . ,(ly:make-pitch -1 1 SHARP))
+ (dtqs . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
+ (dss . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (dx . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+
+ (eff . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (etqf . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
+ (ef . ,(ly:make-pitch -1 2 FLAT))
+ (eqf . ,(ly:make-pitch -1 2 SEMI-FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eqs . ,(ly:make-pitch -1 2 SEMI-SHARP))
+ (es . ,(ly:make-pitch -1 2 SHARP))
+ (etqs . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
+ (ess . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (ex . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+
+ (fff . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (ftqf . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
+ (ff . ,(ly:make-pitch -1 3 FLAT))
+ (fqf . ,(ly:make-pitch -1 3 SEMI-FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fqs . ,(ly:make-pitch -1 3 SEMI-SHARP))
+ (fs . ,(ly:make-pitch -1 3 SHARP))
+ (ftqs . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
+ (fss . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (fx . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+
+ (gff . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (gtqf . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
+ (gf . ,(ly:make-pitch -1 4 FLAT))
+ (gqf . ,(ly:make-pitch -1 4 SEMI-FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gqs . ,(ly:make-pitch -1 4 SEMI-SHARP))
+ (gs . ,(ly:make-pitch -1 4 SHARP))
+ (gtqs . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
+ (gss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (gx . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+
+ (aff . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (atqf . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+ (af . ,(ly:make-pitch -1 5 FLAT))
+ (aqf . ,(ly:make-pitch -1 5 SEMI-FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (aqs . ,(ly:make-pitch -1 5 SEMI-SHARP))
+ (as . ,(ly:make-pitch -1 5 SHARP))
+ (atqs . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
+ (ass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (ax . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+
+ (bff . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (btqf . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
+ (bf . ,(ly:make-pitch -1 6 FLAT))
+ (bqf . ,(ly:make-pitch -1 6 SEMI-FLAT))
+ (b . ,(ly:make-pitch -1 6 NATURAL))
+ (bqs . ,(ly:make-pitch -1 6 SEMI-SHARP))
+ (bs . ,(ly:make-pitch -1 6 SHARP))
+ (btqs . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
+ (bss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ (bx . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+
+
+ ;; Language: Espanol -----------------------------------------------;
+ ;; Carlos García Suárez <cgscqmp@terra.es>,
+ ;; Maximiliano G. G. <mxgdvg@yahoo.it>
+ ;;
+ ;; b = flat (bemol)
+ ;; bb = double-flat
+ ;; cb = quarter-tone flat (cuarto [de tono de] bemol)
+ ;; tcb = three-quarter-tones flat (tres cuartos [de tonos de] bemol)
+ ;;
+ ;; s = sharp (sostenido)
+ ;; x = double-sharp
+ ;; ss = double-sharp
+ ;; cs = quarter-tone sharp (cuarto [de tono de] sostenido)
+ ;; tcs = three-quarter-tones sharp (tres cuartos [de tonos de] sostenido)
+ ;;
+ ;; English: c d e f g a b
+ ;; Spanish: do re mi fa sol la si
+
+ (espanol . (
+ (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (dotcb . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
+ (dob . ,(ly:make-pitch -1 0 FLAT))
+ (docb . ,(ly:make-pitch -1 0 SEMI-FLAT))
+ (do . ,(ly:make-pitch -1 0 NATURAL))
+ (docs . ,(ly:make-pitch -1 0 SEMI-SHARP))
+ (dos . ,(ly:make-pitch -1 0 SHARP))
+ (dotcs . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
+ (doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (dox . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+
+ (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (retcb . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
+ (reb . ,(ly:make-pitch -1 1 FLAT))
+ (recb . ,(ly:make-pitch -1 1 SEMI-FLAT))
+ (re . ,(ly:make-pitch -1 1 NATURAL))
+ (recs . ,(ly:make-pitch -1 1 SEMI-SHARP))
+ (res . ,(ly:make-pitch -1 1 SHARP))
+ (retcs . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
+ (ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (rex . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+
+ (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (mitcb . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
+ (mib . ,(ly:make-pitch -1 2 FLAT))
+ (micb . ,(ly:make-pitch -1 2 SEMI-FLAT))
+ (mi . ,(ly:make-pitch -1 2 NATURAL))
+ (mics . ,(ly:make-pitch -1 2 SEMI-SHARP))
+ (mis . ,(ly:make-pitch -1 2 SHARP))
+ (mitcs . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
+ (miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (mix . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+
+ (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fatcb . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
+ (fab . ,(ly:make-pitch -1 3 FLAT))
+ (facb . ,(ly:make-pitch -1 3 SEMI-FLAT))
+ (fa . ,(ly:make-pitch -1 3 NATURAL))
+ (facs . ,(ly:make-pitch -1 3 SEMI-SHARP))
+ (fas . ,(ly:make-pitch -1 3 SHARP))
+ (fatcs . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
+ (fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (fax . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+
+ (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (soltcb . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
+ (solb . ,(ly:make-pitch -1 4 FLAT))
+ (solcb . ,(ly:make-pitch -1 4 SEMI-FLAT))
+ (sol . ,(ly:make-pitch -1 4 NATURAL))
+ (solcs . ,(ly:make-pitch -1 4 SEMI-SHARP))
+ (sols . ,(ly:make-pitch -1 4 SHARP))
+ (soltcs . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
+ (solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (solx . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+
+ (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (latcb . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+ (lab . ,(ly:make-pitch -1 5 FLAT))
+ (lacb . ,(ly:make-pitch -1 5 SEMI-FLAT))
+ (la . ,(ly:make-pitch -1 5 NATURAL))
+ (lacs . ,(ly:make-pitch -1 5 SEMI-SHARP))
+ (las . ,(ly:make-pitch -1 5 SHARP))
+ (latcs . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
+ (lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (lax . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+
+ (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (sitcb . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
+ (sib . ,(ly:make-pitch -1 6 FLAT))
+ (sicb . ,(ly:make-pitch -1 6 SEMI-FLAT))
+ (si . ,(ly:make-pitch -1 6 NATURAL))
+ (sics . ,(ly:make-pitch -1 6 SEMI-SHARP))
+ (sis . ,(ly:make-pitch -1 6 SHARP))
+ (sitcs . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
+ (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ (six . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+
+
+ ;; Language: Italiano ----------------------------------------------;
+ ;; Paolo Zuliani <zuliap@easynet.it>,
+ ;; Eric Wurbel <wurbel@univ-tln.fr>
+ ;;
+ ;; b = flat (bemolle)
+ ;; bb = double-flat
+ ;; sb = quarter-tone flat (semi-bemolle)
+ ;; bsb = three-quarter-tones flat
+ ;;
+ ;; d = sharp (diesis)
+ ;; dd = double-sharp
+ ;; sd = quarter-tone sharp (semi-diesis)
+ ;; dsd = three-quarter-tones sharp
+ ;;
+ ;; English: c d e f g a b
+ ;; Italian: do re mi fa sol la si
+
+ (italiano . (
+ (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (dobsb . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
+ (dob . ,(ly:make-pitch -1 0 FLAT))
+ (dosb . ,(ly:make-pitch -1 0 SEMI-FLAT))
+ (do . ,(ly:make-pitch -1 0 NATURAL))
+ (dosd . ,(ly:make-pitch -1 0 SEMI-SHARP))
+ (dod . ,(ly:make-pitch -1 0 SHARP))
+ (dodsd . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
+ (dodd . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+
+ (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (rebsb . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
+ (reb . ,(ly:make-pitch -1 1 FLAT))
+ (resb . ,(ly:make-pitch -1 1 SEMI-FLAT))
+ (re . ,(ly:make-pitch -1 1 NATURAL))
+ (resd . ,(ly:make-pitch -1 1 SEMI-SHARP))
+ (red . ,(ly:make-pitch -1 1 SHARP))
+ (redsd . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
+ (redd . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+
+ (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (mibsb . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
+ (mib . ,(ly:make-pitch -1 2 FLAT))
+ (misb . ,(ly:make-pitch -1 2 SEMI-FLAT))
+ (mi . ,(ly:make-pitch -1 2 NATURAL))
+ (misd . ,(ly:make-pitch -1 2 SEMI-SHARP))
+ (mid . ,(ly:make-pitch -1 2 SHARP))
+ (midsd . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
+ (midd . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+
+ (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fabsb . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
+ (fab . ,(ly:make-pitch -1 3 FLAT))
+ (fasb . ,(ly:make-pitch -1 3 SEMI-FLAT))
+ (fa . ,(ly:make-pitch -1 3 NATURAL))
+ (fasd . ,(ly:make-pitch -1 3 SEMI-SHARP))
+ (fad . ,(ly:make-pitch -1 3 SHARP))
+ (fadsd . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
+ (fadd . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+
+ (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (solbsb . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
+ (solb . ,(ly:make-pitch -1 4 FLAT))
+ (solsb . ,(ly:make-pitch -1 4 SEMI-FLAT))
+ (sol . ,(ly:make-pitch -1 4 NATURAL))
+ (solsd . ,(ly:make-pitch -1 4 SEMI-SHARP))
+ (sold . ,(ly:make-pitch -1 4 SHARP))
+ (soldsd . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
+ (soldd . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+
+ (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (labsb . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+ (lab . ,(ly:make-pitch -1 5 FLAT))
+ (lasb . ,(ly:make-pitch -1 5 SEMI-FLAT))
+ (la . ,(ly:make-pitch -1 5 NATURAL))
+ (lasd . ,(ly:make-pitch -1 5 SEMI-SHARP))
+ (lad . ,(ly:make-pitch -1 5 SHARP))
+ (ladsd . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
+ (ladd . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+
+ (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (sibsb . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
+ (sib . ,(ly:make-pitch -1 6 FLAT))
+ (sisb . ,(ly:make-pitch -1 6 SEMI-FLAT))
+ (si . ,(ly:make-pitch -1 6 NATURAL))
+ (sisd . ,(ly:make-pitch -1 6 SEMI-SHARP))
+ (sid . ,(ly:make-pitch -1 6 SHARP))
+ (sidsd . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
+ (sidd . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+
+ ))
+
+
+ ;; Language: Norsk -------------------------------------------------;
+ ;; Arvid Grøtting <arvidg@ifi.uio.no>
+ ;;
+ ;; es = flat
+ ;; ess = flat
+ ;; eses = double-flat
+ ;; essess = double-flat
+ ;;
+ ;; is = sharp
+ ;; iss = sharp
+ ;; isis = double-sharp
+ ;; ississ = double-sharp
+ ;;
+ ;; English: c d e f g a bf b
+ ;; Norwegian: c d e f g a b h
+
+ (norsk . (
+ (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (ces . ,(ly:make-pitch -1 0 FLAT))
+ (cess . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cis . ,(ly:make-pitch -1 0 SHARP))
+ (ciss . ,(ly:make-pitch -1 0 SHARP))
+ (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (cississ . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (dessess . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (des . ,(ly:make-pitch -1 1 FLAT))
+ (dess . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dis . ,(ly:make-pitch -1 1 SHARP))
+ (diss . ,(ly:make-pitch -1 1 SHARP))
+ (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (dississ . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eeses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (eessess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (essess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (ees . ,(ly:make-pitch -1 2 FLAT))
+ (eess . ,(ly:make-pitch -1 2 FLAT))
+ (es . ,(ly:make-pitch -1 2 FLAT))
+ (ess . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eis . ,(ly:make-pitch -1 2 SHARP))
+ (eiss . ,(ly:make-pitch -1 2 SHARP))
+ (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (eississ . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fessess . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fes . ,(ly:make-pitch -1 3 FLAT))
+ (fess . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fis . ,(ly:make-pitch -1 3 SHARP))
+ (fiss . ,(ly:make-pitch -1 3 SHARP))
+ (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (fississ . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (gessess . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (ges . ,(ly:make-pitch -1 4 FLAT))
+ (gess . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gis . ,(ly:make-pitch -1 4 SHARP))
+ (giss . ,(ly:make-pitch -1 4 SHARP))
+ (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (gississ . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (aeses . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (aessess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (assess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (aes . ,(ly:make-pitch -1 5 FLAT))
+ (aess . ,(ly:make-pitch -1 5 FLAT))
+ (as . ,(ly:make-pitch -1 5 FLAT))
+ (ass . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (ais . ,(ly:make-pitch -1 5 SHARP))
+ (aiss . ,(ly:make-pitch -1 5 SHARP))
+ (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (aississ . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (bes . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (bess . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (h . ,(ly:make-pitch -1 6 NATURAL))
+ (his . ,(ly:make-pitch -1 6 SHARP))
+ (hiss . ,(ly:make-pitch -1 6 SHARP))
+ (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ (hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+
+
+ ;; Language: Portugues ---------------------------------------------;
+ ;; Pedro Kröger <kroeger@pedrokroeger.net>
+ ;;
+ ;; b = flat (bemol)
+ ;; bb = double-flat
+ ;; bqt = quarter-tone flat
+ ;; btqt = three-quarter-tones flat
+ ;;
+ ;; s = sharp (sustenido)
+ ;; ss = double-sharp
+ ;; sqt = quarter-tone sharp
+ ;; stqt = three-quarter-tones sharp
+ ;;
+ ;; English: c d e f g a b
+ ;; Portuguese: do re mi fa sol la si
+
+ (portugues . (
+ (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (dobtqt . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
+ (dob . ,(ly:make-pitch -1 0 FLAT))
+ (dobqt . ,(ly:make-pitch -1 0 SEMI-FLAT))
+ (do . ,(ly:make-pitch -1 0 NATURAL))
+ (dosqt . ,(ly:make-pitch -1 0 SEMI-SHARP))
+ (dos . ,(ly:make-pitch -1 0 SHARP))
+ (dostqt . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
+ (doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+
+ (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (rebtqt . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
+ (reb . ,(ly:make-pitch -1 1 FLAT))
+ (rebqt . ,(ly:make-pitch -1 1 SEMI-FLAT))
+ (re . ,(ly:make-pitch -1 1 NATURAL))
+ (resqt . ,(ly:make-pitch -1 1 SEMI-SHARP))
+ (res . ,(ly:make-pitch -1 1 SHARP))
+ (restqt . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
+ (ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+
+ (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (mibtqt . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
+ (mib . ,(ly:make-pitch -1 2 FLAT))
+ (mibqt . ,(ly:make-pitch -1 2 SEMI-FLAT))
+ (mi . ,(ly:make-pitch -1 2 NATURAL))
+ (misqt . ,(ly:make-pitch -1 2 SEMI-SHARP))
+ (mis . ,(ly:make-pitch -1 2 SHARP))
+ (mistqt . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
+ (miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+
+ (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fabtqt . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
+ (fab . ,(ly:make-pitch -1 3 FLAT))
+ (fabqt . ,(ly:make-pitch -1 3 SEMI-FLAT))
+ (fa . ,(ly:make-pitch -1 3 NATURAL))
+ (fasqt . ,(ly:make-pitch -1 3 SEMI-SHARP))
+ (fas . ,(ly:make-pitch -1 3 SHARP))
+ (fastqt . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
+ (fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+
+ (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (solbtqt . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
+ (solb . ,(ly:make-pitch -1 4 FLAT))
+ (solbqt . ,(ly:make-pitch -1 4 SEMI-FLAT))
+ (sol . ,(ly:make-pitch -1 4 NATURAL))
+ (solsqt . ,(ly:make-pitch -1 4 SEMI-SHARP))
+ (sols . ,(ly:make-pitch -1 4 SHARP))
+ (solstqt . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
+ (solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+
+ (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (labtqt . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+ (lab . ,(ly:make-pitch -1 5 FLAT))
+ (labqt . ,(ly:make-pitch -1 5 SEMI-FLAT))
+ (la . ,(ly:make-pitch -1 5 NATURAL))
+ (lasqt . ,(ly:make-pitch -1 5 SEMI-SHARP))
+ (las . ,(ly:make-pitch -1 5 SHARP))
+ (lastqt . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
+ (lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+
+ (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (sibtqt . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
+ (sib . ,(ly:make-pitch -1 6 FLAT))
+ (sibqt . ,(ly:make-pitch -1 6 SEMI-FLAT))
+ (si . ,(ly:make-pitch -1 6 NATURAL))
+ (sisqt . ,(ly:make-pitch -1 6 SEMI-SHARP))
+ (sis . ,(ly:make-pitch -1 6 SHARP))
+ (sistqt . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
+ (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+
+ ))
+
+
+ ;; Language: Suomi -------------------------------------------------;
+ ;; Heikki Junes <heikki.junes@hut.fi>
+ ;;
+ ;; es = flat
+ ;; eses = double-flat
+ ;;
+ ;; is = sharp
+ ;; isis = double-sharp
+ ;;
+ ;; English: c d e f g a bf b
+ ;; Finnish: c d e f g a b h
+
+ (suomi . (
+ (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (ces . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cis . ,(ly:make-pitch -1 0 SHARP))
+ (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (des . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dis . ,(ly:make-pitch -1 1 SHARP))
+ (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (es . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eis . ,(ly:make-pitch -1 2 SHARP))
+ (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fes . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fis . ,(ly:make-pitch -1 3 SHARP))
+ (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (ges . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gis . ,(ly:make-pitch -1 4 SHARP))
+ (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (asas . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT)) ;;non-standard name for asas
+ (as . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (ais . ,(ly:make-pitch -1 5 SHARP))
+ (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (bb . ,(ly:make-pitch -1 6 DOUBLE-FLAT)) ;; should be bes. Kept for downwards compatibility
+ (bes . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT)) ;;non-standard name for bb
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (h . ,(ly:make-pitch -1 6 NATURAL))
+ (his . ,(ly:make-pitch -1 6 SHARP))
+ (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+
+
+ ;; Language: Svenska -----------------------------------------------;
+ ;; Mats Bengtsson <mabe@violin.s3.kth.se>
+ ;;
+ ;; ess = flat
+ ;; essess = double-flat
+ ;;
+ ;; iss = sharp
+ ;; ississ = double-sharp
+ ;;
+ ;; English: c d e f g a bf b
+ ;; Swedish: c d e f g a b h
+
+ (svenska . (
+ (cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (cess . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (ciss . ,(ly:make-pitch -1 0 SHARP))
+ (cississ . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (dessess . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (dess . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (diss . ,(ly:make-pitch -1 1 SHARP))
+ (dississ . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (essess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (ess . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eiss . ,(ly:make-pitch -1 2 SHARP))
+ (eississ . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fessess . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fess . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fiss . ,(ly:make-pitch -1 3 SHARP))
+ (fississ . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (gessess . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (gess . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (giss . ,(ly:make-pitch -1 4 SHARP))
+ (gississ . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (assess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (ass . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (aiss . ,(ly:make-pitch -1 5 SHARP))
+ (aississ . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (hessess . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (h . ,(ly:make-pitch -1 6 NATURAL))
+ (hiss . ,(ly:make-pitch -1 6 SHARP))
+ (hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+
+
+ ;; Language: Vlaams ------------------------------------------------;
+ ;; Hendrik Maryns <hendrik.maryns@ugent.be>
+ ;;
+ ;; b = flat (bemol)
+ ;; bb = double-flat
+ ;;
+ ;; k = sharp (kruis)
+ ;; kk = double-sharp
+ ;;
+ ;; English: c d e f g a b
+ ;; Flemish: do re mi fa sol la si
+
+ (vlaams . (
+ (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (dob . ,(ly:make-pitch -1 0 FLAT))
+ (do . ,(ly:make-pitch -1 0 NATURAL))
+ (dok . ,(ly:make-pitch -1 0 SHARP))
+ (dokk . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+
+ (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (reb . ,(ly:make-pitch -1 1 FLAT))
+ (re . ,(ly:make-pitch -1 1 NATURAL))
+ (rek . ,(ly:make-pitch -1 1 SHARP))
+ (rekk . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+
+ (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (mib . ,(ly:make-pitch -1 2 FLAT))
+ (mi . ,(ly:make-pitch -1 2 NATURAL))
+ (mik . ,(ly:make-pitch -1 2 SHARP))
+ (mikk . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+
+ (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fab . ,(ly:make-pitch -1 3 FLAT))
+ (fa . ,(ly:make-pitch -1 3 NATURAL))
+ (fak . ,(ly:make-pitch -1 3 SHARP))
+ (fakk . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+
+ (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (solb . ,(ly:make-pitch -1 4 FLAT))
+ (sol . ,(ly:make-pitch -1 4 NATURAL))
+ (solk . ,(ly:make-pitch -1 4 SHARP))
+ (solkk . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+
+ (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (lab . ,(ly:make-pitch -1 5 FLAT))
+ (la . ,(ly:make-pitch -1 5 NATURAL))
+ (lak . ,(ly:make-pitch -1 5 SHARP))
+ (lakk . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+
+ (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (sib . ,(ly:make-pitch -1 6 FLAT))
+ (si . ,(ly:make-pitch -1 6 NATURAL))
+ (sik . ,(ly:make-pitch -1 6 SHARP))
+ (sikk . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ ))
+ ))
+
+%% default note names are dutch
+#(define default-language
+ (ly:assoc-get 'nederlands language-pitch-names '()))
'page-label label))))
+language =
+#(define-music-function (parser location str) (string?)
+ (_i "Select note names language.")
+ (let ((language (assoc-get (string->symbol str)
+ language-pitch-names
+ '())))
+ (if (pair? language)
+ (begin
+ (if (ly:get-option 'verbose)
+ (ly:message (_ "Using ~a note names...") str))
+ (set! pitchnames language)
+ (ly:parser-set-note-names parser language))
+ (ly:warning (_ "Could not find language ~a. Ignoring.") str))
+ (make-music 'Music 'void #t)))
+
+
makeClusters =
#(define-music-function (parser location arg) (ly:music?)
(_i "Display chords in @var{arg} as clusters.")
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- es = flat
- eses = double-flat
- eh = quarter-tone flat
- eseh = three-quarter-tones flat
+\language "nederlands"
- is = sharp
- isis = double-sharp
- ih = quarter-tone sharp
- isih = three-quarter-tones sharp
-
- English: c d e f g a bf b
- Dutch: c d e f g a b h
-
-%}
-
-dutchPitchnames = #`(
- (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (ceh . ,(ly:make-pitch -1 0 SEMI-FLAT))
- (ces . ,(ly:make-pitch -1 0 FLAT))
- (ceseh . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
- (c . ,(ly:make-pitch -1 0 NATURAL))
- (cis . ,(ly:make-pitch -1 0 SHARP))
- (cih . ,(ly:make-pitch -1 0 SEMI-SHARP))
- (cisih . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
- (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-
- (deh . ,(ly:make-pitch -1 1 SEMI-FLAT))
- (des . ,(ly:make-pitch -1 1 FLAT))
- (deseh . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
- (d . ,(ly:make-pitch -1 1 NATURAL))
- (dis . ,(ly:make-pitch -1 1 SHARP))
- (dih . ,(ly:make-pitch -1 1 SEMI-SHARP))
- (disih . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
- (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (eeses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-
- (eeh . ,(ly:make-pitch -1 2 SEMI-FLAT))
- (ees . ,(ly:make-pitch -1 2 FLAT))
- (eeseh . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
- (es . ,(ly:make-pitch -1 2 FLAT))
- (e . ,(ly:make-pitch -1 2 NATURAL))
- (eis . ,(ly:make-pitch -1 2 SHARP))
- (eih . ,(ly:make-pitch -1 2 SEMI-SHARP))
- (eisih . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
- (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-
- (feh . ,(ly:make-pitch -1 3 SEMI-FLAT))
- (fes . ,(ly:make-pitch -1 3 FLAT))
- (feseh . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
- (f . ,(ly:make-pitch -1 3 NATURAL))
- (fis . ,(ly:make-pitch -1 3 SHARP))
- (fih . ,(ly:make-pitch -1 3 SEMI-SHARP))
- (fisih . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
- (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-
- (geh . ,(ly:make-pitch -1 4 SEMI-FLAT))
- (ges . ,(ly:make-pitch -1 4 FLAT))
- (geseh . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
- (g . ,(ly:make-pitch -1 4 NATURAL))
- (gis . ,(ly:make-pitch -1 4 SHARP))
- (gih . ,(ly:make-pitch -1 4 SEMI-SHARP))
- (gisih . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
- (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (aeses . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-
- (aeh . ,(ly:make-pitch -1 5 SEMI-FLAT))
- (aes . ,(ly:make-pitch -1 5 FLAT))
- (aeseh . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
- (as . ,(ly:make-pitch -1 5 FLAT))
- (a . ,(ly:make-pitch -1 5 NATURAL))
- (ais . ,(ly:make-pitch -1 5 SHARP))
- (aih . ,(ly:make-pitch -1 5 SEMI-SHARP))
- (aisih . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
- (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (beses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-
- (beh . ,(ly:make-pitch -1 6 SEMI-FLAT))
- (bes . ,(ly:make-pitch -1 6 FLAT))
- (beseh . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
- (b . ,(ly:make-pitch -1 6 NATURAL))
- (bis . ,(ly:make-pitch -1 6 SHARP))
- (bih . ,(ly:make-pitch -1 6 SEMI-SHARP))
- (bisih . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
- (bisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
- )
-
-pitchnames = \dutchPitchnames
-
-#(ly:parser-set-note-names parser pitchnames)
%%%% common Norwegian names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 1998--2010 Arvid Grøtting <arvidg@ifi.uio.no>
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- es = flat
- ess = flat
- eses = double-flat
- essess = double-flat
+\language "norsk"
- is = sharp
- iss = sharp
- isis = double-sharp
- ississ = double-sharp
-
- English: c d e f g a bf b
- Norwegian: c d e f g a b h
-
-%}
-
-pitchnamesNorsk = #`(
- (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (ces . ,(ly:make-pitch -1 0 FLAT))
- (cess . ,(ly:make-pitch -1 0 FLAT))
- (c . ,(ly:make-pitch -1 0 NATURAL))
- (cis . ,(ly:make-pitch -1 0 SHARP))
- (ciss . ,(ly:make-pitch -1 0 SHARP))
- (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (cississ . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (dessess . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (des . ,(ly:make-pitch -1 1 FLAT))
- (dess . ,(ly:make-pitch -1 1 FLAT))
- (d . ,(ly:make-pitch -1 1 NATURAL))
- (dis . ,(ly:make-pitch -1 1 SHARP))
- (diss . ,(ly:make-pitch -1 1 SHARP))
- (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (dississ . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (eeses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (eessess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (essess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (ees . ,(ly:make-pitch -1 2 FLAT))
- (eess . ,(ly:make-pitch -1 2 FLAT))
- (es . ,(ly:make-pitch -1 2 FLAT))
- (ess . ,(ly:make-pitch -1 2 FLAT))
- (e . ,(ly:make-pitch -1 2 NATURAL))
- (eis . ,(ly:make-pitch -1 2 SHARP))
- (eiss . ,(ly:make-pitch -1 2 SHARP))
- (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (eississ . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fessess . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fes . ,(ly:make-pitch -1 3 FLAT))
- (fess . ,(ly:make-pitch -1 3 FLAT))
- (f . ,(ly:make-pitch -1 3 NATURAL))
- (fis . ,(ly:make-pitch -1 3 SHARP))
- (fiss . ,(ly:make-pitch -1 3 SHARP))
- (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (fississ . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (gessess . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (ges . ,(ly:make-pitch -1 4 FLAT))
- (gess . ,(ly:make-pitch -1 4 FLAT))
- (g . ,(ly:make-pitch -1 4 NATURAL))
- (g . ,(ly:make-pitch -1 4 NATURAL))
- (gis . ,(ly:make-pitch -1 4 SHARP))
- (giss . ,(ly:make-pitch -1 4 SHARP))
- (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (gississ . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (aeses . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (aessess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (assess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (aes . ,(ly:make-pitch -1 5 FLAT))
- (aess . ,(ly:make-pitch -1 5 FLAT))
- (as . ,(ly:make-pitch -1 5 FLAT))
- (ass . ,(ly:make-pitch -1 5 FLAT))
- (a . ,(ly:make-pitch -1 5 NATURAL))
- (ais . ,(ly:make-pitch -1 5 SHARP))
- (aiss . ,(ly:make-pitch -1 5 SHARP))
- (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (aississ . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (bes . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (bess . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (b . ,(ly:make-pitch -1 6 FLAT))
- (b . ,(ly:make-pitch -1 6 FLAT))
- (h . ,(ly:make-pitch -1 6 NATURAL))
- (his . ,(ly:make-pitch -1 6 SHARP))
- (hiss . ,(ly:make-pitch -1 6 SHARP))
- (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
- (hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-pitchnames = \pitchnamesNorsk
-
-#(ly:parser-set-note-names parser pitchnames)
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+\version "2.13.36"
%%
%% setup for Request->Element conversion.
%%%% common Portuguese names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 2004--2010 Pedro Kröger <kroeger@pedrokroeger.net>
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- b = flat (bemol)
- bb = double-flat
- bqt = quarter-tone flat
- btqt = three-quarter-tones flat
+\language "portugues"
- s = sharp (sustenido)
- ss = double-sharp
- sqt = quarter-tone sharp
- stqt = three-quarter-tones sharp
-
- English: c d e f g a b
- Portuguese: do re mi fa sol la si
-
- Adapted from espanol.ly and italiano.ly.
-
-%}
-
-pitchnamesPortuguese = #`(
- (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (dobtqt . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
- (dob . ,(ly:make-pitch -1 0 FLAT))
- (dobqt . ,(ly:make-pitch -1 0 SEMI-FLAT))
- (do . ,(ly:make-pitch -1 0 NATURAL))
- (dosqt . ,(ly:make-pitch -1 0 SEMI-SHARP))
- (dos . ,(ly:make-pitch -1 0 SHARP))
- (dostqt . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
- (doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-
- (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (rebtqt . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
- (reb . ,(ly:make-pitch -1 1 FLAT))
- (rebqt . ,(ly:make-pitch -1 1 SEMI-FLAT))
- (re . ,(ly:make-pitch -1 1 NATURAL))
- (resqt . ,(ly:make-pitch -1 1 SEMI-SHARP))
- (res . ,(ly:make-pitch -1 1 SHARP))
- (restqt . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
- (ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-
- (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (mibtqt . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
- (mib . ,(ly:make-pitch -1 2 FLAT))
- (mibqt . ,(ly:make-pitch -1 2 SEMI-FLAT))
- (mi . ,(ly:make-pitch -1 2 NATURAL))
- (misqt . ,(ly:make-pitch -1 2 SEMI-SHARP))
- (mis . ,(ly:make-pitch -1 2 SHARP))
- (mistqt . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
- (miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-
- (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fabtqt . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
- (fab . ,(ly:make-pitch -1 3 FLAT))
- (fabqt . ,(ly:make-pitch -1 3 SEMI-FLAT))
- (fa . ,(ly:make-pitch -1 3 NATURAL))
- (fasqt . ,(ly:make-pitch -1 3 SEMI-SHARP))
- (fas . ,(ly:make-pitch -1 3 SHARP))
- (fastqt . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
- (fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-
- (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (solbtqt . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
- (solb . ,(ly:make-pitch -1 4 FLAT))
- (solbqt . ,(ly:make-pitch -1 4 SEMI-FLAT))
- (sol . ,(ly:make-pitch -1 4 NATURAL))
- (solsqt . ,(ly:make-pitch -1 4 SEMI-SHARP))
- (sols . ,(ly:make-pitch -1 4 SHARP))
- (solstqt . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
- (solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-
- (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (labtqt . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
- (lab . ,(ly:make-pitch -1 5 FLAT))
- (labqt . ,(ly:make-pitch -1 5 SEMI-FLAT))
- (la . ,(ly:make-pitch -1 5 NATURAL))
- (lasqt . ,(ly:make-pitch -1 5 SEMI-SHARP))
- (las . ,(ly:make-pitch -1 5 SHARP))
- (lastqt . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
- (lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-
- (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (sibtqt . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
- (sib . ,(ly:make-pitch -1 6 FLAT))
- (sibqt . ,(ly:make-pitch -1 6 SEMI-FLAT))
- (si . ,(ly:make-pitch -1 6 NATURAL))
- (sisqt . ,(ly:make-pitch -1 6 SEMI-SHARP))
- (sis . ,(ly:make-pitch -1 6 SHARP))
- (sistqt . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
- (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-
-)
-
-pitchnames = \pitchnamesPortuguese
-
-#(ly:parser-set-note-names parser pitchnames)
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
+% chord definitions require default pitchnames
+#(define prev-pitchnames pitchnames)
+#(set! pitchnames default-language)
\include "predefined-guitar-ninth-fretboards.ly"
#guitar-tuning
#(offset-fret 1 (chord-shape 'bes:m7 guitar-tuning))
+#(set! pitchnames prev-pitchnames)
%%%% ukulele hall of fame museum website (http://www.ukulele.org/),
%%%% kiwi ukulele website (http://www.kiwiukulele.co.nz/)
+% chord definitions require default pitchnames
+#(define prev-pitchnames pitchnames)
+#(set! pitchnames default-language)
%%% a chords
\storePredefinedDiagram #default-fret-table \chordmode {aes:9}
#ukulele-tuning
#"1-1;o;2-3;1-2;"
+
+#(set! pitchnames prev-pitchnames)
%%%% common Finnish names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 2001--2010 Heikki Junes <heikki.junes@hut.fi>
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- es = flat
- eses = double-flat
+\language "suomi"
- is = sharp
- isis = double-sharp
-
- English: c d e f g a bf b
- Finnish: c d e f g a b h
-
- Adapted from svenska.ly
-
-%}
-
-pitchnamesSuomi = #`(
- (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (ces . ,(ly:make-pitch -1 0 FLAT))
- (c . ,(ly:make-pitch -1 0 NATURAL))
- (cis . ,(ly:make-pitch -1 0 SHARP))
- (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (des . ,(ly:make-pitch -1 1 FLAT))
- (d . ,(ly:make-pitch -1 1 NATURAL))
- (dis . ,(ly:make-pitch -1 1 SHARP))
- (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (es . ,(ly:make-pitch -1 2 FLAT))
- (e . ,(ly:make-pitch -1 2 NATURAL))
- (eis . ,(ly:make-pitch -1 2 SHARP))
- (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fes . ,(ly:make-pitch -1 3 FLAT))
- (f . ,(ly:make-pitch -1 3 NATURAL))
- (fis . ,(ly:make-pitch -1 3 SHARP))
- (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (ges . ,(ly:make-pitch -1 4 FLAT))
- (g . ,(ly:make-pitch -1 4 NATURAL))
- (gis . ,(ly:make-pitch -1 4 SHARP))
- (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (asas . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT)) ;;non-standard name for asas
- (as . ,(ly:make-pitch -1 5 FLAT))
- (a . ,(ly:make-pitch -1 5 NATURAL))
- (ais . ,(ly:make-pitch -1 5 SHARP))
- (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (bb . ,(ly:make-pitch -1 6 DOUBLE-FLAT)) ;; should be bes. Kept for downwards compatibility
- (bes . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT)) ;;non-standard name for bb
- (b . ,(ly:make-pitch -1 6 FLAT))
- (h . ,(ly:make-pitch -1 6 NATURAL))
- (his . ,(ly:make-pitch -1 6 SHARP))
- (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-pitchnames = \pitchnamesSuomi
-
-#(ly:parser-set-note-names parser pitchnames)
%%%% common Swedish names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 1997--2010 Mats Bengtsson <mabe@violin.s3.kth.se>
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- ess = flat
- essess = double-flat
+\language "svenska"
- iss = sharp
- ississ = double-sharp
-
- English: c d e f g a bf b
- Swedish: c d e f g a b h
-
-%}
-
-pitchnamesSvenska = #`(
- (cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (cess . ,(ly:make-pitch -1 0 FLAT))
- (c . ,(ly:make-pitch -1 0 NATURAL))
- (ciss . ,(ly:make-pitch -1 0 SHARP))
- (cississ . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
- (dessess . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (dess . ,(ly:make-pitch -1 1 FLAT))
- (d . ,(ly:make-pitch -1 1 NATURAL))
- (diss . ,(ly:make-pitch -1 1 SHARP))
- (dississ . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
- (essess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (ess . ,(ly:make-pitch -1 2 FLAT))
- (e . ,(ly:make-pitch -1 2 NATURAL))
- (eiss . ,(ly:make-pitch -1 2 SHARP))
- (eississ . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
- (fessess . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fess . ,(ly:make-pitch -1 3 FLAT))
- (f . ,(ly:make-pitch -1 3 NATURAL))
- (fiss . ,(ly:make-pitch -1 3 SHARP))
- (fississ . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
- (gessess . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (gess . ,(ly:make-pitch -1 4 FLAT))
- (g . ,(ly:make-pitch -1 4 NATURAL))
- (giss . ,(ly:make-pitch -1 4 SHARP))
- (gississ . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
- (assess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (ass . ,(ly:make-pitch -1 5 FLAT))
- (a . ,(ly:make-pitch -1 5 NATURAL))
- (aiss . ,(ly:make-pitch -1 5 SHARP))
- (aississ . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
- (hessess . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (b . ,(ly:make-pitch -1 6 FLAT))
- (h . ,(ly:make-pitch -1 6 NATURAL))
- (hiss . ,(ly:make-pitch -1 6 SHARP))
- (hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-pitchnames = \pitchnamesSvenska
-
-#(ly:parser-set-note-names parser pitchnames)
%%%% common Flemish names for notes
%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 2004--2010 Hendrik Maryns <hendrik.maryns@ugent.be>
+%%%% Copyright (C) 2010 Valentin Villenave <valentin@villenave.net>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% it under the terms of the GNU General Public License as published by
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.12.0"
+%%%% Legacy file. (see language-init.ly)
-%{
+\version "2.13.37"
- b = flat (bemol)
- bb = double-flat
+\language "vlaams"
- k = sharp (kruis)
- kk = double-sharp
-
- English: c d e f g a b
- Flemish: do re mi fa sol la si
-
- Adapted from espanol.ly.
-
-%}
-
-pitchnamesVlaams = #`(
- (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
- (dob . ,(ly:make-pitch -1 0 FLAT))
- (do . ,(ly:make-pitch -1 0 NATURAL))
- (dok . ,(ly:make-pitch -1 0 SHARP))
- (dokk . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-
- (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
- (reb . ,(ly:make-pitch -1 1 FLAT))
- (re . ,(ly:make-pitch -1 1 NATURAL))
- (rek . ,(ly:make-pitch -1 1 SHARP))
- (rekk . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-
- (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
- (mib . ,(ly:make-pitch -1 2 FLAT))
- (mi . ,(ly:make-pitch -1 2 NATURAL))
- (mik . ,(ly:make-pitch -1 2 SHARP))
- (mikk . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-
- (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
- (fab . ,(ly:make-pitch -1 3 FLAT))
- (fa . ,(ly:make-pitch -1 3 NATURAL))
- (fak . ,(ly:make-pitch -1 3 SHARP))
- (fakk . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-
- (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
- (solb . ,(ly:make-pitch -1 4 FLAT))
- (sol . ,(ly:make-pitch -1 4 NATURAL))
- (solk . ,(ly:make-pitch -1 4 SHARP))
- (solkk . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-
- (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
- (lab . ,(ly:make-pitch -1 5 FLAT))
- (la . ,(ly:make-pitch -1 5 NATURAL))
- (lak . ,(ly:make-pitch -1 5 SHARP))
- (lakk . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-
- (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
- (sib . ,(ly:make-pitch -1 6 FLAT))
- (si . ,(ly:make-pitch -1 6 NATURAL))
- (sik . ,(ly:make-pitch -1 6 SHARP))
- (sikk . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-pitchnames = \pitchnamesVlaams
-
-#(ly:parser-set-note-names parser pitchnames)
x-ext
y-ext)))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; scaling
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define-markup-command (scale layout props factor-pair arg)
+ (number-pair? markup?)
+ #:category graphic
+ "
+@cindex scaling markup
+@cindex mirroring markup
+
+Scale @var{arg}. @var{factor-pair} is a pair of numbers
+representing the scaling-factor in the X and Y axes.
+Negative values may be used to produce mirror images.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\line {
+ \\scale #'(2 . 1)
+ stretched
+ \\scale #'(1 . -1)
+ mirrored
+ }
+}
+@end lilypond"
+ (let ((stil (interpret-markup layout props arg))
+ (sx (car factor-pair))
+ (sy (cdr factor-pair)))
+ (ly:stencil-scale stil sx sy)))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Markup list commands
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
repeat-slash
resetcolor
resetrotation
+ resetscale
round-filled-box
setcolor
setrotation
+ setscale
text
unknown
url-link
utf-8-string
- white-dot
- white-text
zigzag-line
))
combine-stencil
delay-stencil-evaluation
rotate-stencil
+ scale-stencil
translate-stencil
))
thickness
(convert-path-exps exps)
(if fill? "fill" ""))))
+
+(define (setscale x y)
+ (ly:format "gsave ~4l scale\n"
+ (list x y)))
+
+(define (resetscale)
+ "grestore\n")
(define (resetrotation ang x y)
"</g>\n")
+(define (resetscale)
+ "</g>\n")
+
(define (round-filled-box breapth width depth height blot-diameter)
(entity
'rect ""
(ly:format "<g transform=\"rotate(~4f, ~4f, ~4f)\">\n"
(- ang) x (- y)))
+(define (setscale x y)
+ (ly:format "<g transform=\"scale(~4f, ~4f)\">\n"
+ x y))
+
(define (text font string)
(dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
--- /dev/null
+#!/usr/bin/env bash
+
+### are we in the top source dir?
+if [ ! -e scripts/convert-ly.py ]; then
+ echo "Must run from top source directory"
+ exit 1
+fi
+
+### get the directories
+TOP_SRC_DIR=`pwd`
+if [ -z $BUILD_DIR ]; then
+ BUILD_DIR=.
+fi
+
+### make sure convert-ly is up-to-date
+touch python/convertrules.py
+touch scripts/convert-ly.py
+cd $BUILD_DIR
+make
+cd $TOP_SRC_DIR
+
+### update manuals
+find Documentation/ -path 'Documentation/snippets' -prune \
+ , -name '*.itely' | xargs $BUILD_DIR/out/bin/convert-ly -e -d
+
+### update .ly files
+find . -name '*.ly' | xargs $BUILD_DIR/out/bin/convert-ly -e -d
projects / lilypond.git / commitdiff