From: Graham Percival Date: Tue, 18 Sep 2007 20:24:20 +0000 (-0700) Subject: Remove all subsubsections from instrument-notation; prepares for more X-Git-Tag: release/2.11.35-1~46^2~159 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=432710150496ab76454da77a328aa189de30237d;p=lilypond.git Remove all subsubsections from instrument-notation; prepares for more changes. (yes, vocal music now looks ugly. deal with it. :) --- diff --git a/Documentation/de/user/instrument-notation.itely b/Documentation/de/user/instrument-notation.itely index 471aabc6bf..c58dd90fac 100644 --- a/Documentation/de/user/instrument-notation.itely +++ b/Documentation/de/user/instrument-notation.itely @@ -712,16 +712,25 @@ wenn die Akkorde mit der @code{< ... >} Syntax notiert werden. UNTRANSLATED NODE: IGNORE ME -@menu -* Setting simple songs:: -* Entering lyrics:: -* Aligning lyrics to a melody:: -* Working with lyrics and identifiers:: -* Flexibility in placement:: -* Spacing lyrics:: -* More about stanzas:: -* Ambitus:: -* Other vocal issues:: +@menu +* Setting simple songs:: +* Entering lyrics:: +* Aligning lyrics to a melody:: +* Automatic syllable durations:: +* Another way of entering lyrics:: +* Assigning more than one syllable to a single note:: +* More than one note on a single syllable:: +* Extenders and hyphens:: +* Working with lyrics and identifiers:: +* Flexibility in placement:: +* Lyrics to multiple notes of a melisma:: +* Divisi lyrics:: +* Switching the melody associated with a lyrics line:: +* Lyrics independent of notes:: +* Spacing lyrics:: +* More about stanzas:: +* Ambitus:: +* Other vocal issues:: @end menu @node Setting simple songs @subsection Setting simple songs @@ -746,27 +755,27 @@ UNTRANSLATED NODE: IGNORE ME * Extenders and hyphens:: @end menu @node Automatic syllable durations -@subsubsection Automatic syllable durations +@subsection Automatic syllable durations UNTRANSLATED NODE: IGNORE ME @node Another way of entering lyrics -@subsubsection Another way of entering lyrics +@subsection Another way of entering lyrics UNTRANSLATED NODE: IGNORE ME @node Assigning more than one syllable to a single note -@subsubsection Assigning more than one syllable to a single note +@subsection Assigning more than one syllable to a single note UNTRANSLATED NODE: IGNORE ME @node More than one note on a single syllable -@subsubsection More than one note on a single syllable +@subsection More than one note on a single syllable UNTRANSLATED NODE: IGNORE ME @node Extenders and hyphens -@subsubsection Extenders and hyphens +@subsection Extenders and hyphens UNTRANSLATED NODE: IGNORE ME @@ -787,22 +796,22 @@ UNTRANSLATED NODE: IGNORE ME * Lyrics independent of notes:: @end menu @node Lyrics to multiple notes of a melisma -@subsubsection Lyrics to multiple notes of a melisma +@subsection Lyrics to multiple notes of a melisma UNTRANSLATED NODE: IGNORE ME @node Divisi lyrics -@subsubsection Divisi lyrics +@subsection Divisi lyrics UNTRANSLATED NODE: IGNORE ME @node Switching the melody associated with a lyrics line -@subsubsection Switching the melody associated with a lyrics line +@subsection Switching the melody associated with a lyrics line UNTRANSLATED NODE: IGNORE ME @node Lyrics independent of notes -@subsubsection Lyrics independent of notes +@subsection Lyrics independent of notes UNTRANSLATED NODE: IGNORE ME @@ -816,11 +825,11 @@ UNTRANSLATED NODE: IGNORE ME UNTRANSLATED NODE: IGNORE ME -@subsubsection Adding stanza numbers -@subsubsection Adding dynamics marks -@subsubsection Adding singer names -@subsubsection Printing stanzas at the end -@subsubsection Printing stanzas at the end in multiple columns +@subsection Adding stanza numbers +@subsection Adding dynamics marks +@subsection Adding singer names +@subsection Printing stanzas at the end +@subsection Printing stanzas at the end in multiple columns @node Ambitus @subsection Ambitus @@ -1702,6 +1711,8 @@ Hier sind alle Unterkapitel auf einen Blick: * Custodes:: * Divisiones:: * Ligatures:: +* White mensural ligatures:: +* Gregorian square neumes ligatures:: * Gregorian Chant contexts:: * Mensural contexts:: * Musica ficta accidentals:: @@ -2480,7 +2491,7 @@ mit der selben Wirkung zur Verfügung stellt und stabil zu sein scheint. @end menu @node White mensural ligatures -@subsubsection White mensural ligatures +@subsection White mensural ligatures @cindex Mensuralligaturen @cindex Weiße Mensuralligaturen @@ -2571,7 +2582,7 @@ wie folgt ausgegeben: Die horizontale Positionierung ist sehr schlecht. @node Gregorian square neumes ligatures -@subsubsection Gregorian square neumes ligatures +@subsection Gregorian square neumes ligatures @cindex Quadratische Neumenligaturen @cindex Gregorianische quadratische Neumenligaturen diff --git a/Documentation/es/user/instrument-notation.itely b/Documentation/es/user/instrument-notation.itely index 430449d79e..c24f1970c1 100644 --- a/Documentation/es/user/instrument-notation.itely +++ b/Documentation/es/user/instrument-notation.itely @@ -684,8 +684,17 @@ examinando el método más simple, y poco a poco iremos aumentando la complejida * Setting simple songs:: * Entering lyrics:: * Aligning lyrics to a melody:: +* Automatic syllable durations:: +* Another way of entering lyrics:: +* Assigning more than one syllable to a single note:: +* More than one note on a single syllable:: +* Extenders and hyphens:: * Working with lyrics and identifiers:: * Flexibility in placement:: +* Lyrics to multiple notes of a melisma:: +* Divisi lyrics:: +* Switching the melody associated with a lyrics line:: +* Lyrics independent of notes:: * Spacing lyrics:: * More about stanzas:: * Ambitus:: @@ -929,7 +938,7 @@ explícitamente, utilizando @code{\lyricmode} @end menu @node Automatic syllable durations -@subsubsection Automatic syllable durations +@subsection Automatic syllable durations @cindex duraciones automáticas de las sílabas @cindex letra y melodías @@ -985,7 +994,7 @@ es lo mismo que @end example @node Another way of entering lyrics -@subsubsection Another way of entering lyrics +@subsection Another way of entering lyrics El texto también se puede introducir sin @code{\addlyrics} ni @code{\lyricsto}. En este caso, @@ -1028,7 +1037,7 @@ Referencia del programa: @internalsref{Lyrics}. @node Assigning more than one syllable to a single note -@subsubsection Assigning more than one syllable to a single note +@subsection Assigning more than one syllable to a single note @funindex _ @@ -1059,7 +1068,7 @@ Referencia del programa: @internalsref{LyricCombineMusic}. @node More than one note on a single syllable -@subsubsection More than one note on a single syllable +@subsection More than one note on a single syllable @cindex melisma @cindex melismata @@ -1140,7 +1149,7 @@ Los melismas no se detectan automáticamente, y las líneas de extensión se deb insertar a mano. @node Extenders and hyphens -@subsubsection Extenders and hyphens +@subsection Extenders and hyphens @cindex melisma @cindex extender @@ -1244,7 +1253,7 @@ distintas. Tales variantes pueden aún captarse mediante @node Lyrics to multiple notes of a melisma -@subsubsection Lyrics to multiple notes of a melisma +@subsection Lyrics to multiple notes of a melisma Existe la posibilidad de que el texto tenga un melisma en un verso, pero varias sílabas en otro. Una solución es hacer que la voz más rápida @@ -1298,7 +1307,7 @@ Por ejemplo, @node Divisi lyrics -@subsubsection Divisi lyrics +@subsection Divisi lyrics Puede presentar letras alternativas (o divisi) nombrando contextos de voz y aplicando la letra a los mencionados contextos específicos. @@ -1344,7 +1353,7 @@ que se repite. @node Switching the melody associated with a lyrics line -@subsubsection Switching the melody associated with a lyrics line +@subsection Switching the melody associated with a lyrics line Son posibles variaciones más complejas en la disposición del texto. Se puede cambiar la melodía para una línea de la letra durante el texto. Esto se hace @@ -1427,7 +1436,7 @@ La disposición se vuelve a cambiar a la situación inicial mediante la asignaci @node Lyrics independent of notes -@subsubsection Lyrics independent of notes +@subsection Lyrics independent of notes En cierta música vocal compleja, podría ser deseable colocar la letra de forma totalmente independiente de las notas. La música que se define @@ -1503,7 +1512,7 @@ layout o disposición. @subsection More about stanzas @cindex número de verso -@subsubsection Adding stanza numbers +@subsection Adding stanza numbers Los números de los versos se pueden añadir estableciendo @code{stanza}, p.ej., @@ -1523,7 +1532,7 @@ Los números de los versos se pueden añadir estableciendo @code{stanza}, p.ej., Estos números aparecerán inmediatamente antes de la primera sílaba. -@subsubsection Adding dynamics marks +@subsection Adding dynamics marks Los versos que difieren en su fuerza se pueden especificar escribiendo una indicación dinámica antes de cada verso. En Lilypond, todo lo que aparece delante de @@ -1550,7 +1559,7 @@ text = { @cindex cantor, nombre del @cindex nombre del cantor -@subsubsection Adding singer names +@subsection Adding singer names También se pueden poner los nombres de los cantantes. Se imprimen al comienzo de la línea, igual que los nombres de instrumento. Se crean estableciendo un valor para @@ -1569,7 +1578,7 @@ línea, igual que los nombres de instrumento. Se crean estableciendo un valor p @end lilypond -@subsubsection Printing stanzas at the end +@subsection Printing stanzas at the end En ocasiones es conveniente tener un verso ajustado a la música, y el resto añadido en forma de estrofa al final @@ -1613,7 +1622,7 @@ its fleece was white as snow. @end lilypond -@subsubsection Printing stanzas at the end in multiple columns +@subsection Printing stanzas at the end in multiple columns Cuando una pieza tiene muchos versos, a menudo se imprimen en varias columnas a lo largo de toda la página. Con frecuencia un número de verso fuera del margen @@ -2639,6 +2648,8 @@ Aquí puede ver de forma resumida todos los apartados relacionados: * Custodes:: * Divisiones:: * Ligatures:: +* White mensural ligatures:: +* Gregorian square neumes ligatures:: * Gregorian Chant contexts:: * Mensural contexts:: * Musica ficta accidentals:: @@ -3408,7 +3419,7 @@ que causa el mismo efecto y se supone que es lo bastante estable. @end menu @node White mensural ligatures -@subsubsection White mensural ligatures +@subsection White mensural ligatures @cindex ligaduras mensurales @cindex ligaduras mensurales blancas @@ -3497,7 +3508,7 @@ de la siguiente manera: El espaciado horizontal es pobre. @node Gregorian square neumes ligatures -@subsubsection Gregorian square neumes ligatures +@subsection Gregorian square neumes ligatures @cindex ligaduras de neumas cuadrados @cindex ligaduras gregorianas de neumas cuadrados diff --git a/Documentation/fr/user/instrument-notation.itely b/Documentation/fr/user/instrument-notation.itely index cfc8cfaf91..942c7cf802 100644 --- a/Documentation/fr/user/instrument-notation.itely +++ b/Documentation/fr/user/instrument-notation.itely @@ -13,15 +13,15 @@ Ce chapitre traite de la notation spécifique à certains instruments. -@menu -* Piano music:: -* Chord names:: -* Vocal music:: -* Rhythmic music:: -* Guitar:: -* Bagpipe:: -* Ancient notation:: -* Other instrument specific notation:: +@menu +* Piano music:: +* Chord names:: +* Vocal music:: +* Rhythmic music:: +* Guitar:: +* Bagpipe:: +* Ancient notation:: +* Other instrument specific notation:: @end menu @@ -35,11 +35,11 @@ instruments à clavier. Le contexte @internalsref{PianoStaff} est précisément conçu pour gérer la notation spécifique au piano, notamment ces croisements. @menu -* Automatic staff changes:: -* Manual staff switches:: -* Pedals:: -* Staff switch lines:: -* Cross staff stems:: +* Automatic staff changes:: +* Manual staff switches:: +* Pedals:: +* Staff switch lines:: +* Cross staff stems:: @end menu @refbugs @@ -695,8 +695,17 @@ examinerons par degré croissant de complexité. * Setting simple songs:: * Entering lyrics:: * Aligning lyrics to a melody:: +* Automatic syllable durations:: +* Another way of entering lyrics:: +* Assigning more than one syllable to a single note:: +* More than one note on a single syllable:: +* Extenders and hyphens:: * Working with lyrics and identifiers:: * Flexibility in placement:: +* Lyrics to multiple notes of a melisma:: +* Divisi lyrics:: +* Switching the melody associated with a lyrics line:: +* Lyrics independent of notes:: * Spacing lyrics:: * More about stanzas:: * Ambitus:: @@ -941,7 +950,7 @@ contexte @code{\lyricmode} @end menu @node Automatic syllable durations -@subsubsection Automatic syllable durations +@subsection Automatic syllable durations @cindex durée automatique des syllabes @cindex paroles et mélodies @@ -997,7 +1006,7 @@ est exactement la même chose que @end example @node Another way of entering lyrics -@subsubsection Another way of entering lyrics +@subsection Another way of entering lyrics On peut aussi se passer de @code{\addlyrics} et de @code{\lyricsto} pour saisir des paroles. Dans ce cas, les syllabes sont entrées comme des @@ -1040,7 +1049,7 @@ Référence du programme : @internalsref{Lyrics}. @node Assigning more than one syllable to a single note -@subsubsection Assigning more than one syllable to a single note +@subsection Assigning more than one syllable to a single note @funindex _ @@ -1071,7 +1080,7 @@ Référence du programme : @internalsref{LyricCombineMusic}. @node More than one note on a single syllable -@subsubsection More than one note on a single syllable +@subsection More than one note on a single syllable @cindex mélisme @cindex vocalise @@ -1155,7 +1164,7 @@ Certains mélismes ne sont pas détectés automatiquement ; vous devrez alors prolonger vous-même les syllabes concernées. @node Extenders and hyphens -@subsubsection Extenders and hyphens +@subsection Extenders and hyphens @cindex mélisme @cindex extenseur @@ -1260,7 +1269,7 @@ La commande @code{\lyricsto} permet de prendre en compte ces variantes. @node Lyrics to multiple notes of a melisma -@subsubsection Lyrics to multiple notes of a melisma +@subsection Lyrics to multiple notes of a melisma Il peut survenir que les paroles comportent un mélisme pour l'un des couplets, mais plusieurs syllabes pour d'autres. Une solution consiste à @@ -1315,7 +1324,7 @@ suivant d'une note : @node Divisi lyrics -@subsubsection Divisi lyrics +@subsection Divisi lyrics En donnant un nom à chaque voix et en leur attribuant spécifiquement des paroles, on peut créer des paroles alternatives --- également @@ -1361,7 +1370,7 @@ Cette astuce permet de faire varier les paroles lorsqu'une section est reprise. @node Switching the melody associated with a lyrics line -@subsubsection Switching the melody associated with a lyrics line +@subsection Switching the melody associated with a lyrics line On peut créer des variations plus complexes à partir d'une mélodie à plusieurs voix. Les paroles peuvent suivre l'une ou l'autre des @@ -1447,7 +1456,7 @@ la valeur @code{lahlah}. @node Lyrics independent of notes -@subsubsection Lyrics independent of notes +@subsection Lyrics independent of notes Dans certaines musiques vocales assez complexes, on peut avoir intérêt à imprimer les paroles indépendamment des notes. La mélodie sur laquelle @@ -1525,7 +1534,7 @@ dans le bloc @code{\layout}. @subsection More about stanzas @cindex numéro de couplet -@subsubsection Adding stanza numbers +@subsection Adding stanza numbers On peut ajouter un numéro aux couplets en définissant la variable @code{stanza} : @@ -1545,7 +1554,7 @@ On peut ajouter un numéro aux couplets en définissant la variable @noindent Ces numéros se placeront juste avant le début de la première syllabe. -@subsubsection Adding dynamics marks +@subsection Adding dynamics marks Lorsque des couplets ont des nuances différentes, vous pouvez ajouter une nuance devant chaque numéro. L'objet @code{StanzaNumber} contient @@ -1572,7 +1581,7 @@ text = { @cindex nom de personnage @cindex nom du chanteur -@subsubsection Adding singer names +@subsection Adding singer names On peut également ajouter le nom de chaque rôle ; ils s'imprimeront au début de chaque ligne comme les noms d'instruments. Il faut pour cela @@ -1592,7 +1601,7 @@ abrégée. @end lilypond -@subsubsection Printing stanzas at the end +@subsection Printing stanzas at the end Il peut parfois s'avérer opportun d'aligner un seul couplet sur la mélodie, et de présenter tous les autres en bloc à la fin du morceau. @@ -1637,7 +1646,7 @@ its fleece was white as snow. @end lilypond -@subsubsection Printing stanzas at the end in multiple columns +@subsection Printing stanzas at the end in multiple columns Si les couplets sont vraiment nombreux, il est possible de les imprimer sur plusieurs colonnes. De plus, l'exemple suivant vous montrera @@ -2681,6 +2690,8 @@ Voici les points que nous allons aborder : * Custodes:: * Divisiones:: * Ligatures:: +* White mensural ligatures:: +* Gregorian square neumes ligatures:: * Gregorian Chant contexts:: * Mensural contexts:: * Musica ficta accidentals:: @@ -3454,7 +3465,7 @@ qui produit le même résultat, et dont la pérennité est assurée. @end menu @node White mensural ligatures -@subsubsection White mensural ligatures +@subsection White mensural ligatures @cindex Ligatures mensurales @cindex Ligatures mensurales blanches @@ -3544,7 +3555,7 @@ L'espacement horizontal n'est pas des meilleurs. @node Gregorian square neumes ligatures -@subsubsection Gregorian square neumes ligatures +@subsection Gregorian square neumes ligatures @cindex neumes carrés et ligatures @cindex grégorien, ligatures de neumes carrés diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index cd8f1e473a..844694fbaa 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -684,8 +684,17 @@ by examining the simplest method, and gradually increase complexity. * Setting simple songs:: * Entering lyrics:: * Aligning lyrics to a melody:: +* Automatic syllable durations:: +* Another way of entering lyrics:: +* Assigning more than one syllable to a single note:: +* More than one note on a single syllable:: +* Extenders and hyphens:: * Working with lyrics and identifiers:: * Flexibility in placement:: +* Lyrics to multiple notes of a melisma:: +* Divisi lyrics:: +* Switching the melody associated with a lyrics line:: +* Lyrics independent of notes:: * Spacing lyrics:: * More about stanzas:: * Ambitus:: @@ -929,7 +938,7 @@ explicitly, using @code{\lyricmode} @end menu @node Automatic syllable durations -@subsubsection Automatic syllable durations +@subsection Automatic syllable durations @cindex automatic syllable durations @cindex lyrics and melodies @@ -985,7 +994,7 @@ is the same as @end example @node Another way of entering lyrics -@subsubsection Another way of entering lyrics +@subsection Another way of entering lyrics Lyrics can also be entered without @code{\addlyrics} or @code{\lyricsto}. In this case, @@ -1028,7 +1037,7 @@ Program reference: @internalsref{Lyrics}. @node Assigning more than one syllable to a single note -@subsubsection Assigning more than one syllable to a single note +@subsection Assigning more than one syllable to a single note @funindex _ @@ -1059,7 +1068,7 @@ Program reference: @internalsref{LyricCombineMusic}. @node More than one note on a single syllable -@subsubsection More than one note on a single syllable +@subsection More than one note on a single syllable @cindex melisma @cindex melismata @@ -1140,7 +1149,7 @@ Melismata are not detected automatically, and extender lines must be inserted by hand. @node Extenders and hyphens -@subsubsection Extenders and hyphens +@subsection Extenders and hyphens @cindex melisma @cindex extender @@ -1244,7 +1253,7 @@ differing ways. Such variations can still be captured with @node Lyrics to multiple notes of a melisma -@subsubsection Lyrics to multiple notes of a melisma +@subsection Lyrics to multiple notes of a melisma One possibility is that the text has a melisma in one stanza, but multiple syllables in another one. One solution is to make the faster @@ -1298,7 +1307,7 @@ For example, @node Divisi lyrics -@subsubsection Divisi lyrics +@subsection Divisi lyrics You can display alternate (or divisi) lyrics by naming voice contexts and attaching lyrics to those specific contexts. @@ -1344,7 +1353,7 @@ section. @node Switching the melody associated with a lyrics line -@subsubsection Switching the melody associated with a lyrics line +@subsection Switching the melody associated with a lyrics line More complex variations in text underlay are possible. It is possible to switch the melody for a line of lyrics during the text. This is @@ -1427,7 +1436,7 @@ The underlay is switched back to the starting situation by assigning @node Lyrics independent of notes -@subsubsection Lyrics independent of notes +@subsection Lyrics independent of notes In some complex vocal music, it may be desirable to place lyrics completely independently of notes. Music defined @@ -1503,7 +1512,7 @@ layout. @subsection More about stanzas @cindex stanza number -@subsubsection Adding stanza numbers +@subsection Adding stanza numbers Stanza numbers can be added by setting @code{stanza}, e.g., @@ -1523,7 +1532,7 @@ Stanza numbers can be added by setting @code{stanza}, e.g., These numbers are put just before the start of the first syllable. -@subsubsection Adding dynamics marks +@subsection Adding dynamics marks Stanzas differing in loudness may be indicated by putting a dynamics mark before each stanza. In Lilypond, everthing coming in @@ -1550,7 +1559,7 @@ text = { @cindex singer name @cindex name of singer -@subsubsection Adding singer names +@subsection Adding singer names Names of singers can also be added. They are printed at the start of the line, just like instrument names. They are created by setting @@ -1569,7 +1578,7 @@ the line, just like instrument names. They are created by setting @end lilypond -@subsubsection Printing stanzas at the end +@subsection Printing stanzas at the end Sometimes it is appropriate to have one stanza set to the music, and the rest added in verse form at @@ -1613,7 +1622,7 @@ its fleece was white as snow. @end lilypond -@subsubsection Printing stanzas at the end in multiple columns +@subsection Printing stanzas at the end in multiple columns When a piece of music has many verses, they are often printed in multiple columns across the page. An outdented verse number often @@ -2639,6 +2648,8 @@ Here are all subtopics at a glance: * Custodes:: * Divisiones:: * Ligatures:: +* White mensural ligatures:: +* Gregorian square neumes ligatures:: * Gregorian Chant contexts:: * Mensural contexts:: * Musica ficta accidentals:: @@ -3408,7 +3419,7 @@ with the same effect and is believed to be stable. @end menu @node White mensural ligatures -@subsubsection White mensural ligatures +@subsection White mensural ligatures @cindex Mensural ligatures @cindex White mensural ligatures @@ -3497,7 +3508,7 @@ to the following Horizontal spacing is poor. @node Gregorian square neumes ligatures -@subsubsection Gregorian square neumes ligatures +@subsection Gregorian square neumes ligatures @cindex Square neumes ligatures @cindex Gregorian square neumes ligatures