From: Werner Lemberg Date: Tue, 26 Oct 2004 21:49:37 +0000 (+0000) Subject: * scripts/lilypond-book.py: Some additional formatting for X-Git-Tag: release/2.3.25~8 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=db44ed9e3c52d5a79157f6b6724dac7b475c5505;p=lilypond.git * scripts/lilypond-book.py: Some additional formatting for orthogonality. (ly_options) [*]: Format strings. [RAGGEDRIGHT]: Don't set `indent'. This is now properly handled by `compose_ly'. (output) [LATEX][OUTPUT]: Format string and simplify. (PREAMBLE_LY, FRAGMENT_LY): Format string. (classic_lilypond_book_compatibility): Take key/value pair as parameter. Return key/value pair. (compose_ly): Rewritten, taking the snippet type as third parameter. The default values are now set more sensible, and a `linewidth' option is no longer overwritten under some circumstances. * Documentation/user/music-glossary.tely: Replace all accented character macros with latin-1 codes. --- diff --git a/ChangeLog b/ChangeLog index c194960af3..8086fb3d53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2004-10-26 Werner Lemberg + + * scripts/lilypond-book.py: Some additional formatting for + orthogonality. + (ly_options) [*]: Format strings. + [RAGGEDRIGHT]: Don't set `indent'. This is now properly handled + by `compose_ly'. + (output) [LATEX][OUTPUT]: Format string and simplify. + (PREAMBLE_LY, FRAGMENT_LY): Format string. + (classic_lilypond_book_compatibility): Take key/value pair as + parameter. + Return key/value pair. + (compose_ly): Rewritten, taking the snippet type as third parameter. + The default values are now set more sensible, and a `linewidth' + option is no longer overwritten under some circumstances. + + * Documentation/user/music-glossary.tely: Replace all accented + character macros with latin-1 codes. + 2004-10-26 Nicolas Sceaux * lily/music-function.cc (ly_make_music_function): when an diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 862d4df28d..54130d4fa2 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -189,16 +189,16 @@ The stress of one tone over others. @c F: how to distinguish between accidental and key-sig alteration? @aitem{accidental} -ES: alteraci@'on, +ES: alteración, I: alterazione, accidente, -F: alt@'eration +F: altération D: Vorzeichen, Versetzungszeichen, NL: voorteken, -DK: l@o{}st fortegn, -S: tillf@"alligt f@"ortecken, -FI: tilap@"ainen etumerkki. +DK: løst fortegn, +S: tillfälligt förtecken, +FI: tilapäinen etumerkki. -@c F: alt@'eration accidentelle, D: Vorzeichen, Versetzungszeichen, +@c F: altération accidentelle, D: Vorzeichen, Versetzungszeichen, @c Akzidenz, NL: toevallig teken, I: accidento. A sharp raises a tone by a @aref{semitone}, a double sharp raises it @@ -222,12 +222,12 @@ accidental. @aitem{accelerando} ES: acelerando, I: accelerando, -F: accelerando, en acc@'el@'erant, +F: accelerando, en accélérant, D: accelerando, schneller werden, NL: accelerando, DK: accelerando, S: accelerando, -FI: accelerando, kiihdytt@"aen. +FI: accelerando, kiihdyttäen. Increase tempo. @@ -251,7 +251,7 @@ It. comfortable, easy. ES: allegro, I: allegro, F: allegro, -D: Allegro, Schnell, Fr@"ohlich, Lustig, +D: Allegro, Schnell, Fröhlich, Lustig, NL: allegro, DK: allegro, S: allegro, @@ -268,7 +268,7 @@ D: Alt, NL: alt, DK: alt, S: alt, -FI: altto, matala nais@"a@"ani. +FI: altto, matala naisääni. A female voice of low range (@emph{contralto}). Originally the alto was a high male voice (hence the name) which by the use of falsetto reached the height of @@ -278,10 +278,10 @@ tenor}. @aitem{alto clef} ES: clave de do en tercera, I: chiave di contralto, -F: clef d'ut troisi@`eme ligne, -D: Altschl@"ussel, Bratschenschl@"ussel, +F: clef d'ut troisième ligne, +D: Altschlüssel, Bratschenschlüssel, NL: alt sleutel, -DK: altn@o{}gle, +DK: altnøgle, S: altklav, FI: alttoavain. @@ -296,7 +296,7 @@ D: ambitus, NL: ambitus, DK: ambitus, S: ambitus, -FI: ambitus, @"a@"aniala, soitinala. +FI: ambitus, ääniala, soitinala. The term ambit (from latin: ambitus, plural: ambitus) denotes a range of pitches for a given voice in a part of music. It may also denote @@ -304,7 +304,7 @@ the pitch range that a musical instrument is capable of playing. @aitem{ancient minor scale} I: scala minore naturale, -F: forme du mode mineur ancien, trois@`eme mode, mode hell@'enique +F: forme du mode mineur ancien, troisème mode, mode hellénique D: reines Moll, NL: authentieke mineurtoonladder, DK: ren mol, @@ -327,7 +327,7 @@ D: Andante, Gehend, NL: andante, DK: andante, S: andante, -FI: andante, k@"ayden. +FI: andante, käyden. Walking tempo/character. @@ -338,7 +338,7 @@ F: appogiature, (port de voix), D: Vorschlag, NL: voorslag, DK: forslag, -S: f@"orslag, +S: förslag, FI: appoggiatura, etuhele. Ornamental note, usually a second, that is melodically connected with the main @@ -390,7 +390,7 @@ An appoggiatura may have more notes preceding the main note. @aitem{arpeggio} ES: arpegio, I: arpeggio, -F: arp@`ege, +F: arpège, D: Arpeggio, Akkordbrechungen, gebrochener Akkord, NL: gebroken akoord, DK: arpeggio, akkordbrydning, @@ -432,11 +432,11 @@ A distance between a starting lower note and a higher ending note. @aitem{augmented interval} ES: intervalo aumentado, I: intervallo aumentato, -F: intervalle augment@'e, -D: @"uberm@"a@ss{}iges Intervall, +F: intervalle augmenté, +D: übermäßiges Intervall, NL: overmatig interval, -DK: forst@o{}rret interval, -S: @"overstigande intervall, +DK: forstørret interval, +S: överstigande intervall, FI: ylinouseva intervalli. @aref{interval}. @@ -446,9 +446,9 @@ I: autografo, F: manuscrit, D: Autograph, Handschrift, NL: manuscript, -DK: h@aa{}ndskrift, autograf, +DK: håndskrift, autograf, S: handskrift, -FI: k@"asinkirjoitettu nuotti. +FI: käsinkirjoitettu nuotti. 1. A manuscript in the composer's own hand. 2. Music prepared for photoreproduction by freehand drawing, @@ -480,30 +480,30 @@ S: taktstreck, FI: tahtiviiva. @aitem{bar} -ES: comp@'as, @aref{measure}. +ES: compás, @aref{measure}. @aitem{baritone} -ES: bar@'{@dotless{i}}tono, +ES: barítono, I: baritono, F: bariton, D: Bariton, NL: bariton, DK: baryton, S: baryton, -FI: baritoni, keskikorkuinen mies@"a@"ani. +FI: baritoni, keskikorkuinen miesääni. The male voice intermediate between the @aref{bass} and the @aref{tenor}. -@c F: clef de troisi@`eme ligne dropped +@c F: clef de troisième ligne dropped @aitem{baritone clef} ES: clave de fa en tercera, I: chiave di baritono, -F: clef d' Ut cinqui@`eme ligne, clef de Fa troisi@`eme, -D: Baritonschl@"ussel, +F: clef d' Ut cinquième ligne, clef de Fa troisième, +D: Baritonschlüssel, NL: baritonsleutel, -DK: barytonn@o{}gle, +DK: barytonnøgle, S: barytonklav, FI: baritoniavain. @@ -513,10 +513,10 @@ C or F clef setting middle C on the upper staff line. @aitem{bass clef} ES: clave de fa en cuarta, I: chiave di basso, -F: cl@'e de fa quatri@`eme ligne, -D: Bassschl@"ussel, +F: clé de fa quatrième ligne, +D: Bassschlüssel, NL: bassleutel, -DK: basn@o{}gle, +DK: basnøgle, S: basklav, FI: bassoavain. @@ -530,7 +530,7 @@ D: Bass, NL: bas, DK: bas, S: bas, -FI: basso, matala mies@"a@"ani. +FI: basso, matala miesääni. 1. The lowest of men's voices. 2. Sometimes, especially in jazz music, used as @@ -542,7 +542,7 @@ I: coda, F: barre, D: Balken, NL: waardestreep, -DK: bj@ae{}lke, +DK: bjælke, S: balk, FI: palkki. @@ -592,7 +592,7 @@ D: Klammer, Akkolade, NL: accolade, teksthaak, DK: klamme, S: klammer, -FI: yhdist@"av@"a sulkumerkki. +FI: yhdistävä sulkumerkki. Symbol at the start of a system connecting staves. Curly braces are used for connecting piano staves, angular brackets for connecting parts in an @@ -614,11 +614,11 @@ orchestral or choral score. @aitem{brass} ES: metales, I: ottoni, -D: Blechbl@"aser, +D: Blechbläser, NL: koper (blazers), F: cuivres, -DK: messingbl@ae{}sere, -S: brassinstrument, m@"assingsinstrument, +DK: messingblæsere, +S: brassinstrument, mässingsinstrument, FI: vaskisoitin. A family of blown musical instruments made of brass all using a cup formed @@ -630,7 +630,7 @@ I: respiro, F: respiration, D: Atemzeichen, Trennungszeichen, NL: repercussieteken, -DK: vejrtr@ae{}kningstegn, +DK: vejrtrækningstegn, S: andningstecken, FI: hengitysmerkki. @@ -639,7 +639,7 @@ Indication of where to breathe in vocal and wind instrument parts. @aitem{breve} ES: breve, I: breve, -F: br@`eve, +F: brève, D: Brevis, NL: brevis, DK: brevis, @@ -667,10 +667,10 @@ FI: C, c. @aitem{C clef} ES: Clave de do, I: chiave di do, -F: cl@'e d'ut, -D: C-Schl@"ussel, +F: clé d'ut, +D: C-Schlüssel, NL: C-sleutel, -DK: c-n@o{}gle, +DK: c-nøgle, S: c-klav, FI: C-avain. @@ -731,7 +731,7 @@ D: Kanon, NL: canon, DK: kanon, S: kanon, -FI: kaanon, tarkka j@"aljittely. +FI: kaanon, tarkka jäljittely. @aref{counterpoint}. @@ -743,7 +743,7 @@ D: Cent, NL: cent, DK: cent, S: cent, -FI: sentti, puolis@"avelaskeleen sadasosa tasavireisess@"a viritysj@"arjestelm@"ass@"a. +FI: sentti, puolisävelaskeleen sadasosa tasavireisessä viritysjärjestelmässä. Logarithmic unit of measurement. 1 cent is 1/1200 of an octave (1/100 of an equally tempered @aref{semitone}). @@ -791,7 +791,7 @@ chords are denoted open chords @end lilypond @aitem{chromatic scale} -ES: escala crom@'atica, +ES: escala cromática, I: scala cromatica, F: gamme chromatique, D: chromatische Tonleiter, @@ -820,24 +820,24 @@ FI: kromatiikka. Use of tones extraneous to a @aref{diatonic scale} (minor, major). @aitemii{church mode,ecclesiastical mode} -ES: modo eclesi@'astico, +ES: modo eclesiástico, I: modo ecclesiastico, -F: mode eccl@'esiastique, +F: mode ecclésiastique, D: Kirchentonart, NL: kerktoonladder, DK: kirketoneart, S: kyrkotonart, -FI: moodi, kirkkos@"avellaji. +FI: moodi, kirkkosävellaji. @aref{diatonic scale}. @aitem{clef} ES: clave, I: chiave, -F: cl@'e, clef, -D: Schl@"ussel, Notenschl@"ussel, +F: clé, clef, +D: Schlüssel, Notenschlüssel, NL: sleutel, -DK: n@o{}gle, +DK: nøgle, S: klav, FI: avain, nuottiavain. @@ -879,7 +879,7 @@ D: Komma, NL: komma, DK: komma, S: komma, -FI: komma, korvinkuultava ero @"a@"anenkorkeudessa. +FI: komma, korvinkuultava ero äänenkorkeudessa. Difference in pitch between a note derived from pure tuning and the same note derived from some other tuning method. @aref{temperament}. @@ -890,7 +890,7 @@ derived from some other tuning method. @aref{temperament}. @aitem{compound interval} ES: intervalo compuesto, I: intervallo composto, -F: intervalle compos@'e, +F: intervalle composé, D: weites Intervall, NL: samengesteld interval, DK: sammensat interval, @@ -903,12 +903,12 @@ Intervals larger than an octave. @aitem{complement} I: rivolto, -F: intervalle compl@'ementaire, -D: Komplement@"arintervall, +F: intervalle complémentaire, +D: Komplementärintervall, NL: complementair interval, -DK: komplement@ae{}rinterval, -S: komplement@"arintervall (?), -FI: t@"aydent@"av@"a intervalli. +DK: komplementærinterval, +S: komplementärintervall (?), +FI: täydentävä intervalli. @aref{inverted interval}. @@ -918,8 +918,8 @@ I: moto congiunto, F: mouvement conjoint, D: schrittweise, stufenweise Bewegung, NL: stapsgewijze, trapsgewijze beweging, -DK: trinvis bev@ae{}gelse, -S: stegvis r@"orelse, +DK: trinvis bevægelse, +S: stegvis rörelse, FI: asteittainen liike. Progressing melodically by intervals of a second. Opposite of @aref{disjunct movement}. @@ -962,7 +962,7 @@ D: Kontrapunkt, NL: contrapunt, DK: kontrapunkt, S: kontrapunkt, -FI: kontrapunkti, @"a@"ani @"a@"ant@"a vastaan. +FI: kontrapunkti, ääni ääntä vastaan. From latin @emph{punctus contra punctum}, note against note. The combination into a single musical fabric of lines or parts which have distinct melodic @@ -1049,7 +1049,7 @@ abbreviation ``cresc.''. @aitem{cue-notes} ES: notas guia, I: notine, -F: petites notes pr@'ec@'edent l'entr@'ee d'in instrument, r@'eplique, +F: petites notes précédent l'entrée d'in instrument, réplique, D: Stichnoten, NL: stichnoten, DK: stiknoder, @@ -1096,7 +1096,7 @@ of the 20th century @aitem{D} ES: Re, I: re, -F: r@'e, +F: ré, D: D, d, NL: d, DK: d, @@ -1168,7 +1168,7 @@ FI: laskeva intervalli. A distance between a starting higher note and a lower ending note. @aitem{diatonic scale} -ES: escala diat@'onica, +ES: escala diatónica, I: scala diatonica, F: gamme diatonique, D: diatonische Tonleiter, @@ -1339,14 +1339,14 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @end lilypond @aitem{diminished interval} -ES: intervalo disminu@'{@dotless{i}}do, +ES: intervalo disminuído, I: intervallo diminuito, -F: intervalle diminu@'e, +F: intervalle diminué, D: vermindertes Intervall, NL: verminderd interval, DK: formindsket interval, -S: f@"orminskat intervall, -FI: v@"ahennetty intervalli. +S: förminskat intervall, +FI: vähennetty intervalli. @aref{interval}. @@ -1368,9 +1368,9 @@ I: moto disgiunto, F: mouvement disjoint, D: sprunghafte Bewegung, NL: sprongsgewijze beweging, -DK: springende bev@ae{}gelse, -S: hoppande r@"orelse, -FI: melodian hyppiv@"a liike. +DK: springende bevægelse, +S: hoppande rörelse, +FI: melodian hyppivä liike. Progressing melodically by intervals larger than a major second. Opposite of @aref{conjunct movement}. @@ -1398,7 +1398,7 @@ FI: dissonanssi, dissonoiva intervalli, riitasointi. @aitem{dominant ninth chord} I: accordo di nona di dominante, -F: accord de neuvi@`eme dominante, +F: accord de neuvième dominante, D: Dominantnoneakkord, NL: dominant noon akkoord, DK: dominantnoneakkord, @@ -1408,9 +1408,9 @@ FI: dominanttinoonisointu. @aref{chord}, @aref{functional harmony}. @aitem{dominant seventh chord} -ES: acorde de s@'eptima de dominante, +ES: acorde de séptima de dominante, I: accordo di settima di dominante, -F: accord de septi@`eme dominante, +F: accord de septième dominante, D: Dominantseptakkord, NL: dominant septiem akkoord, DK: dominantseptimakkord, @@ -1433,7 +1433,7 @@ The fifth @aref{scale degree}, @aref{functional harmony}. @aitem{dorian mode} -ES: modo d@'orico, +ES: modo dórico, I: modo dorico, F: mode dorien, D: dorisch, dorischer Kirchenton, @@ -1448,7 +1448,7 @@ FI: doorinen moodi. ES: puntillo, I: punto (di valore), F: point, -D: Punkt (Verl@"angerungspunkt), +D: Punkt (Verlängerungspunkt), NL: punt, DK: punkt, S: punkt, @@ -1459,7 +1459,7 @@ FI: piste. @aitem{dotted note} ES: nota con puntillo, I: nota puntata, -F: note point@'ee, +F: note pointée, D: punktierte Note, NL: gepuncteerde noot, DK: punkteret node, @@ -1494,7 +1494,7 @@ Indicates the end of a section within a movement. @aitem{double dotted note} ES: nota con dos puntillos, I: nota doppiamente puntata, -F: note doublement point@'ee, +F: note doublement pointée, D: doppelt punktierte Note, NL: dubbelgepuncteerde noot, DK: dob@-belt@-punk@-te@-ret node, @@ -1506,7 +1506,7 @@ FI: kaksoispisteellinen nuotti. @aitem{double flat} ES: doble bemol, I: doppio bemolle, -F: double b@'emol, +F: double bémol, D: Doppel-B, NL: dubbelmol, DK: dob@-belt-b, @@ -1518,7 +1518,7 @@ FI: kaksoisalennusmerkki. @aitem{double sharp} ES: doble sostenido, I: doppio diesis, -F: double di@`ese, +F: double dièse, D: Doppelkreuz, NL: dubbelkruis, DK: dob@-belt@-kryds, @@ -1546,7 +1546,7 @@ F: temps binaire, D: in zwei, NL: tweedelige maatsoort, DK: todelt takt, -S: tv@aa{}takt, +S: tvåtakt, FI: kaksoistempo. @aref{meter}. @@ -1564,13 +1564,13 @@ FI: duoli. @aref{note value}. @aitem{duration} -ES: duraci@'on, +ES: duración, I: durata, -F: dur@'ee, -D: Dauer, L@"ange, +F: durée, +D: Dauer, Länge, NL: duur, lengte, DK: varighed, -S: tonl@"angd, +S: tonlängd, FI: kesto, aika-arvo. @aref{note value}. @@ -1596,7 +1596,7 @@ UK: quaver, D: Achtel, Achtelnote, NL: achtste noot, DK: ottendedelsnode, -S: @aa{}ttondelsnot, +S: åttondelsnot, FI: kahdeksasosanuotti. @aref{note value}. @@ -1609,7 +1609,7 @@ UK: quaver rest, D: Achtelpause, NL: achtste rust, DK: ottendedelspause, -S: @aa{}ttonddelspaus, +S: åttonddelspaus, FI: kahdeksasosatauko. @aref{note value}. @@ -1632,7 +1632,7 @@ The traditional process of music printing is done through cutting in a plate of metal. Now also the term for the art of music typesetting. @aitem{enharmonic} -ES: enharm@'onico, +ES: enharmónico, I: enarmonico, F: enharmonique, D: enharmonisch, @@ -1660,11 +1660,11 @@ but equal pitch. @aitem{equal temperament} ES: ?, I: temperamento equabile, -F: temp@'erament @'egal, +F: tempérament égal, D: gleichschwebende Stimmung, NL: ge@-lijk@-zwe@-ven@-de temperatuur, -DK: ligesv@ae{}vende temperatur, -S: liksv@"avande temperatur, +DK: ligesvævende temperatur, +S: liksvävande temperatur, FI: tasavireinen. Tuning system dividing the octave into 12 equal @aref{semitone}s @@ -1677,7 +1677,7 @@ F: signe d'expression, indication de nuance, D: Vortragszeichen, NL: voordrachtsteken, DK: foredragsbetegnelse, -S: f@"oredragsbeteckning, +S: föredragsbeteckning, FI: nyanssiosoitus, esitysmerkki. Performance indications concerning 1. volume, dynamics (for example @@ -1697,10 +1697,10 @@ FI: F, f. @aitem{F clef} ES: Clave de Fa, I: chiave di fa, -F: cl@'e de fa, -D: F-Schl@"ussel, +F: clé de fa, +D: F-Schlüssel, NL: F-sleutel, -DK: F-n@o{}gle, +DK: F-nøgle, S: f-klav, FI: F-avain. @@ -1741,14 +1741,14 @@ symbol indicates playing an octave lower (for example on double bass @c F: 'point d'orgue' on a note, 'point d'arret' on a rest. @aitem{fermata} -ES: Calder@'on, +ES: Calderón, I: corona, F: point d'orgue, point d'arr@^et, D: Fermate, NL: fermate, DK: fermat, S: fermat, -FI: fermaatti, pid@"ake. +FI: fermaatti, pidäke. Prolonged note or rest of indefinite duration. @@ -1775,13 +1775,13 @@ FI: kvintti. ES: bajo cifrado, @aref{thorough bass}. @aitem{fingering} -ES: digitaci@'on, +ES: digitación, I: diteggiatura, -F: doigt@'e, +F: doigté, D: Fingersatz, NL: vingerzetting, -DK: fingers@ae{}tning, -S: fingers@"attning, +DK: fingersætning, +S: fingersättning, FI: sormitus. The methodical use of fingers in the playing of instruments. @@ -1790,7 +1790,7 @@ The methodical use of fingers in the playing of instruments. ES: corchete, I: coda (uncinata), bandiera, F: crochet, -D: Fahne, F@"ahnchen, +D: Fahne, Fähnchen, NL: vlaggetje, DK: fane, S: flagga, @@ -1814,11 +1814,11 @@ less than a quarter note. The number of flags determines the @aitem{flat} ES: bemol, I: bemolle, -F: b@'emol, +F: bémol, D: B, b, NL: mol, DK: b, -S: bef@"ortecken, +S: beförtecken, FI: alennusmerkki. @aref{accidental}. @@ -1864,14 +1864,14 @@ FI: fuuga. @aref{counterpoint}. @aitem{functional harmony} -ES: armon@'{@dotless{i}}a funcional, +ES: armonía funcional, I: armonia funzionale, -F: @'etude des functions, +F: étude des functions, D: Funktionslehre, NL: functionele harmonie, DK: funktionsanalyse, funktionsharmonik, -S: funktionsl@"ara, -FI: harmoniaj@"arjestelm@"a. +S: funktionslära, +FI: harmoniajärjestelmä. A system of harmonic analysis. It is based on the idea that, in a given key, there are only three functionally different chords: tonic (T, the chord on the @@ -1903,10 +1903,10 @@ FI: G, g. @aitem{G clef} ES: Clave de sol, I: chiave di sol, -F: cl@'e de sol, -D: G-Schl@"ussel, Violinschl@"ussel, +F: clé de sol, +D: G-Schlüssel, Violinschlüssel, NL: G-sleutel, -DK: g-n@o{}gle, +DK: g-nøgle, S: g-klav, FI: G-avain. @@ -1956,7 +1956,7 @@ Letting the pitch slide fluently from one note to the other. ES: ?, I: abbellimenti, F: fioriture, -D: Verzierungen, Vorschl@"age, Vorschlagsnoten, +D: Verzierungen, Vorschläge, Vorschlagsnoten, NL: versieringen, DK: forsiringer, S: ornament, @@ -1971,7 +1971,7 @@ F: accolade, D: Akkolade, NL: piano systeem, DK: klaversystem, -S: ackolad, b@"ojd klammer, +S: ackolad, böjd klammer, FI: kaksoisnuottiviivasto. @aref{brace}. @@ -2017,7 +2017,7 @@ FI: puolitauko. @aref{note value}. @aitem{harmonic cadence} -ES: cadencia (arm@'onica), +ES: cadencia (armónica), I: cadenza (armonica), F: cadence harmonique, D: Schlusskadenz, @@ -2052,7 +2052,7 @@ section. @aref{functional harmony}. @end lilypond @aitem{harmony} -ES: armon@'{@dotless{i}}a, +ES: armonía, I: armonia, F: harmonie, D: Harmonie, Zusammenklang, @@ -2095,14 +2095,14 @@ Dissonances: Three note harmony @aref{chord}. @aitem{homophony} -ES: homofon@'{@dotless{i}}a, +ES: homofonía, I: omofonia, F: homophonie, D: Homophonie, NL: homofonie, DK: homofoni, S: homofoni, -FI: homofonia, yksi@"a@"anisyys. +FI: homofonia, yksiäänisyys. Music in which one voice leads melodically followed by the other voices more or less in the same rhythm. In contrast to @aref{polyphony}. @@ -2115,7 +2115,7 @@ D: Intervall, NL: interval, DK: interval, S: intervall, -FI: intervalli, kahden s@"avelen korkeusero. +FI: intervalli, kahden sävelen korkeusero. Difference in pitch between two notes. Intervals may be perfect, minor, major, diminished, or augmented. The augmented fourth and the diminished fifth are @@ -2189,12 +2189,12 @@ of such two forms an octave. @aitem{inverted interval} ES: intervalo invertido, I: intervallo rivolto, -F: intervalle revers@'e, +F: intervalle reversé, D: umgekehrtes Intervall, NL: interval inversie, DK: omvendingsinterval, -S: intervallets omv@"andning, -FI: k@"a@"anteisintervalli. +S: intervallets omvändning, +FI: käänteisintervalli. The difference between an interval and an octave. @@ -2214,7 +2214,7 @@ F: intonation juste, D: reine Stimmung, NL: reine stemming, DK: ren stemning, -S: ren st@"amning, +S: ren stämning, FI: puhdas viritys. Tuning system in which the notes are obtained by adding and subtracting @@ -2222,8 +2222,8 @@ natural fifths and thirds. @aref{temperament}. @aitem{key} ES: tonalidad, -I: tonalit@`a, -F: tonalit@'e, +I: tonalità, +F: tonalité, D: Tonart, NL: toonsoort, DK: toneart, @@ -2237,12 +2237,12 @@ there are 12@w{ }keys, one on@w{ }c, one on c-sharp, etc. @aitem{key signature} ES: armadura de clave, I: armatura di chiave, -F: armure, armature [de la cl@'e], +F: armure, armature [de la clé], D: Vorzeichen, Tonart, NL: toon@-soort (voortekens), DK: faste fortegn, S: tonartssignatur, -FI: s@"avellajiosoitus. +FI: sävellajiosoitus. The sharps or flats appearing at the beginning of each staff indicating the key of the music. @aref{accidental}. @@ -2255,7 +2255,7 @@ D: Largo, Langsam, Breit, NL: largo, DK: largo, S: largo, -FI: largo, hitaasti, leve@"asti. +FI: largo, hitaasti, leveästi. Very slow in tempo, usually combined with great expressiveness. @emph{Larghetto} is less slow than largo. @@ -2268,20 +2268,20 @@ D: Leitton, NL: leidtoon, DK: ledetone, S: ledton, -FI: johtos@"avel. +FI: johtosävel. The seventh @aref{scale degree}, a @aref{semitone} below the tonic; so called because of its strong tendency to ``lead up'' (resolve upwards) to the tonic scale degree. @aitemii{ledger line,leger line} -ES: l@'{@dotless{i}}neas adicionales, +ES: líneas adicionales, I: tagli addizionali, -F: ligne suppl@'ementaire, +F: ligne supplémentaire, D: Hilfslinie, NL: hulplijntje, -DK: hj@ae{}lpelinie, -S: hj@"alplinje, +DK: hjælpelinie, +S: hjälplinje, FI: apuviiva. A ledger line is an extension of the staff. @@ -2294,7 +2294,7 @@ A ledger line is an extension of the staff. @aitem{legato} ES: ligado, I: legato, -F: legato, li@'e, +F: legato, lié, D: legato, NL: legato, DK: legato, @@ -2329,7 +2329,7 @@ unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato}, and @aitem{lilypond} ES: estanque de lilas, I: stagno del giglio, -F: @'etang de lis, +F: étang de lis, UK: lily pond, D: Seerosenteich, NL: le@-lie@-vij@-ver, @@ -2353,7 +2353,7 @@ notation, the need for ligatures to denote such patterns disappeared. @aitem{line} -ES: l@'{@dotless{i}}nea, +ES: línea, I: linea, F: ligne, D: Linie, Notenlinie, @@ -2371,8 +2371,8 @@ F: appoggiature longue, D: langer Vorschlag, NL: Lange voorslag, DK: langt forslag, -S: l@aa{}ngt f@"orslag, -FI: pitk@"a appoggiatura, pitk@"a etuhele. +S: långt förslag, +FI: pitkä appoggiatura, pitkä etuhele. @aref{appoggiatura}. @@ -2411,7 +2411,7 @@ FI, sanoitus. ES: intervalo mayor, I: intervallo maggiore, F: intervalle majeur, -D: gro@ss{}es Intervall, +D: großes Intervall, NL: groot interval, DK: stort interval, S: stort intervall, @@ -2433,12 +2433,12 @@ FI: duuri. @aitem{meantone temperament} I: accordatura mesotonica, -F: temp@'erament m@'esotonique, -D: mittelt@"onige Stimmung, +F: tempérament mésotonique, +D: mitteltönige Stimmung, NL: middenstemming, middentoonstemming, DK: middeltonetemperatur, S: medeltonstemperatur, -FI: keskis@"avelviritys. +FI: keskisävelviritys. Temperament yielding acoustically pure thirds by decreasing the natural fifth by 16@w{ }@aref{cent}s. Due to the non-circular character of this @@ -2446,7 +2446,7 @@ by 16@w{ }@aref{cent}s. Due to the non-circular character of this Used for tuning keyboard instruments for performance of pre-1650 music. @aitemii{measure,bar} -ES: comp@'as, +ES: compás, I: misura, battuta, F: mesure, D: Takt, @@ -2463,12 +2463,12 @@ bar-lines. @aref{meter}. @aitem{mediant} ES: mediante, I: mediante, modale, -F: m@'ediante, +F: médiante, NL: mediant, D: Mediante, DK: mediant, S: mediant, -FI: keskis@"avel. +FI: keskisävel. 1. The third @b{scale degree}. 2. A @aref{chord} having its base tone @@ -2479,7 +2479,7 @@ harmony}, @aref{relative key}. @aitem{melisma} NL: melisma, -FI: melisma, laulettavan tavun s@"avelkuvio. +FI: melisma, laulettavan tavun sävelkuvio. A melisma (plural: melismata) is a group of notes or tones sung on one syllable in plainsong @@ -2488,9 +2488,9 @@ syllable in plainsong @aref{cadenza}. @aitemii{meter,time} -ES: comp@'as, +ES: compás, I: tempo, metro, -F: indication de m@'esure, +F: indication de mésure, D: Taktart, Metrum, NL: maatsoort, DK: taktart, @@ -2530,9 +2530,9 @@ one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8), or @end lilypond @aitem{metronome} -ES: metr@'onomo, +ES: metrónomo, I: metronomo, -F: m@'etronome, +F: métronome, D: Metronom, NL: metronoom, DK: me@-tro@-nom, @@ -2543,9 +2543,9 @@ Device indicating the exact tempo of a piece. @aref{metronomic indication}. @aitem{metronomic indication} -ES: indicaci@'on metron@'omica, +ES: indicación metronómica, I: indicazione metronomica, -F: indication m@'etronomique, +F: indication métronomique, D: Metronomangabe, NL: metronoom aanduiding, DK: metronomtal, @@ -2553,7 +2553,7 @@ S: metronomangivelse, FI: metronomiosoitus. Exact tempo indication (in beats per minute). Also denoted by -M.M. (M@"alzels Metronom). +M.M. (Mälzels Metronom). @aitem{mezzo-soprano} ES: mezzo soprano, @@ -2622,19 +2622,19 @@ D: Modus, NL: modus, DK: skala, S: modus, skala, -FI: moodi, kirkkos@"avelasteikko. +FI: moodi, kirkkosävelasteikko. @aref{church mode}, @aref{diatonic scale}. @aitem{modulation} -ES: modulaci@'on, +ES: modulación, I: modulazione, F: modulation, D: Modulation, NL: modulatie, DK: modulation, S: modulering, -FI: modulaatio, s@"avellajin vaihdos. +FI: modulaatio, sävellajin vaihdos. Moving from one @aref{key} to another. For example, the second subject of a @aref{sonata form} movement modulates to the dominant @@ -2660,7 +2660,7 @@ D: Motiv, NL: motief, DK: motiv, S: motiv, -FI: teema, s@"avelaihe. +FI: teema, sävelaihe. The briefest intelligible and self-contained fragment of a musical theme or subject. @@ -2715,11 +2715,11 @@ FI: usean tahdin mittainen tauko. @aitem{natural sign} ES: becuadro, I: bequadro, -F: b@'ecarre, -D: Aufl@"osungszeichen, +F: bécarre, +D: Auflösungszeichen, NL: herstellingsteken, -DK: op@-l@o{}sningstegn, -S: @aa{}terst@"allningstecken, +DK: op@-løsningstegn, +S: återställningstecken, FI: palautusmerkki. @aref{accidental}. @@ -2730,7 +2730,7 @@ FI: palautusmerkki. @aitem{ninth} ES: novena, I: nona, -F: neuvi@`eme, +F: neuvième, D: None, NL: noon, DK: none, @@ -2766,7 +2766,7 @@ D: Notenkopf, NL: nootballetje, DK: nodehovede, S: nothuvud, -FI: nuotin p@"a@"a. +FI: nuotin pää. A head like sign which indicates pitch by its position on a @aref{staff} provided with a @aref{clef}, and duration @@ -2778,11 +2778,11 @@ instrument. @aitem{note value} ES: valor, I: valore, durata, -F: dur@'ee, valeur (d'une note), +F: durée, valeur (d'une note), D: Notenwert, NL: nootwaarde, -DK nodev@ae{}rdi, -S: notv@"arde, +DK nodeværdi, +S: notvärde, FI: nuotin aika-arvo. Note values (durations) are measured as fractions, normally 1/2, of the next @@ -2863,7 +2863,7 @@ FI: oktaavi. @aitemiii{ornament,embellishment,accessory} ES: adorno, I: abbellimento, fioriture, -F: agr@'ement, ornement, +F: agrément, ornement, D: Verzierung, Ornament, NL: versiering, DK: forsiring, @@ -2936,7 +2936,7 @@ F: partie, D: Stimme, NL: partij, DK: stemme, -S: st@"amma, +S: stämma, FI: stemma, instrumenttiosuus. 1. In instrumental or choral music the music for the single instrument @@ -2944,14 +2944,14 @@ or voice. 2. in contrapuntal music @aref{counterpoint} the single melodic line of the contrapunctal web. @aitem{percussion} -ES: percusi@'on, +ES: percusión, I: percussioni, F: percussion, D: Schlagzeug, Schlagwerk, NL: slagwerk, -DK: slagt@o{}j, +DK: slagtøj, S: slagverk, -FI: ly@"om@"asoittimet. +FI: lyömäsoittimet. A family of musical instruments which are played on by striking or shaking. Percussion instruments commonly used in a symphony orchestra are @@ -2986,12 +2986,12 @@ A natural division of the melodic line, comparable to a sentence of speech. @aitem{phrasing} ES: fraseo, I: fraseggio, -F: phras@'e, +F: phrasé, D: Phrasierung, NL: frasering, DK: frasering, S: fra@-se@-ring, -FI: fraseeraus, j@"asent@"aminen. +FI: fraseeraus, jäsentäminen. The clear rendering in musical performance of the @aref{phrase}s of the melody. Phrasing may be indicated by a @aref{slur}. @@ -3013,11 +3013,11 @@ FI, piano, hiljaa. ES: altura, I: altezza, F: hauteur, -D: Tonh@"ohe, +D: Tonhöhe, NL: toonhoogte, -DK: toneh@o{}jde, -S: tonh@"ojd, -FI: s@"avelkorkeus. +DK: tonehøjde, +S: tonhöjd, +FI: sävelkorkeus. @aitem{pizzicato} ES: pizzicato, @@ -3027,19 +3027,19 @@ D: pizzicato, NL: pizzicato, getokkeld, DK: pizzicato, S: pizzicato, -FI: pizzicato, n@"app@"aillen. +FI: pizzicato, näppäillen. Play by plucking the strings. @aitem{polyphony} -ES: polifon@'{@dotless{i}}a, +ES: polifonía, I: polifonia, F: polyphonie, D: Polyphonie, NL: polyfonie, DK: polyfoni, S: polyfoni, -FI: polyfonia, moni@"a@"anisyys. +FI: polyfonia, moniäänisyys. Music written in a combination of several simultaneous voices (parts) of a more or less pronounced individuality. @aref{counterpoint}. @@ -3061,12 +3061,12 @@ Very quick, i.e. quicker than @aref{allegro}; @emph{prestissimo} denotes the highest possible degree of speed. @aitem{Pythagorean comma} -ES: coma pitag@'orico, +ES: coma pitagórico, I: comma pitagorico, F: comma pythagoricien, -D: Pythagor@"aisches Komma, +D: Pythagoräisches Komma, NL: komma van Pythagoras, -DK: pythagor@ae{}isk komma, +DK: pythagoræisk komma, S: pytagoreiskt komma, FI: pytagorinen komma. @@ -3096,8 +3096,8 @@ UK: crotchet, D: Viertel, Viertelnote, NL: kwartnoot, DK: fjerdedelsnode, -S: fj@"ardedelsnot, -FI: nelj@"annesosanuotti. +S: fjärdedelsnot, +FI: neljännesosanuotti. @aref{note value}. @@ -3109,8 +3109,8 @@ UK: crotchet rest, D: Viertelpause, NL: kwart rust, DK:@w{ }fjerdedelspause, -S: fj@"ardedelspaus, -FI: nelj@"annesosatauko. +S: fjärdedelspaus, +FI: neljännesosatauko. @aref{note value}. @@ -3140,13 +3140,13 @@ Abbreviation "rall.". @aref{ritardando}. @aitem{relative key} ES: relativa, -I: tonalit@`a relativa, -F: tonalit@'e relative, +I: tonalità relativa, +F: tonalité relative, D: Paralleltonart, NL: paralleltoonsoort, DK: paralleltoneart, S: parallelltonart, -FI: rinnakkaiss@"avellaji. +FI: rinnakkaissävellaji. @aref{major} and @aref{minor} @aref{key} with the same @aref{key signature}. @@ -3171,7 +3171,7 @@ with the same @aref{key signature}. @end lilypond @aitem{repeat} -ES: barra de repetici@'on, +ES: barra de repetición, I: ritornello, F: barre de reprise, D: Wiederholung, @@ -3254,19 +3254,19 @@ D: Tonleiter, NL: toonladder, DK: Skala, S: skala, -FI: asteikko, s@"avelasteikko. +FI: asteikko, sävelasteikko. @aref{diatonic scale}. @aitem{scale degree} ES: grados de la escala, I: grado della scala, -F: degr@'e [de la gamme], +F: degré [de la gamme], D: Tonleiterstufe, NL: trap [van de toonladder], DK: skalatrin, S: skalsteg (?), -FI: s@"avelaste, asteikon s@"avel. +FI: sävelaste, asteikon sävel. Names and symbols used in harmonic analysis to denote tones of the scale as roots of chords. The most important are degrees I = tonic (T), IV = @@ -3325,7 +3325,7 @@ D: Halbton, NL: halve toon, DK: halvtone, S: halvton, -FI: puolis@"avel. +FI: puolisävel. The @aref{interval} of a minor second. The (usually) smallest interval in European composed music. The interval between two neighbouring @@ -3339,9 +3339,9 @@ semitone. An octave may be divided into 12@w{ }semitones. @end lilypond @aitem{seventh} -ES: s@'eptima, +ES: séptima, I: settima, -F: septi@`eme, +F: septième, D: Septime, NL: septiem, DK: septim, @@ -3364,11 +3364,11 @@ FI: sekstoli. @aitem{sharp} ES: sostenido, I: diesis, -F: di@`ese, +F: dièse, D: Kreuz, NL: kruis, DK: kryds, -S: korsf@"ortecken, +S: korsförtecken, FI: korotusmerkki. @aref{accidental}. @@ -3422,32 +3422,32 @@ UK: hemidemisemiquaver, D: Vierundsechzigstel, Vierundsechzigstelnote, NL: vierenzestigste noot, DK: fi@-re@-og@-tred@-sinds@-ty@-ven@-de@-dels@-no@-de, -S: sextiofj@"ardedelsnot, -FI: kuudeskymmenesnelj@"asosanuotti. +S: sextiofjärdedelsnot, +FI: kuudeskymmenesneljäsosanuotti. @aref{note value}. @aitem{sixty-fourth rest} ES: silencia de semifusa, I: pausa di semibiscroma, -F: seizi@`eme de soupir, +F: seizième de soupir, UK: hemidemisemiquaver rest, D: Vierundsechzigstelpause, NL: vierenzestigste rust, DK: fi@-re@-og@-tred@-sinds@-ty@-ven@-de@-dels@-pau@-se, -S: sextiofj@"ardedelspaus, -FI: kuudeskymmenesnelj@"asosatauko. +S: sextiofjärdedelspaus, +FI: kuudeskymmenesneljäsosatauko. @aref{note value}. @aitem{slur} ES: ligadura, I: legatura (di portamento or espressiva), -F: liaison, coul@'e, +F: liaison, coulé, D: Bogen, Legatobogen, Phrasierungsbogen, NL: fraseringsboog, legatoboog, streekboog, DK: legatobue, fraseringsbue, -S: b@aa{}ge, +S: båge, FI: kaari. A slur above or below a group of notes indicates that they are to be played @@ -3514,19 +3514,19 @@ D: Sopran, NL: sopraan, DK: sopran, S: sopran, -FI: sopraano, korkea nais@"a@"ani. +FI: sopraano, korkea naisääni. The highest female voice. @aitem{staccato} ES: staccato, I: staccato, -F: staccato, piqu@'e, d@'etach@'e, +F: staccato, piqué, détaché, D: staccato, NL: staccato, DK: staccato, S: staccato, -FI: staccato, lyhyesti, ter@"av@"asti. +FI: staccato, lyhyesti, terävästi. Playing the note(s) short. Staccato is indicated by a dot above or below the note head. @@ -3544,7 +3544,7 @@ note head. @aitemii{staff,pl. staves} ES: pentagrama, I: pentagramma, rigo (musicale), -F: port@'ee, +F: portée, D: Notenzeile, NL: (noten)balk, partij, DK: nodesystem, @@ -3588,7 +3588,7 @@ F: cordes, D: Streicher, NL: strijkers, DK: strygere, -S: str@aa{}kar, +S: stråkar, FI: jouset. A family of stringed musical instruments played with a bow. Strings commonly @@ -3623,12 +3623,12 @@ harmony}. @aitem{submediant} ES: superdominante, I: sopratonica, -F: sous-m@'ediante, +F: sous-médiante, D: Submediante, NL: submediant, DK: Submediant, S: submediant, -FI: alikeskis@"avel. +FI: alikeskisävel. The sixth @aref{scale degree}. @@ -3657,7 +3657,7 @@ FI: ylidominantti. The sixth @aref{scale degree}. @aitem{supertonic} -ES: supert@'onica, +ES: supertónica, I: sopratonica, F: sus-tonique, D: Supertonika, @@ -3669,7 +3669,7 @@ FI: ylitoonika. The second @aref{scale degree}. @aitem{symphony} -ES: sinfon@'{@dotless{i}}a, +ES: sinfonía, I: sinfonia, F: symphonie, D: Sinfonie, Symphonie, @@ -3713,19 +3713,19 @@ D: syntonisches Komma, NL: syntonische komma, DK: syntonisk komma, S: syntoniskt komma, -FI: syntoninen komma, terssien taajuusero luonnollisessa ja Pytagorisessa viritysj@"arjestelm@"ass@"a. +FI: syntoninen komma, terssien taajuusero luonnollisessa ja Pytagorisessa viritysjärjestelmässä. Difference between the natural third and the third obtained by Pythagorean tuning (@aref{Pythagorean comma}), equal to 22@w{ }cents. @aitem{system} I: accollatura, -F: syst@`eme, +F: système, D: Notensystem, NL: systeem, DK: system, S: system, -FI: nuottij@"arjestelm@"a. +FI: nuottijärjestelmä. The collection of staves @aref{staff}, two or more, as used for writing down of keyboard, chamber, choral, or orchestral music. @@ -3733,26 +3733,26 @@ writing down of keyboard, chamber, choral, or orchestral music. @aitem{temperament} ES: temperamento, I: temperamento, -F: temp@'erament, +F: tempérament, D: Stimmung, Temperatur, NL: stemming, temperatuur, DK: temperatur, S: temperatur, -FI: viritysj@"arjestelm@"a. +FI: viritysjärjestelmä. Systems of tuning in which the intervals deviate from the acoustically pure intervals. @aref{meantone temperament}, @aref{equal temperament}. @aitem{tempo indication} -ES: indicaci@'on de tempo, +ES: indicación de tempo, I: indicazione di tempo, F: indication de temps, -D: Zeitma@ss{}, Tempobezeichnung, +D: Zeitmaß, Tempobezeichnung, NL: tempo aanduiding, DK: tempobetegelse, S: tempobeteckning, -FI: tempomerkint@"a. +FI: tempomerkintä. The rate of speed of a composition or a section thereof, ranging from the slowest to the quickest, as is indicated by tempo marks as @@ -3762,19 +3762,19 @@ slowest to the quickest, as is indicated by tempo marks as @aitem{tenor} ES: tenor, I: tenore, -F: t@'enor, +F: ténor, D: Tenor, NL: tenor, DK: tenor, S: tenor, -FI: tenori, korkea mies@"a@"ani. +FI: tenori, korkea miesääni. The highest voice of men (apart from @aref{counter tenor}). @aitem{tenth} -ES: d@'ecima, +ES: décima, I: decima, -F: dixi@`eme, +F: dixième, D: Dezime, NL: deciem, DK: decim, @@ -3803,7 +3803,7 @@ UK: demisemiquaver, D: Zweiunddreissigstel, Zweiunddreissigstelnote, NL: twee-endertig@-ste noot, DK: toogtredivtedelsnode, -S: trettiotv@aa{}ondelsnot, +S: trettiotvåondelsnot, FI: kolmanneskymmeneskahdesosanuotti. @aref{note value}. @@ -3811,12 +3811,12 @@ FI: kolmanneskymmeneskahdesosanuotti. @aitem{thirty-second rest} ES: silencio de fusa, I: pausa di biscroma, -F: huiti@`eme de soupir, +F: huitième de soupir, UK: demisemiquaver rest, D: Zweiunddreissigstel@-pause, NL: 32e rust, DK: toogtredivtedelspause, -S: trettiotv@aa{}ondelspaus, +S: trettiotvåondelspaus, FI: kolmanneskymmeneskahdesosatauko. @aref{note value}. @@ -3824,7 +3824,7 @@ FI: kolmanneskymmeneskahdesosatauko. @aitemii{thorough bass,figured bass} ES: bajo cifrado, I: basso continuo, basso numerato, -F: basse chiffr@'ee, +F: basse chiffrée, D: Generalbass, bezifferter Bass, NL: basso continuo, becijferde bas DK: generalbas, @@ -3864,13 +3864,13 @@ with figures designating the chief @aref{interval}s and @end lilypond @aitemii{tie,bind} -ES: ligadura de prolongaci@'on, +ES: ligadura de prolongación, I: legatura (di valore), F: liaison, D: Haltebogen, NL: overbinding, bindingsboog, DK: bindebue, -S: bindeb@aa{}ge, @"overbindning, +S: bindebåge, överbindning, FI: sitominen. A curved line, identical in appearance with the @aref{slur}, which @@ -3883,7 +3883,7 @@ uniting them into a single sound equal to the combined durations. @end lilypond @aitem{time signature} -ES: cifra indicadora de comp@'as, +ES: cifra indicadora de compás, I: segni di tempo, F: chiffrage (chiffres indicateurs), signe de valeur, D: Taktangabe, Angabe der Taktart, @@ -3902,7 +3902,7 @@ D: Ton, NL: toon, DK: tone, S: ton, -FI: @"a@"ani. +FI: ääni. A sound of definite pitch and duration, as distinct from @emph{noise}. Tone is a primary building material of music. @@ -3922,7 +3922,7 @@ The first @aref{scale degree}. @aref{functional harmony}. @aitem{transposition} -ES: transposici@'on, +ES: transposición, I: trasposizione, F: transposition, D: Transposition, @@ -3957,10 +3957,10 @@ relative pitches. @aitem{treble clef} ES: clave de sol, I: chiave di violino, -F: cl@'e de sol, -D: Violinschl@"ussel, Sopranschl@"ussel, +F: clé de sol, +D: Violinschlüssel, Sopranschlüssel, NL: viool sleutel, -DK:@w{ }diskantn@o{}gle, +DK:@w{ }diskantnøgle, S: diskantklav, FI: diskanttiavain. @@ -3969,7 +3969,7 @@ FI: diskanttiavain. @aitem{tremolo} ES: tremolo, I: tremolo, -F: tr@'emolo, +F: trémolo, D: Tremolo, NL: tremolo, DK: tremolo, @@ -3993,7 +3993,7 @@ a @aref{chord}, usually in the distance of a third @end lilypond @aitem{triad} -ES: tr@'{@dotless{i}}ada, +ES: tríada, I: triade, F: triade, accord parfait, accord de trois sons, D: Dreiklang, @@ -4017,7 +4017,7 @@ FI: trilli. @aref{ornament}. @aitem{triple meter} -ES: comp@'as compuesto, +ES: compás compuesto, I: tempo ternario, F: mesure ternaire, D: in drei, @@ -4041,7 +4041,7 @@ FI: trioli. @aref{note value}. @aitem{tritone} -ES: tr@'{@dotless{i}}tono, +ES: trítono, I: tritono, F: triton, D: Tritonus, @@ -4053,13 +4053,13 @@ FI: tritonus. @aref{interval}. @aitem{tuning fork} -ES: diapas@'on, +ES: diapasón, I: diapason, corista, F: diapason, D: Stimmgabel, NL: stemvork, DK: stemmegaffel, -S: st@"amgaffel, +S: stämgaffel, FI: viritysavain. A two-pronged piece of steel used to indicate absolute pitch. Tuning forks @@ -4078,23 +4078,23 @@ FI: korukuvio. @aref{ornament}. @aitem{unison} -ES: un@'{@dotless{i}}sono, +ES: unísono, I: unisono, F: unisson, D: unisono, NL: unisono, DK: unison, S: unison, -FI: unisono, yksi@"a@"anisesti. +FI: unisono, yksiäänisesti. Playing of the same notes or the same melody by various instruments (voices) or by the whole orchestra (choir), either at exactly the same pitch or in a different octave. @aitem{upbeat} -ES: entrada anacr@'usica, +ES: entrada anacrúsica, I: anacrusi, -F: anacrouse, lev@'ee, +F: anacrouse, levée, D: Auftakt, NL: opmaat, DK: optakt, @@ -4119,8 +4119,8 @@ F: voix, D: Stimme, NL: stem, DK: stemme, -S: st@"amma, -FI: @"a@"ani, laulu@"a@"ani. +S: stämma, +FI: ääni, lauluääni. 1. Human voices: @aref{soprano}, @aref{mezzo-soprano}, @aref{contralto}, @aref{tenor}, @@ -4128,7 +4128,7 @@ FI: @"a@"ani, laulu@"a@"ani. 2. A melodic layer or part of a polyphonic composition. @aitem{weak beat} -ES: tiempo d@'ebil, +ES: tiempo débil, I: tempo debole, arsi, F: temps faible, D: unbetonter Taktteil oder Taktschlag, @@ -4183,10 +4183,10 @@ black and white keys -- is a whole tone. ES: maderas, I: legni, F: les bois, -D: Holzbl@"aser, +D: Holzbläser, NL: houtblazers, -DK tr@ae{}bl@ae{}sere, -S: tr@"abl@aa{}sare, +DK træblæsere, +S: träblåsare, FI: puupuhaltimet. A family of blown wooden musical instruments. Today some of these instruments @@ -4213,7 +4213,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon. @item -@item @strong{breve} @tab breve @tab breve @tab br@`eve @tab Brevis @tab +@item @strong{breve} @tab breve @tab breve @tab brève @tab Brevis @tab brevis @tab brevis @tab brevis @tab brevis @item @@ -4229,12 +4229,12 @@ halve @tab halv @tab halv @tab puoli- @tab @item @item @strong{quarter} @tab crotchet @tab semi@-minima @tab noire @tab -Viertel @tab kwart @tab fjerde@-del @tab fj@"arde@-del @tab nelj@"annes- @tab +Viertel @tab kwart @tab fjerde@-del @tab fjärde@-del @tab neljännes- @tab @item @item @strong{eighth} @tab quaver @tab croma @tab croche @tab Achtel @tab -achtste @tab ottende@-del @tab @aa{}tton@-del @tab kahdeksasosa- @tab +achtste @tab ottende@-del @tab åtton@-del @tab kahdeksasosa- @tab @item @@ -4245,15 +4245,15 @@ achtste @tab ottende@-del @tab @aa{}tton@-del @tab kahdeksasosa- @tab @item @item @strong{thirty-second} @tab demi@-semi@-quaver @tab bis@-croma @tab -triple croche @tab Zwei@-und@-drei@-@ss{}ig@-stel @tab twee-en@-dertig@-ste -@tab toog@-tredivte-del @tab trettio@-tv@aa{}on@-del @tab kolmaskymmeneskahdesosa- @tab +triple croche @tab Zwei@-und@-drei@-ßig@-stel @tab twee-en@-dertig@-ste +@tab toog@-tredivte-del @tab trettio@-tvåon@-del @tab kolmaskymmeneskahdesosa- @tab @item @item @strong{sixty-fourth} @tab hemi@-demi@-semi@-quaver @tab semi@-bis@-croma @tab qua@-druple croche @tab Vier@-und@-sechzig@-stel @tab vier@-en@-zestig@-ste @tab fireog@-tred@-sinds@-ty@-ven@-de@-del @tab -sextio@-fj@"arde@-del @tab kuudeskymmenesnelj@"asosa- @tab +sextio@-fjärde@-del @tab kuudeskymmenesneljäsosa- @tab @end multitable @c @item @tab @tab @tab @tab @tab @tab @tab @tab @tab @@ -4275,17 +4275,17 @@ sextio@-fj@"arde@-del @tab kuudeskymmenesnelj@"asosa- @tab @item -@item @strong{c-sharp} @tab do diesis @tab ut di@`ese @tab Cis @tab cis @tab +@item @strong{c-sharp} @tab do diesis @tab ut dièse @tab Cis @tab cis @tab cis @tab cis @tab cis @item -@item @strong{d-flat} @tab re bemolle @tab r@'e b@'emol @tab Des @tab des @tab +@item @strong{d-flat} @tab re bemolle @tab ré bémol @tab Des @tab des @tab des @tab des @tab des @item -@item @strong{d} @tab re @tab r@'e @tab D @tab d @tab d @tab d @tab d +@item @strong{d} @tab re @tab ré @tab D @tab d @tab d @tab d @tab d @item @@ -4301,7 +4301,7 @@ des @tab des @tab des @item -@item @strong{a-flat} @tab la bemolle @tab la b@'emol @tab As @tab as @tab as +@item @strong{a-flat} @tab la bemolle @tab la bémol @tab As @tab as @tab as @tab as @tab as @item @@ -4310,12 +4310,12 @@ des @tab des @tab des @item -@item @strong{a-sharp} @tab la diesis @tab la di@`ese @tab Ais @tab ais @tab +@item @strong{a-sharp} @tab la diesis @tab la dièse @tab Ais @tab ais @tab ais @tab ais @tab ais @item -@item @strong{b-flat} @tab si bemolle @tab si b@'emol @tab B @tab bes @tab b +@item @strong{b-flat} @tab si bemolle @tab si bémol @tab B @tab bes @tab b @tab b @tab b @item @@ -4338,7 +4338,7 @@ quotes from its articles have been included into the item explanation texts. Hugo Riemanns Musiklexicon, Berlin 1929. -Polyglottes W@"orterbuch der musikalischen Terminologie, Kassel 1980 +Polyglottes Wörterbuch der musikalischen Terminologie, Kassel 1980 Oxford Advanced Learner's Dictionary of Current English, Third Edition 1974. Webster's Revised Unabridged Dictionary, Springfield 1913. diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index ace30b4cf5..ba975886a7 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -366,38 +366,30 @@ ly_options = { ## PAPER: { - INDENT: r''' - indent = %(indent)s''', - 'linewidth': r''' - linewidth = %(linewidth)s''', + INDENT: r'''indent = %(indent)s''', - NOINDENT: r''' - indent = 0.0\mm''', + LINEWIDTH: r'''linewidth = %(linewidth)s''', - QUOTE: r''' - linewidth = %(linewidth)s - 2.0 * %(exampleindent)s -''', + NOINDENT: r'''indent = 0.0\mm''', + + QUOTE: r'''linewidth = %(linewidth)s - 2.0 * %(exampleindent)s''', - RAGGEDRIGHT: r''' - indent = 0.0\mm - raggedright = ##t''', + RAGGEDRIGHT: r'''raggedright = ##t''', }, ## LAYOUT: { EXAMPLEINDENT: '', - NOTIME: r''' - \context { - \Staff - \remove Time_signature_engraver - }''', + NOTIME: r'''\context { + \Staff + \remove Time_signature_engraver +}''', }, ## PREAMBLE: { - STAFFSIZE: r''' -#(set-global-staff-size %(staffsize)s)''', + STAFFSIZE: r'''#(set-global-staff-size %(staffsize)s)''', }, } @@ -436,13 +428,22 @@ output = { BEFORE: '', - OUTPUT: r'''{\parindent 0pt + OUTPUT: r'''{%% +\parindent 0pt \catcode`\@=12 -\ifx\preLilyPondExample\undefined\relax\else\preLilyPondExample\fi +\ifx\preLilyPondExample \undefined + \relax +\else + \preLilyPondExample +\fi \def\lilypondbook{}%% \input %(base)s.tex -\ifx\postLilyPondExample\undefined\relax\else\postLilyPondExample\fi -\catcode`\@=0}''', +\ifx\postLilyPondExample \undefined + \relax +\else + \postLilyPondExample +\fi +}''', PRINTFILENAME: '''\\texttt{%(filename)s} ''', @@ -494,27 +495,31 @@ output = { PREAMBLE_LY = r'''%%%% Generated by %(program_name)s %%%% Options: [%(option_string)s] + #(set! toplevel-score-handler ly:parser-print-score) #(set! toplevel-music-handler (lambda (p m) (ly:parser-print-score - p (ly:music-scorify m p)) - )) + p (ly:music-scorify m p)))) + %(preamble_string)s + \paper { #(define dump-extents #t) %(paper_string)s } -\layout { %(layout_string)s -} +\layout { + %(layout_string)s +} ''' FRAGMENT_LY = r''' - %(notes_string)s{ +%(notes_string)s +{ %% ly snippet contents follows: - %(code)s +%(code)s %% end ly snippet - } +} ''' FULL_LY = ''' @@ -531,79 +536,106 @@ texinfo_linewidths = { '@letterpaper': '6\\in', } -def classic_lilypond_book_compatibility (o): - if o == 'singleline': - return RAGGEDRIGHT - m = re.search ('relative\s*([-0-9])', o) - if m: - return 'relative=%s' % m.group (1) - m = re.match ('([0-9]+)pt', o) - if m: - return 'staffsize=%s' % m.group (1) - m = re.match ('indent=([-.0-9]+)(cm|in|mm|pt|staffspace)', o) +def classic_lilypond_book_compatibility (key, value): + if key == 'singleline' and value == None: + return (RAGGEDRIGHT, None) + + m = re.search ('relative\s*([-0-9])', key) if m: - f = float (m.group (1)) - return 'indent=%f\\%s' % (f, m.group (2)) - m = re.match ('linewidth=([-.0-9]+)(cm|in|mm|pt|staffspace)', o) + return ('relative', m.group (1)) + + m = re.match ('([0-9]+)pt', key) if m: - f = float (m.group (1)) - return 'linewidth=%f\\%s' % (f, m.group (2)) - return None + return ('staffsize', m.group (1)) + + if key == 'indent' or key == 'linewidth': + m = re.match ('([-.0-9]+)(cm|in|mm|pt|staffspace)', value) + if m: + f = float (m.group (1)) + return (key, '%f\\%s' % (f, m.group (2))) + + return (None, None) + +def compose_ly (code, options, type): + option_dict = {} + for i in options: + if string.find (i, '=') > 0: + (key, value) = re.split ('\s*=\s*', i) + option_dict[key] = value + else: + option_dict[i] = None + + has_linewidth = option_dict.has_key (LINEWIDTH) -def compose_ly (code, options): - #Hmm for i in default_ly_options.keys (): - if i not in options: - options.append (i) + if i not in option_dict.keys (): + option_dict[i] = default_ly_options[i] + + if not INDENT in option_dict.keys (): + option_dict[NOINDENT] = None - #Hmm - if QUOTE in options and LINEWIDTH in options: - options.remove (LINEWIDTH) + if not has_linewidth and LINEWIDTH in option_dict.keys (): + if QUOTE in option_dict.keys () or type == 'lilypond': + del option_dict[LINEWIDTH] + option_dict[RAGGEDRIGHT] = None - if FRAGMENT in options: - if RAGGEDRIGHT not in options: - options.append (RAGGEDRIGHT) + if FRAGMENT in option_dict.keys (): body = FRAGMENT_LY else: body = FULL_LY # defaults relative = 1 - staffsize = 16 override = {} #FIXME: where to get sane value for exampleindent? - override[EXAMPLEINDENT] = r'9.0 \mm' + override[EXAMPLEINDENT] = r'9.0\mm' override[LINEWIDTH] = None override.update (default_ly_options) - option_string = string.join (options, ',') - - options_dict = {} - option_types = [NOTES, PREAMBLE, LAYOUT, PAPER] - for a in option_types: - options_dict[a] = [] - - for i in options: - c = classic_lilypond_book_compatibility (i) - if c: - ly.warning (_ ("deprecated ly-option used: %s" % i)) - ly.warning (_ ("compatibility mode translation: %s" \ - % c)) - i = c - - if string.find (i, '=') > 0: - key, value = re.split ('\s*=\s*', i) + option_list = [] + for (key, value) in option_dict.items (): + if value == None: + option_list.append (key) + else: + option_list.append (key + '=' + value) + option_string = string.join (option_list, ',') + + compose_dict = {} + compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER] + for a in compose_types: + compose_dict[a] = [] + + for (key, value) in option_dict.items(): + (c_key, c_value) = \ + classic_lilypond_book_compatibility (key, value) + if c_key: + if c_value: + ly.warning \ + (_ ("deprecated ly-option used: %s=%s" \ + % (key, value))) + ly.warning \ + (_ ("compatibility mode translation: %s=%s" \ + % (c_key, c_value))) + else: + ly.warning \ + (_ ("deprecated ly-option used: %s" \ + % key)) + ly.warning \ + (_ ("compatibility mode translation: %s" \ + % c_key)) + + (key, value) = (c_key, c_value) + + if value: override[key] = value else: - key = i - if not override.has_key (i): - override[i] = None + if not override.has_key (key): + override[key] = None found = 0 - for type in option_types: + for type in compose_types: if ly_options[type].has_key (key): - - options_dict[type].append (ly_options[type][key]) + compose_dict[type].append (ly_options[type][key]) found = 1 break @@ -625,10 +657,15 @@ def compose_ly (code, options): program_name = __main__.program_name - paper_string = string.join (options_dict[PAPER], '\n ') % override - layout_string = string.join (options_dict[LAYOUT], '\n ') % override - notes_string = string.join (options_dict[NOTES], '\n ') % vars () - preamble_string = string.join (options_dict[PREAMBLE], '\n ') % override + paper_string = \ + string.join (compose_dict[PAPER], '\n ') % override + layout_string = \ + string.join (compose_dict[LAYOUT], '\n ') % override + notes_string = \ + string.join (compose_dict[NOTES], '\n ') % vars () + preamble_string = \ + string.join (compose_dict[PREAMBLE], '\n ') % override + return (PREAMBLE_LY + body) % vars () # BARF @@ -662,7 +699,7 @@ def find_file (name): full = os.path.join (i, name) if os.path.exists (full): return full - ly.error (_ ('file not found: %s') % name + '\n') + ly.error (_ ("file not found: %s") % name + '\n') ly.exit (1) return '' @@ -742,7 +779,7 @@ class Lilypond_snippet (Snippet): def full_ly (self): s = self.ly () if s: - return compose_ly (s, self.options) + return compose_ly (s, self.options, self.type) return '' # todo: use md5? @@ -807,7 +844,7 @@ class Lilypond_snippet (Snippet): multiple = '%(base)s-page1.png' % vars () images = (single,) if os.path.exists (multiple) \ - and (not os.path.exists (single)\ + and (not os.path.exists (single) \ or (os.stat (multiple)[stat.ST_MTIME] \ > os.stat (single)[stat.ST_MTIME])): images = glob.glob ('%(base)s-page*.png' % vars ()) @@ -826,7 +863,7 @@ class Lilypond_snippet (Snippet): str += output[HTML][BEFORE] % vars () for image in self.get_images (): - base, ext = os.path.splitext (image) + (base, ext) = os.path.splitext (image) str += output[HTML][OUTPUT] % vars () str += output[HTML][AFTER] % vars () return str @@ -835,7 +872,7 @@ class Lilypond_snippet (Snippet): str = self.output_print_filename (HTML) str = output[TEXINFO][BEFORE] % vars () for image in self.get_images (): - base, ext = os.path.splitext (image) + (base, ext) = os.path.splitext (image) # URG, makeinfo implicitely prepends dot to ext # specifying no extension is most robust @@ -919,7 +956,7 @@ def find_toplevel_snippets (s, types): ## found = dict (map (lambda x: (x, None), types)) ## urg python2.1 found = {} - map (lambda x, f=found: f.setdefault (x, None), types) + map (lambda x, f = found: f.setdefault (x, None), types) # We want to search for multiple regexes, without searching # the string multiple times for one regex. @@ -975,9 +1012,9 @@ def find_toplevel_snippets (s, types): def filter_pipe (input, cmd): if verbose_p: - ly.progress (_ ("Opening filter `%s\'") % cmd) + ly.progress (_ ("Opening filter `%s'") % cmd) - stdin, stdout, stderr = os.popen3 (cmd) + (stdin, stdout, stderr) = os.popen3 (cmd) stdin.write (input) status = stdin.close () @@ -992,7 +1029,7 @@ def filter_pipe (input, cmd): signal = 0x0f & status if status or (not output and error): exit_status = status >> 8 - ly.error (_ ("`%s\' failed (%d)") % (cmd, exit_status)) + ly.error (_ ("`%s' failed (%d)") % (cmd, exit_status)) ly.error (_ ("The error log is as follows:")) sys.stderr.write (error) sys.stderr.write (stderr.read ()) @@ -1031,10 +1068,10 @@ def process_snippets (cmd, ly_snippets, png_snippets): for i in png_names: if not os.path.exists (i + '.eps') and os.path.exists (i + '.tex'): to_eps (i) - ly.make_ps_images (i + '.eps', resolution=110) + ly.make_ps_images (i + '.eps', resolution = 110) # elif os.path.exists (i + '.ps'): -# ly.make_ps_images (i + '.ps', resolution=110) +# ly.make_ps_images (i + '.ps', resolution = 110) LATEX_DOCUMENT = r''' %(preamble)s @@ -1103,7 +1140,7 @@ def do_process_cmd (chunks): ly.progress ('\n') if ly_outdated: - ly.progress (_ ("Processing...")) + ly.progress (_ ("Processing...\n")) process_snippets (process_cmd, ly_outdated, png_outdated) else: ly.progress (_ ("All snippets are up to date...")) @@ -1189,8 +1226,8 @@ def do_file (input_filename): if not default_ly_options.has_key (LINEWIDTH): if format == LATEX: textwidth = get_latex_textwidth (source) - default_ly_options[LINEWIDTH] = '''%.0f\\pt''' \ - % textwidth + default_ly_options[LINEWIDTH] = \ + '''%.0f\\pt''' % textwidth elif format == TEXINFO: for (k, v) in texinfo_linewidths.items (): # FIXME: @layout is usually not in chunk #0: @@ -1214,7 +1251,7 @@ def do_file (input_filename): def process_include (snippet): os.chdir (original_dir) name = snippet.substring ('filename') - ly.progress (_ ('Processing include: %s') % name) + ly.progress (_ ("Processing include: %s") % name) ly.progress ('\n') do_file (name) @@ -1222,7 +1259,7 @@ def do_file (input_filename): filter (lambda x: is_derived_class (x.__class__, Include_snippet), chunks)) except Compile_error: os.chdir (original_dir) - ly.progress (_ ('Removing `%s\'') % output_filename) + ly.progress (_ ("Removing `%s'") % output_filename) ly.progress ('\n') os.unlink (output_filename) @@ -1237,7 +1274,7 @@ def do_options (): (options, files) = getopt.getopt (sys.argv[1:], sh, long) except getopt.error, s: sys.stderr.write ('\n') - ly.error (_ ("getopt says: `%s\'" % s)) + ly.error (_ ("getopt says: `%s'" % s)) sys.stderr.write ('\n') ly.help () ly.exit (2)