From: Jean-Charles Malahieude Date: Sat, 2 Jul 2016 14:11:49 +0000 (+0200) Subject: Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a1267e20afa61258ce3031f07d916e0e66ac6582;hp=df45ab1a1dfc9ec2d90f03edec9edaa85715ea87;p=lilypond.git Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation --- diff --git a/Documentation/ca/learning/common-notation.itely b/Documentation/ca/learning/common-notation.itely index 6ff4bc746c..286ceba6f2 100644 --- a/Documentation/ca/learning/common-notation.itely +++ b/Documentation/ca/learning/common-notation.itely @@ -174,11 +174,8 @@ accidentals}, vegeu @ruser{Note names in other languages}. @cindex presentació en front a contingut @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Glossari musical: @rglos{key signature}, @@ -454,11 +451,8 @@ articulacions. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Glossari musical: @rglos{dynamics}, @@ -497,7 +491,6 @@ Referència de la notació: @cindex marcat @funindex \markup -@funindex markup És possible afegir text a la partitura: @@ -536,9 +529,7 @@ Referència de la notació: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Glossari musical: @rglos{beam}. @@ -596,7 +587,6 @@ Referència de la notació: @cindex compàs parcial @funindex \partial -@funindex partial Glossari musical: @rglos{anacrusis}. @@ -620,7 +610,6 @@ una anacrusi de negra i @code{\partial 8} de corxera. @cindex tresets @funindex \tuplet -@funindex tuplet Glossari musical: @rglosnamed{note value,valor de la nota}, @@ -651,9 +640,7 @@ manera que els @notation{tresets} es fan amb una fracció de 3/2. @cindex appoggiatura @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -852,10 +839,8 @@ disposa sobre un sols pentagrama. @cindex notació, context de @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -1064,7 +1049,6 @@ senzilles de cançó. @cindex cançons @funindex \addlyrics -@funindex addlyrics Glossari musical: @rglos{lyrics}. @@ -1464,7 +1448,6 @@ llocs. El següent exemple utilitza les variables anteriors: @cindex bloc d'encapçalaments @funindex \header -@funindex header La informació sobre el títol, autor, número d'Opus i altres elements similars s'escriuen al bloc @code{\header}. Aquest bloc diff --git a/Documentation/ca/learning/fundamental.itely b/Documentation/ca/learning/fundamental.itely index 735c848338..53bc51d22d 100644 --- a/Documentation/ca/learning/fundamental.itely +++ b/Documentation/ca/learning/fundamental.itely @@ -74,9 +74,7 @@ Hi ha moltes variacions d'aquest esquema bàsic, però l'exemple constitueix un punt de partida útil. @funindex \book -@funindex book @funindex \score -@funindex score @cindex book (llibre) @cindex score (partitura) @cindex llibre @@ -170,11 +168,8 @@ altres coses, com ara @end example @funindex \header -@funindex header @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex midi @cindex capçalera @cindex disposició @@ -202,7 +197,6 @@ Referència de la notació, a @ruser{Score layout} i a @cindex book, bloc implícit @cindex implícit, bloc book @funindex \book -@funindex book Podem escriure diversos blocs @code{\score}. Cada un d'ells rebrà el mateix tractament que una partitura independent, però es @@ -281,7 +275,6 @@ consulteu @ruser{File structure} @cindex musical, expressió, composta @cindex expressió musical composta @funindex \score -@funindex score En la secció anterior, @ref{Introducció a l'estructura dels fitxers del LilyPond}, hem pogut veure l'organització general dels @@ -989,15 +982,10 @@ Referència de la notació: @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex contextos de veu, creació de @@ -1188,13 +1176,9 @@ està en silenci, com per exemple: @cindex notes, col·lisions de @cindex desplaçament, instruccions de @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Les notes properes a un acord, o les notes que es produeixen al mateix temps en diferents veus, es disposen en dos (i @@ -1247,7 +1231,6 @@ dues expressions, és a dir, les notes i la lletra. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics, creació d'un context @cindex lletra, creació d'un context de @@ -1283,7 +1266,6 @@ un cas on és necessari crear contextos de @code{Staff} i de @cindex lletra i barrat @cindex barrat i lletra @funindex \autoBeamOff -@funindex autoBeamOff El barrat automàtic que el LilyPond usa de forma predeterminada funciona bé per a la música instrumental, però no tan bé per a @@ -1295,7 +1277,6 @@ per desactivar el barrat automàtic. @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex vocal, estructura d'una partitura @cindex cor, sistema de @@ -1513,7 +1494,6 @@ Referencia de la notació: @translationof Creating contexts @funindex \new -@funindex new @cindex nous contextos @cindex creació de contextos @cindex contextos, creació de @@ -1728,9 +1708,7 @@ Referència de funcionament intern: @cindex context, propietats de, modificació @cindex modificar les propietats de context @funindex \set -@funindex set @funindex \unset -@funindex unset Els contextos es responsabilitzen de mantenir els valors d'un cert nombre de @emph{properties} de context. Moltes d'elles es poden @@ -1932,7 +1910,6 @@ forma molt més general utilitzant la molt potent instrucció @subsubheading Canviar les propietats d'un context amb @code{\with} @funindex \with -@funindex with @cindex context, propietats de, establiment amb \with El valor predeterminat de les propietats de context es pot @@ -1986,7 +1963,6 @@ restablir-se amb la instrucció @code{\unset fontSize}. @cindex contextos, establir propietats de, amb \context @funindex \context -@funindex context Els valors de propietat dels contextos es poden establir per a @emph{tots} els contextos d'un tipus determinat, com per exemple @@ -2070,9 +2046,7 @@ Referència de funcionament intern: @cindex eliminació de gravadors @funindex \consists -@funindex consists @funindex \remove -@funindex remove Hem vist que cada un dels contextos conté diversos gravadors, cada u dels quals és al seu cop responsable de la producció d'una @@ -2170,7 +2144,6 @@ pentagrama: @subsubheading Canviar tots els contextos del mateix tipus @funindex \layout -@funindex layout Els exemples anteriors mostren la manera d'eliminar o afegir gravadors als contextos individuals. També és possible eliminar o diff --git a/Documentation/ca/learning/tutorial.itely b/Documentation/ca/learning/tutorial.itely index cd68123772..32e37b6b89 100644 --- a/Documentation/ca/learning/tutorial.itely +++ b/Documentation/ca/learning/tutorial.itely @@ -218,7 +218,6 @@ valors automàtics són adequats. @cindex relatiu, mode, alteracions i @funindex \relative -@funindex relative @funindex ' @funindex , @@ -404,7 +403,6 @@ el nom @code{r}@tie{}: @cindex compàs, indicació de @funindex \time -@funindex time Glossari musical: @rglos{time signature}. @@ -431,7 +429,6 @@ La @notation{indicació de compàs} es pot establir amb l'ordre @cindex metrònom, indicacions @funindex \tempo -@funindex tempo Glossari musical: @rglos{tempo indication}, @@ -470,7 +467,6 @@ de metrònom} poden establir-se amb l'ordre @code{\tempo}: @cindex baix @funindex \clef -@funindex clef Glossari musical: @rglos{clef}. diff --git a/Documentation/ca/learning/tweaks.itely b/Documentation/ca/learning/tweaks.itely index 1f167a762a..90fe3e351e 100644 --- a/Documentation/ca/learning/tweaks.itely +++ b/Documentation/ca/learning/tweaks.itely @@ -222,7 +222,6 @@ Referencia de la notació: @cindex override (sobreescriptura), sintaxi de @funindex \override -@funindex override Ja hem vist les ordres @code{\set} i @code{\with}, que s'usen per canviar les propietats dels @strong{contextos} i per treure i @@ -301,7 +300,6 @@ per canviar el color d'un cap: @cindex revert, instrucción @funindex \revert -@funindex revert Un cop sobreescrita, la propietat reté el seu nou valor fins que se sobreescriu de o es troba una ordre @code{\revert}. L'ordre té @@ -340,7 +338,6 @@ dues notes: @translationof The once prefix @funindex \once -@funindex once @code{\override}, @code{\revert}, @code{\set} i @code{\unset} es poden fer precedir per @code{\once}. Això fa que l'ordre sigui @@ -389,7 +386,6 @@ predefinides per limitar el seu efecte a un sol moment musical: @cindex overrideProperty, ordre @funindex \overrideProperty -@funindex overrideProperty Hi ha una altra forma per a l'ordre de sobreescriptura, @code{\overrideProperty}, que ocasionalment és necessària. La @@ -405,7 +401,6 @@ detalls consulteu @rextendnamed{Difficult tweaks,Ajustaments difícils}. @cindex tweak, ordre @funindex \tweak -@funindex tweak L'última ordre d'ajustament que està disponible és @code{\tweak}. S'ha de fer servir quan diversos objectes s'usen en el mateix @@ -839,7 +834,6 @@ aquest lloc concret. @cindex once override @funindex \once -@funindex once Com podeu veure, @emph{totes} les lligadures són més gruixudes a l'últim exemple. Però, i si volguéssim que sols la primera @@ -885,7 +879,6 @@ l'ordre @code{\set}. @cindex predeterminades, recuperar las propietats @funindex \revert -@funindex revert Finalment, i si volguéssim que sols les dues primeres lligadures fossin més gruixudes? Per acabar; podríem usar dues ordres, @@ -2358,9 +2351,7 @@ d'ells. @cindex octava alta y baixa, claudàtor de @funindex \startTextSpan -@funindex startTextSpan @funindex \stopTextSpan -@funindex stopTextSpan @cindex TextSpanner, exemple de sobreescriptura @cindex bound-details, propietat, exemple @@ -2514,9 +2505,7 @@ fa usant l'ordre @code{textLengthOn}. @cindex notes, espaiar amb el text @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff De forma predeterminada, el text produït mitjançant marcatge no ocupa cap espai horitzontal en quant es refereix a la disposició @@ -3060,13 +3049,9 @@ diferents. @cindex col·lisions de notes @cindex desplaçament, ordres de @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Dins d'una veu, totes les notes que es produeixen al mateix moment s'agrupen a una columna de notes, i es crea un objecte diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi index 6d47ad9cf3..7ee978a076 100644 --- a/Documentation/common-macros.itexi +++ b/Documentation/common-macros.itexi @@ -9,6 +9,7 @@ @set txicodequoteundirected @set txicodequotebacktick +@set txiindexbackslashignore @include cyrillic.itexi diff --git a/Documentation/cs/learning/common-notation.itely b/Documentation/cs/learning/common-notation.itely index f9f4f68ae7..077a2b8f06 100644 --- a/Documentation/cs/learning/common-notation.itely +++ b/Documentation/cs/learning/common-notation.itely @@ -129,11 +129,8 @@ Podívejte se na @ruser{Označení not v jiných jazycích}. @cindex Zobrazení a obsah @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Slovníček: @rglos{key signature}, @rglos{major}, @rglos{minor}. @@ -365,11 +362,8 @@ jak se mají artikulační znaménka umístit. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Slovníček: @rglos{dynamics}, @@ -449,9 +443,7 @@ Doporučení pro notový zápis: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Všechny @notation{trámce} se zapisují automaticky: @@ -499,7 +491,6 @@ Doporučení pro notový zápis: @cindex Předtaktí @funindex \partial -@funindex partial @notation{Předtaktí} se zadává příkazem @code{\partial}. Potom následuje délka předtaktí: @code{\partial 4} @@ -520,7 +511,6 @@ znamená jednu čtvrťovou notu předtaktí a @code{\partial 8} jednu osminovou @cindex Rytmická rozdělení @funindex \times -@funindex times Slovníček: @rglos{note value}, @rglos{triplet}. @@ -547,9 +537,7 @@ takže triola má 2/3 jako svůj zlomek: @cindex Prodleva @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -737,10 +725,8 @@ příklad začíná jednou notou: @cindex Prostředí notového zápisu @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -941,7 +927,6 @@ Doporučení pro notový zápis: @cindex Text písně, zápis @funindex \addlyrics -@funindex addlyrics V této kapitole je laskavý čtenář uveden do spojení not s textem a je ukázáno, jak se vytváří jednodušší listy s písničkami. @@ -962,7 +947,6 @@ a je ukázáno, jak se vytváří jednodušší listy s písničkami. @cindex Text písně @funindex \addlyrics -@funindex addlyrics Slovníček: @rglos{lyrics}. @@ -1390,7 +1374,6 @@ právě vymezené značky: @cindex Úvodní stránka @funindex \header -@funindex header Název, skladatel, číslo opusu a podobné údaje se vkládají do prostředí @code{\header}. Toto prostředí se nachází mimo diff --git a/Documentation/cs/learning/fundamental.itely b/Documentation/cs/learning/fundamental.itely index 261bac7a83..4efdc777bc 100644 --- a/Documentation/cs/learning/fundamental.itely +++ b/Documentation/cs/learning/fundamental.itely @@ -235,7 +235,6 @@ notace -- @ruser{Rozvržení notového zápisu} a @cindex Prostředí book, skryté @cindex Skryté prostředí book @funindex \book -@funindex book Váš LilyPondovský kód může obsahovat více bloků @code{\score}. Každý z nich je vykládán jako samostatný notový zápis, ovšem @@ -310,7 +309,6 @@ tato omezení popsána v části @ruser{Stavba souboru}. @translationof Score is a (single) compound musical expression @funindex \score -@funindex score @cindex score @cindex Notový zápis @cindex Hudební kus @@ -1022,15 +1020,10 @@ Notace: @ruser{Více hlasů}. @translationof Explicitly instantiating voices @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex Vytvoření prostředí hlasu @cindex Prostředí hlasu, vytvoření @@ -1277,7 +1270,6 @@ Pozor: Textu písně se v angličtině říká @qq{lyrics}. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Prostředí text písně, vytvoření @cindex Text písně, spojení s notami @@ -1313,7 +1305,6 @@ a hlasu @code{Voice}, aby všechno fungovalo. @cindex Text a trámce @cindex Trámce a text @funindex \autoBeamOff -@funindex autoBeamOff Automatické trámce, jež LilyPond používá ve výchozím nastavení, pracují dobře pro instrumentální hudbu, ale ne tak dobře v případě hudby s textem, @@ -1551,7 +1542,6 @@ Notationreferenz: @ruser{Vysvětlení prostředí}. @translationof Creating contexts @funindex \new -@funindex new @cindex Neue Kontexte @cindex Erstellen von Kontexten @cindex Kontexte, Erstellen @@ -1991,7 +1981,6 @@ eingegeben werden kann. @subsubheading Kontexteigenschaften mit @code{\with} setzen @funindex \with -@funindex with @cindex Kontexteigenschaft, setzen mit \with Die Standardwerte von Kontexteigenschaften können zu dem Zeitpunkt @@ -2044,7 +2033,6 @@ wird, kann dieser neue Standardwert mit dem Befehl @cindex Kontexteigenschaften, mit \context setzen @cindex Eigenschaften von Kontexten, mit \context setzen @funindex \context -@funindex context Die Werte von Kontext-Eigenschaften können in @emph{allen} Kontexten eines bestimmten Typs (etwa alle @code{Staff}-Kontexte) diff --git a/Documentation/cs/learning/tutorial.itely b/Documentation/cs/learning/tutorial.itely index 9719d9d072..b0de130457 100644 --- a/Documentation/cs/learning/tutorial.itely +++ b/Documentation/cs/learning/tutorial.itely @@ -216,7 +216,6 @@ jsou automatické hodnoty v zásadě použitelné. @cindex Vztažný režim a předznamenání @funindex \relative -@funindex relative @funindex ' @funindex , @@ -397,7 +396,6 @@ označením je @code{r}@tie{}: @cindex Druh taktu @funindex \time -@funindex time Slovníček: @rglos{time signature}. @@ -422,7 +420,6 @@ Slovníček: @rglos{time signature}. @cindex Údaj metronomu @funindex \tempo -@funindex tempo Slovníček: @rglos{tempo indication}, @rglos{metronome}. @@ -453,7 +450,6 @@ zapsat příkazem @code{\tempo}: @cindex Bas @funindex \clef -@funindex clef Slovníček: @rglos{clef}. diff --git a/Documentation/cs/learning/tweaks.itely b/Documentation/cs/learning/tweaks.itely index 941fac0258..a351690d71 100644 --- a/Documentation/cs/learning/tweaks.itely +++ b/Documentation/cs/learning/tweaks.itely @@ -198,7 +198,6 @@ Befehl einsetzen zu können. @cindex override-Befehl @funindex \override -@funindex override @strong{Der \override-Befehl} @@ -272,7 +271,6 @@ zu ändern: @cindex revert-Befehl @funindex \revert -@funindex revert Wenn eine Eigenschaft einmal überschrieben wurde, wird ihr neuer Wert so lange bewahrt, bis er noch einmal überschrieben @@ -311,7 +309,6 @@ wieder auf den Standardwert für die letzten zwei Noten gesetzt. @strong{\once-Präfix} @funindex \once -@funindex once Sowohl der @code{\override}-Befehl als auch der @code{\set}-Befehl können mit dem Präfix @code{\once} (@emph{einmal}) versehen werden. Dadurch wird @@ -339,7 +336,6 @@ g4 a b c | @cindex overrideProperty-Befehl @funindex \overrideProperty -@funindex overrideProperty Es gibt eine andere Form des @code{override}-Befehls, @code{\overrideProperty} (überschreibe Eigenschaft), @@ -353,7 +349,6 @@ in @rextend{Schwierige Korrekturen}. @cindex tweak-Befehl @funindex \tweak -@funindex tweak Der letzte Optimierungsbefehl in LilyPond ist @code{\tweak} (engl. optimieren). Er wird eingesetzt um Eigenschaften @@ -741,7 +736,6 @@ auch weggelassen werden. @cindex Override nur einmal @cindex once override @funindex \once -@funindex once Im Beispiel oben wurden @emph{alle} Legatobögen dicker gesetzt. Vielleicht wollen Sie aber nur den ersten Bogen @@ -789,7 +783,6 @@ eingesetzt werden. @cindex Wiederherstellen von Standardeinstellungen @cindex Standardeinstellungen, Wiederherstellen @funindex \revert -@funindex revert Eine weitere Möglichkeit: nur die beiden ersten Legatobögen sollen dicker gesetzt werden. Gut, wir könnten jetzt zwei Befehle benutzen, @@ -2380,9 +2373,7 @@ werden. Das kann erreicht werden mit dem @cindex Noten, durch Text gespreizt @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff Standardmäßig wird Text, der mit dem Beschriftungsbefehl @code{\markup} bzw. Äquivalenten erstellt wird, kein diff --git a/Documentation/de/extending/scheme-tutorial.itely b/Documentation/de/extending/scheme-tutorial.itely index 35663e5ac1..6213ffdd29 100644 --- a/Documentation/de/extending/scheme-tutorial.itely +++ b/Documentation/de/extending/scheme-tutorial.itely @@ -1106,7 +1106,6 @@ um komplizierte musikalische Funktionen zu erstellen. @cindex Musikausdrücke anzeigen @cindex Anzeigen von Musikausdrücken -@funindex displayMusic @funindex \displayMusic Wenn man eine musikalische Funktion erstellt, ist es oft @@ -1262,7 +1261,6 @@ Die Tonhöhe einer Note kann geändert werden, indem man diese @code{'pitch}-Eigenschaft umdefiniert: @funindex \displayLilyMusic -@funindex displayLilyMusic @example #(set! (ly:music-property (first (ly:music-property someNote 'elements)) diff --git a/Documentation/de/learning/common-notation.itely b/Documentation/de/learning/common-notation.itely index f7dd233575..f74f53beb8 100644 --- a/Documentation/de/learning/common-notation.itely +++ b/Documentation/de/learning/common-notation.itely @@ -194,11 +194,8 @@ Sprachen zu benutzen, siehe @ruser{Notenbezeichnungen in anderen Sprachen}. @cindex Darstellung & Inhalt @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Glossar: @rglos{key signature}, @rglos{major}, @rglos{minor}. @@ -481,11 +478,8 @@ Möglichkeit, wie die Artikulationen platziert werden sollen. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Glossar: @rglos{dynamics}, @@ -529,7 +523,6 @@ Notationsreferenz: @cindex markup @funindex \markup -@funindex markup Text können Sie auf folgende Art in die Partitur einfügen: @@ -566,9 +559,7 @@ Notationsreferenz: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Alle @notation{Balken} werden automatisch gesetzt: @@ -625,7 +616,6 @@ Notationsreferenz: @cindex Auftakt @funindex \partial -@funindex partial Ein @notation{Auftakt} wird mit dem Befehl @code{\partial} eingegeben. Darauf folgt die Länge des Auftaktes: @code{\partial 4} @@ -648,7 +638,6 @@ heißt eine Viertelnote Auftakt und @code{\partial 8} eine Achtelnote. @cindex Rhythmische Aufteilungen @funindex \tuplet -@funindex tuplet Glossar: @rglos{note value}, @rglos{triplet}. @@ -679,9 +668,7 @@ Für eine Triole wären das drei Noten statt zwei, also bekommen @cindex Vorhalt @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -882,10 +869,8 @@ folgende Beispiel beginnt mit einer Note: @cindex Notationskontext @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -1112,7 +1097,6 @@ gezeigt. @cindex Gesangstext, schreiben @funindex \addlyrics -@funindex addlyrics Glossar: @rglos{lyrics}. @@ -1494,7 +1478,6 @@ Benutzung der eben definierten Bezeichner: @cindex Kopf @funindex \header -@funindex header Titel, Komponist, Opusnummern und ähnliche Information werden in einer @code{\header}-Umgebung eingefügt. Diese Umgebung befindet sich diff --git a/Documentation/de/learning/fundamental.itely b/Documentation/de/learning/fundamental.itely index 46099b98b1..13bcf2ccc8 100644 --- a/Documentation/de/learning/fundamental.itely +++ b/Documentation/de/learning/fundamental.itely @@ -198,7 +198,6 @@ Benutzerhandbuch -- @ruser{Partiturlayout} und @cindex book-Abschnitte, implizit @cindex implizite book-Umgebung @funindex \book -@funindex book Ihr LilyPond Code kann auch mehrere @code{\score}-Blöcke enthalten. Jeder davon wird als eigenständige Partitur interpretiert, die @@ -274,7 +273,6 @@ Eine vollständige Definition des Eingabeformats findet sich in @translationof Score is a (single) compound musical expression @funindex \score -@funindex score @cindex score @cindex Partitur @cindex Musikstück @@ -1010,15 +1008,10 @@ Notationsreferenz: @ruser{Mehrere Stimmen}. @translationof Explicitly instantiating voices @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex Voice context, erstellen von @cindex Stimmenkontexte, erstellen von @@ -1281,7 +1274,6 @@ Achtung: Der Gesangstext wird auf Englisch @qq{lyrics} genannt. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics context, erstellen @cindex Gesangstext, Verbindung mit Noten @@ -1320,7 +1312,6 @@ funktioniert. @cindex Text und Balken @cindex Balken und Text @funindex \autoBeamOff -@funindex autoBeamOff Die automatischen Balken, die LilyPond in der Standardeinstellung setzt, eignen sich sehr gut für instrumentale Musik, aber nicht @@ -1562,7 +1553,6 @@ Notationsreferenz: @ruser{Was sind Kontexte?}. @translationof Creating contexts @funindex \new -@funindex new @cindex Neue Kontexte @cindex Erstellen von Kontexten @cindex Kontexte, Erstellen @@ -2002,7 +1992,6 @@ eingegeben werden kann. @subsubheading Kontexteigenschaften mit @code{\with} setzen @funindex \with -@funindex with @cindex Kontexteigenschaft, setzen mit \with Die Standardwerte von Kontexteigenschaften können zu dem Zeitpunkt @@ -2056,7 +2045,6 @@ wird, kann dieser neue Standardwert mit dem Befehl @cindex Kontexteigenschaften, mit \context setzen @cindex Eigenschaften von Kontexten, mit \context setzen @funindex \context -@funindex context Die Werte von Kontext-Eigenschaften können in @emph{allen} Kontexten eines bestimmten Typs (etwa alle @code{Staff}-Kontexte) @@ -2247,7 +2235,6 @@ Stimmen in diesem Notensystem errechnet: @subsubheading Alle Kontexte des gleichen Typs verändern @funindex \layout -@funindex layout Die vorigen Beispiele zeigen, wie man Engraver in einem bestimmten Kontext hinzufügen oder entfernen kann. Es ist diff --git a/Documentation/de/learning/tutorial.itely b/Documentation/de/learning/tutorial.itely index 2df1136746..5a968f0dfb 100644 --- a/Documentation/de/learning/tutorial.itely +++ b/Documentation/de/learning/tutorial.itely @@ -236,7 +236,6 @@ sind die automatischen Werte durchaus brauchbar. @cindex relativer Modus und Versetzungszeichen @funindex \relative -@funindex relative @funindex ' @funindex , @@ -432,7 +431,6 @@ Bezeichnung ist @code{r}@tie{}: @cindex Taktart @funindex \time -@funindex time Glossar: @rglos{time signature}. @@ -458,7 +456,6 @@ Die @notation{Taktart} wird mit dem @cindex Metronom-Angabe @funindex \tempo -@funindex tempo Glossar: @rglos{tempo indication}, @rglos{metronome}. @@ -491,7 +488,6 @@ mit dem @code{\tempo}-Befehl gesetzt: @cindex Bass @funindex \clef -@funindex clef Glossar: @rglos{clef}. diff --git a/Documentation/de/learning/tweaks.itely b/Documentation/de/learning/tweaks.itely index 953986ba5b..57f5afc41c 100644 --- a/Documentation/de/learning/tweaks.itely +++ b/Documentation/de/learning/tweaks.itely @@ -220,7 +220,6 @@ den Typ und die Eigenschaften eines Objekts zu erkennen. @cindex override-Befehl @funindex \override -@funindex override @strong{Der \override-Befehl} @@ -303,7 +302,6 @@ zur Änderung der Farbe von Notenköpfen: @cindex revert-Befehl @funindex \revert -@funindex revert Wenn eine Eigenschaft einmal überschrieben wurde, wird ihr neuer Wert so lange bewahrt, bis er noch einmal überschrieben @@ -345,7 +343,6 @@ wieder auf den Standardwert für die letzten zwei Noten gesetzt. @translationof The once prefix @funindex \once -@funindex once Sowohl der @code{\override}-Befehl als auch der @code{\set}-Befehl können mit dem Präfix @code{\once} (@emph{einmal}) versehen werden. Dadurch wird @@ -401,7 +398,6 @@ ein @code{\once} Präfix hier keine Auswirkungen hat. @cindex overrideProperty-Befehl @funindex \overrideProperty -@funindex overrideProperty Es gibt eine andere Form des @code{override}-Befehls, @code{\overrideProperty} (überschreibe Eigenschaft), @@ -418,7 +414,6 @@ in @rextend{Schwierige Korrekturen}. @cindex tweak-Befehl @funindex \tweak -@funindex tweak Der letzte Optimierungsbefehl in LilyPond ist @code{\tweak} (engl. optimieren). Er wird eingesetzt um Eigenschaften @@ -879,7 +874,6 @@ auch weggelassen werden. @cindex once override @funindex \once -@funindex once Im Beispiel oben wurden @emph{alle} Legatobögen dicker gesetzt. Vielleicht wollen Sie aber nur den ersten Bogen @@ -927,7 +921,6 @@ eingesetzt werden. @cindex Standardeinstellungen, Wiederherstellen @funindex \revert -@funindex revert Eine weitere Möglichkeit: nur die beiden ersten Legatobögen sollen dicker gesetzt werden. Gut, wir könnten jetzt zwei Befehle benutzen, @@ -2599,9 +2592,7 @@ werden. Das kann erreicht werden mit dem @cindex Noten, durch Text gespreizt @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff Standardmäßig wird Text, der mit dem Beschriftungsbefehl @code{\markup} bzw. Äquivalenten erstellt wird, kein @@ -3157,13 +3148,9 @@ zu lösen. @cindex Kollision, Noten @cindex shift Befehl @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Innerhalb einer Stimme werden alle Noten, die zeitgleich stattfinden, zu einer Gruppe zusammen gefasst, einem sog. @code{NoteColumn} Objekt. diff --git a/Documentation/de/notation/changing-defaults.itely b/Documentation/de/notation/changing-defaults.itely index 016843f0b3..205626f318 100644 --- a/Documentation/de/notation/changing-defaults.itely +++ b/Documentation/de/notation/changing-defaults.itely @@ -594,7 +594,6 @@ geschieht, indem man einen neuen Kontext mit @code{\new} oder @code{\context} beginnt und ihn dann verändert: @funindex \with -@funindex with @example \new @var{context} \with @{ @@ -1027,17 +1026,11 @@ Notationsreferenz: @cindex Engraver, in Kontexte einfügen @funindex \alias -@funindex alias @funindex \name -@funindex name @funindex \type -@funindex type @funindex \consists -@funindex consists @funindex \accepts -@funindex accepts @funindex \denies -@funindex denies Bestimme Kontexte, wie @code{Staff} oder @code{Voice}, werden erstellt, indem man sie mit einer Musikumgebung aufruft. Es ist @@ -1158,7 +1151,6 @@ Alles zusammen haben wir folgende Einstellungen: @end example @funindex \accepts -@funindex accepts Kontexte sind hierarchisch. Wie wollen, dass @code{ImproVoice} sich als Unterkontext von @code{Staff} erkennt, wie eine normale @@ -1173,7 +1165,6 @@ Stimme. Darum wird die Definition von @code{Staff} mit dem @end example @funindex \denies -@funindex denies Das Gegenteil von @code{\accepts} ist @code{\denies} (verbietet), was manchmal gebraucht werden kann, wenn schon existierende Kontext-Definitionen @@ -1801,7 +1792,6 @@ oder einen Absturz des Programms hervorrufen. @cindex Verändern von Eigenschaften @funindex \set -@funindex set Jeder Kontext kann unterschiedliche @emph{Eigenschaften} besitzen, Variablen, die in diesem Kontext definiert sind. Sie können @@ -1874,7 +1864,6 @@ die Änderungen auf alle Stimmen (@code{Voice}), die in diesem Kontext enthalten sind. @funindex \unset -@funindex unset Es gibt auch einen @code{\unset}-Befehl: @@ -1913,7 +1902,6 @@ verhalten sich gleich, wenn die gegenwärtige Basis der @code{Voice}-Kontext ist. @funindex \once -@funindex once Einstellungen, die nur einmal vorgenommen werden sollen, können mit @code{\once} notiert werden, etwa: @@ -1951,7 +1939,6 @@ Internals Reference: @cindex graphische Objekte, Eigenschaften @funindex \override -@funindex override Es gibt eine besondere Art von Kontexteigenschaft: die Grob-Beschreibung. Grob-Beschreibungen werden mit @code{GroßGroßbuchstabe} benannt. Sie @@ -2012,7 +1999,6 @@ benutzt: @cindex \override rückgängig machen @funindex \revert -@funindex revert Die Auswirkungen von @code{\override} können mit @code{\revert} wieder rückgängig gemacht werden: @@ -2050,7 +2036,6 @@ Grobs im entsprechenden Kontext aber der Stelle aus, an der sie gesetzt werden: @cindex \override, nur einmal @funindex \once -@funindex once @code{\once} kann zusammen mit @code{\override} benutzt werden, um nur den aktuellen Zeitwert zu verändern: @@ -2081,7 +2066,6 @@ um nur den aktuellen Zeitwert zu verändern: @cindex Veränderungen der Einstellungen @cindex Einstellungen verändern -@funindex override @funindex \override Viele Eigenschaften können unabhängig von der Art der Daten, die @@ -2103,7 +2087,6 @@ Referenz der Interna: @translationof The tweak command @funindex \tweak -@funindex tweak @cindex Optimieren diff --git a/Documentation/de/notation/editorial.itely b/Documentation/de/notation/editorial.itely index ea36309863..dc8a328cda 100644 --- a/Documentation/de/notation/editorial.itely +++ b/Documentation/de/notation/editorial.itely @@ -152,7 +152,6 @@ Referenz der Interna: @cindex Fingerwechsel @cindex Griff: Fingersatz @funindex \finger -@funindex finger Fingersatzanweisungen können folgenderweise notiert werden: @samp{Note}-@var{Zahl} @@ -170,7 +169,6 @@ c4-1 d-2 f-4 c^\markup { \finger "2 - 3" } @cindex thumb-script @cindex Fingersatz: Daumen-Zeichen @funindex \thumb -@funindex thumb Mit dem Daumen-Befehl (@code{\thumb}) können die Noten bezeichnet werden, die mit dem @@ -238,9 +236,7 @@ Schreibweise @code{@var{Note}-@var{Zahl}} einsetzt. @cindex Noten, durchsichtig @cindex transparent, Noten @funindex \hideNotes -@funindex hideNotes @funindex \unHideNotes -@funindex unHideNotes Versteckte (oder unsichtbare oder transparente) Noten können sinnvoll sein, wenn man Notation für den Theorieunterricht oder Kompositionsübungen @@ -308,7 +304,6 @@ Referenz der Interna: @cindex with-color @funindex color @funindex \with-color -@funindex with-color @funindex x11-color Einzelnen Objekten können einfach eigene Farben zugewiesen werden. @@ -414,7 +409,6 @@ dazu muss @code{\tweak} benutzt werden. Siehe auch @ref{Der tweak-Befehl}. @cindex Klammern um Noten @cindex editorische Noten @funindex \parenthesize -@funindex parenthesize Objekte können in Klammern gesetzt werden, indem vor ihnen der Befehl @code{\parenthesize} geschrieben wird. Wenn ein Akkord in Klammern gesetzt @@ -687,9 +681,7 @@ Referenz der Interna: @cindex Musikanalyse @funindex Horizontal_bracket_engraver @funindex \startGroup -@funindex startGroup @funindex \stopGroup -@funindex stopGroup Klammern über dem System werden in der Musikanalyse benutzt, um strukturelle Einheiten der Musik zu markieren. Einfache diff --git a/Documentation/de/notation/expressive.itely b/Documentation/de/notation/expressive.itely index a695763f3d..009ca0553b 100644 --- a/Documentation/de/notation/expressive.itely +++ b/Documentation/de/notation/expressive.itely @@ -237,43 +237,24 @@ Referenz der Interna: @cindex absolute Lautstärke @funindex \ppppp -@funindex ppppp @funindex \pppp -@funindex pppp @funindex \ppp -@funindex ppp @funindex \pp -@funindex pp @funindex \p -@funindex p @funindex \mp -@funindex mp @funindex \mf -@funindex mf @funindex \f -@funindex f @funindex \ff -@funindex ff @funindex \fff -@funindex fff @funindex \ffff -@funindex ffff @funindex \fffff -@funindex fffff @funindex \fp -@funindex fp @funindex \sf -@funindex sf @funindex \sff -@funindex sff @funindex \sp -@funindex sp @funindex \spp -@funindex spp @funindex \sfz -@funindex sfz @funindex \rfz -@funindex rfz Absolute Dynamikbezeichnung wird mit Befehlen nach den Noten angezeigt, etwa @code{c4\ff}. Die vordefinierten Befehle lauten: @@ -302,9 +283,7 @@ platziert werden, siehe @ref{Richtung und Platzierung}. @funindex \> @funindex \! @funindex \cr -@funindex cr @funindex \decr -@funindex decr Eine @notation{Crescendo}-Klammer wird mit dem Befehl @code{\<} begonnen und mit @code{\!}, einem absoluten Dynamikbefehl oder einer weiteren Crescendo- oder @@ -359,7 +338,6 @@ und @notation{decrescendo} zu der selben Note hinzufügen will: @cindex Espressivo-Artikulation @funindex \espressivo -@funindex espressivo Der @code{\espressivo}-Befehl kann eingesetzt werden, um crescendo und decrescendo für die selbe Note anzuzeigen. Dieser Befehl ist @@ -373,11 +351,8 @@ jedoch als Artikulation, nicht als Dynamikzeichen implementiert. @end lilypond @funindex \cresc -@funindex cresc @funindex \decresc -@funindex decresc @funindex \dim -@funindex dim Mit Text gesetzte Crescendo-Bezeichnungen beginnen mit @code{\cresc}. Mit Text gesetzte Decrescendo-Bezeichnungen beginnen mit @code{\decresc} oder @code{\dim}. Fortsetzungslinien werden gesetzt, wenn sie benötigt werden. @@ -394,17 +369,11 @@ oder @code{\dim}. Fortsetzungslinien werden gesetzt, wenn sie benötigt werden. @funindex \crescTextCresc -@funindex crescTextCresc @funindex \dimTextDecresc -@funindex dimTextDecresc @funindex \dimTextDecr -@funindex dimTextDecr @funindex \dimTextDim -@funindex dimTextDim @funindex \crescHairpin -@funindex crescHairpin @funindex \dimHairpin -@funindex dimHairpin Als Text gesetzte Dynamik-Bezeichnungen können auch die Crescendo-Klammern ersetzen: @@ -434,11 +403,8 @@ angeordnet wird, zu erstellen, siehe @ref{Neue Lautstärkezeichen}. Vertikale Position der Zeichen wird von der Funktion @rinternals{DynamicLineSpanner} verwaltet. @funindex \dynamicUp -@funindex dynamicUp @funindex \dynamicDown -@funindex dynamicDown @funindex \dynamicNeutral -@funindex dynamicNeutral Es gibt einen besonderen @code{Dynamics}-Kontext, um Crescendi und Decrescendi auf einer eigenen Zeile zu notieren. Mit leeren Pausen (@code{s}) werden die @@ -549,9 +515,7 @@ moltoF = \markup { molto \dynamic f } @cindex Dynamikzeichen, Klammer @cindex editorische Dynamikzeichen @funindex \bracket -@funindex bracket @funindex \dynamic -@funindex dynamic Mit einer Textbeschriftung können editorische Dynamikzeichen (in runden oder eckigen Klammern) erstellt werden. Die Syntax @@ -688,9 +652,7 @@ Stimme beendet werden, in der er begonnen wurde.} @cindex Bögen, unter Noten @cindex Bögen, über Noten @funindex \slurDown -@funindex slurDown @funindex \slurNeutral -@funindex slurNeutral Legatobögen können manuell ober- oder unterhalb des Notensystems @@ -719,11 +681,8 @@ können zwei Bögen gleichzeitig ausgegeben werden. Siehe auch @cindex Legatobogen, gestrichelt @cindex Stil von Legatobögen @funindex \slurDashed -@funindex slurDashed @funindex \slurDotted -@funindex slurDotted @funindex \slurSolid -@funindex slurSolid Legatobögen können durchgehend, gepunktet oder gestrichelt dargestellt werden. Standard ist der durchgehende Bogen: @@ -741,9 +700,7 @@ werden. Standard ist der durchgehende Bogen: @end lilypond @funindex \slurHalfDashed -@funindex slurHalfDashed @funindex \slurHalfSolid -@funindex slurHalfSolid @cindex Bogen, halb gestrichelt, halb durchgehend Bögen können auch halb gestrichelt (die erste Hälfte gestrichelt, @@ -764,7 +721,6 @@ zweite Hälfte gestrichelt: @end lilypond @funindex \slurDashPattern -@funindex slurDashPattern @cindex Bogen, Strichelung definieren Eigene Muster für die Strichelung können definiert werden: @@ -782,7 +738,6 @@ Eigene Muster für die Strichelung können definiert werden: @end lilypond @funindex \slurUp -@funindex slurUp @predefined @code{\slurUp}, @@ -850,11 +805,8 @@ musikalischen Ausdruck anzuzeigen. Er wird mit den Befehlen @end lilypond @funindex \phrasingSlurUp -@funindex phrasingSlurUp @funindex \phrasingSlurDown -@funindex phrasingSlurDown @funindex \phrasingSlurNeutral -@funindex phrasingSlurNeutral Im typographischen Sinne verhalten sich Phrasierungsbögen genauso wie Legatobögen. Sie werden aber als eigene Objekte behandelt. Ein @@ -872,12 +824,9 @@ Notensystems gesetzt werden, siehe Simultane oder überlappende Phrasierungsbögen sind nicht erlaubt. -@funindex phrasingSlurDashed @funindex \phrasingSlurDashed @funindex \phrasingSlurDotted -@funindex phrasingSlurDotted @funindex \phrasingSlurSolid -@funindex phrasingSlurSolid @cindex Phrasierungsbögen, gestrichelt @cindex gestrichelter Phrasierungsbogen @cindex Phrasierungsbögen, gepunktet @@ -901,7 +850,6 @@ werden. Standard ist der durchgehende Bogen: funindex phrasingSlurHalfDashed @funindex \phrasingSlurHalfDashed @funindex \phrasingSlurHalfSolid -@funindex phrasingSlurHalfSolid @cindex Phrasierungsbogen, halb durchgehend, halb gestrichelt @cindex Bogen, halb durchgehend, halb gestrichelt @@ -924,7 +872,6 @@ gestrichelt): @end lilypond @funindex \phrasingSlurDashPattern -@funindex phrasingSlurDashPattern @cindex Phrasierungsbogen, Strichelmuster definieren Eigene Strichelmuster für Phrasierungsbögen können definiert werden: @@ -981,7 +928,6 @@ Referenz der Interna: @cindex Atemzeichen @cindex Pausenzeichen @funindex \breathe -@funindex breathe Atemzeichen werden mit dem Befehl @code{\breathe} eingegeben. @@ -1039,7 +985,6 @@ Referenz der Interna: @cindex Glissando, nach unten @cindex Gleiten nach oben/unten @funindex \bendAfter -@funindex bendAfter Gleiten nach oben und unten kann mit dem Befehl @code{\bendAfter} @@ -1093,7 +1038,6 @@ Triller. @cindex Glissando @funindex \glissando -@funindex glissando Ein @notation{Glissando} wird mit dem Befehl @code{\glissando} auf eine Note folgend notiert: @@ -1140,13 +1084,9 @@ supported. @cindex Gebrochene Akkorde @cindex Akkord, gebrochen @funindex \arpeggio -@funindex arpeggio @funindex \arpeggioArrowUp -@funindex arpeggioArrowUp @funindex \arpeggioArrowDown -@funindex arpeggioArrowDown @funindex \arpeggioNormal -@funindex arpeggioNormal Ein @notation{Arpeggio} als Zeichen, dass ein Akkord gebrochen gespielt werden soll, kann mit dem Befehl @code{\arpeggio} hinter der @@ -1179,11 +1119,8 @@ her: @cindex besondere Arpeggio-Symbole @funindex \arpeggioBracket -@funindex arpeggioBracket @funindex \arpeggioParenthesis -@funindex arpeggioParenthesis @funindex \arpeggioParenthesisDashed -@funindex arpeggioParenthesisDashed Besondere Arpeggios mit Klammern können erstellt werden: @@ -1270,11 +1207,8 @@ mehrere Notensysteme. @cindex Triller @funindex \trill -@funindex trill @funindex \startTrillSpan -@funindex startTrillSpan @funindex \stopTrillSpan -@funindex stopTrillSpan Kurze Triller ohne eine Dauer werden mit dem Befehl @code{\trill} notiert, siehe auch @@ -1333,7 +1267,6 @@ präzise zu positionieren, wird gezeigt in @ref{Verzierungen}. @cindex Triller mit Tonhöhe @funindex \pitchedTrill -@funindex pitchedTrill Triller, die auf einer bestimmten Note ausgeführt werden sollen, können mit dem Befehl @code{pitchedTrill} notiert werden. Das erste diff --git a/Documentation/de/notation/fretted-strings.itely b/Documentation/de/notation/fretted-strings.itely index c421085d9a..e5120acb6a 100644 --- a/Documentation/de/notation/fretted-strings.itely +++ b/Documentation/de/notation/fretted-strings.itely @@ -204,7 +204,6 @@ symbols = { @end lilypond @funindex \tabFullNotation -@funindex tabFullNotation Wenn alle musikalischen Symbole, die in der traditionellen Notation eingesetzt werden, auch in der Tabulatur gedruckt werden sollen, muss @@ -581,7 +580,6 @@ in der EADGHE-Stimmung. Andere vordefinierte Stimmung sind: @code{banjo-open-g-tuning}. Die vordefinierten Stimmungen finden sich in @file{ly/string-tunings-init.ly}. -@funindex stringTuning @funindex \stringTuning @cindex Tabulatur, eigene Saitenstimmung @cindex Eigene Saitenstimmung, Tabulatur @@ -794,7 +792,6 @@ Barré kann hinzugefügt werden: @cindex fret (Bunddiagramme) @cindex Ukulele -@funindex fret-diagram @funindex \fret-diagram Die Größe des Bunddiagrammes und die Anzahl der Bünde im Diagramm @@ -884,7 +881,6 @@ Die Größe und Position der Punkte kann geändert werden: @cindex fret-diagram-terse-Markup @cindex Bunddiagramme, knapper Stil -@funindex fret-diagram-terse @funindex \fret-diagram-terse Die Beschriftungsfunktion @code{fret-diagram-terse} (knappe Version) @@ -965,7 +961,6 @@ mit @code{\override}-Befehlen angegeben werden. @cindex Kapo @cindex Capo -@funindex fret-diagram-verbose @funindex \fret-diagram-verbose Die Beschriftungsfunktion @code{fret-diagram-verbose} @@ -1222,7 +1217,6 @@ oder im Akkordmodus notiert werden (siehe auch @cindex Bunddiagramme und Akkordbezeichnungen @funindex ChordNames -@funindex chordmode @funindex \chordmode Oft wird sowohl eine Akkordbezeichnung als ein Bunddiagramm @@ -1370,8 +1364,6 @@ mychords = \chordmode { @cindex Akkordformen für Bundinstrumente @funindex \addChordShape -@funindex addChordShape -@funindex storePredefinedDiagram @funindex \storePredefinedDiagram Zusätzlich zu Bunddiagrammen speichert LilyPond auch eine interne @@ -1493,9 +1485,7 @@ um die Noten zu spielen. >> @end lilypond -@funindex predefinedFretboardsOff @funindex \predefinedFretboardsOff -@funindex predefinedFretboardsOn @funindex \predefinedFretboardsOn Da in den Standardeinstellungen keine vordefinierten Diagramme @@ -1634,7 +1624,6 @@ cindex Fingersatz der rechten Hand, Bundinstrumente @cindex rechte Hand, Fingersatz für bundierte Saiteninstrumente @cindex rechte Hand, Fingersatz für Bundinstrumente -@funindex rightHandFinger @funindex \rightHandFinger Fingersatz für die rechte Hand @var{p-i-m-a} @@ -1820,7 +1809,6 @@ Schnipsel: @unnumberedsubsubsec Powerakkorde anzeigen @translationof Indicating power chords -@funindex powerChords @funindex \powerChords @cindex Powerakkorde diff --git a/Documentation/de/notation/keyboards.itely b/Documentation/de/notation/keyboards.itely index ad2d1b64e4..253bfee083 100644 --- a/Documentation/de/notation/keyboards.itely +++ b/Documentation/de/notation/keyboards.itely @@ -169,7 +169,6 @@ Referenz der Interna: @cindex Balken zwischen Systemen @funindex \change -@funindex change Stimmen können mit dem Befehl @@ -289,7 +288,6 @@ Balken einsetzen. @cindex Wechsel des Systems, automatisch @funindex \autochange -@funindex autochange @funindex PianoStaff Stimmen können angewiesen werden, automatisch zwischen dem @@ -320,7 +318,6 @@ wird die Richtung auch über Pausen hinweg im Voraus bestimmt. @cindex automatischer Systemwechsel und relativer Modus @funindex \relative -@funindex relative Ein @code{\relative}-Abschnitt, der sich außerhalb des @code{\autochange}-Abschnittes befindet, hat keinen Einfluss auf die @@ -395,9 +392,7 @@ System zugewiesen, auf dem sich ihre erste Note befinden würde. @funindex followVoice @funindex \showStaffSwitch -@funindex showStaffSwitch @funindex \hideStaffSwitch -@funindex hideStaffSwitch Immer, wenn eine Stimme von einem Klaviersystem zu dem anderen wechselt, kann automatisch eine Linie zur Verdeutlichung des @@ -494,17 +489,11 @@ Dieser Abschnitt zeigt Eigenheiten der Notation von Klavermusik @cindex U.C. @funindex \sustainOn -@funindex sustainOn @funindex \sustainOff -@funindex sustainOff @funindex \sostenutoOn -@funindex sostenutoOn @funindex \sostenutoOff -@funindex sostenutoOff @funindex \unaCorda -@funindex unaCorda @funindex \treCorde -@funindex treCorde Klaviere (teilweise auch Vibraphone und Celesta) besitzen üblicherweise drei Pedale, das linke oder Haltepedal, das rechte oder Una-corda-Pedal diff --git a/Documentation/de/notation/pitches.itely b/Documentation/de/notation/pitches.itely index 77589db61d..50784f29ac 100644 --- a/Documentation/de/notation/pitches.itely +++ b/Documentation/de/notation/pitches.itely @@ -118,7 +118,6 @@ Schnipsel: @cindex Noteneingabe: relative Oktavbestimmung @funindex \relative -@funindex relative Wenn Oktaven im absoluten Modus notiert, passiert es schnell, eine Note auf der falschen Oktave zu notieren. Mit @@ -645,7 +644,6 @@ Dieser Abschnitt zeigt, wie man Tonhöhen beeinflusst. @funindex = @funindex \octaveCheck -@funindex octaveCheck @funindex controlpitch Im relativen Modus geschieht es recht häufig, dass ein @@ -724,7 +722,6 @@ Referenz der Interna: @cindex Tonhöhen, transponieren @funindex \transpose -@funindex transpose Ein musikalischer Ausdruck kann mit dem Befehl @code{\transpose} transponiert werden. Die Syntax lautet: @@ -871,7 +868,6 @@ Des anstelle von e-dreifach-b). @cindex Melodietransformation, Umkehrung @funindex \inversion -@funindex inversion Ein musikalischer Ausdruck kann in seine Umkehrung transformiert und gleichzeitig transponiert werden: @@ -912,7 +908,6 @@ Notationsreferenz: @cindex Melodietransformation, Krebs @funindex \retrograde -@funindex retrograde Ein musikalischer Ausdruck kann umgekehrt werden, um im Krebsgang dargestellt zu werden: @@ -963,7 +958,6 @@ nicht transformiert.} @cindex Melodietransposition, modal @funindex \modalTranspose -@funindex modalTranspose Ein Motiv kann innerhalb einer Skala transponiert werden: @@ -1022,7 +1016,6 @@ motif = \relative { c'8 d e f g a b c } @cindex Melodieumkehrung, modal @funindex \modalInversion -@funindex modalInversion Ein musikalischer Ausdruck kann innerhalb einer definierten Skala um eine Referenznote umgekehrt werden und transponiert werden: @@ -1129,7 +1122,6 @@ verändern werden kann. @cindex Schlüssel, F @funindex \clef -@funindex clef Der Schlüssel kann verändert werden. Das eingestrichene C wird in jedem Beispiel gezeigt: @@ -1242,7 +1234,6 @@ Referenz der Interna: @cindex Vorzeichen @funindex \key -@funindex key @c duplicated in Key signature and Accidentals @warning{Neue Benutzer sind manchmal verwirrt, wie @@ -1358,7 +1349,6 @@ Referenz der Interna: @funindex set-octavation @funindex \ottava -@funindex ottava @notation{Oktavierungsklammern} zeigen eine zusätzliche Transposition von einer Oktave an: @@ -1409,7 +1399,6 @@ Referenz der Interna: @cindex MIDI-Transposition @funindex \transposition -@funindex transposition Wenn man Noten setzt, die von transponierenden Instrumenten gespielt werden, sind oft einige Stimmen auf einer @@ -2883,9 +2872,7 @@ Referenz der Interna: @cindex Notenköpfe für Anfänger @funindex \easyHeadsOn -@funindex easyHeadsOn @funindex \easyHeadsOff -@funindex easyHeadsOff Die @qq{einfachen Notenköpfe} haben die Bezeichnung der Note im Kopf gedruckt. Das wird eingesetzt, um die Notation beizubringen. @@ -2956,11 +2943,8 @@ Referenz der Interna: @funindex aikenHeads @funindex sacredHarpHeads @funindex \southernHarmonyHeads -@funindex southernHarmonyHeads @funindex \funkHeads -@funindex funkHeads @funindex \walkerHeads -@funindex walkerHeads In dieser Notation haben die Notenköpfe eine Form, die ihrer harmonischen Funktion innerhalb der Tonleiter entspricht. Die @@ -2985,17 +2969,11 @@ und Aiken (Christian Harmony) benutzt werden: @end lilypond @funindex \key -@funindex key @funindex \aikenHeadsMinor -@funindex aikenHeadsMinor @funindex \sacredHarpHeadsMinor -@funindex sacredHarpHeadsMinor @funindex \southernHarmonyHeadsMinor -@funindex southernHarmonyHeadsMinor @funindex \funkHeadsMinor -@funindex funkHeadsMinor @funindex \walkerHeadsMinor -@funindex walkerHeadsMinor Die unterschiedlichen Formen richten sich nach der Stufe in der Skala, wobei der Grundton der Skala aus dem @code{\key}-Befehl @@ -3064,9 +3042,7 @@ Referenz der Interna: @cindex Striche: Notenköpfe @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff Improvisation wird manchmal angezeigt, indem schräge Notenköpfe gesetzt werden, wenn der Spieler eine beliebige Tonhöhe wählen kann diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely index 8e5c266ae0..53ad92a27e 100644 --- a/Documentation/de/notation/rhythms.itely +++ b/Documentation/de/notation/rhythms.itely @@ -206,7 +206,6 @@ Maxima (8 Ganze) gesetzt werden. @cindex Triolen @cindex Rhythmische Aufteilungen -@funindex times @funindex \times Triolen und andere rhythmische Aufteilungen werden aus einem musikalischen @@ -380,7 +379,6 @@ beeinflusst werden. Das ist sinnvoll, wenn man viele Takte @cindex Ausdehnen von Noten @cindex Dauern skalieren -@funindex scaleDurations @funindex \scaleDurations Längere Notenabschnitte können auf die gleiche Art durch Multiplikation @@ -486,7 +484,6 @@ geschrieben werden. @cindex Volta und Überbindung @funindex \repeatTie -@funindex repeatTie Wenn die zweite Variante einer Wiederholung mit einer übergebundenen Note anfängt, muss der Bindebogen wie folgt notiert werden: @@ -505,7 +502,6 @@ Note anfängt, muss der Bindebogen wie folgt notiert werden: @cindex Bögen, laissez vibrer @cindex Ausklingen lassen -@funindex laissezVibrer @funindex \laissezVibrer So genannte @notation{laissez vibrer}-Bögen werden verwendet um anzuzeigen, dass @@ -757,7 +753,6 @@ Maxima (8 Ganze). @cindex Platzhalternoten @funindex \skip -@funindex skip @funindex s Eine unsichtbare Pause (auch als @qq{skip} oder Überspringung bezeichnet) @@ -926,7 +921,6 @@ R2.*2 | @cindex Mehrtaktpause mit Fermate @funindex \fermataMarkup -@funindex fermataMarkup @funindex MultiMeasureRestText Textbeschriftung kann Mehrtaktpausen mit @code{\markup} @@ -963,15 +957,10 @@ folgt, werden möglicherweise daraus resultierende Taktprüfungswarnungen nicht angezeigt. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @funindex \fermataMarkup -@funindex fermataMarkup @funindex \compressFullBarRests -@funindex compressFullBarRests @funindex \expandFullBarRests -@funindex expandFullBarRests @predefined @code{\textLengthOn}, @@ -1059,7 +1048,6 @@ berücksichtigt. @cindex Taktangabe @cindex Metrum -@funindex time @funindex \time Taktangaben werden wie folgt erstellt. @@ -1125,7 +1113,6 @@ werden behandelt unter @ref{Mensurale Taktartenbezeichnungen}. @cindex Balken, Taktartstandard @funindex \overrideTimeSignatureSettings -@funindex overrideTimeSignatureSettings Zusätzlich zu der gedruckten Taktart werden mit der Definition des Befehls @code{\time} auch die Standardwerte fürt die Eigenschaften @@ -1209,7 +1196,6 @@ Noten in dem Kontext befinen müssen, bevor @cindex Zurücksetzen von Taktart-Standardeigenschaften @funindex \revertTimeSignatureSettings -@funindex revertTimeSignatureSettings Veränderte Werte der Taktart-Eigenschaften können wieder auf den Standard zurückgesetzt werden: @@ -1310,7 +1296,6 @@ Referenz der Interna: @cindex Tempobezeichnung @cindex Aufführungsanweisung: Tempo -@funindex tempo @funindex \tempo Eine Metronomanweisung wird wie folgt erstellt: @@ -1419,7 +1404,6 @@ Referenz der Interna: @funindex measurePosition @funindex \partial -@funindex partial Verkleinerte Takte, wie etwa ein Auftakt, werden mit dem Befehl @code{\partial} notiert, dessen Syntax lautet: @@ -1661,9 +1645,7 @@ ein seltsamer Fehler auftreten kann. @funindex timeSignatureFraction @funindex \scaleDurations -@funindex scaleDurations @funindex \times -@funindex times Polymetrische Notation ist direkt unterstützt, oder indem man das sichtbare Taktart-Symbol verändert und zusätzlich @@ -1940,9 +1922,7 @@ Linie. @funindex Pitch_squash_engraver @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff Akkordnotation für Gitarren bezeichnet auch oft zusätzlich den geschlagenen Rhythmus. Das kann notiert werden unter Verwendung @@ -2014,9 +1994,7 @@ LilyPond setzt Balken (engl. beam) automatisch. @cindex eigene Balkenregeln @funindex \autoBeamOn -@funindex autoBeamOn @funindex \autoBeamOff -@funindex autoBeamOff @lilypond[quote,verbatim] \relative c'' { @@ -2127,9 +2105,7 @@ Balken beginnt. @funindex measureLength @funindex baseMoment @funindex \time -@funindex time @funindex \set -@funindex set Wenn die automatischen Balken angeschaltet sind, wird die Platzierung der automatischen Balken von drei Kontexteigenschaften bestimmt: @@ -2542,7 +2518,6 @@ Die Richtung von Balken kann mit den Richtungszeichen verändert werden: @end lilypond @funindex \noBeam -@funindex noBeam Einzelne Noten können mit dem Befehl @code{\noBeam} markiert werden, damit sie nicht mit einem Balken versehen werden. @@ -2617,7 +2592,6 @@ Referenz der Interna: @cindex Balken, gespreizt @cindex gespreizte Balken -@funindex featherDurations @funindex \featherDurations @funindex grow-direction @@ -2707,7 +2681,6 @@ sind. @cindex Wiederholungszeichen @funindex \bar -@funindex bar Taktstriche trennen Takte voneinander, werden aber auch verwendet, um Wiederholungen anzuzeigen. Normalerweise werden sie automatisch @@ -2945,7 +2918,6 @@ Taktstriche sind miteinander verbunden innerhalb einer Gruppe @funindex whichBar @funindex defaultBarType @funindex \bar -@funindex bar @funindex bartype Der Befehl @code{\bar }@var{Taktart} ist eine Kurzform von: @@ -3136,7 +3108,6 @@ als Taktüberprüfung zu funktionieren. @end lilypond @funindex \barNumberCheck -@funindex barNumberCheck Wenn man größere Musikstücke kopiert, kann es hilfreich sein, wenn LilyPond überprüft, ob die Taktnummer, in der Sie gerade kopieren, @@ -3165,7 +3136,6 @@ Schnipsel: @cindex Abschnitte markieren @cindex Markieren von Abschnitten -@funindex mark @funindex \mark Übungszeichen können mit dem @code{\mark}-Befehl ausgegeben werden: @@ -3287,7 +3257,6 @@ hinzufügen: @cindex Musikbuchstaben @funindex \musicglyph -@funindex musicglyph Musikbuchstaben (wie etwa das Segno-Zeichen) können mit dem Befehl @code{\musicglyph} als ein @@ -3398,7 +3367,6 @@ System zwei 16-Noten für jede 8-Note des zweiten Systems: @end lilypond @funindex \afterGrace -@funindex afterGrace @cindex Verzierung, danach @cindex Nachschlag diff --git a/Documentation/de/notation/simultaneous.itely b/Documentation/de/notation/simultaneous.itely index 28e60c0964..982bac08e0 100644 --- a/Documentation/de/notation/simultaneous.itely +++ b/Documentation/de/notation/simultaneous.itely @@ -356,7 +356,6 @@ Resultaten führen. (Siehe auch @ref{Auflösung von Zusammenstößen}.) @cindex Notencluster @funindex \makeClusters -@funindex makeClusters Ein Cluster zeigt an, dass alle Tonhöhen in einem Bereich gleichzeitig gespielt werden sollen. Cluster können gedeutet werden als eine @@ -426,11 +425,9 @@ oder mehreren Systemen. @cindex Mehrstimmigkeit @cindex Polyphonie @funindex \voiceOne -@funindex voiceOne @funindex \voiceOne ... \voiceFour @funindex Voice @funindex \oneVoice -@funindex oneVoice @strong{@i{Stimmen explicit beginnen}} @@ -704,21 +701,13 @@ Schnipsel: @cindex Pausen verschieben, automatisch @cindex Verschieben von Pausen, automatisch @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn @funindex \shiftOff -@funindex shiftOff @funindex \mergeDifferentlyDottedOn -@funindex mergeDifferentlyDottedOn @funindex \mergeDifferentlyDottedOff -@funindex mergeDifferentlyDottedOff @funindex \mergeDifferentlyHeadedOn -@funindex mergeDifferentlyHeadedOn @funindex \mergeDifferentlyHeadedOff -@funindex mergeDifferentlyHeadedOff Die Notenköpfe von Noten in unterschiedlichen Stimmen mit derselben Tonhöhe, demselben Notenkopf und den Hälsen in entgegengesetzte @@ -951,7 +940,6 @@ are at the same time differently dotted are not clear. @cindex a due-Stellen @cindex solo-Stellen @funindex \partcombine -@funindex partcombine Automatische Kombination von Stimmen wird verwendet, um zwei selbständige Stimmen auf einem Notensystem zu setzen. Es wird vor allem @@ -1025,17 +1013,11 @@ keinen Einfluss auf die Tonhöhen von @code{@var{musikAusdr1}} oder @code{@var{musikAusdr2}}. @funindex \partcombineChords -@funindex partcombineChords @funindex \partcombineApart -@funindex partcombineApart @funindex \partcombineUnisono -@funindex partcombineUnisono @funindex \partcombineSoloI -@funindex partcombineSoloI @funindex \partcombineSoloII -@funindex partcombineSoloII @funindex \partcombineAutomatic -@funindex partcombineAutomatic In professionellen Partituren werden Stimmen oft für lange Strecken auseinander gehalten, auch wenn eine oder mehrere Noten tatsälich aufeinander treffen und @@ -1170,7 +1152,6 @@ wenn Sie @code{\partcombine} in Tabulaturen benutzen @cindex Eingabe von Noten parallel @cindex Verschachtelte Musik @funindex \parallelMusic -@funindex parallelMusic Noten für mehrere Stimmen können verschachtelt notiert werden. Die Funktion @code{\parallelMusic} akzeptiert eine Liste mit diff --git a/Documentation/de/notation/staff.itely b/Documentation/de/notation/staff.itely index 87732a0507..47d22bb9b4 100644 --- a/Documentation/de/notation/staff.itely +++ b/Documentation/de/notation/staff.itely @@ -60,7 +60,6 @@ Gruppen von Systemen zu erstellen. @cindex neues Notensystem @funindex \drummode -@funindex drummode @funindex DrumStaff @funindex RhythmicStaff @funindex TabStaff @@ -459,9 +458,7 @@ beenden sowie eine Methode, Ossia-Systeme zu erstellen. @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff Die Befehle @code{\stopStaff} und @code{\startStaff} können benutzt werden, um ein Notensystem zu stoppen oder (wieder) @@ -790,10 +787,8 @@ Referenz der Interna: @cindex Verschwinden von leeren Systemen @funindex \RemoveEmptyStaves -@funindex RemoveEmptyStaves @funindex Staff_symbol_engraver @funindex \stopStaff -@funindex stopStaff Die Notenlinien können entfernt werden, indem der @code{Staff_symbol_engraver} aus dem @code{Staff}-Kontext @@ -850,7 +845,6 @@ um Ossiaabschnitte zu erstellen. Zu Einzelheiten, siehe @cindex Verstecken von Rhythmus-Systemen @funindex \RemoveEmptyStaves -@funindex RemoveEmptyStaves Der @code{\VaticanaStaff \RemoveEmptyStaves}-Befehl kann benutzt werden, um leere Takte in Notation der Alten Musik @@ -1060,9 +1054,7 @@ und spätere Änderungen nicht berücksichtigt. @cindex Wechsel von Instrument @funindex \addInstrumentDefinition -@funindex addInstrumentDefinition @funindex \instrumentSwitch -@funindex instrumentSwitch Wenn das Instrument gewechselt werden soll, kann der Befehl @code{\addInstrumentDefinition} in Begleitung von @@ -1124,11 +1116,8 @@ Referenz der Interna: @cindex Stimmen, zitieren @funindex \addQuote -@funindex addQuote @funindex \quoteDuring -@funindex quoteDuring @funindex \transposition -@funindex transposition Es kommt sehr oft vor, dass eine Orchesterstimme die gleichen Noten wie eine andere spielt. So können etwa die ersten und @@ -1295,13 +1284,9 @@ werden, ist das Notenbild unter Umständen sehr schlecht. @cindex Zitieren von anderen Stimmen @funindex \cueDuring -@funindex cueDuring @funindex \cueClef -@funindex cueClef @funindex \cueDuringWithClef -@funindex cueDuringWithClef @funindex \quoteDuring -@funindex quoteDuring @cindex Noten, kleiner @cindex kleinere Noten @@ -1491,7 +1476,6 @@ bassoonNotes = \relative c { @end lilypond @funindex \transposedCueDuring -@funindex transposedCueDuring Genauso wie @code{\quoteDuring} berücksichtigt auch @code{\cueDuring} Transpositionen. Stichnoten werden auf den Tonhöhen erstellt, die für @@ -1533,9 +1517,7 @@ bassClarinetNotes = \relative c' { @cindex cue notes, removing @funindex \killCues -@funindex killCues @funindex \addInstrumentDefinition -@funindex addInstrumentDefinition Der @code{\killCues}-Befehl entfernt Stichnoten aus einem musikalischen Ausdruck, sodass derselbe musikalische Ausdruck diff --git a/Documentation/de/notation/text.itely b/Documentation/de/notation/text.itely index 9179e508fa..ef12e4bb0d 100644 --- a/Documentation/de/notation/text.itely +++ b/Documentation/de/notation/text.itely @@ -249,9 +249,7 @@ Referenz der Interna: @cindex Symbole auf der Taktstrich @funindex \mark -@funindex mark @funindex \markup -@funindex markup Verschiedene Textelemente können der Partitur hinzugefügt werden, indem man die Syntax für Zeichen einsetzen, wie beschrieben in @@ -353,7 +351,6 @@ ausgegeben. @cindex oberste Ebene, Text @funindex \markup -@funindex markup Eine @code{\markup}-Umgebung kann auch für sich alleine existieren, außerhalb einer @code{\score}-Umgebung, als ein Ausdruck auf der @@ -447,7 +444,6 @@ Formatierung von Text, wobei der Textbeschriftungsmodus @cindex Beschriftung, Text @cindex Setzen von Text -@funindex markup @funindex \markup Eine @code{\markup}-Umgebung wird benutzt, um Text mit einer @@ -648,11 +644,8 @@ der globalen Notensystemgröße: @cindex tiefergestellt @funindex \super -@funindex super @funindex \sub -@funindex sub @funindex \normal-size-super -@funindex normal-size-super Text kann auch hoch- bzw. tiefgestellt gesetzt werden. Die so markierten Buchstaben werden automatisch in einer kleineren Schriftgröße gesetzt, @@ -819,7 +812,6 @@ an der linken Ecke ausgerichtet. @end lilypond @funindex \halign -@funindex halign Die horizontale Ausrichtung kann mit einer Zahl auf einen exakten Wert festgelegt werden: @@ -949,7 +941,6 @@ eigenen Zeile gesetzt, entweder linksbündig oder zentriert: @cindex Beschriftung, Zentrieren auf der Seite @funindex \fill-line -@funindex fill-line Eine Anzahl an Ausdrücken innerhalb von @code{\markup} kann auch gestreckt werden, so dass die gesamte Seitenbreite benutzt wird. Wenn @@ -1383,11 +1374,8 @@ Referenz der Interna: @cindex mehrseitiger Text @funindex \markuplist -@funindex markuplist @funindex \justified-lines -@funindex justified-lines @funindex \wordwrap-lines -@funindex wordwrap-lines Normale Textbeschriftungsobjekte können nicht getrennt werden, aber mit einer spezifischen Umgebung ist es möglich, Text auch über mehrere Seiten @@ -1438,7 +1426,6 @@ Referenz der Interna: @rinternals{TextScript}. @funindex \markuplist -@funindex markuplist @predefined @code{\markuplist}. diff --git a/Documentation/de/notation/unfretted-strings.itely b/Documentation/de/notation/unfretted-strings.itely index a74a8d0d21..21d2149e9e 100644 --- a/Documentation/de/notation/unfretted-strings.itely +++ b/Documentation/de/notation/unfretted-strings.itely @@ -143,7 +143,6 @@ Notation Reference: @cindex rautenförmige Notenköpfe @funindex \harmonic -@funindex harmonic Flageolett-Töne können auf verschiedene Arten notiert werden. Üblicherweise werden sie mit einem Rautenkopf notiert, wenn diff --git a/Documentation/de/notation/vocal.itely b/Documentation/de/notation/vocal.itely index 372e9db2a7..367223d7dd 100644 --- a/Documentation/de/notation/vocal.itely +++ b/Documentation/de/notation/vocal.itely @@ -401,7 +401,6 @@ am Leben erhält, siehe @ref{Kontexte am Leben halten}. @cindex \lyricsto @funindex \lyricsto -@funindex lyricsto Gesangstext kann an einer Melodie automatisch ausgerichtet werdne, indem man den beannten @code{Voice}-Kontext mit der Melodie durch den Befehl @@ -431,7 +430,6 @@ angeordnet. Für andere Optionen siehe @ref{Gesangstext vertikal verschieben}. @subheading @code{\addlyrics} benutzen -@funindex addlyrics @funindex \addlyrics Der @code{\addlyrics}-Befehl ist eigentlich nur eine Abkürzung für eine diff --git a/Documentation/de/notation/wind.itely b/Documentation/de/notation/wind.itely index f2724111b4..15cf15e6e4 100644 --- a/Documentation/de/notation/wind.itely +++ b/Documentation/de/notation/wind.itely @@ -178,11 +178,8 @@ Dieser Abschnitt beinhaltet die Notation von Dudelsackmusik. @cindex Sackpfeife @cindex Schottischer Dudelsack @funindex \taor -@funindex taor @funindex \hideKeySignature -@funindex hideKeySignature @funindex \showKeySignature -@funindex showKeySignature LilyPond besitzt spezielle Definitionen, mit der die Musik des schottischen Hochland-Dudelsacks notiert wird. Um sie diff --git a/Documentation/es/learning/common-notation.itely b/Documentation/es/learning/common-notation.itely index ba01420684..b54f8705c9 100644 --- a/Documentation/es/learning/common-notation.itely +++ b/Documentation/es/learning/common-notation.itely @@ -194,11 +194,8 @@ idiomas}. @cindex presentación frente a contenido @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Glosario musical: @rglos{key signature}, @@ -492,11 +489,8 @@ articulaciones. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Glosario musical: @rglos{dynamics}, @@ -536,7 +530,6 @@ Referencia de la notación: @cindex marcado @funindex \markup -@funindex markup Es posible añadir texto a la partitura: @@ -575,9 +568,7 @@ Referencia de la notación: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Glosario musical: @rglos{beam}. @@ -636,7 +627,6 @@ Referencia de la notación: @cindex compás parcial @funindex \partial -@funindex partial Glosario musical: @rglos{anacrusis}. @@ -660,7 +650,6 @@ una anacrusa de negra y @code{\partial 8} de corchea. @cindex tresillos @funindex \tuplet -@funindex tuplet Glosario musical: @rglos{note value}, @@ -691,9 +680,7 @@ de manera que los @notation{tresillos} tienen una fracción de 3/2. @cindex appoggiatura @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -895,10 +882,8 @@ sobre un solo pentagrama. @cindex notación, contexto de @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -1110,7 +1095,6 @@ canción sencillas. @cindex canciones @funindex \addlyrics -@funindex addlyrics Glosario musical: @rglos{lyrics}. @@ -1499,7 +1483,6 @@ anteriores: @cindex bloque de encabezamientos @funindex \header -@funindex header La información sobre el título, autor, número de Opus y similares se escriben en el bloque @code{\header}. Éste se encuentra fuera diff --git a/Documentation/es/learning/fundamental.itely b/Documentation/es/learning/fundamental.itely index ff989e7dc0..d4a149e016 100644 --- a/Documentation/es/learning/fundamental.itely +++ b/Documentation/es/learning/fundamental.itely @@ -75,9 +75,7 @@ Existen muchas variaciones de este esquema básico, pero el ejemplo constituye un útil punto de partida. @funindex \book -@funindex book @funindex \score -@funindex score @cindex book (libro) @cindex score (partitura) @cindex libro @@ -168,11 +166,8 @@ otras cosas, tales como @end example @funindex \header -@funindex header @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex midi @cindex cabecera @cindex disposición @@ -200,7 +195,6 @@ partitura} y en @ruser{Creación de salida MIDI}. @cindex book, bloque implícito @cindex implícito, bloque book @funindex \book -@funindex book Podemos escribir varios bloques @code{\score}. Cada uno de ellos recibirá el mismo tratamiento que una partitura independiente, @@ -283,7 +277,6 @@ entrada, consulte @ruser{Estructura del archivo}. @cindex musical, expresión, compuesta @cindex expresión musical compuesta @funindex \score -@funindex score En la sección anterior, @ref{Introducción a la estructura de los archivos de LilyPond}, @@ -1010,15 +1003,10 @@ Referencia de la notación: @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex contextos de voz, creación de @@ -1212,13 +1200,9 @@ aquí: @cindex notas, colisiones de @cindex desplazamiento, instrucciones de @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Las notas cercanas de un acorde, o las notas que se producen al mismo tiempo en distintas voces, se disponen en dos (y @@ -1276,7 +1260,6 @@ combinar dos expresiones, a saber, las notas y la letra. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics, creación de un contexto @cindex letra, creación de un contexto de @@ -1312,7 +1295,6 @@ un caso en que es necesario crear contextos de @code{Staff} y de @cindex letra y barrado @cindex barrado y letra @funindex \autoBeamOff -@funindex autoBeamOff El barrado automático que LilyPond usa de forma predeterminada funciona bien para la música instrumental, pero no tan bien para @@ -1324,7 +1306,6 @@ letra. En el ejemplo anterior hemos utilizado la instrucción @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex vocal, estructura de una partitura @cindex coro, sistema de @@ -1551,7 +1532,6 @@ Referencia de la notación: @translationof Creating contexts @funindex \new -@funindex new @cindex nuevos contextos @cindex creación de contextos @cindex contextos, creación de @@ -1774,9 +1754,7 @@ Referencia de funcionamiento interno: @cindex contexto, propiedades de, modificación @cindex modificar las propiedades de contexto @funindex \set -@funindex set @funindex \unset -@funindex unset Los contextos se responsabilizan de mantener los valores de un cierto número de @emph{properties} de contexto. Muchas de ellas @@ -1984,7 +1962,6 @@ potentísima instrucción @code{markup}. @subsubheading Cambiar las propiedades de un contexto con @code{\with} @funindex \with -@funindex with @cindex contexto, propiedades de, establecimiento con \with El valor predeterminado de las propiedades de contexto se puede @@ -2039,7 +2016,6 @@ puede restablecerse con la instrucción @code{\unset fontSize}. @cindex contextos, establecer propiedades de, con \context @funindex \context -@funindex context Los valores de propiedad de los contextos se pueden establecer para @emph{todos} los contextos de un tipo determinado, como por @@ -2126,9 +2102,7 @@ Referencia de funcionamiento interno: @cindex eliminación de grabadores @funindex \consists -@funindex consists @funindex \remove -@funindex remove Hemos visto que cada uno de los contextos contiene varios grabadores, cada uno de los cuales a su vez es responsable de la @@ -2226,7 +2200,6 @@ voces de ese pentagrama: @subsubheading Cambiar todos los contextos del mismo tipo @funindex \layout -@funindex layout Los ejemplos anteriores muestran la manera de eliminar o añadir grabadores a los contextos individuales. También es posible diff --git a/Documentation/es/learning/tutorial.itely b/Documentation/es/learning/tutorial.itely index a8b359b48f..47439ec3da 100644 --- a/Documentation/es/learning/tutorial.itely +++ b/Documentation/es/learning/tutorial.itely @@ -222,7 +222,6 @@ valores automáticos son adecuados. @cindex relativo, modo, alteraciones y @funindex \relative -@funindex relative @funindex ' @funindex , @@ -420,7 +419,6 @@ con el nombre @code{r}@tie{}: @cindex compás, indicación de @funindex \time -@funindex time Glosario musical: @rglos{time signature}. @@ -447,7 +445,6 @@ orden @code{\time} : @cindex metronómicas, indicaciones @funindex \tempo -@funindex tempo Glosario musical: @rglos{tempo indication}, @@ -486,7 +483,6 @@ metronómica} pueden establecerse con la instrucción @code{\tempo}: @cindex bajo @funindex \clef -@funindex clef Glosario musical: @rglos{clef}. diff --git a/Documentation/es/learning/tweaks.itely b/Documentation/es/learning/tweaks.itely index 5b33f851f9..451fb6b598 100644 --- a/Documentation/es/learning/tweaks.itely +++ b/Documentation/es/learning/tweaks.itely @@ -225,7 +225,6 @@ Referencia de la notación: @cindex override (sobreescritura), sintaxis de @funindex \override -@funindex override Ya hemos visto las instrucciones @code{\set} y @code{\with}, que se usan para cambiar las propiedades de los @strong{contextos} y @@ -305,7 +304,6 @@ ejemplo sencillo para cambiar el color de una cabeza: @cindex revert, instrucción @funindex \revert -@funindex revert Una vez sobreescrita, la propiedad retiene su nuevo valor hasta que se sobreescribe de nuevo o se encuentra una instrucción @@ -345,7 +343,6 @@ las dos últimas notas: @translationof The once prefix @funindex \once -@funindex once @code{\override}, @code{\revert}, @code{\set} y @code{\unset} se pueden hacer preceder por @code{\once}. Esto hace que la @@ -395,7 +392,6 @@ momento musical: @cindex overrideProperty, instrucción @funindex \overrideProperty -@funindex overrideProperty Hay otra forma para la instrucción de sobreescritura, @code{\overrideProperty}, que ocasionalmente es necesaria. La @@ -411,7 +407,6 @@ más detalles consulte @rextend{Trucos difíciles}. @cindex tweak, instrucción @funindex \tweak -@funindex tweak La última instrucción de trucaje que está disponible es @code{\tweak}. Se debe utilizar cuando varios objetos tienen @@ -853,7 +848,6 @@ omitirlo en este lugar concreto. @cindex once override @funindex \once -@funindex once Como puede ver, @emph{todas} las ligaduras son más gruesas en el último ejemplo. Pero ¿y si quisiéramos que solamente la primera @@ -901,7 +895,6 @@ de la instrucción @code{\set}. @cindex predeterminadas, recuperar las propiedades @funindex \revert -@funindex revert Finalmente ¿y si quisiéramos que solamente las dos primeras ligaduras fuesen más gruesas? En fin; podríamos usar dos @@ -2388,9 +2381,7 @@ algunos de ellos. @cindex octava alta y baja, corchete de @funindex \startTextSpan -@funindex startTextSpan @funindex \stopTextSpan -@funindex stopTextSpan @cindex TextSpanner, ejemplo de sobreescritura @cindex bound-details, propiedad, ejemplo @@ -2548,9 +2539,7 @@ instrucción @code{textLengthOn}. @cindex notas, espaciar junto al texto @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff De forma predeterminada, el texto producido mediante marcado no ocupa ningún espacio horizontal en cuanto se refiere a la @@ -3103,13 +3092,9 @@ voces. @cindex colisiones de notas @cindex desplazamiento, instrucciones de @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Dentro de una voz, todas las notas que se producen en el mismo moemtno se agrupan en una columna de notas, y se crea un objeto diff --git a/Documentation/es/notation/ancient.itely b/Documentation/es/notation/ancient.itely index 01c845f0fe..f1f10c14e5 100644 --- a/Documentation/es/notation/ancient.itely +++ b/Documentation/es/notation/ancient.itely @@ -2746,7 +2746,6 @@ polifónica; @unnumberedsubsubsec Incipits @translationof Incipits @funindex \incipit -@funindex incipit @cindex incipits, añadir Al transcribir música mensural a la notación moderna, es costumbre diff --git a/Documentation/es/notation/changing-defaults.itely b/Documentation/es/notation/changing-defaults.itely index d878e9c414..a90010a8bb 100644 --- a/Documentation/es/notation/changing-defaults.itely +++ b/Documentation/es/notation/changing-defaults.itely @@ -1160,17 +1160,11 @@ Referencia de la notación: @cindex grabadores, incluir en contextos @funindex \alias -@funindex alias @funindex \name -@funindex name @funindex \type -@funindex type @funindex \consists -@funindex consists @funindex \accepts -@funindex accepts @funindex \denies -@funindex denies Los contextos específicos, como @code{Staff} y @code{Voice}, están construidos a partir de bloques sencillos. Es posible crear diff --git a/Documentation/es/notation/editorial.itely b/Documentation/es/notation/editorial.itely index 72e0b7fbae..10e3cf6b56 100644 --- a/Documentation/es/notation/editorial.itely +++ b/Documentation/es/notation/editorial.itely @@ -349,7 +349,6 @@ instrucciones @code{\newSpacingSection}, y/o las instrucciones @cindex cambio de dedo @funindex \finger -@funindex finger Las instrucciones de digitación se pueden introducir usando @samp{@var{nota}-@var{dígito}}: @@ -370,7 +369,6 @@ texto o de cadenas de caracteres. @cindex thumb-script @funindex \thumb -@funindex thumb Puede usar la articulación de pulgar para indicar que una nota se debe tocar con el pulgar (p.ej. en música de violoncello). @@ -433,9 +431,7 @@ Referencia de funcionamiento interno: @cindex notas transparentes @funindex \hideNotes -@funindex hideNotes @funindex \unHideNotes -@funindex unHideNotes Las notas ocultas (o invisibles, o transparentes) pueden ser de utilidad en la preparación de ejercicios de teoría o de @@ -509,7 +505,6 @@ Referencia de funcionamiento interno: @funindex color @funindex \with-color -@funindex with-color @funindex x11-color Se pueden asignar colores a los objetos individuales. Los nombres @@ -625,7 +620,6 @@ Consulte @ref{La instrucción tweak} para ver más detalles. @cindex corchetes @funindex \parenthesize -@funindex parenthesize Los objetos se pueden encerrar entre paréntesis anteponiendo @code{\parenthesize} al evento musical. Si se aplica a un acorde, @@ -679,11 +673,8 @@ grande rodeando al acorde completo. @cindex plica neutral @funindex \stemUp -@funindex stemUp @funindex \stemDown -@funindex stemDown @funindex \stemNeutral -@funindex stemNeutral Cuando se encuentra con una nota, se crea automáticamente un objeto @code{Stem} (plica). Para las redondas y los silencios, @@ -748,9 +739,7 @@ del pentagrama, desde fuera del pentagrama. @funindex balloonGrobText @funindex balloonText @funindex \balloonLengthOn -@funindex balloonLengthOn @funindex \balloonLengthOff -@funindex balloonLengthOff Los elementos de notación se pueden marcar y nombrar con la ayuda de un cartel o globo de ayuda rectangular. El propósito principal @@ -892,9 +881,7 @@ Referencia de funcionamiento interno: @funindex Horizontal_bracket_engraver @funindex \startGroup -@funindex startGroup @funindex \stopGroup -@funindex stopGroup Los corchetes se usan en análisis musical para indicar la estructura de las piezas musicales. Están contemplados los diff --git a/Documentation/es/notation/expressive.itely b/Documentation/es/notation/expressive.itely index f569690a31..94196896b6 100644 --- a/Documentation/es/notation/expressive.itely +++ b/Documentation/es/notation/expressive.itely @@ -241,41 +241,23 @@ Referencia de funcionamiento interno: @cindex matices @cindex absolutos, matices @funindex \pppp -@funindex pppp @funindex \ppp -@funindex ppp @funindex \pp -@funindex pp @funindex \p -@funindex p @funindex \mp -@funindex mp @funindex \mf -@funindex mf @funindex \f -@funindex f @funindex \ff -@funindex ff @funindex \fff -@funindex fff @funindex \ffff -@funindex ffff @funindex \fffff -@funindex fffff @funindex \fp -@funindex fp @funindex \sf -@funindex sf @funindex \sff -@funindex sff @funindex \sp -@funindex sp @funindex \spp -@funindex spp @funindex \sfz -@funindex sfz @funindex \rfz -@funindex rfz Las marcas dinámicas de matiz absoluto se especifican usando una instrucción después de una nota: @code{c4\ff}. Las marcas @@ -304,9 +286,7 @@ ver más detalles, consulte @ref{Dirección y posición}. @funindex \> @funindex \! @funindex \cr -@funindex cr @funindex \decr -@funindex decr Una indicación de @notation{crescendo} se comienza con @code{\<} y se termina con @code{\!}, con un matiz absoluto o con otra @@ -376,7 +356,6 @@ especialmente para añadir un @notation{crescendo} y un @cindex espressivo, articulación @funindex \espressivo -@funindex espressivo Se puede usar la instrucción @code{\espressivo} para indicar un crescendo y un decrescendo sobre la misma nota. Sin embargo, @@ -391,11 +370,8 @@ articulación, no como una expresión dinámica. @end lilypond @funindex \cresc -@funindex cresc @funindex \decresc -@funindex decresc @funindex \dim -@funindex dim Las indicaciones de crescendo textuales se inician con @code{\cresc}. Los decrescendos textuales se inician con @@ -412,17 +388,11 @@ cuando es necesario. @end lilypond @funindex \crescTextCresc -@funindex crescTextCresc @funindex \dimTextDecresc -@funindex dimTextDecresc @funindex \dimTextDecr -@funindex dimTextDecr @funindex \dimTextDim -@funindex dimTextDim @funindex \crescHairpin -@funindex crescHairpin @funindex \dimHairpin -@funindex dimHairpin También pueden sustituirse los reguladores gráficos por cambios de dinámica textuales: @@ -456,11 +426,8 @@ La colocación vertical de las indicaciones de dinámica se maneja por parte de @rinternals{DynamicLineSpanner}. @funindex \dynamicUp -@funindex dynamicUp @funindex \dynamicDown -@funindex dynamicDown @funindex \dynamicNeutral -@funindex dynamicNeutral Está disponible un contexto @code{Dynamics} para tipografiar las indicaciones de matiz dinámico en su propia línea horizontal. @@ -583,9 +550,7 @@ moltoF = \markup { molto \dynamic f } @cindex dinámicas, indicaciones entre paréntesis @cindex editoriales, indicaciones dinámicas @funindex \bracket -@funindex bracket @funindex \dynamic -@funindex dynamic En el modo de marcado se pueden crear indicaciones dinámicas editoriales (entre paréntesis o corchetes). La sintaxis del modo @@ -732,9 +697,7 @@ terminar en la misma voz en la que empiezan.} @cindex ligaduras de expresión, debajo de las notas @cindex ligaduras de expresión, encima de las notas @funindex \slurDown -@funindex slurDown @funindex \slurNeutral -@funindex slurNeutral Las ligaduras de expresión se pueden colocar manualmente por encima o por debajo de las notas; véase @@ -773,11 +736,8 @@ caracteres que la identifique. @cindex estilo de la ligadura @funindex \slurDashed -@funindex slurDashed @funindex \slurDotted -@funindex slurDotted @funindex \slurSolid -@funindex slurSolid Las ligaduras de expresión pueden ser continuas, discontinuas o de puntos. El estilo predeterminado de las ligaduras de expresión es @@ -798,9 +758,7 @@ el continuo: @cindex ligadura de expresión, mitad continua y mitad discontinua @funindex \slurHalfDashed -@funindex slurHalfDashed @funindex \slurHalfSolid -@funindex slurHalfSolid También se puede hacer que las ligaduras de expresión sean semi-discontinuas (la primera mitad discontinua y la segunda mitad @@ -822,7 +780,6 @@ discontinua): @cindex ligadura de expresión, definir patrones de discontinuidad @funindex \slurDashPattern -@funindex slurDashPattern Se pueden definir patrones de discontinuidad para las ligaduras de expresión: @@ -841,7 +798,6 @@ expresión: @funindex \slurUp -@funindex slurUp @predefined @@ -909,11 +865,8 @@ indican una frase musical se escriben usando las instrucciones @end lilypond @funindex \phrasingSlurUp -@funindex phrasingSlurUp @funindex \phrasingSlurDown -@funindex phrasingSlurDown @funindex \phrasingSlurNeutral -@funindex phrasingSlurNeutral Tipográficamente, la ligadura de fraseo se comporta casi exactamente igual que una ligadura de expresión normal. Sin @@ -940,12 +893,9 @@ normales, véase @ref{Ligaduras de expresión}. @cindex ligaduras de fraseo discontinuas @cindex ligaduras de fraseo punteadas -@funindex phrasingSlurDashed @funindex \phrasingSlurDashed @funindex \phrasingSlurDotted -@funindex phrasingSlurDotted @funindex \phrasingSlurSolid -@funindex phrasingSlurSolid Las ligaduras de fraseo pueden ser continuas, de puntos o de rayas. El estilo predeterminado para las ligaduras de fraseo es @@ -966,10 +916,8 @@ el continuo: @cindex fraseo, ligadura de, mitad continua y mitad discontinua @cindex ligadura de fraseo mitad continua y mitad discontinua -@funindex phrasingSlurHalfDashed @funindex \phrasingSlurHalfDashed @funindex \phrasingSlurHalfSolid -@funindex phrasingSlurHalfSolid Se puede hacer también que las ligaduras de fraseo sean semi-discontinuas (la primera mitad discontinua y la segunda mitad @@ -992,7 +940,6 @@ mitad discontinua): @cindex ligadura de fraseo, definir patrones de discontinuidad @funindex \phrasingSlurDashPattern -@funindex phrasingSlurDashPattern Se pueden definir patrones de discontinuidad para las ligaduras de fraseo: @@ -1049,7 +996,6 @@ Referencia de funcionamiento interno: @cindex respiraciones @cindex pausa, marcas de @funindex \breathe -@funindex breathe Las respiraciones se introducen utilizando @code{\breathe}: @@ -1118,7 +1064,6 @@ Referencia de funcionamiento interno: @cindex caídas de tono (falls) @cindex elevaciones de tono (doits) @funindex \bendAfter -@funindex bendAfter Se pueden expresar @notation{caídas} y @notation{subidas} de tono (falls y doits) añadidas a las notas mediante la instrucción @@ -1172,7 +1117,6 @@ siguen un camino lineal: glissandi, arpegios y trinos. @cindex glissando @funindex \glissando -@funindex glissando Se crea un @notation{glissando} añadiendo @code{\glissando} después de la nota: @@ -1271,13 +1215,9 @@ está contemplada. @cindex acorde arpegiado @cindex quebrado, acorde @funindex \arpeggio -@funindex arpeggio @funindex \arpeggioArrowUp -@funindex arpeggioArrowUp @funindex \arpeggioArrowDown -@funindex arpeggioArrowDown @funindex \arpeggioNormal -@funindex arpeggioNormal Un signo de @notation{acorde arpegiado} (conocido también como acorde quebrado) sobre un acorde, se denota adjuntando @@ -1309,11 +1249,8 @@ Se pueden escribir distintos tipos de acordes arpegiados. @cindex especial, símbolos de arpegio @funindex \arpeggioBracket -@funindex arpeggioBracket @funindex \arpeggioParenthesis -@funindex arpeggioParenthesis @funindex \arpeggioParenthesisDashed -@funindex arpeggioParenthesisDashed Se pueden crear símbolos especiales de arpegio @emph{con corchete}: @@ -1400,11 +1337,8 @@ see @ref{Plicas de pentagrama cruzado}. @cindex trinos @funindex \trill -@funindex trill @funindex \startTrillSpan -@funindex startTrillSpan @funindex \stopTrillSpan -@funindex stopTrillSpan Los trinos cortos sin línea extensora se imprimen con @code{\trill}; véase @ref{Articulaciones y ornamentos}. @@ -1465,7 +1399,6 @@ las notas de adorno con precisión están descritos en @cindex trinos de nota explícita @cindex explícita, trinos de nota @funindex \pitchedTrill -@funindex pitchedTrill Los trinos que se tienen que ejecutar sobre notas auxiliares explícitas se pueden tipografiar con la instrucción diff --git a/Documentation/es/notation/fretted-strings.itely b/Documentation/es/notation/fretted-strings.itely index f676e7353f..62f92f0fbc 100644 --- a/Documentation/es/notation/fretted-strings.itely +++ b/Documentation/es/notation/fretted-strings.itely @@ -624,7 +624,6 @@ Re-Sol-Re-Sol-Si-Re), @code{mandolin-tuning} (mandolina) y afinaciones predefinidas están en @file{ly/string-tunings-init.ly}. -@funindex stringTuning @funindex \stringTuning @cindex tablaturas, afinaciones personalizadas @cindex personalizadas, afinaciones de cuerdas @@ -882,7 +881,6 @@ de la cadena de marcado del diagrama de trastes. @cindex fret-diagram, marcado con @cindex ukelele -@funindex fret-diagram @funindex \fret-diagram El tamaño del diagrama de trastes y el número de trastes del @@ -975,7 +973,6 @@ cadena de marcado @code{fret-diagram}. @cindex fret-diagram-terse, marcado con -@funindex fret-diagram-terse @funindex \fret-diagram-terse La cadena de marcado de diagrama de trastes escueta, @@ -1058,7 +1055,6 @@ fret-diagram-terse. @cindex fret-diagram-verbose, marcado con @cindex capo -@funindex fret-diagram-verbose @funindex \fret-diagram-verbose La cadena de marcado prolija @code{fret-diagram-verbose} está en @@ -1353,7 +1349,6 @@ simultánea o bien usando el modo de acordes (véase @cindex trastes, diagramas de, con nombres de acorde @funindex ChordNames -@funindex chordmode @funindex \chordmode Es corriente que se impriman juntos los nombres de acorde y los @@ -1504,8 +1499,6 @@ mychords = \chordmode { @cindex acordes, formas de, en instrumentos de trastes @funindex \addChordShape -@funindex addChordShape -@funindex storePredefinedDiagram @funindex \storePredefinedDiagram Además de los diagramas de traste, LilyPond almacena una lista @@ -1627,9 +1620,7 @@ tocar las notas. >> @end lilypond -@funindex predefinedFretboardsOff @funindex \predefinedFretboardsOff -@funindex predefinedFretboardsOn @funindex \predefinedFretboardsOn Puesto que de forma predeterminada no se carga ningún diagrama @@ -1768,7 +1759,6 @@ instrumentos con afinaciones no monótonas. @cindex digitaciones de la mano derecha para instrumentos de trastes @cindex derecha, mano, digitaciones para instrumentos de traste -@funindex rightHandFinger @funindex \rightHandFinger Las digitaciones de la mano derecha @var{p-i-m-a} se deben introducir @@ -1949,7 +1939,6 @@ Referencia de la notación: @unnumberedsubsubsec Indicación de acordes de potencia o de quinta vacía @translationof Indicating power chords -@funindex powerChords @funindex \powerChords @cindex potencia, acordes de diff --git a/Documentation/es/notation/keyboards.itely b/Documentation/es/notation/keyboards.itely index 2ee396edc2..65fa5258bb 100644 --- a/Documentation/es/notation/keyboards.itely +++ b/Documentation/es/notation/keyboards.itely @@ -163,7 +163,6 @@ Fragmentos de código: @cindex cruzado, pentagrama, barras de @funindex \change -@funindex change Las voces se pueden cambiar de pentagrama manualmente usando la instrucción @@ -283,7 +282,6 @@ un cambio de pauta. En este caso, utilice barras manuales. @cindex pentagrama, cambio automático de @funindex \autochange -@funindex autochange @funindex PianoStaff Se puede hacer que las voces cambien automáticamente entre los @@ -332,7 +330,6 @@ music = { @cindex autocambiador y el modo relativo @funindex \relative -@funindex relative Una sección marcada @code{\relative} que se encuentra fuera de @code{\autochange} no tiene efecto sobre las notas de la música; @@ -410,9 +407,7 @@ construcción del acorde. @funindex followVoice @funindex \showStaffSwitch -@funindex showStaffSwitch @funindex \hideStaffSwitch -@funindex hideStaffSwitch Cuando una voz cambia a otro pentagrama, se puede imprimir automáticamente una línea que conecte las notas: @@ -523,17 +518,11 @@ relacionados con el piano. @cindex U.C. @funindex \sustainOn -@funindex sustainOn @funindex \sustainOff -@funindex sustainOff @funindex \sostenutoOn -@funindex sostenutoOn @funindex \sostenutoOff -@funindex sostenutoOff @funindex \unaCorda -@funindex unaCorda @funindex \treCorde -@funindex treCorde En general, los pianos tienen tres pedales que alteran la forma de producir el sonido: el pedal de mantenimiento (pedal diff --git a/Documentation/es/notation/pitches.itely b/Documentation/es/notation/pitches.itely index 61216b492f..f03c553e14 100644 --- a/Documentation/es/notation/pitches.itely +++ b/Documentation/es/notation/pitches.itely @@ -93,7 +93,6 @@ cada@tie{}@code{,} baja la altura una octava. } @end lilypond -@funindex fixed @funindex \fixed Las marcas de octava comunes se pueden escribir una sola vez sobre una nota de referencia si se emplea @code{\fixed} antes de la @@ -139,7 +138,6 @@ Fragmentos de código: @cindex relativa, especificación de la octava @cindex octava, especificación relativa -@funindex relative @funindex \relative La entrada de octava absoluta requere que se especifique la octava @@ -333,11 +331,8 @@ Referencia de funcionamiento interno: @cindex transposición y modo relativo @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @node Alteraciones accidentales @@ -669,7 +664,6 @@ Esta sección trata de la manera de modificar las alturas. @funindex = @funindex \octaveCheck -@funindex octaveCheck @funindex controlpitch En el modo relativo, es fácil olvidar una marca de cambio de @@ -747,7 +741,6 @@ Referencia de funcionamiento interno: @cindex notas, transporte de @funindex \transpose -@funindex transpose Una expresión musical se puede transportar mediante @code{\transpose}. La sintaxis es @@ -865,11 +858,8 @@ Referencia de funcionamiento interno: @rinternals{TransposedMusic}. @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @knownissues La conversión relativa no afecta a las secciones @@ -932,7 +922,6 @@ Referencia de la notación: @cindex transformación de retrogradación @cindex operación de retrogradación @funindex \retrograde -@funindex retrograde Se puede revertir una expresión musical para producir su retrogradación: @@ -986,7 +975,6 @@ sin transformar.} @cindex transposición modal @cindex operación de transposición @funindex \modalTranspose -@funindex modalTranspose Se puede transportar un motivo dentro de una escala dada con: @@ -1044,7 +1032,6 @@ motif = \relative { c'8 d e f g a b c } @cindex inversión modal @cindex operación de inversión modal @funindex \modalInversion -@funindex modalInversion Se puede invertir un motivo dentro de una escala dada alrededor de una nota pivote dada y transportada al mismo tiempo en una única @@ -1160,7 +1147,6 @@ las notas. @cindex clave de contrabajo @funindex \clef -@funindex clef Sin ninugna instrucción explícita, la clave predeterminada en LilyPond es la clave @qq{treble} (o clave de @emph{Sol}). @@ -1348,7 +1334,6 @@ diferente. @cindex Armadura de la tonalidad @funindex \key -@funindex key @c duplicated in Key signature and Accidentals @warning{Las alteraciones accidentales y las armaduras son una @@ -1370,23 +1355,14 @@ armadura se hace con la instrucción @code{\key}: @end example @funindex \major -@funindex major @funindex \minor -@funindex minor @funindex \ionian -@funindex ionian @funindex \locrian -@funindex locrian @funindex \aeolian -@funindex aeolian @funindex \mixolydian -@funindex mixolydian @funindex \lydian -@funindex lydian @funindex \phrygian -@funindex phrygian @funindex \dorian -@funindex dorian @cindex modos eclesiásticos @cindex modos @@ -1492,7 +1468,6 @@ Referencia de funcionamiento interno: @funindex set-octavation @funindex \ottava -@funindex ottava Los @notation{corchetes de Ottava} introducen un trasporte adicional de una octava para el pentagrama. @@ -1548,7 +1523,6 @@ Referencia de funcionamiento interno: @cindex MIDI, transposición @funindex \transposition -@funindex transposition Al tipografiar partituras donde participan instrumentos transpositores, ciertas partes se pueden tipografiar en un tono @@ -3144,9 +3118,7 @@ Referencia de funcionamiento interno: @cindex simplificada, notación @funindex \easyHeadsOn -@funindex easyHeadsOn @funindex \easyHeadsOff -@funindex easyHeadsOff Las notas con cabeza de @q{notación facilitada} tienen el nombre de la nota (en inglés) dentro de la cabeza. Se usan en la música @@ -3213,15 +3185,10 @@ Referencia de funcionamiento interno: @cindex notas, cabezas de, Walker @funindex \aikenHeads -@funindex aikenHeads @funindex \sacredHarpHeads -@funindex sacredHarpHeads @funindex \southernHarmonyHeads -@funindex southernHarmonyHeads @funindex \funkHeads -@funindex funkHeads @funindex \walkerHeads -@funindex walkerHeads En la notación de cabezas con forma, la forma de la cabeza corresponde a la función armónica de una nota dentro de la @@ -3247,17 +3214,11 @@ Harmony)}: @end lilypond @funindex \key -@funindex key @funindex \aikenHeadsMinor -@funindex aikenHeadsMinor @funindex \sacredHarpHeadsMinor -@funindex sacredHarpHeadsMinor @funindex \southernHarmonyHeadsMinor -@funindex southernHarmonyHeadsMinor @funindex \funkHeadsMinor -@funindex funkHeadsMinor @funindex \walkerHeadsMinor -@funindex walkerHeadsMinor Las formas se determinan en función del grado de la escala, donde la tónica está determinada por la instrucción @code{\key} Cuando @@ -3326,9 +3287,7 @@ Referencia de funcionamiento interno: @cindex notas, cabezas de, barradas @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff La improvisación se denota a veces mediante cabezas de nota en forma de barra inclinada, donde el ejecutante puede elegir diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely index 2a8fba55ba..0851e27f25 100644 --- a/Documentation/es/notation/rhythms.itely +++ b/Documentation/es/notation/rhythms.itely @@ -49,11 +49,8 @@ las barras y los compases. @cindex notas, longitud de @funindex \longa -@funindex longa @funindex \breve -@funindex breve @funindex \maxima -@funindex maxima Las duraciones se designan mediante números y puntos. Las duraciones se introducen como sus valores recíprocos respecto de @@ -146,11 +143,8 @@ otros ajustes que controlan la notación proporcional, consulte @ref{Notación proporcional}. @funindex \dotsUp -@funindex dotsUp @funindex \dotsDown -@funindex dotsDown @funindex \dotsNeutral -@funindex dotsNeutral Normalmente los puntillos se desplazan hacia arriba para evitar las líneas del pentagrama, excepto en situaciones de polifonía. Se @@ -215,7 +209,6 @@ silencio de garrapatea (128) hasta el de máxima (8 redondas). @cindex tresillos @funindex \tuplet -@funindex tuplet Los grupos especiales se obtienen a partir de una expresión musical con la instrucción @code{\tuplet}, multiplicando la @@ -255,11 +248,8 @@ música para que así se agrupen automáticamente: @cindex grupos de valoración especial, colocación del corchete @funindex \tupletUp -@funindex tupletUp @funindex \tupletDown -@funindex tupletDown @funindex \tupletNeutral -@funindex tupletNeutral Se pueden colocar manualmente los corchetes de tresillo encima o debajo de la pauta: @@ -389,7 +379,6 @@ muchos compases, como por ejemplo @code{s1*23}. @cindex expansión de música @funindex \scaleDurations -@funindex scaleDurations De la misma forma, se pueden comprimir por una fracción trozos de música más largos, como si cada nota, acorde o silencio tuviera la @@ -512,7 +501,6 @@ dentro del acorde. @cindex ligaduras de unión y corchetes de primera y segunda vez @funindex \repeatTie -@funindex repeatTie Cuando la segunda vez de una repetición comienza con una nota ligada, es necesario especificar la ligadura repetida como sigue: @@ -533,7 +521,6 @@ es necesario especificar la ligadura repetida como sigue: @cindex ligaduras laissez vibrer @funindex \laissezVibrer -@funindex laissezVibrer Las ligaduras @notation{L.v.} (@notation{laissez vibrer}, dejar vibrar) indican que las notas no se deben apagar al final. Se @@ -547,11 +534,8 @@ cuerda y percusión. Se pueden introducir de la siguiente manera: @cindex ligaduras, colocación @funindex \tieUp -@funindex tieUp @funindex \tieDown -@funindex tieDown @funindex \tieNeutral -@funindex tieNeutral Es posible hacer manualmente que las ligaduras de unión se curven hacia arriba o hacia abajo; véase @ref{Dirección y posición}. @@ -563,11 +547,8 @@ hacia arriba o hacia abajo; véase @ref{Dirección y posición}. @cindex puntos, ligaduras de @funindex \tieDotted -@funindex tieDotted @funindex \tieDashed -@funindex tieDashed @funindex \tieSolid -@funindex tieSolid Se puede hacer que las ligaduras de expresión sean discontinuas, punteadas o una combinación de continuas y discontinuas. @@ -697,14 +678,10 @@ expresiones musicales. @cindex breve, silencio de @funindex \rest -@funindex rest @funindex r @funindex \maxima -@funindex maxima @funindex \longa -@funindex longa @funindex \breve -@funindex breve Los silencios se introducen como notas con el nombre @code{r}. Las duraciones mayores que la redonda utilizan las instrucciones @@ -788,7 +765,6 @@ el número de glifos es limitado: hay silencios desde la garrapatea @funindex s @funindex \skip -@funindex skip Un silencio invisible (también conocido como @q{skip} o desplazamiento) se puede introducir como una nota con el @@ -883,7 +859,6 @@ Referencia de funcionamiento interno: @cindex redonda, silencios de, para un compás completo @cindex silencios de redonda para un compás completo -@funindex compressMMRests @funindex \compressMMRests @funindex R @@ -966,7 +941,6 @@ R2.*2 | @cindex multicompás, silencio, con marcados @funindex \fermataMarkup -@funindex fermataMarkup @funindex MultiMeasureRestText Se pueden añadir elementos de marcado a los silencios multicompás. @@ -1002,13 +976,9 @@ posible que no se emitan las advertencias correspondientes de comprobación de compás. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @funindex \fermataMarkup -@funindex fermataMarkup @funindex \compressMMRests -@funindex compressMMRests @predefined @code{\textLengthOn}, @@ -1095,7 +1065,6 @@ silencios. @cindex medida @funindex \time -@funindex time La indicación de compás se establece como sigue: @@ -1131,9 +1100,7 @@ predeterminado, véase @ref{Visibilidad de los objetos}. @cindex metro, estilo de @funindex \numericTimeSignature -@funindex numericTimeSignature @funindex \defaultTimeSignature -@funindex defaultTimeSignature El símbolo de compás que se usa en 2/2 y 4/4 se puede cambiar a un estilo numérico: @@ -1349,7 +1316,6 @@ Referencia de funcionamiento interno: @cindex metrónomo, indicación de, con texto @funindex \tempo -@funindex tempo Es muy sencillo escribir una indicación metronómica básica: @@ -1415,9 +1381,7 @@ entrada: @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff En una particella de un instrumento con períodos de silencio largos, en ocasiones se suceden muy cerca distintas indicaciones @@ -1486,7 +1450,6 @@ Referencia de funcionamiento interno:: @funindex measurePosition @funindex \partial -@funindex partial Los compases parciales como las @emph{anacrusas} o partes @emph{al alzar} se escriben usando la instrucción @code{\partial}: @@ -1585,9 +1548,7 @@ Referencia de funcionamiento interno: @cindex barras, música sin metro @funindex \cadenzaOn -@funindex cadenzaOn @funindex \cadenzaOff -@funindex cadenzaOff En la música medida se insertan líneas divisorias y se calculan los números de compás automáticamente. En música sin metro (es @@ -1719,9 +1680,7 @@ de música sin medir para permitir los saltos: @funindex timeSignatureFraction @funindex \scaleDurations -@funindex scaleDurations @funindex \tuplet -@funindex tuplet Está contemplada la notación polimétrica, ya sea explícitamente o mediante la modificación manual de la indicación visible del @@ -2021,9 +1980,7 @@ tiene una sola línea: @funindex Pitch_squash_engraver @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff Las tablas de acordes de guitarra ofrecen a menudo los ritmos de rasgueado. Esto se puede hacer con el grabador @@ -2092,9 +2049,7 @@ automáticamente: @cindex barras, reglas personalizadas @funindex \autoBeamOn -@funindex autoBeamOn @funindex \autoBeamOff -@funindex autoBeamOff @lilypond[quote,verbatim] \relative c'' { @@ -2196,14 +2151,11 @@ se ha completado no tendrá efecto hasta que inicie la @funindex autoBeaming @funindex baseMoment -@funindex beamExceptions @funindex \beamExceptions @funindex beatStructure @funindex measureLength @funindex \time -@funindex time @funindex \set -@funindex set Cuando está habilitado el barrado automático, la colocación de las barras automáticas viene determinada por tres propiedades de @@ -2636,7 +2588,6 @@ utilizando indicadores de dirección: @end lilypond @funindex \noBeam -@funindex noBeam Se pueden marcar notas individuales con @code{\noBeam} para evitar que resulten unidas por una barra: @@ -2720,7 +2671,6 @@ Referencia de funcionamiento interno: @cindex progresivas, barras @funindex \featherDurations -@funindex featherDurations @funindex grow-direction Las barras progresivas se usan para indicar que un pequeño grupo @@ -2808,7 +2758,6 @@ fracción son pequeños. @cindex repetición, barras de @funindex \bar -@funindex bar Las líneas divisorias delimitan a los compases pero también se pueden usar para indicar las repeticiones. Normalmente, las @@ -3030,7 +2979,6 @@ una línea de repetición adecuada si se utiliza con una instrucción @code{\repeat volta}, véase @ref{Repeticiones normales}. @funindex \defineBarLine -@funindex defineBarLine @cindex compás, definir líneas de @cindex definir líneas de compás @@ -3153,7 +3101,6 @@ pentagramas de un @code{StaffGroup}, @code{PianoStaff} o @funindex whichBar @funindex defaultBarType @funindex \bar -@funindex bar @funindex bartype La instrucción @samp{\bar @var{tipo de barra}} es una forma corta @@ -3367,7 +3314,6 @@ en vez de comprobar el final de un compás. @end lilypond @funindex \barNumberCheck -@funindex barNumberCheck Al copiar piezas musicales grandes puede servir de ayuda comprobar que el número de compás de LilyPond corresponde al original desde @@ -3395,7 +3341,6 @@ Fragmentos de código: @cindex letras de ensayo @funindex \mark -@funindex mark Para imprimir una letra de ensayo, utilice la orden @code{\mark}. @@ -3520,7 +3465,6 @@ elemento @code{\markup} a la cadena. @cindex glifos musicales @funindex \musicglyph -@funindex musicglyph Los glifos musicales (como el segno) se pueden imprimir dentro de un elemento @code{\mark} @@ -3636,7 +3580,6 @@ adorno por cada corchea de adorno: @cindex adorno, seguimiento de notas de @funindex \afterGrace -@funindex afterGrace Si queremos terminar una nota con un adorno, usamos la instrucción @code{\afterGrace}. Toma dos argumentos: la nota principal, y las diff --git a/Documentation/es/notation/simultaneous.itely b/Documentation/es/notation/simultaneous.itely index 3528e6419e..e220a56e45 100644 --- a/Documentation/es/notation/simultaneous.itely +++ b/Documentation/es/notation/simultaneous.itely @@ -367,7 +367,6 @@ otros efectos no deseados (consulte también @cindex racimo (cluster) @funindex \makeClusters -@funindex makeClusters Un «cluster» o racimo indica que se deben tocar simultáneamente un conjunto de notas consecutivas. Se escriben aplicando la función @@ -433,11 +432,9 @@ pentagramas. @cindex letra asignada a una voz @funindex \voiceOne -@funindex voiceOne @funindex \voiceOne ... \voiceFour @funindex Voice @funindex \oneVoice -@funindex oneVoice @subsubsubheading Instanciar las voces explícitamente @@ -704,21 +701,13 @@ Fragmentos de código: @cindex desplazamiento, silencio automático de @cindex desplazamiento de silencios, automático @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn @funindex \shiftOff -@funindex shiftOff @funindex \mergeDifferentlyDottedOn -@funindex mergeDifferentlyDottedOn @funindex \mergeDifferentlyDottedOff -@funindex mergeDifferentlyDottedOff @funindex \mergeDifferentlyHeadedOn -@funindex mergeDifferentlyHeadedOn @funindex \mergeDifferentlyHeadedOff -@funindex mergeDifferentlyHeadedOff Las cabezas de notas que están en diferentes voces y tienen la misma altura, la misma forma de cabeza, y dirección opuesta de la @@ -954,7 +943,6 @@ tienen también distinto puntillo, no están claros. @cindex a due, partes @cindex solo, partes @funindex \partcombine -@funindex partcombine La combinación automática de particellas se usa para mezclar dos partes musicales distintas sobre un pentagrama. Esto puede ser de @@ -1065,17 +1053,11 @@ Una sección @code{\relative} que se encuentra fuera de @code{@var{expresión_musical_2}}. @funindex \partcombineChords -@funindex partcombineChords @funindex \partcombineApart -@funindex partcombineApart @funindex \partcombineUnisono -@funindex partcombineUnisono @funindex \partcombineSoloI -@funindex partcombineSoloI @funindex \partcombineSoloII -@funindex partcombineSoloII @funindex \partcombineAutomatic -@funindex partcombineAutomatic En las partituras profesionales, las voces con frecuencia se mantienen separadas entre sí durante pasajes prolongados incluso @@ -1226,7 +1208,6 @@ utilizar barrado automático. @cindex música intercalada @cindex paralelo, música en @funindex \parallelMusic -@funindex parallelMusic La música para varias partes se puede intercalar dentro del código de entrada. La función @code{\parallelMusic} admite una lista que diff --git a/Documentation/es/notation/staff.itely b/Documentation/es/notation/staff.itely index 9cfc2be7e2..cf585bc585 100644 --- a/Documentation/es/notation/staff.itely +++ b/Documentation/es/notation/staff.itely @@ -61,7 +61,6 @@ pentagramas y grupos de ellos. @cindex tablatura, pauta de @funindex \drummode -@funindex drummode @funindex DrumStaff @funindex RhythmicStaff @funindex TabStaff @@ -424,9 +423,7 @@ terminar los pentagramas, y establecer secciones de ossia. @cindex líneas adicionales @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff Se pueden usar las instrucciones @code{\stopStaff} y @code{\startStaff} para detener y (re)iniciar, respectivamente, la @@ -609,9 +606,7 @@ Referencia de funcionamiento interno: @cindex escalado de pentagramas @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff Los pentagramas @notation{Ossia} se pueden preparar mediante la creación de un pentagrama simultáneo nuevo en la posición @@ -769,7 +764,6 @@ Referencia de funcionamiento interno: @funindex \RemoveAllEmptyStaves @funindex Staff_symbol_engraver @funindex \stopStaff -@funindex stopStaff Se pueden ocultar las líneas del pentagrama quitando el grabador @code{Staff_symbol_engraver} del contexto de @code{Staff}. Como @@ -1067,11 +1061,8 @@ Referencia de funcionamiento interno: @cindex notas guía @funindex \addQuote -@funindex addQuote @funindex \quoteDuring -@funindex quoteDuring @funindex \transposition -@funindex transposition Es muy frecuente que una voz use las mismas notas que otra voz. Por ejemplo, los violines primero y segundo tocando la misma frase @@ -1275,13 +1266,9 @@ otros puede dar como resultado una notación de pobre calidad. @funindex \cueDuring -@funindex cueDuring @funindex \cueClef -@funindex cueClef @funindex \cueDuringWithClef -@funindex cueDuringWithClef @funindex \quoteDuring -@funindex quoteDuring @cindex notas pequeñas @cindex pequeñas, notas @@ -1474,7 +1461,6 @@ bassoonNotes = \relative c { @end lilypond @funindex \transposedCueDuring -@funindex transposedCueDuring Como @code{\quoteDuring}, @code{\cueDuring} tiene en cuenta las transposiciones instrumentales. Las notas guía se producen en las @@ -1517,7 +1503,6 @@ bassClarinetNotes = \relative c' { @cindex cue notes, removing @funindex \killCues -@funindex killCues La instrucción @code{\killCues} elimina las notas guía de una expresión musical, de forma que la misma expresión musical pueda diff --git a/Documentation/es/notation/text.itely b/Documentation/es/notation/text.itely index aae020d905..20b95b4cb0 100644 --- a/Documentation/es/notation/text.itely +++ b/Documentation/es/notation/text.itely @@ -104,9 +104,7 @@ inscripciones de texto y las articulaciones, consulte @rlearning{Colocación de los objetos}. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @predefined @code{\textLengthOn}, @@ -190,11 +188,8 @@ definir como una propiedad de objeto. Esta sintaxis se describe en @ref{Estilos de línea}. @funindex \textSpannerUp -@funindex textSpannerUp @funindex \textSpannerDown -@funindex textSpannerDown @funindex \textSpannerNeutral -@funindex textSpannerNeutral @predefined @@ -241,9 +236,7 @@ Referencia de funcionamiento interno: @cindex líneas divisorias, símbolos sobre las @funindex \mark -@funindex mark @funindex \markup -@funindex markup Se pueden añadir a la partitura varios elementos de texto con la sintaxis que se describe en @ref{Llamadas de ensayo}: @@ -308,9 +301,7 @@ siguiente. @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff @predefined @code{\markLengthOn}, @@ -353,7 +344,6 @@ Referencia de funcionamiento interno: @cindex texto independiente @funindex \markup -@funindex markup Un bloque @code{\markup} puede existir de forma independiente, fuera de cualquier bloque @code{\score}, como una @qq{expresión de @@ -392,9 +382,7 @@ requiere se describen en @funindex \markup -@funindex markup @funindex \markuplist -@funindex markuplist @predefined @code{\markup}, @@ -446,7 +434,6 @@ usando la sintaxis específica del modo de @code{\markup}. @cindex tipografiar texto @funindex \markup -@funindex markup Se usa un bloque @code{\markup} para tipografiar texto con una sintaxis ampliable que se denomina @qq{modo de marcado}. @@ -558,11 +545,8 @@ confusión. @cindex cambio de la fuente tipográfica @funindex \italic -@funindex italic @funindex \bold -@funindex bold @funindex \underline -@funindex underline Está contemplado de forma básica el cambio de la fuente tipográfica en el modo de marcado: @@ -584,13 +568,9 @@ tipográfica en el modo de marcado: @funindex \abs-fontsize @funindex \fontsize -@funindex fontsize @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @funindex \magnify -@funindex magnify El tamaño de la fuente tipográfica se puede alterar en relación al tamaño global del pentagrama, de una serie de formas como se ve a @@ -651,11 +631,8 @@ el tamaño de los otros caracteres. @cindex superíndice @funindex \super -@funindex super @funindex \sub -@funindex sub @funindex \normal-size-super -@funindex normal-size-super El texto se puede imprimir como subíndice o como superíndice. De forma predeterminada se imprimen en un tamaño menor, pero también @@ -727,21 +704,13 @@ También es posible definir conjuntos personalizados de fuentes, tal y como se explica en @ref{Tipografías}. @funindex \teeny -@funindex teeny @funindex \tiny -@funindex tiny @funindex \small -@funindex small @funindex \normalsize -@funindex normalsize @funindex \large -@funindex large @funindex \huge -@funindex huge @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @predefined @@ -801,11 +770,8 @@ todo, usando la sintaxis que se describe en @cindex horizontal, alineación de texto @funindex \left-align -@funindex left-align @funindex \center-align -@funindex center-align @funindex \right-align -@funindex right-align Los objetos de marcado se pueden alinear de distintas maneras. De forma predeterminada, una indicación de texto se alinea sobre el @@ -825,7 +791,6 @@ entre los marcados primero y segundo. @end lilypond @funindex \halign -@funindex halign Se puede realizar un ajuste fino de la alineación horizontal usando un valor numérico: @@ -852,11 +817,8 @@ todo, como se muestra por ejemplo en @ref{Indicaciones de texto}. @cindex vertical, alineación de texto @funindex \raise -@funindex raise @funindex \lower -@funindex lower @funindex \null -@funindex null La alineación vertical es un poco más compleja. Como se ha dicho más arriba, los objetos de marcado se pueden mover como un todo; @@ -887,11 +849,8 @@ ejemplo no tiene punto de anclaje y por ello no resulta movido. @end lilypond @funindex \general-align -@funindex general-align @funindex \translate -@funindex translate @funindex \translate-scaled -@funindex translate-scaled Algunas instrucciones pueden afectar tanto a la alineación horizontal como a la vertical de los objetos de texto en el modo @@ -926,9 +885,7 @@ deben preceder de un punto de anclaje: @cindex columnas, texto @funindex \column -@funindex column @funindex \center-column -@funindex center-column Un objeto de marcado puede incluir varias líneas de texto. En el ejemplo siguiente, cada elemento o expresión se sitúa en su propia @@ -955,7 +912,6 @@ línea, ya sea alineada por la izquierda o centrada: @cindex marcado, centrar en la página @funindex \fill-line -@funindex fill-line De forma similar, una lista de elementos o expresiones se puede repartir de forma que rellene por completo el ancho de la línea @@ -989,9 +945,7 @@ cualquier otra expresión de marcado: @cindex ajuste de línea, texto con @funindex \wordwrap -@funindex wordwrap @funindex \justify -@funindex justify Las indicaciones de texto largas se pueden también ajustar @@ -1071,15 +1025,10 @@ utilizando instrucciones de marcado. @cindex decorar texto @funindex \box -@funindex box @funindex \circle -@funindex circle @funindex \rounded-box -@funindex rounded-box @funindex \bracket -@funindex bracket @funindex \hbracket -@funindex hbracket Ciertas instrucciones de marcado permiten la decoración de elementos de texto con gráficos, como se muestra en el ejemplo @@ -1107,13 +1056,9 @@ siguiente. @cindex marcado, relleno de textos de @funindex \pad-markup -@funindex pad-markup @funindex \pad-x -@funindex pad-x @funindex \pad-to-box -@funindex pad-to-box @funindex \pad-around -@funindex pad-around Algunas instrucciones pueden requerir un aumento del relleno alrededor del texto: esto se puede conseguir con algunas @@ -1147,17 +1092,11 @@ Flute quartet keeps very uneven time." @cindex notación gráfica @funindex \combine -@funindex combine @funindex \draw-circle -@funindex draw-circle @funindex \filled-box -@funindex filled-box @funindex \triangle -@funindex triangle @funindex \draw-line -@funindex draw-line @funindex \arrow-head -@funindex arrow-head Se pueden imprimir otros símbolos o elementos gráficos sin que se requiera ningún otro texto. De igual manera que en el caso de las @@ -1185,9 +1124,7 @@ expresiones de marcado, dichos objetos se pueden combinar: @cindex PostScript @funindex \epsfile -@funindex epsfile @funindex \postscript -@funindex postscript Entre las funcionalidades gráficas avanzadas se encuentran la posibilidad de incluir archivos de imagen externos convertidos al @@ -1388,11 +1325,8 @@ Referencia de funcionamiento interno: @cindex texto que ocupa varias páginas @funindex \markuplist -@funindex markuplist @funindex \justified-lines -@funindex justified-lines @funindex \wordwrap-lines -@funindex wordwrap-lines Aunque los objetos de marcado estándar no se pueden dividir, una sintaxis específica hace posible la introducción de líneas de @@ -1443,7 +1377,6 @@ Referencia de funcionamiento interno: @rinternals{TextScript}. @funindex \markuplist -@funindex markuplist @predefined @code{\markuplist}. diff --git a/Documentation/es/notation/wind.itely b/Documentation/es/notation/wind.itely index 35882c89d3..5d254e2c53 100644 --- a/Documentation/es/notation/wind.itely +++ b/Documentation/es/notation/wind.itely @@ -175,11 +175,8 @@ Esta sección trata de la notación común para gaita. @cindex notas de adorno @funindex \taor -@funindex taor @funindex \hideKeySignature -@funindex hideKeySignature @funindex \showKeySignature -@funindex showKeySignature LilyPond contiene definiciones especiales para la música de gaita escocesa de las tierras altas; para usarlas, escriba diff --git a/Documentation/fr/learning/common-notation.itely b/Documentation/fr/learning/common-notation.itely index 909ec9b7ab..2af2db7f6d 100644 --- a/Documentation/fr/learning/common-notation.itely +++ b/Documentation/fr/learning/common-notation.itely @@ -202,11 +202,8 @@ autres langues disponibles, consultez @cindex mineur @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Glossaire musicologique : @rglosnamed{key signature,armure}, @rglosnamed{major,majeur}, @@ -502,11 +499,8 @@ l'articulation. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Glossaire musicologique : @rglosnamed{dynamics,nuances}, @@ -552,7 +546,6 @@ Manuel de notation : @cindex étiquette @funindex \markup -@funindex markup On peut ajouter du texte à une partition : @@ -588,9 +581,7 @@ Manuel de notation : @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Glossaire musicologique : @rglosnamed{beam,ligature}. @@ -650,7 +641,6 @@ Manuel de notation : @cindex mesure incomplète @funindex \partial -@funindex partial Glossaire musicologique : @rglosnamed{anacrusis,anacrouse}. @@ -674,7 +664,6 @@ noire et @code{\partial 8} d'une croche. @cindex triolets @funindex \tuplet -@funindex tuplet Glossaire musicologique : @rglosnamed{note value,valeur d'une note}, @rglosnamed{triplet,triolet}. @@ -706,9 +695,7 @@ que deux ; un @notation{triolet} portera donc une fraction de 3/2. @cindex acciaccature @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -906,10 +893,8 @@ produite sur une unique portée. @cindex notation, contexte @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -1119,7 +1104,6 @@ Cette section présente l'écriture vocale et les partitions de variété. @cindex chansons @funindex \addlyrics -@funindex addlyrics Glossaire musicologique : @rglos{lyrics}. @@ -1495,7 +1479,6 @@ ci-dessus. @cindex bloc d'en-tête @funindex \header -@funindex header On indique les informations bibliographiques -- nom du morceau, du compositeur, numéro d'opus@dots{} -- dans un bloc à part, le bloc diff --git a/Documentation/fr/learning/fundamental.itely b/Documentation/fr/learning/fundamental.itely index 8bcdb3bca7..f0fa46ee77 100644 --- a/Documentation/fr/learning/fundamental.itely +++ b/Documentation/fr/learning/fundamental.itely @@ -76,9 +76,7 @@ Il existe de nombreuses variantes à ce schéma simpliste, mais cet exemple est un préambule à notre propos. @funindex \book -@funindex book @funindex \score -@funindex score @cindex book, livre, ouvrage @cindex livre @@ -167,11 +165,8 @@ d'autres informations : @end example @funindex \header -@funindex header @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex header @cindex en-tête @@ -204,7 +199,6 @@ particulièrement dans le manuel de notation, aux chapitres @cindex implicite, bloc book @funindex \book -@funindex book Vous pouvez tout à fait mentionner plusieurs blocs @code{\score}. Ils seront traités comme autant de partitions indépendantes qui seront @@ -276,7 +270,6 @@ Pour une description complète du format des fichiers d'entrée, voir @translationof Score is a (single) compound musical expression @funindex \score -@funindex score @cindex partition @cindex bloc score, contenu @@ -968,15 +961,10 @@ Manuel de notation : @translationof Explicitly instantiating voices @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex Voice, création de contextes @@ -1170,13 +1158,9 @@ voix. @cindex décalage, commandes @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Les notes rapprochées d'un accord, ou des notes de différentes voix qui tombent ensemble, seront rangées sur deux colonnes, voire plus, pour @@ -1227,7 +1211,6 @@ deux expressions différentes -- des notes et des paroles. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics, création d'un contexte @@ -1265,7 +1248,6 @@ et @code{Voice}. @cindex ligatures et paroles @funindex \autoBeamOff -@funindex autoBeamOff Si la ligature automatique que LilyPond applique par défaut est pleinement adaptée en matière de musique instrumentale, il n'en va pas @@ -1278,7 +1260,6 @@ afin de désactiver les ligatures automatiques. @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex structure d'une partition vocale @cindex chœur, partie de @@ -1492,7 +1473,6 @@ Manuel de notation : @translationof Creating contexts @funindex \new -@funindex new @cindex nouveaux contextes @cindex contextes, création de @@ -1704,9 +1684,7 @@ Référence des propriétés internes : @cindex modification des propriétés d'un contexte @funindex \set -@funindex set @funindex \unset -@funindex unset Les contextes gèrent les différentes valeurs des nombreuses @emph{propriétés} qui leur sont attachées. Beaucoup d'entre elles @@ -1910,7 +1888,6 @@ commande @code{\markup} permet aussi de spécifier du texte. @translationof Setting context properties with @code{\with} @funindex \with -@funindex with @cindex propriétés d'un contexte, définition avec \with @@ -1964,7 +1941,6 @@ revenir à la nouvelle valeur par défaut. @cindex propriétés d'un contexte, définition avec \context @funindex \context -@funindex context Vous pouvez régler les valeurs des propriétés de contexte en une seule fois pour tous les contextes d'un même type, par exemple tous les @@ -2042,9 +2018,7 @@ Référence des propriétés internes : @cindex graveurs, suppression @funindex \consists -@funindex consists @funindex \remove -@funindex remove Nous avons vu que chaque contexte met en œuvre plusieurs graveurs, et que chacun de ces graveurs est chargé de générer une composante @@ -2145,7 +2119,6 @@ les notes de toutes les voix de la portée : @translationof Changing all contexts of the same type @funindex \layout -@funindex layout Les exemples ci-dessus nous ont montré comment ajouter ou retirer des graveurs à des contextes individuels. Nous pourrions aussi ajouter ou diff --git a/Documentation/fr/learning/tutorial.itely b/Documentation/fr/learning/tutorial.itely index 59383ebb9c..b2092eeb7a 100644 --- a/Documentation/fr/learning/tutorial.itely +++ b/Documentation/fr/learning/tutorial.itely @@ -240,7 +240,6 @@ explicitement. @cindex mode relatif et altérations @funindex \relative -@funindex relative @funindex ' @funindex , @@ -430,7 +429,6 @@ lettre @code{r} (pour @emph{rest}). @cindex chiffre de mesure @funindex \time -@funindex time Glossaire musicologique : @rglosnamed{time signature,métrique}. @@ -459,7 +457,6 @@ peut être définie à l'aide de la commande @code{\time} : @cindex indication métronomique @funindex \tempo -@funindex tempo Glossaire musicologique : @rglosnamed{tempo indication,indication de tempo}, @@ -494,7 +491,6 @@ que le métronome : @cindex fa, clef de @funindex \clef -@funindex clef Glossaire musicologique : @rglos{clef}. diff --git a/Documentation/fr/learning/tweaks.itely b/Documentation/fr/learning/tweaks.itely index 51cb7cad7f..7aeef62f09 100644 --- a/Documentation/fr/learning/tweaks.itely +++ b/Documentation/fr/learning/tweaks.itely @@ -230,7 +230,6 @@ Manuel de notation : @cindex override, syntaxe @funindex \override -@funindex override Dans @ref{Modification des propriétés d'un contexte} et dans @ref{Ajout et suppression de graveurs}, nous avons déjà rencontré les @@ -307,7 +306,6 @@ ci-dessous change la couleur des têtes de notes : @cindex revert, commande @funindex \revert -@funindex revert Une fois qu'elle a été modifiée, la propriété conserve sa nouvelle valeur jusqu'à ce qu'elle soit à nouveau modifiée ou qu'elle rencontre @@ -347,7 +345,6 @@ des deux dernières notes à leur valeur par défaut : @translationof The once prefix @funindex \once -@funindex once Les commandes @code{\override}, @code{\revert}, @code{\set} et @code{\unset} peuvent supporter le préfixe @code{\once}. Celui-ci a @@ -398,7 +395,6 @@ musical : @cindex overrideProperty, commande @funindex \overrideProperty -@funindex overrideProperty Il existe une autre forme de commande @code{\override}, @code{\overrideProperty}, qui est parfois utile. Nous la mentionnons @@ -415,7 +411,6 @@ ici par souci d'exhaustivité ; pour le détail, voir @cindex tweak, commande @funindex \tweak -@funindex tweak La dernière commande disponible pour les retouches est @code{\tweak}. Elle sert à changer les propriétés d'objets qui @@ -584,7 +579,6 @@ Manuel de notation : @translationof The single prefix @funindex \single -@funindex single @cindex tweak généré par override @@ -836,7 +830,6 @@ en train de saisir des notes, on peut ici ne pas le mentionner. @cindex usage unique, dérogation à @funindex \once -@funindex once Dans le dernier exemple ci-dessus, @emph{toutes} les liaisons étaient plus épaisses. Et si on veut épaissir uniquement la première liaison ? @@ -887,7 +880,6 @@ La commande @code{\once} peut aussi être utilisée devant la commande @cindex défaut, retour aux propriétés par @funindex \revert -@funindex revert Et si l'on voulait que les deux premières liaisons soient plus épaisses ? On pourrait bien sûr utiliser deux commandes, chacune @@ -1261,7 +1253,6 @@ LilyPond dispose d'un raccourci -- @code{\omit} (pour « oublier ») -- à cet effet : @funindex \omit -@funindex omit @lilypond[quote,ragged-right,verbatim] \relative { @@ -2360,9 +2351,7 @@ d'entre eux. @cindex indication d'octaviation @funindex \startTextSpan -@funindex startTextSpan @funindex \stopTextSpan -@funindex stopTextSpan @cindex TextSpanner, exemple de dérogation @cindex bound-details, exemple d'utilisation de la propriété @@ -2515,9 +2504,7 @@ commande @code{textLengthOn}. @cindex notes, répartition selon le texte @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff Par défaut, l'espacement horizontal d'un texte produit sous forme de @emph{markup} (ou d'étiquette) n'est pas pris en compte, dans la mesure @@ -3056,13 +3043,9 @@ les liaisons et les notes de différentes voix. @cindex collisions de notes @cindex shift, commandes @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Au sein d'une même voix, toutes les notes intervenant au même instant musical sont regroupées dans un empilement (une colonne) et est créé un diff --git a/Documentation/fr/notation/ancient.itely b/Documentation/fr/notation/ancient.itely index 1c211ce791..1c10423a94 100644 --- a/Documentation/fr/notation/ancient.itely +++ b/Documentation/fr/notation/ancient.itely @@ -2723,7 +2723,6 @@ une édition en notation moderne à partir d'une même source. @cindex ajout d'incipit @funindex \incipit -@funindex incipit Il est d'usage, lorsque l'on transcrit de la musique ancienne en notation moderne, d'indiquer aussi comment apparaissaient les silences diff --git a/Documentation/fr/notation/changing-defaults.itely b/Documentation/fr/notation/changing-defaults.itely index 06727c69be..ac70a01175 100644 --- a/Documentation/fr/notation/changing-defaults.itely +++ b/Documentation/fr/notation/changing-defaults.itely @@ -1193,17 +1193,11 @@ Manuel de notation : @cindex graveur, affectation à un contexte @funindex \alias -@funindex alias @funindex \name -@funindex name @funindex \type -@funindex type @funindex \consists -@funindex consists @funindex \accepts -@funindex accepts @funindex \denies -@funindex denies Les contextes tels que @code{Staff} ou @code{Voice} sont faits de briques de construction empilées. En combinant divers graveurs, diff --git a/Documentation/fr/notation/editorial.itely b/Documentation/fr/notation/editorial.itely index 06a00b4d50..61d33e7a8e 100644 --- a/Documentation/fr/notation/editorial.itely +++ b/Documentation/fr/notation/editorial.itely @@ -349,7 +349,6 @@ et @code{\revert} : @cindex substitution de doigt @funindex \finger -@funindex finger Les doigtés peuvent être indiqués comme suit : @var{note}-@var{chiffre_du_doigt} @@ -370,7 +369,6 @@ textuelle (commande @code{\markup}) de doigté (commande @code{\finger}). @cindex pouce, doigté @funindex \thumb -@funindex thumb La commande @code{\thumb} peut être utilisée pour indiquer, par exemple dans une partition de violoncelle, si une note doit être jouée avec le @@ -432,9 +430,7 @@ Référence des propriétés internes : @cindex note masquée @funindex \hideNotes -@funindex hideNotes @funindex \unHideNotes -@funindex unHideNotes Les notes masquées -- ou invisibles ou encore transparentes -- sont utiles dans le cadre d'exercices de théorie ou de composition. @@ -504,7 +500,6 @@ Référence des propriétés internes : @funindex color @funindex \with-color -@funindex with-color @funindex x11-color Des objets peuvent être colorisés individuellement. Une listes des @@ -621,7 +616,6 @@ Pour plus de détails, consultez @ref{La commande d'affinage (tweak)}. @cindex crochets, notes entre @funindex \parenthesize -@funindex parenthesize Des objets peuvent être mis entre parenthèses en saisissant @code{\parenthesize} juste avant l'événement musical. Si l'instruction @@ -677,11 +671,8 @@ attendrait une seule paire de parenthèses encadrant tout l'accord. @cindex hampe neutre @funindex \stemUp -@funindex stemUp @funindex \stemDown -@funindex stemDown @funindex \stemNeutral -@funindex stemNeutral Dès qu'une note est rencontrée, un objet @code{Stem} se crée automatiquement. Pour les rondes et les silences, ils sont aussi @@ -745,9 +736,7 @@ la portée par des éléments qui lui seront externes. @funindex balloonGrobText @funindex balloonText @funindex \balloonLengthOn -@funindex balloonLengthOn @funindex \balloonLengthOff -@funindex balloonLengthOff Vous pouvez marquer et nommer des éléments de notation à l'aide de bulles. L'objectif premier de cette fonctionnalité est d'expliquer la @@ -888,9 +877,7 @@ Référence des propriétés internes : @funindex Horizontal_bracket_engraver @funindex \startGroup -@funindex startGroup @funindex \stopGroup -@funindex stopGroup On utilise des crochets en analyse musicale, pour indiquer la structure d'une pièce. diff --git a/Documentation/fr/notation/expressive.itely b/Documentation/fr/notation/expressive.itely index a11c2e1eaf..55fa64c51b 100644 --- a/Documentation/fr/notation/expressive.itely +++ b/Documentation/fr/notation/expressive.itely @@ -235,43 +235,24 @@ Référence des propriétés internes : @cindex nuances @funindex \ppppp -@funindex ppppp @funindex \pppp -@funindex pppp @funindex \ppp -@funindex ppp @funindex \pp -@funindex pp @funindex \p -@funindex p @funindex \mp -@funindex mp @funindex \mf -@funindex mf @funindex \f -@funindex f @funindex \ff -@funindex ff @funindex \fff -@funindex fff @funindex \ffff -@funindex ffff @funindex \fffff -@funindex fffff @funindex \fp -@funindex fp @funindex \sf -@funindex sf @funindex \sff -@funindex sff @funindex \sp -@funindex sp @funindex \spp -@funindex spp @funindex \sfz -@funindex sfz @funindex \rfz -@funindex rfz À chaque nuance absolue correspond une commande qui peut être indiquée après une note : @code{c4\ff} par exemple. Les commandes de nuance @@ -299,9 +280,7 @@ d'information, consultez @ref{Direction et positionnement}. @funindex \> @funindex \! @funindex \cr -@funindex cr @funindex \decr -@funindex decr Un crescendo est délimité par @code{\<} et @code{\!}, ou peut se terminer par une commande de nuance explicite, ou bien un decrescendo ou @@ -362,7 +341,6 @@ faudra avoir recours à des silences invisibles : @cindex espressivo @funindex \espressivo -@funindex espressivo On peut avoir recours à l'indication @code{\espressivo} pour indiquer un crescendo suivi d'un decrescendo sur une même note. Gardez à l'esprit @@ -376,11 +354,8 @@ qu'il s'agit d'une articulation, et en aucun cas d'une nuance. @end lilypond @funindex \cresc -@funindex cresc @funindex \decresc -@funindex decresc @funindex \dim -@funindex dim La commande @code{\cresc} permet d'indiquer textuellement le début d'un crescendo. @code{\decresc} ou @code{\dim} marquent le début d'un @@ -396,17 +371,11 @@ decrescendo. Les lignes d'extension sont gérées automatiquement. @end lilypond @funindex \crescTextCresc -@funindex crescTextCresc @funindex \dimTextDecresc -@funindex dimTextDecresc @funindex \dimTextDecr -@funindex dimTextDecr @funindex \dimTextDim -@funindex dimTextDim @funindex \crescHairpin -@funindex crescHairpin @funindex \dimHairpin -@funindex dimHairpin Une indication textuelle peut indiquer, au lieu d'un soufflet, un changement de nuance : @@ -440,11 +409,8 @@ Le positionnement vertical des nuances est géré par le @rinternals{DynamicLineSpanner}. @funindex \dynamicUp -@funindex dynamicUp @funindex \dynamicDown -@funindex dynamicDown @funindex \dynamicNeutral -@funindex dynamicNeutral L'utilisation d'un contexte @code{Dynamics} permet de graver les nuances sur leur propre ligne -- Il suffit de placer des silences invisibles @@ -565,9 +531,7 @@ moltoF = \markup { molto \dynamic f } @cindex nuances suggérées @funindex \bracket -@funindex bracket @funindex \dynamic -@funindex dynamic Vous pouvez créer des indications de nuance éditoriales (entre parenthèses ou crochets) grâce aux étiquettes (@emph{mode markup}) ; la @@ -721,9 +685,7 @@ terminer dans la voix où elle a été entamée.} @cindex liaison, au-dessus des notes @funindex \slurDown -@funindex slurDown @funindex \slurNeutral -@funindex slurNeutral @funindex \= Vous pouvez décider de l'orientation des liaisons par rapport à la @@ -759,11 +721,8 @@ contexte @code{Voice}, leurs début et fin doivent être labellisés par un @cindex style de trait, liaison @funindex \slurDashed -@funindex slurDashed @funindex \slurDotted -@funindex slurDotted @funindex \slurSolid -@funindex slurSolid Une liaison est par défaut dessinée d'un trait plein. Il est aussi possible de l'imprimer sous la forme de tirets ou en pointillé : @@ -781,9 +740,7 @@ possible de l'imprimer sous la forme de tirets ou en pointillé : @end lilypond @funindex \slurHalfDashed -@funindex slurHalfDashed @funindex \slurHalfSolid -@funindex slurHalfSolid @cindex liaison, tirets et trait continu @@ -804,7 +761,6 @@ s'obtient avec @code{\slurHalfSolid}. @end lilypond @funindex \slurDashPattern -@funindex slurDashPattern @cindex liaison, densité des tirets @@ -824,7 +780,6 @@ liaison : @end lilypond @funindex \slurUp -@funindex slurUp @predefined @code{\slurUp}, @@ -889,11 +844,8 @@ et @code{\)} respectivement. @end lilypond @funindex \phrasingSlurUp -@funindex phrasingSlurUp @funindex \phrasingSlurDown -@funindex phrasingSlurDown @funindex \phrasingSlurNeutral -@funindex phrasingSlurNeutral D'un point de vue typographique, rien ne distingue une liaison de phrasé d'une liaison d'articulation. Cependant, LilyPond les considère comme @@ -920,12 +872,9 @@ qu'elles sont labellisées, comme des liaisons normales -- voir @cindex tiret, trait de liaison @cindex style de trait, liaison -@funindex phrasingSlurDashed @funindex \phrasingSlurDashed @funindex \phrasingSlurDotted -@funindex phrasingSlurDotted @funindex \phrasingSlurSolid -@funindex phrasingSlurSolid Une liaison est par défaut dessinée d'un trait plein. Il est aussi possible de l'imprimer sous la forme de tirets ou en pointillé : @@ -944,10 +893,8 @@ possible de l'imprimer sous la forme de tirets ou en pointillé : @cindex liaison, tirets et trait continu -@funindex phrasingSlurHalfDashed @funindex \phrasingSlurHalfDashed @funindex \phrasingSlurHalfSolid -@funindex phrasingSlurHalfSolid En utilisant @code{\phrasingslurHalfDashed}, la première moitié de la liaison aura un trait discontinu et continu pour la seconde. L'inverse @@ -966,7 +913,6 @@ s'obtient avec @code{\phrasingslurHalfSolid}. @end lilypond @funindex \phrasingSlurDashPattern -@funindex phrasingSlurDashPattern @cindex liaison, densité des tirets @@ -1024,7 +970,6 @@ Référence des propriétés internes : @cindex point d'arrêt @funindex \breathe -@funindex breathe Les indications de respiration sont indiquées par la commande @code{\breathe}. @@ -1091,7 +1036,6 @@ Référence des propriétés internes : @cindex sauts @funindex \bendAfter -@funindex bendAfter Des indications de désinence peuvent être obtenues au moyen de la commande @code{\bendAfter}. Leur direction s'indique au moyen des @@ -1146,7 +1090,6 @@ d'aspect linéaire, tels les glissandos, arpèges et trilles. @cindex glissando @funindex \glissando -@funindex glissando Un glissando relie une hauteur à une autre en passant par chaque hauteur intermédiaire. On l'obtient en accolant la commande @code{\glissando} à @@ -1245,13 +1188,9 @@ le long de la ligne de glissando. @cindex accord arpégé @funindex \arpeggio -@funindex arpeggio @funindex \arpeggioArrowUp -@funindex arpeggioArrowUp @funindex \arpeggioArrowDown -@funindex arpeggioArrowDown @funindex \arpeggioNormal -@funindex arpeggioNormal On peut indiquer qu'un accord doit être arpégé en lui accolant la commande @code{\arpeggio} : @@ -1281,11 +1220,8 @@ LilyPond dispose de différents graphismes pour indiquer un arpège ; @cindex arpège, symboles spéciaux @funindex \arpeggioBracket -@funindex arpeggioBracket @funindex \arpeggioParenthesis -@funindex arpeggioParenthesis @funindex \arpeggioParenthesisDashed -@funindex arpeggioParenthesisDashed Des crochets indiquent que l'accord devra être plaqué et non arpégé : @@ -1372,11 +1308,8 @@ n'est pas opérationnelle pour des arpèges inter-portées ; voir @cindex trilles @funindex \trill -@funindex trill @funindex \startTrillSpan -@funindex startTrillSpan @funindex \stopTrillSpan -@funindex stopTrillSpan Les trilles brefs s'indiquent comme n'importe quelle ponctuation, avec un simple @code{\trill} ; voir @ref{Articulations et ornements}. @@ -1435,7 +1368,6 @@ les notes d'ornement avec précision est expliquée au chapitre @cindex trilles avec hauteur explicite @funindex \pitchedTrill -@funindex pitchedTrill Les trilles qui font intervenir une hauteur précise peuvent être indiqués par la commande @code{pitchedTrill}. Le premier argument est diff --git a/Documentation/fr/notation/fretted-strings.itely b/Documentation/fr/notation/fretted-strings.itely index efed76bf99..4ee9a4cc73 100644 --- a/Documentation/fr/notation/fretted-strings.itely +++ b/Documentation/fr/notation/fretted-strings.itely @@ -612,7 +612,6 @@ dans le fichier @file{ly/string-tunings-init.ly}. @cindex accordage personnalisé -@funindex stringTuning @funindex \stringTuning LilyPond vous permet de créer n'importe quel accordage. L'accordage du @@ -858,7 +857,6 @@ d'accord dans l'interface standard : @cindex markup et fret-diagram @cindex ukulele -@funindex fret-diagram @funindex \fret-diagram La taille du diagramme d'accord ainsi que le nombre de cases @@ -949,7 +947,6 @@ l'interface standard. @cindex fret-diagram-terse markup -@funindex fret-diagram-terse @funindex \fret-diagram-terse Dans l'interface @code{fret-diagram-terse}, les numéros de corde sont @@ -1031,7 +1028,6 @@ utilisant la commande @code{\override} dans l'interface @cindex fret-diagram-verbose markup @cindex capo -@funindex fret-diagram-verbose @funindex \fret-diagram-verbose L'interface @code{fret-diagram-verbose} est au format d'une liste @@ -1320,7 +1316,6 @@ simultanée qu'en utilisant le mode accord (voir @cindex fret, diagrammes avec noms d'accord @funindex ChordNames -@funindex chordmode @funindex \chordmode Il est courant d'afficher simultanément le nom des accords et les @@ -1458,8 +1453,6 @@ mychords = \chordmode { @cindex accord, carrures pour cordes frettées @funindex \addChordShape -@funindex addChordShape -@funindex storePredefinedDiagram @funindex \storePredefinedDiagram En plus des diagrammes d'accord, LilyPond possède une liste interne de @@ -1579,9 +1572,7 @@ correspondant aux notes seront automatiquement calculées. >> @end lilypond -@funindex predefinedFretboardsOff @funindex \predefinedFretboardsOff -@funindex predefinedFretboardsOn @funindex \predefinedFretboardsOn Dans la mesure où aucun diagramme prédéfini n'est chargé par défaut, le @@ -1714,7 +1705,6 @@ hauteurs. @cindex doigtés main droite et cordes frettées @cindex main droite, doigtés pour cordes frettées -@funindex rightHandFinger @funindex \rightHandFinger Les doigtés de main droite @var{p-i-m-a} doivent être entrés à l'aide de @@ -1893,7 +1883,6 @@ Morceaux choisis : @unnumberedsubsubsec Indication de @emph{power chord} @translationof Indicating power chords -@funindex powerChords @funindex \powerChords @cindex power chords diff --git a/Documentation/fr/notation/keyboards.itely b/Documentation/fr/notation/keyboards.itely index 5d9c39d026..609cbb6a36 100644 --- a/Documentation/fr/notation/keyboards.itely +++ b/Documentation/fr/notation/keyboards.itely @@ -176,7 +176,6 @@ Référence des propriétés internes : @cindex ligature inter-portée @funindex \change -@funindex change Il est possible de passer d'une portée à l'autre de façon manuelle, au moyen de la commande @@ -292,7 +291,6 @@ de portée, utilisez alors une ligature manuelle. @cindex Automatique, changement de portée @funindex \autochange -@funindex autochange @funindex PianoStaff Les voix peuvent passer automatiquement d'une portée à l'autre, au moyen @@ -339,7 +337,6 @@ music = { @cindex autochange et mode relatif @funindex \relative -@funindex relative Une section en mode @code{\relative} se situant en dehors de la commande @code{\autochange} n'aura pas d'effet sur les hauteurs de l'expression @@ -412,9 +409,7 @@ construction de cet accord. @funindex followVoice @funindex \showStaffSwitch -@funindex showStaffSwitch @funindex \hideStaffSwitch -@funindex hideStaffSwitch Lorsqu'une voix change de portée, il est possible d'imprimer automatiquement une ligne reliant les notes, en faisant appel à la @@ -515,17 +510,11 @@ Ce chapitre traite des aspects de la notation directement liés au piano. @cindex U.C. @funindex \sustainOn -@funindex sustainOn @funindex \sustainOff -@funindex sustainOff @funindex \sostenutoOn -@funindex sostenutoOn @funindex \sostenutoOff -@funindex sostenutoOff @funindex \unaCorda -@funindex unaCorda @funindex \treCorde -@funindex treCorde Le piano possède deux pédales, parfois trois, permettant de modifier l'émission du son : une pédale de @notation{tenue} (@emph{sustain}), une diff --git a/Documentation/fr/notation/pitches.itely b/Documentation/fr/notation/pitches.itely index 1ef13ac7ff..c2ebe3ab4b 100644 --- a/Documentation/fr/notation/pitches.itely +++ b/Documentation/fr/notation/pitches.itely @@ -94,7 +94,6 @@ chaque @code{,} baisse la note d'une octave. } @end lilypond -@funindex fixed @funindex \fixed Les indications d'octave communes peuvent ne se mentionner qu'une fois, @@ -139,7 +138,6 @@ Morceaux choisis : @cindex octave relative, indication @funindex \relative -@funindex relative Le mode d'écriture en octave absolue requiert d'indiquer l'octave de chaque note. Pour le mode d'écriture en octave relative, par contre, @@ -647,7 +645,6 @@ Cette partie traite de la manière de modifier les hauteurs de note. @funindex = @funindex \octaveCheck -@funindex octaveCheck @funindex controlpitch Les tests d'octave rendent la correction d'erreurs d'octave plus facile @@ -720,7 +717,6 @@ Référence des propriétés internes : @cindex transposition des hauteurs @funindex \transpose -@funindex transpose Une expression musicale peut être transposée avec @code{\transpose}. En voici la syntaxe : @@ -834,11 +830,8 @@ Référence des propriété internes : @rinternals{TransposedMusic}. @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @knownissues Si vous voulez utiliser en même temps @code{\transpose} et @@ -898,7 +891,6 @@ Manuel de notation : @cindex transformation rétrograde @funindex \retrograde -@funindex retrograde Une expression musicale peut se renverser et se présenter sous forme rétrograde : @@ -947,7 +939,6 @@ sera pas transformée.} @cindex modale, transposition @funindex \modalTranspose -@funindex modalTranspose Un motif peut se transposer selon une gamme donnée : @@ -1005,7 +996,6 @@ motif = \relative { c'8 d e f g a b c } @cindex modale, inversion @funindex \modalInversion -@funindex modalInversion Un motif peut s'inverser selon une certaine gamme et à partir d'un pivot déterminé, puis transposé, le tout en une seule opération : @@ -1098,7 +1088,6 @@ hauteurs. @cindex anciennes, clefs @funindex \clef -@funindex clef La clef indique quelles lignes de la portée correspondent à quelles hauteurs. En l'absence de commande explicite, LilyPond utilise @@ -1282,7 +1271,6 @@ l'objet @code{Clef} devra être manuellement répercuté sur l'objet @cindex armure @funindex \key -@funindex key @c duplicated in Key signature and in Accidentals @warning{Les nouveaux utilisateurs sont parfois déroutés par la gestion @@ -1305,23 +1293,14 @@ On définit ou modifie l'armure avec la commande @code{\key} : @end example @funindex \major -@funindex major @funindex \minor -@funindex minor @funindex \ionian -@funindex ionian @funindex \locrian -@funindex locrian @funindex \aeolian -@funindex aeolian @funindex \mixolydian -@funindex mixolydian @funindex \lydian -@funindex lydian @funindex \phrygian -@funindex phrygian @funindex \dorian -@funindex dorian @cindex modes anciens @cindex modes @@ -1423,7 +1402,6 @@ Référence des propriétés internes : @funindex set-octavation @funindex \ottava -@funindex ottava Les marques d'octaviation, @emph{Ottava}, permettent d'introduire une transposition spécifique d'une octave pour la portée en cours. C'est @@ -1478,7 +1456,6 @@ Référence des propriétés internes : @cindex transposition, instrument @funindex \transposition -@funindex transposition Lorsque l'on saisit une partition d'ensemble incluant des instruments transpositeurs, certaines parties peuvent être dans une autre tonalité @@ -3043,9 +3020,7 @@ Référence des propriétés internes : @cindex @emph{easy play}, têtes de note @funindex \easyHeadsOn -@funindex easyHeadsOn @funindex \easyHeadsOff -@funindex easyHeadsOff Les notes « easy play » comportent le nom de la note à l'intérieur de la tête. On l'utilise dans des partitions pour débutants. L'impression @@ -3106,27 +3081,16 @@ Référence des propriétés internes : @cindex tête de note, Walker @funindex \key -@funindex key @funindex \aikenHeads -@funindex aikenHeads @funindex \aikenHeadsMinor -@funindex aikenHeadsMinor @funindex \sacredHarpHeads -@funindex sacredHarpHeads @funindex \sacredHarpHeadsMinor -@funindex sacredHarpHeadsMinor @funindex \southernHarmonyHeads -@funindex southernHarmonyHeads @funindex \southernHarmonyHeadsMinor -@funindex southernHarmonyHeadsMinor @funindex \funkHeads -@funindex funkHeads @funindex \walkerHeads -@funindex walkerHeads @funindex \funkHeadsMinor -@funindex funkHeadsMinor @funindex \walkerHeadsMinor -@funindex walkerHeadsMinor En notation profilée, le profil d'une tête de note correspond à la fonction harmonique de cette note dans la gamme. Ce style de notation @@ -3212,9 +3176,7 @@ Référence des propriétés internes : @cindex tête de note allongée @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff L'improvisation peut quelquefois s'indiquer à l'aide de notes de forme allongée (@emph{slash}). L'interprète jouera alors les notes qu'il diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely index 197f40b1fd..9c440f1b44 100644 --- a/Documentation/fr/notation/rhythms.itely +++ b/Documentation/fr/notation/rhythms.itely @@ -53,11 +53,8 @@ ligature et de mesure. @cindex longueur de note @funindex \longa -@funindex longa @funindex \breve -@funindex breve @funindex \maxima -@funindex maxima Dans les modes de notes, d'accords et de paroles, les durées sont écrites avec des chiffres et des points : les durées sont indiquées @@ -149,11 +146,8 @@ Pour plus de détails à ce sujet et sur les autres réglages propres à cette forme de notation, reportez vous à @ref{Notation proportionnelle}. @funindex \dotsUp -@funindex dotsUp @funindex \dotsDown -@funindex dotsDown @funindex \dotsNeutral -@funindex dotsNeutral Les points sont normalement haussés pour éviter les lignes de portée, sauf dans certaines polyphonies. Des commandes prédéfinies permettent @@ -216,7 +210,6 @@ soupir à la maxime (valant huit pauses). @cindex triolets @funindex \tuplet -@funindex tuplet Les n-olets -- triolets, quintolets, etc. -- sont obtenus en multipliant la vitesse d'une expression musicale par une fraction. @@ -255,11 +248,8 @@ formés automatiquement : @cindex n-olet, positionnement du crochet @funindex \tupletUp -@funindex tupletUp @funindex \tupletDown -@funindex tupletDown @funindex \tupletNeutral -@funindex tupletNeutral Des commandes prédéfinies permettent de déroger au positionnement automatique du crochet en surplomb ou au-dessous des notes : @@ -387,7 +377,6 @@ tout simplement de sauter plusieurs mesures, comme par exemple un @cindex musique échelonnée @funindex \scaleDurations -@funindex scaleDurations Il est tout à fait possible d'échelonner des fragments musicaux plus ou moins longs à l'aide d'une simple fraction, comme si chaque note, accord @@ -511,7 +500,6 @@ accords. @cindex liaison de prolongation et reprise avec alternative @funindex \repeatTie -@funindex repeatTie Lorsqu'une mesure « de seconde fois » après une reprise commence sur une note liée, la liaison doit être répétée, comme ici : @@ -532,7 +520,6 @@ une note liée, la liaison doit être répétée, comme ici : @cindex liaison, laissez vibrer @funindex \laissezVibrer -@funindex laissezVibrer Les liaisons « Laissez vibrer » (@notation{L.v.}) sont utilisées pour le piano, la harpe et certains instruments de percussion. Elles @@ -546,11 +533,8 @@ lieu de l'étouffer. Elles s'indiquent de la manière suivante : @cindex liaisons de prolongation, positionnement @funindex \tieUp -@funindex tieUp @funindex \tieDown -@funindex tieDown @funindex \tieNeutral -@funindex tieNeutral Le positionnement vertical des liaisons de prolongation peut être affiné -- voir à ce sujet les « commandes prédéfinies » et, pour de plus @@ -561,11 +545,8 @@ amples détails, @ref{Direction et positionnement}. @cindex liaison de prolongation, tirets @funindex \tieDotted -@funindex tieDotted @funindex \tieDashed -@funindex tieDashed @funindex \tieSolid -@funindex tieSolid Les liaisons de prolongation peuvent s'imprimer sous la forme de ligne continue, discontinue ou pointillée. @@ -691,14 +672,10 @@ notes. @cindex double pause @funindex \rest -@funindex rest @funindex r @funindex \maxima -@funindex maxima @funindex \longa -@funindex longa @funindex \breve -@funindex breve Les silences sont écrits comme des notes avec le nom de note @code{r} -- premier caractère du mot @emph{rest}. Les durées supérieures à la pause @@ -780,7 +757,6 @@ soupir à la maxime (équivalant à huit pauses). @funindex s @funindex \skip -@funindex skip Un silence invisible -- que l'on pourrait appeler un @qq{saut} -- peut être entré comme une note avec le nom de note @code{s} ou avec @@ -874,7 +850,6 @@ Référence des propriétés internes : @cindex silences, mesure entière @cindex une pause par mesure -@funindex compressMMRests @funindex \compressMMRests @funindex R @@ -953,7 +928,6 @@ R2.*2 | @cindex silence multimesure et point d'orgue @funindex \fermataMarkup -@funindex fermataMarkup @funindex MultiMeasureRestText Vous pouvez aussi ajouter du texte à un silence multimesure en @@ -989,13 +963,10 @@ Un silence multimesure placé directement après une commande numéros de mesure. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff @funindex textLenthOff @funindex \fermataMarkup -@funindex fermataMarkup @funindex \compressMMRests -@funindex compressMMRests @predefined @code{\textLengthOn}, @@ -1083,7 +1054,6 @@ silences. @cindex métrique @funindex \time -@funindex time Le chiffre de mesure indique le mètre d'une pièce : une alternance régulière de temps forts et de temps faibles. Il est indiqué par une @@ -1121,9 +1091,7 @@ indiqué au chapitre @ref{Visibilité des objets}. @cindex styles de métrique @funindex \numericTimeSignature -@funindex numericTimeSignature @funindex \defaultTimeSignature -@funindex defaultTimeSignature Le symbole de métrique utilisé pour les mesures à 2/2 et 4/4 peut être changé pour un style numérique : @@ -1329,7 +1297,6 @@ Références des propriétés internes : @cindex métronome, indication @funindex \tempo -@funindex tempo Une indication métronomique s'insère tout simplement comme ceci : @@ -1394,9 +1361,7 @@ parenthèses l'indication numérique : @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff Dans le cas d'une partie où l'instrumentiste a de longs moments de silence, les indications de tempo peuvent être fort rapprochées @@ -1465,7 +1430,6 @@ Référence des propriétés internes : @funindex measurePosition @funindex \partial -@funindex partial Les mesures incomplètes, telles que les anacrouses ou levées, doivent être entrées avec la commande @code{\partial}. La syntaxe de cette @@ -1557,9 +1521,7 @@ Références des propriétés internes : @cindex musique non mesurée @funindex \cadenzaOn -@funindex cadenzaOn @funindex \cadenzaOff -@funindex cadenzaOff En matière de musique mesurée, le positionnement des barres et la numérotation sont calculés automatiquement. Ceci n'est pas souhaitable @@ -1692,9 +1654,7 @@ des sauts de ligne peuvent prendre place : @funindex timeSignatureFraction @funindex \scaleDurations -@funindex scaleDurations @funindex \tuplet -@funindex tuplet LilyPond gère les métriques composites, aussi bien de manière explicite que de manière détournée -- modification de l'indicateur de métrique @@ -1996,9 +1956,7 @@ sont ramenées à la même hauteur, sur une portée d'une seule ligne. @funindex Pitch_squash_engraver @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff L'utilisation combinée du @code{Pitch_squash_engraver} et de @code{\improvisationOn} permet d'afficher la structure rythmique d'une @@ -2065,9 +2023,7 @@ d'imprimer les ligatures. @cindex ligatures, personnalisation @funindex \autoBeamOn -@funindex autoBeamOn @funindex \autoBeamOff -@funindex autoBeamOff @lilypond[quote,verbatim] \relative c'' { @@ -2174,9 +2130,7 @@ terminaison ne sera prise en compte qu'à l'occasion de la @funindex beatStructure @funindex measureLength @funindex \time -@funindex time @funindex \set -@funindex set Lorsque la fonction de ligature automatique est active, le positionnement des ligatures dépend des trois propriétés @@ -2596,7 +2550,6 @@ indication attachée à une note : @end lilypond @funindex \noBeam -@funindex noBeam Le fait d'affubler une note particulière d'un @code{\noBeam} aura pour effet de l'empêcher d'être ligaturée : @@ -2679,7 +2632,6 @@ Référence des propriétés internes : @cindex ligature en soufflet @funindex \featherDurations -@funindex featherDurations @funindex grow-direction Les ligatures en soufflet permettent d'indiquer qu'un petit groupe de @@ -2760,7 +2712,6 @@ courts extraits, avec une faible amplitude. @cindex barres de reprise @funindex \bar -@funindex bar Les barres de mesures délimitent les mesures, mais peuvent aussi indiquer une reprise. En principe, elles sont insérées automatiquement @@ -2971,7 +2922,6 @@ surmontée d'un @emph{segno}, et sait coopérer avec l'instruction @cindex définition d'une barre de mesure @funindex \defineBarLine -@funindex defineBarLine L'instruction @code{\defineBarLine} permet de définir ses propres types de barre de mesure, en respectant la syntaxe : @@ -3094,7 +3044,6 @@ les portées d'un @code{StaffGroup}, d'un @code{PianoStaff} ou d'un @funindex whichBar @funindex defaultBarType @funindex \bar -@funindex bar @funindex bartype La commande @samp{\bar @var{type_de_barre}} sert de raccourci pour @@ -3293,7 +3242,6 @@ atteinte. @end lilypond @funindex \barNumberCheck -@funindex barNumberCheck Lorsque l'on recopie de longues pièces, il peut être utile de vérifier que les numéros de mesure de LilyPond correspondent à l'original que @@ -3319,7 +3267,6 @@ Morceaux choisis : @cindex repère, indication de @funindex \mark -@funindex mark Indiquer un repère s'obtient grâce à la commande @code{\mark}. @@ -3431,7 +3378,6 @@ définis. Un @code{\markup} peut néanmoins s'utiliser en argument. @cindex glyphes musicales @funindex \musicglyph -@funindex musicglyph Un @code{\mark} peut contenir un glyphe musical tel que le signe @emph{segno}. @@ -3548,7 +3494,6 @@ pour chaque petite croche. @cindex notes d'ornement en fin de note @funindex \afterGrace -@funindex afterGrace La commande @code{\afterGrace} sert à placer une petite note après une note réelle -- et non @emph{avant} comme d'ordinaire. Cette commande diff --git a/Documentation/fr/notation/simultaneous.itely b/Documentation/fr/notation/simultaneous.itely index b54838030f..abd276f332 100644 --- a/Documentation/fr/notation/simultaneous.itely +++ b/Documentation/fr/notation/simultaneous.itely @@ -369,7 +369,6 @@ rubrique @ref{Résolution des collisions}). @cindex cluster @funindex \makeClusters -@funindex makeClusters Un cluster indique un agrégat de sons. On peut le représenter par une plage limitée par un @emph{ambitus} (notes extrêmes). On obtient une @@ -437,11 +436,9 @@ portées. @cindex paroles assignées à une voix @funindex \voiceOne -@funindex voiceOne @funindex \voiceOne ... \voiceFour @funindex Voice @funindex \oneVoice -@funindex oneVoice @subsubsubheading Instanciation explicite des voix @@ -716,21 +713,13 @@ Morceaux choisis : @cindex silences, décalage automatique @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn @funindex \shiftOff -@funindex shiftOff @funindex \mergeDifferentlyDottedOn -@funindex mergeDifferentlyDottedOn @funindex \mergeDifferentlyDottedOff -@funindex mergeDifferentlyDottedOff @funindex \mergeDifferentlyHeadedOn -@funindex mergeDifferentlyHeadedOn @funindex \mergeDifferentlyHeadedOff -@funindex mergeDifferentlyHeadedOff Les notes de hauteur identique appartenant à des voix différentes, même si leur hampe sont opposées, verront leur tête automatiquement @@ -954,7 +943,6 @@ are at the same time differently dotted are not clear. @cindex solo @funindex \partcombine -@funindex partcombine Le regroupement automatique de parties vous permet de fusionner deux pupitres sur une seule portée, ceci dans le but de créer des @@ -1059,17 +1047,11 @@ restera sans effet sur les hauteurs de @code{@var{expression_musicale_2}}. @funindex \partcombineChords -@funindex partcombineChords @funindex \partcombineApart -@funindex partcombineApart @funindex \partcombineUnisono -@funindex partcombineUnisono @funindex \partcombineSoloI -@funindex partcombineSoloI @funindex \partcombineSoloII -@funindex partcombineSoloII @funindex \partcombineAutomatic -@funindex partcombineAutomatic En matière d'édition professionnelle, les voix sont souvent maintenues séparément et sur une durée conséquente, bien que les notes des @@ -1209,7 +1191,6 @@ Certaines considérations apparaissent aussi dans les chapitres @cindex musique entremêlée @funindex \parallelMusic -@funindex parallelMusic On peut écrire plusieurs voix de façon entremêlée. La fonction @code{\parallelMusic} prend en charge une liste des variables à créer, diff --git a/Documentation/fr/notation/staff.itely b/Documentation/fr/notation/staff.itely index 9af9d3429a..bedf6937db 100644 --- a/Documentation/fr/notation/staff.itely +++ b/Documentation/fr/notation/staff.itely @@ -67,7 +67,6 @@ Nous allons voir ici comment créer des portées et comment les regrouper. @cindex tablature @funindex \drummode -@funindex drummode @funindex DrumStaff @funindex RhythmicStaff @funindex TabStaff @@ -426,9 +425,7 @@ d'@emph{ossia}. @cindex ligne supplémentaire @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff Les commandes @code{\stopStaff} et @code{\startStaff} permettent respectivement de clôturer et (re)démarrer une portée n'importe où dans @@ -607,9 +604,7 @@ Référence des propriétés internes : @cindex nombre de portées @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff Une portée d'@notation{ossia} -- ou de variante -- s'obtient en créant, à l'endroit approprié, une nouvelle portée simultanée : @@ -761,7 +756,6 @@ Référence des propriétés internes : @funindex \RemoveAllEmptyStaves @funindex Staff_symbol_engraver @funindex \stopStaff -@funindex stopStaff Désactiver le graveur @code{Staff_symbol_engraver} dans un contexte @code{Staff} permet de masquer des lignes. La commande @@ -1055,11 +1049,8 @@ Référence des propriétés internes : @cindex petites notes @funindex \addQuote -@funindex addQuote @funindex \quoteDuring -@funindex quoteDuring @funindex \transposition -@funindex transposition Il est assez courant qu'une voix soit doublée par une autre. Par exemple, les premiers et seconds violons peuvent jouer les mêmes notes @@ -1262,13 +1253,9 @@ qualité. @cindex CueVoice @funindex \cueDuring -@funindex cueDuring @funindex \cueClef -@funindex cueClef @funindex \cueDuringWithClef -@funindex cueDuringWithClef @funindex \quoteDuring -@funindex quoteDuring Le moyen le plus simple pour mettre en forme des notes provenant d'une autre voix consiste à déclarer explicitement un contexte @code{CueVoice} @@ -1446,7 +1433,6 @@ bassoonNotes = \relative c { @end lilypond @funindex \transposedCueDuring -@funindex transposedCueDuring L'instruction @code{\cueDuring}, à l'instar de la commande @code{\quoteDuring}, tient compte des instruments transpositeurs. La @@ -1490,7 +1476,6 @@ bassClarinetNotes = \relative c' { @cindex fin de réplique @funindex \killCues -@funindex killCues La commande @code{killCues} permet de supprimer les notes d'une citation. Ceci est utile lorsque cette citation n'est pas imprimée dans diff --git a/Documentation/fr/notation/text.itely b/Documentation/fr/notation/text.itely index 57621a19a0..471ae3c5e0 100644 --- a/Documentation/fr/notation/text.itely +++ b/Documentation/fr/notation/text.itely @@ -105,9 +105,7 @@ textuelles et articulations, reportez-vous au chapitre @rlearning{Positionnement des objets}. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @predefined @code{\textLengthOn}, @@ -191,11 +189,8 @@ Les détails concernant la syntaxe à utiliser sont expliqués au chapitre @ref{Styles de ligne}. @funindex \textSpannerUp -@funindex textSpannerUp @funindex \textSpannerDown -@funindex textSpannerDown @funindex \textSpannerNeutral -@funindex textSpannerNeutral @predefined @code{\textSpannerUp}, @@ -238,9 +233,7 @@ LilyPond ne peut traiter qu'un seul extenseur à la fois par voix. @cindex barres de mesure, symboles au dessus de @funindex \mark -@funindex mark @funindex \markup -@funindex markup La commande @code{\mark} est tout d'abord conçue pour les @ref{Indications de repère}. @@ -308,9 +301,7 @@ de la ligne suivante. @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff @predefined @code{\markLengthOn}, @@ -352,7 +343,6 @@ Référence des propriétés internes : @cindex indépendant, texte @funindex \markup -@funindex markup Un bloc @code{\markup} peut exister en lui-même, indépendamment de tout bloc @code{\score}, et venir en préambule par exemple -- voir le @@ -388,9 +378,7 @@ fonctionnalité, ainsi que la syntaxe appropriée, est abordée plus en détail au chapitre @ref{Texte avec sauts de page}. @funindex \markup -@funindex markup @funindex \markuplist -@funindex markuplist @predefined @code{\markup}, @@ -443,7 +431,6 @@ forme du texte à l'aide de la syntaxe propre au mode @code{\markup}. @cindex annotation @funindex \markup -@funindex markup La commande @code{\markup} permet d'ajouter du texte et dispose de sa propre syntaxe que nous appellerons le @qq{mode @emph{markup}}. @@ -563,11 +550,8 @@ Les erreurs de syntaxe en mode @emph{markup} sont peu explicites. @cindex souligné @funindex \italic -@funindex italic @funindex \bold -@funindex bold @funindex \underline -@funindex underline Le mode @emph{markup} autorise des changements élémentaires de la fonte : @@ -589,13 +573,9 @@ fonte : @funindex \abs-fontsize @funindex \fontsize -@funindex fontsize @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @funindex \magnify -@funindex magnify La taille des caractères se modifie, relativement à la taille globale des portées, de différentes manières. @@ -655,11 +635,8 @@ taille des espaces et celle des autres caractères : @cindex exposant @funindex \super -@funindex super @funindex \sub -@funindex sub @funindex \normal-size-super -@funindex normal-size-super Vous pouvez imprimer du texte en indice ou en exposant. Celui-ci sera dans une taille plus petite, mais rien ne s'oppose à ce que vous lui @@ -730,21 +707,13 @@ Pour savoir comment personnaliser des fontes, reportez-vous au chapitre @ref{Fontes}. @funindex \teeny -@funindex teeny @funindex \tiny -@funindex tiny @funindex \small -@funindex small @funindex \normalsize -@funindex normalsize @funindex \large -@funindex large @funindex \huge -@funindex huge @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @predefined @code{\teeny}, @@ -801,11 +770,8 @@ utilisant la syntaxe décrite au chapitre @cindex alignement horizontal du texte @funindex \left-align -@funindex left-align @funindex \center-align -@funindex center-align @funindex \right-align -@funindex right-align Les objets de type @emph{markup} peuvent s'aligner de différentes manières. Une indication textuelle est par défaut alignée sur son @@ -825,7 +791,6 @@ entre les deux premiers @emph{markups}. @end lilypond @funindex \halign -@funindex halign L'alignement horizontal peut être ajusté à l'aide d'une valeur numérique : @@ -853,11 +818,8 @@ objets @emph{markup}, comme indiqué par exemple au chapitre @cindex alignement vertical du texte @funindex \raise -@funindex raise @funindex \lower -@funindex lower @funindex \null -@funindex null @c QUERY Should the function of ``\null'' be clarified? rp @@ -891,11 +853,8 @@ déplacé. @end lilypond @funindex \general-align -@funindex general-align @funindex \translate -@funindex translate @funindex \translate-scaled -@funindex translate-scaled Certaines commandes permettent de régler l'alignement des objets textuels en mode @emph{markup}, tant au niveau horizontal que vertical. @@ -930,9 +889,7 @@ d'ancrage. @cindex colonnes de texte @funindex \column -@funindex column @funindex \center-column -@funindex center-column Un objet de type @emph{markup} peut contenir plusieurs lignes de texte. Dans l'exemple suivant, chaque élément ou expression ira se placer sur @@ -959,7 +916,6 @@ sa propre ligne, tantôt alignée à gauche, tantôt centrée. @cindex markup, centrage sur la page @funindex \fill-line -@funindex fill-line Pareillement, une liste d'éléments ou d'expressions sera répartie sur une ligne entière, voire même centrée sur toute la page s'il n'y a qu'un @@ -991,9 +947,7 @@ texte multiligne ou une autre expression @emph{markup}. @cindex markup, texte justifié @funindex \wordwrap -@funindex wordwrap @funindex \justify -@funindex justify Les indications textuelles, lorsqu'elles sont relativement longues, peuvent se répartir sur plusieurs lignes en fonction de la largeur de @@ -1072,15 +1026,10 @@ graphiques à votre partition. @cindex markup, encadrement du texte @funindex \box -@funindex box @funindex \circle -@funindex circle @funindex \rounded-box -@funindex rounded-box @funindex \bracket -@funindex bracket @funindex \hbracket -@funindex hbracket Certaines commandes de @emph{markup} permettent d'ornementer des éléments textuels avec des graphismes, à l'instar de l'exemple @@ -1108,13 +1057,9 @@ suivant : @cindex markup, rembourrage du texte @funindex \pad-markup -@funindex pad-markup @funindex \pad-x -@funindex pad-x @funindex \pad-to-box -@funindex pad-to-box @funindex \pad-around -@funindex pad-around Certaines directives peuvent nécessiter d'accroître l'espacement autour du texte -- voir l'annexe @ref{Align} pour une liste des différentes @@ -1148,17 +1093,11 @@ Flute quartet keeps very uneven time." @cindex notation et graphisme @funindex \combine -@funindex combine @funindex \draw-circle -@funindex draw-circle @funindex \filled-box -@funindex filled-box @funindex \triangle -@funindex triangle @funindex \draw-line -@funindex draw-line @funindex \arrow-head -@funindex arrow-head Vous pouvez imprimer certains graphismes ou symboles sans qu'il n'y ait de texte. Ces objets peuvent même se combiner, à l'instar de @@ -1186,9 +1125,7 @@ n'importe quelle expression @emph{markup}. @cindex postscript @funindex \epsfile -@funindex epsfile @funindex \postscript -@funindex postscript Des fonctionnalités graphiques avancées vous permettent même d'inclure dans une partition un fichier image converti au format PostScript @@ -1387,11 +1324,8 @@ Référence des propriétés internes : @cindex plusieurs pages de texte @funindex \markuplist -@funindex markuplist @funindex \justified-lines -@funindex justified-lines @funindex \wordwrap-lines -@funindex wordwrap-lines Alors que @code{\markup} s'utilise pour traiter un bloc de texte insécable, @code{\markuplist} permet, employé en tête de partition, diff --git a/Documentation/fr/notation/wind.itely b/Documentation/fr/notation/wind.itely index 2724b9083d..6affb70676 100644 --- a/Documentation/fr/notation/wind.itely +++ b/Documentation/fr/notation/wind.itely @@ -174,11 +174,8 @@ Voici quelques informations spécifiques à la cornemuse. @cindex Scottish highland bagpipe @cindex petites notes @funindex \taor -@funindex taor @funindex \hideKeySignature -@funindex hideKeySignature @funindex \showKeySignature -@funindex showKeySignature LilyPond inclut des définitions spécifiques destinées à la notation pour cornemuse écossaise ; pour les utiliser, il suffit d'ajouter diff --git a/Documentation/hu/learning/common-notation.itely b/Documentation/hu/learning/common-notation.itely index 0bad8859a0..c29ca28c54 100644 --- a/Documentation/hu/learning/common-notation.itely +++ b/Documentation/hu/learning/common-notation.itely @@ -164,11 +164,8 @@ cis4 ees fisis, aeses @cindex lejegyzés és hangzás különbsége @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Fogalomtár: @rglos{key signature}, @rglos{major}, @rglos{minor}. @@ -423,11 +420,8 @@ c4_-^1 d^. f^4_2-> e^-_+ @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Fogalomtár: @rglos{dynamics}, @rglos{crescendo}, @rglos{decrescendo}. @@ -463,7 +457,6 @@ A kottaírás kézikönyve: @cindex formázott szöveg @funindex \markup -@funindex markup A hangokhoz a következő módon lehet szöveges jelzéseket rendelni: @@ -501,9 +494,7 @@ A kottaírás kézikönyve: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Fogalomtár: @rglos{beam}. @@ -557,7 +548,6 @@ A kottaírás kézikönyve: @cindex csonkaütem @funindex \partial -@funindex partial Fogalomtár: @rglos{anacrusis}. @@ -580,7 +570,6 @@ c2 d | @cindex n-ola @funindex \tuplet -@funindex tuplet Fogalomtár: @rglos{note value}, @rglos{triplet}. @@ -606,9 +595,7 @@ a @notation{triolák} lejegyzett hosszúságuk 2/3 részéig szólnak, így trio @cindex appoggiatura @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -792,10 +779,8 @@ hoz létre, ha igen, többet. @cindex kontextus @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -993,7 +978,6 @@ lejegyzésébe nyújt betekintést. @cindex dal @funindex \addlyrics -@funindex addlyrics Fogalomtár: @rglos{lyrics}. @@ -1354,7 +1338,6 @@ Az alábbi példa a fenti változókat hasznosítja újra: @cindex metaadatok @funindex \header -@funindex header A címet, szerzőt, opus-számot és hasonló adatokat a @code{\header} blokkban kell megadni. Ez a fő zenei kifejezésen kívül helyezendő el; a diff --git a/Documentation/hu/learning/fundamental.itely b/Documentation/hu/learning/fundamental.itely index 77dc20d01b..30da3d4f89 100644 --- a/Documentation/hu/learning/fundamental.itely +++ b/Documentation/hu/learning/fundamental.itely @@ -74,9 +74,7 @@ Ennek az alapvető mintának sok változata lehetséges, de ez a példa jó kiindulási alapot jelent. @funindex \book -@funindex book @funindex \score -@funindex score @cindex book @cindex score @@ -158,11 +156,8 @@ tartalmazhat, mint például: @end example @funindex \header -@funindex header @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex header @cindex layout @cindex midi @@ -184,7 +179,6 @@ Kézikönyvében található, a @ruser{Score layout} és a @cindex több kotta @cindex implicit book blokk @funindex \book -@funindex book Egy fájlban több @code{\score} blokk lehet. Mindegyik egy-egy zeneművet vagy tételt jelöl, de ezek egy kimeneti fájlban fognak megjelenni. Nem @@ -248,7 +242,6 @@ A bemeneti formátum teljes definíciója a @translationof Score is a (single) compound musical expression @funindex \score -@funindex score @cindex score @cindex összetett zenei kifejezés @@ -873,15 +866,10 @@ A kottaírás kézikönyve: @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex voice contexts, creating @@ -1055,13 +1043,9 @@ A szólamokat akkor érdemes így írni, ha a zene csak egy kis része polifón. @cindex collisions, notes @cindex shift commands @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Egymáshoz közel elhelyezkedő, különböző szólamban levő hangok esetén @@ -1099,7 +1083,6 @@ A vokális zene speciális nehézséget jelent: két kifejezést kell egyesíten @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics context, creating @cindex lyrics, linking to voice @@ -1131,7 +1114,6 @@ muszáj közvetlenül készíteni @code{Staff} és @code{Voice} környezetet is. @cindex lyrics and beaming @cindex beaming and lyrics @funindex \autoBeamOff -@funindex autoBeamOff Az automatikus gerendázás -, amit a LilyPond használ - jól működik a hangszeres zenére, de nem túl jó a dalszövegek esetén, @@ -1141,7 +1123,6 @@ A fenti példában az @code{\autoBeamOff} paranccsal kikapcsoltuk az automatikus @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex vocal score structure @cindex choir staff @@ -1366,7 +1347,6 @@ refrenszovegB = \lyricmode { @cindex book, example of using @funindex \book -@funindex book Habár ez egy érdekes és hasznos példa arra, hogy megértsük, hogyan működnek az egymásutáni és egyidejű blokkok, gyakorlatban valószínűleg a többség ezt két @@ -1536,7 +1516,6 @@ A kottaírás kézikönyve: @funindex \new -@funindex new @cindex new contexts @cindex creating contexts @cindex contexts, creating @@ -1746,9 +1725,7 @@ Internals reference: @rinternals{Engravers and Performers}. @cindex context properties, modifying @cindex modifying context properties @funindex \set -@funindex set @funindex \unset -@funindex unset Contexts are responsible for holding the values of a number of context @emph{properties}. Many of them can be changed to @@ -1940,7 +1917,6 @@ general way by using the very powerful @code{\markup} command. @subsubheading Setting context properties with @code{\with} @funindex \with -@funindex with @cindex context properties, setting with \with The default value of context properties may be set at the time the @@ -2008,7 +1984,6 @@ with @code{\set}, this new default value may be restored with the @cindex context properties, setting with \context @funindex \context -@funindex context The values of context properties may be set in @emph{all} contexts of a particular type, such as all @code{Staff} contexts, with a single @@ -2063,9 +2038,7 @@ Internals Reference: @cindex removing engravers @funindex \consists -@funindex consists @funindex \remove -@funindex remove We have seen that contexts each contain several engravers, each of which is responsible for producing a particular part of the @@ -2157,7 +2130,6 @@ the notes in all the voices on that staff: @subsubheading Changing all contexts of the same type @funindex \layout -@funindex layout The examples above show how to remove or add engravers to individual contexts. It is also possible to remove or add diff --git a/Documentation/hu/learning/tutorial.itely b/Documentation/hu/learning/tutorial.itely index 67f9e07e98..f2061fd3a9 100644 --- a/Documentation/hu/learning/tutorial.itely +++ b/Documentation/hu/learning/tutorial.itely @@ -215,7 +215,6 @@ megfelelő. @cindex módosítójelek és relatív mód @funindex \relative -@funindex relative @funindex ' @funindex , @@ -386,7 +385,6 @@ csak a hangmagasság megjelölése helyett @code{r}@tie{} betűt kell írni: @cindex ütemmutató @funindex \time -@funindex time Fogalomtár: @rglos{time signature}. @@ -411,7 +409,6 @@ Az @notation{ütemmutató} beállítására a @code{\time} parancs szolgál: @cindex metronómjelzés @funindex \tempo -@funindex tempo Fogalomtár: @rglos{tempo indication}, @rglos{metronome}. @@ -445,7 +442,6 @@ a @code{\tempo} parancs segítségével álítható be: @cindex basszuskulcs @funindex \clef -@funindex clef Fogalomtár: @rglos{clef}. diff --git a/Documentation/included/script-chart.ly b/Documentation/included/script-chart.ly index 853b07179f..e03bb4abc9 100644 --- a/Documentation/included/script-chart.ly +++ b/Documentation/included/script-chart.ly @@ -53,6 +53,7 @@ This chart shows all articulations, or scripts, that the feta font contains. "snappizzicato" "open" "halfopen" + "halfopenvertical" "stopped" "lheel" "rheel" diff --git a/Documentation/it/learning/common-notation.itely b/Documentation/it/learning/common-notation.itely index dfb4addd83..ef60fdc4fd 100644 --- a/Documentation/it/learning/common-notation.itely +++ b/Documentation/it/learning/common-notation.itely @@ -167,11 +167,8 @@ nomi per le @notation{alterazioni}, si veda @ruser{Nomi delle note in altre ling @cindex layout vs. contenuto @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Glossario musicale: @rglosnamed{key signature,armatura di chiave}, @rglosnamed{major,maggiore}, @rglosnamed{minor,minore}. @@ -441,11 +438,8 @@ meglio lasciare che sia LilyPond a determinare le direzioni delle articolazioni. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Glossario musicale: @rglosnamed{dynamics,dinamiche}, @rglos{crescendo}, @rglos{decrescendo}. @@ -484,7 +478,6 @@ Guida alla notazione: @cindex markup @funindex \markup -@funindex markup Puoi aggiungere del testo nei tuoi spartiti: @@ -521,9 +514,7 @@ Guida alla notazione: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Glossario musicale: @rglosnamed{beam,travatura}. @@ -580,7 +571,6 @@ Guida alla notazione: @cindex battuta parziale @funindex \partial -@funindex partial Glossario musicale: @rglos{anacrusis}. @@ -603,7 +593,6 @@ Un' @notation{anacrusi} può essere inserita con la parola chiave @cindex terzine @funindex \tuplet -@funindex tuplet Glossario musicale: @rglosnamed{note value,durata}, @rglosnamed{triplet,gruppo irregolare}. @@ -633,9 +622,7 @@ due, quindi una @notation{terzina} ha 3/2 come frazione: @cindex appoggiatura @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -824,10 +811,8 @@ su un singolo rigo. @cindex contesto della notazione @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -1031,7 +1016,6 @@ Questa sezione presenta la musica vocale e gli spartiti di semplici canzoni. @cindex canzoni @funindex \addlyrics -@funindex addlyrics Glossario musicale: @rglosnamed{lyrics,testo}. @@ -1404,7 +1388,6 @@ differenti. L'esempio seguente usa le variabili mostrate sopra: @cindex blocco dell'intestazione @funindex \header -@funindex header Titolo, compositore, numero di opus e informazioni simili vengono inserite nel blocco @code{\header}. Questo si trova fuori dalla diff --git a/Documentation/it/learning/fundamental.itely b/Documentation/it/learning/fundamental.itely index 0b4a3fb69e..dd89ae5049 100644 --- a/Documentation/it/learning/fundamental.itely +++ b/Documentation/it/learning/fundamental.itely @@ -71,9 +71,7 @@ Ci sono molte varianti a questo modello di base, ma questo esempio serve da utile punto di partenza. @funindex \book -@funindex book @funindex \score -@funindex score @cindex book (libro) @cindex score (partitura) @cindex libro @@ -159,11 +157,8 @@ elementi, come ad esempio @end example @funindex \header -@funindex header @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex header @cindex layout @cindex midi @@ -189,7 +184,6 @@ Guida alla notazione, in @ruser{Formattazione della partitura}, e @cindex libro, blocco implicito @cindex implicito, blocco del libro @funindex \book -@funindex book Puoi scrivere molteplici blocchi @code{\score}. Ciascuno verrà trattato come una partitura separata, ma saranno tutti combinati in @@ -255,7 +249,6 @@ Per una definizione completa del formato di input, si veda @translationof Score is a (single) compound musical expression @funindex \score -@funindex score @cindex partitura @cindex score @cindex contenuto di un blocco score @@ -938,15 +931,10 @@ Guida alla notazione: @ruser{Più voci}. @translationof Explicitly instantiating voices @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex contesti della voce, creazione dei @@ -1133,13 +1121,9 @@ come nel seguente esempio: @cindex note, collisioni di @cindex comandi di spostamento @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Le note maggiormente ravvicinate all'interno di un accordo o quelle che compaiono nello stesso momento in voci diverse sono disposte in due, e @@ -1189,7 +1173,6 @@ espressioni -- note e testo. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics, creazione di un contesto @cindex testo, creazione di un contesto @@ -1224,7 +1207,6 @@ necessario creare esplicitamente contesti @code{Staff} e @code{Voice}. @cindex testo e travatura @cindex travatura e testo @funindex \autoBeamOff -@funindex autoBeamOff La disposizione automatica delle travature predefinita di LilyPond funziona bene per la musica strumentale, ma non altrettanto per la musica con testi, @@ -1235,7 +1217,6 @@ di melismi nel testo. Nell'esempio precedente usiamo il comando @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex struttura di una partitura vocale @cindex rigo per un coro @@ -1443,7 +1424,6 @@ Guida alla notazione: @ruser{Tutto sui contesti}. @translationof Creating contexts @funindex \new -@funindex new @cindex nuovi contesti @cindex creazione di contesti @cindex contesti, creazione di @@ -1659,9 +1639,7 @@ Guida al funzionamento interno: @rinternals{Engravers and Performers}. @cindex contesto, proprietà del, modificare @cindex modificare le proprietà del contesto @funindex \set -@funindex set @funindex \unset -@funindex unset I contesti si occupano di tenere i valori di un certo numero di @emph{proprietà} del contesto. Molte di queste possono essere cambiate @@ -1853,7 +1831,6 @@ modo molto più generale usando il potente comando @code{\markup}. @subsubheading Impostare le proprietà di contesto con @code{\with} @funindex \with -@funindex with @cindex contesto, proprietà del, impostare con \with Il valore predefinito delle proprietà di contesto possono essere impostate @@ -1902,7 +1879,6 @@ questo nuovo valore predefinito può essere recuperato col comando @cindex contesto, proprietà del, impostare con \context @funindex \context -@funindex context I valori delle proprietà di un contesto possono essere impostate in @emph{tutti} i contesti di un particolare tipo, così come in tutti i contesti @code{Staff}, con un @@ -1982,9 +1958,7 @@ Guida al funzionamento interno: @cindex rimuovere gli incisori @funindex \consists -@funindex consists @funindex \remove -@funindex remove Abbiamo visto che ciascuno dei contesti contiene vari incisori, ognuno dei quali ha il compito di produrre una parte specifica dell'output, @@ -2079,7 +2053,6 @@ l'intervallo di tutte le note in tutte le voci di quel pentagramma: @subsubheading Modificare tutti i contesti dello stesso tipo @funindex \layout -@funindex layout Gli esempi precedenti mostrano come rimuovere o aggiungere degli incisori a contesti individuali. È anche possibile rimuovere o aggiungere gli diff --git a/Documentation/it/learning/tutorial.itely b/Documentation/it/learning/tutorial.itely index 158b70ecf8..f673c65c61 100644 --- a/Documentation/it/learning/tutorial.itely +++ b/Documentation/it/learning/tutorial.itely @@ -210,7 +210,6 @@ casi questi valori sono utili. @cindex modo relativo, e alterazioni @funindex \relative -@funindex relative @funindex ' @funindex , @@ -387,7 +386,6 @@ Una @notation{pausa} viene inserita proprio come una nota ma col nome @cindex tempo, indicazione di @funindex \time -@funindex time Glossario musicale: @rglosnamed{time signature,indicazione di tempo}. @@ -412,7 +410,6 @@ Il @notation{tempo} si imposta con il comando @code{\time}: @cindex indicazioni metronomiche @funindex \tempo -@funindex tempo Glossario musicale: @rglosnamed{tempo indication,indicazione di tempo}, @rglosnamed{metronome,metronomo}. @@ -446,7 +443,6 @@ impostano col comando @code{\tempo}: @cindex basso @funindex \clef -@funindex clef Glossario musicale: @rglosnamed{clef,chiave}. diff --git a/Documentation/it/learning/tweaks.itely b/Documentation/it/learning/tweaks.itely index 482a54b2c3..9c940c9483 100644 --- a/Documentation/it/learning/tweaks.itely +++ b/Documentation/it/learning/tweaks.itely @@ -209,7 +209,6 @@ Guida alla notazione: @cindex override, sintassi @funindex \override -@funindex override Abbiamo già incontrato i comandi @code{\set} e @code{\with}, che servono a modificare le proprietà dei @strong{contesti} e a togliere o aggiungere @@ -282,7 +281,6 @@ il colore della testa di nota: @cindex ripristino, comando \revert @funindex \revert -@funindex revert Quando viene sovrascritta, la proprietà mantiene il suo nuovo valore finché non viene sovrascritta di nuovo o non si incontra un comando @code{\revert}. @@ -320,7 +318,6 @@ note al valore predefinito: @translationof The once prefix @funindex \once -@funindex once I comandi @code{\override}, @code{revert}, @code{\set} e @code{\unset} possono essere preceduti da @code{\once}. Questo fa sì che tale comando sia operativo @@ -367,7 +364,6 @@ comandi predefiniti per limitare il loro effetto a un momento musicale: @cindex overrideProperty, comando @funindex \overrideProperty -@funindex overrideProperty Esiste un'altra forma di comando di sovrascrittura, @code{\overrideProperty}, che si rende necessario raramente. @@ -385,7 +381,6 @@ si veda @rextend{Difficult tweaks}. @cindex tweak, comando @funindex \tweak -@funindex tweak L'ultimo comando di modifica a disposizione è @code{\tweak}. Si usa quando vari oggetti compaiono nello stesso momento musicale, @@ -799,7 +794,6 @@ dal fatto che stiamo inserendo delle note, in questo caso possiamo ometterlo. @cindex \once \override @funindex \once -@funindex once Come puoi vedere, @emph{tutte} le legature di portamento sono più spesse nell'ultimo esempio. E se volessimo rendere più spessa solo la prima legatura di portamento? @@ -845,7 +839,6 @@ Il comando @code{\once} può essere usato anche prima del comando @code{\set}. @cindex proprietà predefinite, ripristinare le @funindex \revert -@funindex revert E se volessimo che soltanto le prime due legature di portamento fossero più spesse? Potremmo usare due comandi, ciascuno preceduto da @@ -2303,9 +2296,7 @@ questi oggetti. @cindex segno del cambio d'ottava @funindex \startTextSpan -@funindex startTextSpan @funindex \stopTextSpan -@funindex stopTextSpan @cindex TextSpanner, esempio di sovrascrittura @cindex proprietà bound-details, esempio @@ -2453,9 +2444,7 @@ far posto al testo. Lo si può ottenere con il comando @cindex note, distanziarle insieme al testo @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff Per impostazione predefinita, finché si tratta di formattare la musica il testo prodotto dal comando @code{\markup} non occupa uno spazio orizzontale. @@ -2980,13 +2969,9 @@ note in voci diverse. @cindex note, collisioni @cindex shift, comandi @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn All'interno di una voce, tutte le note che si trovano nello stesso momento musicale sono raggruppate in una colonna di note, e viene creato un oggetto diff --git a/Documentation/it/notation/changing-defaults.itely b/Documentation/it/notation/changing-defaults.itely index 0a27e4bc7a..127a381a09 100644 --- a/Documentation/it/notation/changing-defaults.itely +++ b/Documentation/it/notation/changing-defaults.itely @@ -1126,17 +1126,11 @@ Guida alla notazione: @cindex incisori, includere nei contesti @funindex \alias -@funindex alias @funindex \name -@funindex name @funindex \type -@funindex type @funindex \consists -@funindex consists @funindex \accepts -@funindex accepts @funindex \denies -@funindex denies Contesti specifici, come @code{Staff} e @code{Voice}, sono creati a partire da semplici mattoncini. È possibile creare nuovi tipi di contesto con diff --git a/Documentation/it/notation/editorial.itely b/Documentation/it/notation/editorial.itely index 072194fa84..a777e532ca 100644 --- a/Documentation/it/notation/editorial.itely +++ b/Documentation/it/notation/editorial.itely @@ -69,7 +69,6 @@ Questa sezione spiega come aggiungere enfasi agli elementi interni al rigo. @funindex tiny @funindex teeny @funindex \magnifyMusic -@funindex magnifyMusic @funindex magnification->font-size @warning{@* @@ -336,7 +335,6 @@ e @code{\revert}: @cindex dita, cambio @funindex \finger -@funindex finger Le indicazioni di diteggiatura si inseriscono con @samp{@var{nota}-@var{numero}}: @@ -357,7 +355,6 @@ indicare un cambio di dito. @cindex pollice, indicazione @funindex \thumb -@funindex thumb Si può aggiungere il simbolo del pollice per indicare che una nota deve essere suonata col pollice (ad esempio, nella musica per violoncello). @@ -420,9 +417,7 @@ Guida al funzionamento interno: @cindex trasparenti, note @funindex \hideNotes -@funindex hideNotes @funindex \unHideNotes -@funindex unHideNotes Le note nascoste (o invisibili o trasparenti) possono essere utili nella preparazione di esercizi di teoria e composizione. @@ -493,7 +488,6 @@ Guida al funzionamento interno: @funindex color @funindex \with-color -@funindex with-color @funindex x11-color Si possono assegnare dei colori a ciascun oggetto. I nomi dei colori validi @@ -602,7 +596,6 @@ Le note in un accordo non possono essere colorate separatamente con un @cindex parentesi quadre @funindex \parenthesize -@funindex parenthesize Gli oggetti possono essere messi tra parentesi se si usa il comando @code{\parenthesize} prima dell'evento musicale. Se precede un accordo, viene messa tra parentesi @@ -650,11 +643,8 @@ nota dell'accordo invece di una sola grande parentesi per l'intero accordo. @cindex invisibile, gambo @funindex \stemUp -@funindex stemUp @funindex \stemDown -@funindex stemDown @funindex \stemNeutral -@funindex stemNeutral @cindex gambo, direzione @cindex gambo, su @cindex gambo, giù @@ -724,9 +714,7 @@ delle note esterne al rigo. @funindex balloonGrobText @funindex balloonText @funindex \balloonLengthOn -@funindex balloonLengthOn @funindex \balloonLengthOff -@funindex balloonLengthOff Si possono contrassegnare e nominare gli elementi della notazione tramite una nuvoletta quadrata. La sua funzione principale è spiegare la notazione. @@ -863,9 +851,7 @@ Guida al funzionamento interno: @funindex Horizontal_bracket_engraver @funindex \startGroup -@funindex startGroup @funindex \stopGroup -@funindex stopGroup Nell'analisi musicale si usano le parentesi per indicare la struttura dei brani musicali. Sono supportate delle semplici parentesi orizzontali. diff --git a/Documentation/it/notation/expressive.itely b/Documentation/it/notation/expressive.itely index 65e060c545..806286774a 100644 --- a/Documentation/it/notation/expressive.itely +++ b/Documentation/it/notation/expressive.itely @@ -236,43 +236,24 @@ Guida al funzionamento interno: @cindex dinamiche assolute @funindex \ppppp -@funindex ppppp @funindex \pppp -@funindex pppp @funindex \ppp -@funindex ppp @funindex \pp -@funindex pp @funindex \p -@funindex p @funindex \mp -@funindex mp @funindex \mf -@funindex mf @funindex \f -@funindex f @funindex \ff -@funindex ff @funindex \fff -@funindex fff @funindex \ffff -@funindex ffff @funindex \fffff -@funindex fffff @funindex \fp -@funindex fp @funindex \sf -@funindex sf @funindex \sff -@funindex sff @funindex \sp -@funindex sp @funindex \spp -@funindex spp @funindex \sfz -@funindex sfz @funindex \rfz -@funindex rfz Le indicazioni dinamiche assolute si indicano con un comando che segue una nota, come ad esempio @code{c4\ff}. Le indicazioni dinamiche disponibili @@ -300,9 +281,7 @@ rigo, come è spiegato in dettaglio in @ref{Direction and placement}. @funindex \> @funindex \! @funindex \cr -@funindex cr @funindex \decr -@funindex decr Un'indicazione di @notation{crescendo} inizia con @code{\<} e termina con @code{\!}, un'indicazione dinamica assoluta o un'ulteriore indicazione @@ -367,7 +346,6 @@ una nota. Questo è utile soprattutto quando si aggiunge un @cindex articolazione "espressivo" @funindex \espressivo -@funindex espressivo Il comando @code{\espressivo} permette di indicare un crescendo e un decrescendo sulla stessa nota. Tuttavia, si tenga presente che @@ -381,11 +359,8 @@ viene implementato come articolazione, non come dinamica. @end lilypond @funindex \cresc -@funindex cresc @funindex \decresc -@funindex decresc @funindex \dim -@funindex dim Le indicazioni di crescendo testuali iniziano con @code{\cresc}, quelle di decrescendo con @code{\decresc} o @code{\dim}. @@ -401,17 +376,11 @@ Le linee di estensione sono aggiunte automaticamente. @end lilypond @funindex \crescTextCresc -@funindex crescTextCresc @funindex \dimTextDecresc -@funindex dimTextDecresc @funindex \dimTextDecr -@funindex dimTextDecr @funindex \dimTextDim -@funindex dimTextDim @funindex \crescHairpin -@funindex crescHairpin @funindex \dimHairpin -@funindex dimHairpin Le indicazioni testuali per i cambi di dinamica possono essere impiegate anche per sostituire le forcelle: @lilypond[verbatim,quote] @@ -443,11 +412,8 @@ Il posizionamento verticale della dinamica è gestito da @rinternals{DynamicLineSpanner}. @funindex \dynamicUp -@funindex dynamicUp @funindex \dynamicDown -@funindex dynamicDown @funindex \dynamicNeutral -@funindex dynamicNeutral Esiste un contesto @code{Dynamics} che permette di posizionare le indicazioni dinamiche su un'apposita linea orizzontale. Si usano le pause spaziatrici @@ -567,9 +533,7 @@ moltoF = \markup { molto \dynamic f } @cindex dinamiche, parentesi @cindex editoriali, dinamiche @funindex \bracket -@funindex bracket @funindex \dynamic -@funindex dynamic In modalità markup, si possono creare dinamiche editoriali (racchiuse tra parentesi normali o quadrate). La sintassi della modalità markup è @@ -711,9 +675,7 @@ terminare nella stessa voce in cui è iniziata.} @cindex legature di portamento, sotto le note @cindex legature di portamento, sopra le note @funindex \slurDown -@funindex slurDown @funindex \slurNeutral -@funindex slurNeutral Le legature di portamento possono essere posizionate manualmente sopra o sotto il rigo, come è spiegato in @ref{Direction and placement}. @@ -742,11 +704,8 @@ voce, l'inizio e la fine di ogni legatura devono essere preceduti da un @cindex legatura di portamento tratteggiata @cindex stile, legatura di portamento @funindex \slurDashed -@funindex slurDashed @funindex \slurDotted -@funindex slurDotted @funindex \slurSolid -@funindex slurSolid Le legature di portamento possono essere continue, punteggiate o tratteggiate. Lo stile predefinito è quello continuo: @@ -764,9 +723,7 @@ stile predefinito è quello continuo: @end lilypond @funindex \slurHalfDashed -@funindex slurHalfDashed @funindex \slurHalfSolid -@funindex slurHalfSolid @cindex legatura di portamento, metà tratteggiata e metà continua Le legature di portamento possono essere anche semitratteggiate (half-dashed), @@ -786,7 +743,6 @@ ovvero con la prima metà tratteggiata e la seconda continua; oppure semicontinu @end lilypond @funindex \slurDashPattern -@funindex slurDashPattern @cindex legatura di portamento, definizione del modello di tratteggio Si possono definire modelli di tratteggio personalizzati per le legature di @@ -807,7 +763,6 @@ portamento: @funindex \slurUp -@funindex slurUp @predefined @@ -872,11 +827,8 @@ scrivono con i comandi @code{\(} e @code{\)}: @end lilypond @funindex \phrasingSlurUp -@funindex phrasingSlurUp @funindex \phrasingSlurDown -@funindex phrasingSlurDown @funindex \phrasingSlurNeutral -@funindex phrasingSlurNeutral A livello tipografico, una legatura di frase si comporta in modo pressoché identico a una normale legatura di portamento. Sono però trattate @@ -892,12 +844,9 @@ sopra o sotto il rigo, come è spiegato in @ref{Direction and placement}. Per inserire più legature di frase simultanee o sovrapposte si usa @code{\=}, come per le normali legature di portamento (vedi @ref{Slurs}). -@funindex phrasingSlurDashed @funindex \phrasingSlurDashed @funindex \phrasingSlurDotted -@funindex phrasingSlurDotted @funindex \phrasingSlurSolid -@funindex phrasingSlurSolid @cindex legatura di frase tratteggiata @cindex legatura di frase puntata @cindex legatura di portamento, frase tratteggiata @@ -918,10 +867,8 @@ predefinito è quello continuo: } @end lilypond -@funindex phrasingSlurHalfDashed @funindex \phrasingSlurHalfDashed @funindex \phrasingSlurHalfSolid -@funindex phrasingSlurHalfSolid @cindex legatura di frase, metà continua e metà tratteggiata @cindex legatura di portamento, tratto metà continuo e metà tratteggiato @@ -942,7 +889,6 @@ continua, la seconda tratteggiata): @end lilypond @funindex \phrasingSlurDashPattern -@funindex phrasingSlurDashPattern @cindex legatura di frase, definizione dei modelli di tratteggio @cindex legatura di portamento, fraseggio, definizione dei modelli di tratteggio @cindex legatura di portamento, definizione dei modelli di tratteggio per il fraseggio @@ -1000,7 +946,6 @@ Guida al funzionamento interno: @cindex respiri @cindex segno di pausa @funindex \breathe -@funindex breathe I respiri si inseriscono col comando @code{\breathe}: @@ -1064,7 +1009,6 @@ Guida al funzionamento interno: @cindex portamenti indeterminati verso il basso (cadute) e verso l'alto @funindex \bendAfter -@funindex bendAfter I @notation{portamenti indeterminati verso il basso (cadute) e verso l'alto} possono essere aggiunti alle note col comando @code{\bendAfter}. La direzione del @@ -1114,7 +1058,6 @@ una traiettoria lineare: glissandi, arpeggi e trilli. @cindex glissando @funindex \glissando -@funindex glissando Un @notation{glissando} si crea attaccando @code{\glissando} a una nota: @@ -1210,13 +1153,9 @@ Non è supportato il testo lungo la linea del glissando (ad esempio @notation{gl @cindex spezzato, arpeggio @funindex \arpeggio -@funindex arpeggio @funindex \arpeggioArrowUp -@funindex arpeggioArrowUp @funindex \arpeggioArrowDown -@funindex arpeggioArrowDown @funindex \arpeggioNormal -@funindex arpeggioNormal Un @notation{arpeggio} su un accordo (detto anche accordo spezzato) si ottiene aggiungendo @code{\arpeggio} all'accordo: @@ -1247,11 +1186,8 @@ Si possono scrivere vari tipi di arpeggio. @cindex simboli speciali di arpeggio @funindex \arpeggioBracket -@funindex arpeggioBracket @funindex \arpeggioParenthesis -@funindex arpeggioParenthesis @funindex \arpeggioParenthesisDashed -@funindex arpeggioParenthesisDashed Si possono creare simboli di arpeggio speciali @emph{in forma di parentesi}: @@ -1337,11 +1273,8 @@ descritti in @ref{Cross-staff stems}. @cindex trilli @funindex \trill -@funindex trill @funindex \startTrillSpan -@funindex startTrillSpan @funindex \stopTrillSpan -@funindex stopTrillSpan I trilli senza linea di estensione si ottengono col comando @code{\trill}; si veda @ref{Articulations and ornamentations}. @@ -1400,7 +1333,6 @@ sono descritti in @ref{Grace notes}. @cindex trilli con altezza @cindex trilli con notina @funindex \pitchedTrill -@funindex pitchedTrill I trilli che richiedono una nota ausiliaria dall'altezza esplicita si ottengono col comando @code{\pitchedTrill}. Il primo argomento è la nota diff --git a/Documentation/it/notation/pitches.itely b/Documentation/it/notation/pitches.itely index 55e677728d..53ef1ad1f4 100644 --- a/Documentation/it/notation/pitches.itely +++ b/Documentation/it/notation/pitches.itely @@ -90,7 +90,6 @@ un'ottava; ogni@tie{}@code{,} abbassa l'altezza di un'ottava. } @end lilypond -@funindex fixed @funindex \fixed I normali segni di ottava possono essere inseriti una sola volta se si imposta un'altezza di riferimento dopo @code{\fixed} e prima della musica. @@ -132,7 +131,6 @@ Frammenti di codice: @cindex ottava relativa @cindex relativa, ottava -@funindex relative @funindex \relative L'inserimento delle note con l'ottava assoluta costringe a specificare @@ -324,11 +322,8 @@ Guida al funzionamento interno: @cindex trasposizione e ottava relativa @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @@ -656,7 +651,6 @@ Questa sezione tratta il modo di modificare le altezze delle note. @funindex = @funindex \octaveCheck -@funindex octaveCheck @funindex controlpitch In modalità relativa è facile dimenticare un segno di cambiamento d'ottava. @@ -730,7 +724,6 @@ Guida al funzionamento interno: @cindex note, trasposizione delle @funindex \transpose -@funindex transpose Un'espressione musicale può essere trasposta con @code{\transpose}. La sintassi è @@ -849,11 +842,8 @@ Guida al funzionamento interno: @rinternals{TransposedMusic}. @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @knownissues La conversione relativa non avrà effetto sulle sezioni @code{\transpose}, @@ -915,7 +905,6 @@ Guida alla notazione: @cindex retrogradazione, trasformazione @cindex operazione, retrogradazione @funindex \retrograde -@funindex retrograde Un'espressione musicale può essere invertita in modo da produrre il proprio retrogrado: @@ -965,7 +954,6 @@ vengono trasformate.} @cindex modale, trasposizione @cindex operazione, trasposizione @funindex \modalTranspose -@funindex modalTranspose Un motivo può essere trasposto entro una certa scala con: @@ -1022,7 +1010,6 @@ motif = \relative { c'8 d e f g a b c } @cindex modale, inversione @cindex operazione, inversione modale @funindex \modalInversion -@funindex modalInversion Una sequenza di note può essere invertita all'interno di una data scala intorno a una determinata nota cardine e quindi trasposto, in un'unica operazione, con: @@ -1136,7 +1123,6 @@ Questa sezione tratta il modo di modificare l'aspetto delle altezze delle note. @funindex \clef -@funindex clef Senza un comando esplicito, la chiave predefinita in LilyPond è la chiave di violino (o di @emph{Sol}). @@ -1312,7 +1298,6 @@ applicato, con un altro @code{\override}, all'oggetto @var{ClefModifier}. @cindex armatura di chiave @funindex \key -@funindex key @c duplicated in Key signature and Accidentals @warning{I nuovi utenti sono talvolta confusi dalla gestione delle @@ -1331,23 +1316,14 @@ di chiave può essere modificata: @end example @funindex \major -@funindex major @funindex \minor -@funindex minor @funindex \ionian -@funindex ionian @funindex \locrian -@funindex locrian @funindex \aeolian -@funindex aeolian @funindex \mixolydian -@funindex mixolydian @funindex \lydian -@funindex lydian @funindex \phrygian -@funindex phrygian @funindex \dorian -@funindex dorian @cindex modi ecclesiastici @cindex modi @@ -1452,7 +1428,6 @@ Guida al funzionamento interno: @funindex set-octavation @funindex \ottava -@funindex ottava I @notation{segni di ottavazione} introducono un'ulteriore trasposizione di ottava nel rigo: @@ -1508,7 +1483,6 @@ Guida al funzionamento interno: @cindex trasposizione MIDI @funindex \transposition -@funindex transposition Quando si scrivono partiture che comprendono strumenti traspositori, alcune parti possono essere scritte a un'altezza diversa dall'@notation{intonazione reale}. @@ -3081,9 +3055,7 @@ Guida al funzionamento interno: @cindex teste di nota facili da suonare @funindex \easyHeadsOn -@funindex easyHeadsOn @funindex \easyHeadsOff -@funindex easyHeadsOff La nota @q{easy play} inserisce il nome della nota dentro la testa. Viene usata nella musica per principianti. Per rendere le lettere @@ -3149,15 +3121,10 @@ Guida al funzionamento interno: @cindex testa di nota, Walker @funindex \aikenHeads -@funindex aikenHeads @funindex \sacredHarpHeads -@funindex sacredHarpHeads @funindex \southernHarmonyHeads -@funindex southernHarmonyHeads @funindex \funkHeads -@funindex funkHeads @funindex \walkerHeads -@funindex walkerHeads In alcune notazioni, la forma della testa della nota corrisponde alla funzione armonica di una nota nella scala. Questa notazione @@ -3181,17 +3148,11 @@ Funk (Harmonica Sacra), Walker e Aiken (Christian Harmony): @end lilypond @funindex \key -@funindex key @funindex \aikenHeadsMinor -@funindex aikenHeadsMinor @funindex \sacredHarpHeadsMinor -@funindex sacredHarpHeadsMinor @funindex \southernHarmonyHeadsMinor -@funindex southernHarmonyHeadsMinor @funindex \funkHeadsMinor -@funindex funkHeadsMinor @funindex \walkerHeadsMinor -@funindex walkerHeadsMinor Le forme variano in base al grado della scala; la scala è determinata dal comando @code{\key}. Se si scrive in @@ -3262,9 +3223,7 @@ Guida al funzionamento interno: @cindex tagliata, testa di nota @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff L'improvvisazione viene talvolta indicata con teste tagliate: l'esecutore può scegliere qualsiasi nota ma deve seguire il ritmo diff --git a/Documentation/it/notation/rhythms.itely b/Documentation/it/notation/rhythms.itely index 8ff83031e7..77cc962d50 100644 --- a/Documentation/it/notation/rhythms.itely +++ b/Documentation/it/notation/rhythms.itely @@ -52,11 +52,8 @@ travature e le battute. @cindex note, lunghezza delle @funindex \longa -@funindex longa @funindex \breve -@funindex breve @funindex \maxima -@funindex maxima Le durate, indicate con numeri e punti, sono indicate con i valori corrispondenti. Per esempio, una nota di un quarto si indica con un @@ -139,11 +136,8 @@ alla loro durata. I dettagli relativi a questo argomento e alle impostazioni della notazione proporzionale si trovano in @ref{Proportional notation}. @funindex \dotsUp -@funindex dotsUp @funindex \dotsDown -@funindex dotsDown @funindex \dotsNeutral -@funindex dotsNeutral Di norma i punti sono spostati in su per evitare le linee del rigo, fuorché all'interno di passaggi polifonici. I punti possono essere orientati manualmente verso l'alto @@ -207,7 +201,6 @@ centoventottesimo fino alla maxima (otto volte una semibreve). @cindex terzine @funindex \tuplet -@funindex tuplet I gruppi irregolari sono costituiti da un'espressione musicale introdotta dal comando @code{\tuplet}, che moltiplica la velocità @@ -247,11 +240,8 @@ della musica per far sì che i gruppi siano suddivisi automaticamente: @cindex gruppo irregolare, posizionamento della parentesi quadra @funindex \tupletUp -@funindex tupletUp @funindex \tupletDown -@funindex tupletDown @funindex \tupletNeutral -@funindex tupletNeutral Le parentesi dei gruppi irregolari si possono posizionare manualmente sopra o sotto il rigo: @@ -384,7 +374,6 @@ esempio @code{s1*23}. @cindex espandere la musica @funindex \scaleDurations -@funindex scaleDurations Frammenti musicali più lunghi possono essere compressi secondo la stessa proporzione, come moltiplicando ogni nota, accordo o pausa per una medesima frazione. @@ -501,7 +490,6 @@ legati inserendo la legatura all'interno dell'accordo stesso. @cindex legature di valore e parentesi della volta @funindex \repeatTie -@funindex repeatTie Quando la battuta della "seconda volta" di un ritornello inizia con una nota legata a quella precedente, occorre indicare la legatura nel modo seguente: @@ -522,7 +510,6 @@ legata a quella precedente, occorre indicare la legatura nel modo seguente: @cindex legatura di valore, laissez vibrer @funindex \laissezVibrer -@funindex laissezVibrer Le legature @notation{L.v.}@: (@notation{laissez vibrer}) indicano che le note non devono essere terminate nettamente. Si usa nella notazione per @@ -536,11 +523,8 @@ così: @cindex legature di valore, posizionamento @funindex \tieUp -@funindex tieUp @funindex \tieDown -@funindex tieDown @funindex \tieNeutral -@funindex tieNeutral Le legature di valore possono essere impostate manualmente per avere la curva in su o in giù, come è spiegato in @ref{Direction and placement}. @@ -550,11 +534,8 @@ curva in su o in giù, come è spiegato in @ref{Direction and placement}. @cindex legature di valore tratteggiate @funindex \tieDotted -@funindex tieDotted @funindex \tieDashed -@funindex tieDashed @funindex \tieSolid -@funindex tieSolid Le legature di valore possono essere tratteggiate, punteggiate, oppure tracciate secondo una successione di tratti continui e tratti interrotti. @@ -679,14 +660,10 @@ Le pause si inseriscono insieme alla musica contenuta nelle espressioni musicali @cindex pausa di breve @funindex \rest -@funindex rest @funindex r @funindex \maxima -@funindex maxima @funindex \longa -@funindex longa @funindex \breve -@funindex breve Le pause si inseriscono allo stesso modo delle note, ma con il carattere @code{r}. Le durate più lunghe di un intero usano i seguenti comandi predefiniti: @@ -766,7 +743,6 @@ centoventottesimo fino alla maxima (otto volte una semibreve). @funindex s @funindex \skip -@funindex skip Una pausa invisibile (chiamata anche @q{pausa spaziatrice}) si inserisce come come una nota col nome@tie{}@code{s}: @@ -854,7 +830,6 @@ Guida al funzionamento interno: @cindex pause d'intero @cindex pausa intera per una misura intera -@funindex compressMMRests @funindex \compressMMRests @funindex R @@ -934,7 +909,6 @@ R2.*2 | @cindex pausa multipla con testo a margine @funindex \fermataMarkup -@funindex fermataMarkup @funindex MultiMeasureRestText Si possono aggiungere delle annotazioni alle pause multiple. Il comando @@ -967,13 +941,9 @@ non apparire i relativi avvertimenti del controllo battuta. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @funindex \fermataMarkup -@funindex fermataMarkup @funindex \compressMMRests -@funindex compressMMRests @predefined @code{\textLengthOn}, @@ -1060,7 +1030,6 @@ Le pause multiple non considerano le collisioni di pausa. @cindex misura @funindex \time -@funindex time L'indicazione di tempo si imposta così: @@ -1095,9 +1064,7 @@ comportamento predefinito, come è spiegato in @ref{Visibility of objects}. @cindex tempo, stile @funindex \numericTimeSignature -@funindex numericTimeSignature @funindex \defaultTimeSignature -@funindex defaultTimeSignature Il simbolo di indicazione di tempo usato nei tempi 2/2 e 4/4 può essere sostituito da un numero: @@ -1306,7 +1273,6 @@ Guida al funzionamento interno: @cindex indicazione metronomica con testo @funindex \tempo -@funindex tempo Un'indicazione metronomica è semplice da scrivere: @@ -1370,9 +1336,7 @@ includendo una stringa vuota nell'input: @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff In una parte per uno strumento che ha lunghi periodi pieni di pause, le indicazioni di tempo sono talvolta molto ravvicinate. Il comando @@ -1438,7 +1402,6 @@ Guida al funzionamento interno: @funindex measurePosition @funindex \partial -@funindex partial Le misure parziali, come l'@emph{anacrusi} o la battuta in levare, si inseriscono col comando @code{\partial}: @@ -1536,9 +1499,7 @@ Guida al funzionamento interno: @cindex travature, musica in tempo libero @funindex \cadenzaOn -@funindex cadenzaOn @funindex \cadenzaOff -@funindex cadenzaOff Nella musica in un tempo determinato l'inserimento delle stanghette e dei numeri di battuta è calcolato automaticamente. Nella musica in tempo libero (per esempio, @@ -1668,9 +1629,7 @@ di musica in tempo libero è necessario inserire manualmente delle stanghette @funindex timeSignatureFraction @funindex \scaleDurations -@funindex scaleDurations @funindex \tuplet -@funindex tuplet La notazione polimetrica è supportata esplicitamente o tramite la modifica manuale del simbolo d'indicazione di tempo (e la trasformazione della durata @@ -1965,9 +1924,7 @@ il rigo stesso ha una sola linea @funindex Pitch_squash_engraver @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff I diagrammi degli accordi per chitarra di solito mostrano i ritmi di accompagnamento. Si possono visualizzare usando l'incisore @@ -2035,9 +1992,7 @@ Le travature sono inserite automaticamente: @cindex travature, personalizzazione delle regole @funindex \autoBeamOn -@funindex autoBeamOn @funindex \autoBeamOff -@funindex autoBeamOff @lilypond[quote,verbatim] \relative c'' { @@ -2136,14 +2091,11 @@ non inizia la @emph{successiva}, nuova travatura. @funindex autoBeaming @funindex baseMoment -@funindex beamExceptions @funindex \beamExceptions @funindex beatStructure @funindex measureLength @funindex \time -@funindex time @funindex \set -@funindex set Quando la disposizione automatica delle travature è abilitata, la disposizione delle travature è determinata da tre proprietà di contesto: @@ -2552,7 +2504,6 @@ gli indicatori di direzione: @end lilypond @funindex \noBeam -@funindex noBeam Le note individuali possono essere contrassegnate con @code{\noBeam} per impedire che vengano inserite in una travatura: @@ -2636,7 +2587,6 @@ Guida al funzionamento interno: @cindex travature convergenti o divergenti @funindex \featherDurations -@funindex featherDurations @funindex grow-direction Le travature a raggiera servono a indicare che un gruppo di note determinato @@ -2718,7 +2668,6 @@ musica molto brevi e quando i numeri della frazione sono piccoli. @cindex battute dei ritornelli @funindex \bar -@funindex bar Le stanghette delimitano le misure e sono usate anche per indicare i ritornelli. Di norma, le stanghette semplici sono inserite @@ -2921,7 +2870,6 @@ con segno in congiunzione con un'appropriata stanghetta di ripetizione se usata con un comando @code{\repeat volta}, vedi @ref{Normal repeats}.. @funindex \defineBarLine -@funindex defineBarLine @cindex stanghette, definire @cindex definire le stanghette @@ -3039,7 +2987,6 @@ di un @code{StaffGroup}, @code{PianoStaff} o @code{GrandStaff}. @funindex whichBar @funindex defaultBarType @funindex \bar -@funindex bar @funindex bartype Il comando @samp{\bar @var{tipo-stanghetta}} è una scorciatoia di @@ -3244,7 +3191,6 @@ nell'input. @end lilypond @funindex \barNumberCheck -@funindex barNumberCheck Quando si copiano brani di una certa ampiezza, può essere d'aiuto verificare che i numeri di battuta di LilyPond corrispondano all'originale a partire dal quale @@ -3271,7 +3217,6 @@ Frammenti di codice: @cindex segni di chiamata @funindex \mark -@funindex mark Per creare un segno di chiamata si usa il comando @code{\mark}. @@ -3387,7 +3332,6 @@ stringa. @cindex glifi musicali @funindex \musicglyph -@funindex musicglyph I glifi musicali (come il Segno) possono essere posti dentro il comando @code{\mark} @@ -3501,7 +3445,6 @@ abbellimento da un ottavo @cindex abbellimenti al termine di una nota @funindex \afterGrace -@funindex afterGrace Se si desidera risolvere una nota su un abbellimento, si usa il comando @code{\afterGrace}. Considera due argomenti: la nota principale e diff --git a/Documentation/it/notation/simultaneous.itely b/Documentation/it/notation/simultaneous.itely index eb7dddf2c0..50779f4055 100644 --- a/Documentation/it/notation/simultaneous.itely +++ b/Documentation/it/notation/simultaneous.itely @@ -353,7 +353,6 @@ risoluzione delle collisioni, e potrebbe comportare altri effetti indesiderati @cindex cluster di note @funindex \makeClusters -@funindex makeClusters Un cluster prescrive l'esecuzione simultanea di tutti i suoni compresi in un determinato intervallo. Può essere rappresentato come un involucro che contiene le note che ne fanno parte. Si @@ -415,11 +414,9 @@ Questa sezione presenta le note simultanee in più voci o più righi. @cindex testo assegnato a una voce @funindex \voiceOne -@funindex voiceOne @funindex \voiceOne ... \voiceFour @funindex Voice @funindex \oneVoice -@funindex oneVoice @subsubsubheading Istanziare esplicitamente le voci @@ -681,21 +678,13 @@ Frammenti: @cindex spostamento automatico della pausa @cindex pausa, spostamento automatico @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn @funindex \shiftOff -@funindex shiftOff @funindex \mergeDifferentlyDottedOn -@funindex mergeDifferentlyDottedOn @funindex \mergeDifferentlyDottedOff -@funindex mergeDifferentlyDottedOff @funindex \mergeDifferentlyHeadedOn -@funindex mergeDifferentlyHeadedOn @funindex \mergeDifferentlyHeadedOff -@funindex mergeDifferentlyHeadedOff Le teste di note che si trovano in voci diverse ma hanno stessa altezza, stessa testa e direzione del gambo opposta vengono unite automaticamente; @@ -923,7 +912,6 @@ are at the same time differently dotted are not clear. @cindex parte a due @cindex parte solista @funindex \partcombine -@funindex partcombine La combinazione automatica delle parti si usa per combinare in un unico rigo due parti musicali separate. Ciò è utile soprattutto quando si scrivono partiture @@ -1029,17 +1017,11 @@ effetto sulle altezze di @code{@var{espressione-musicale1}} e @code{@var{espressione-musicale2}}. @funindex \partcombineChords -@funindex partcombineChords @funindex \partcombineApart -@funindex partcombineApart @funindex \partcombineUnisono -@funindex partcombineUnisono @funindex \partcombineSoloI -@funindex partcombineSoloI @funindex \partcombineSoloII -@funindex partcombineSoloII @funindex \partcombineAutomatic -@funindex partcombineAutomatic Nelle partiture professionali, spesso le voci sono tenute separate per lunghi passaggi anche se alcune note sono le stesse in entrambe le voci @@ -1176,7 +1158,6 @@ se si usa @code{\partcombine} con l'intavolatura, e la @emph{Nota} in @cindex musica parallela @cindex parallela, musica @funindex \parallelMusic -@funindex parallelMusic La musica che contiene parti diverse può essere messa in parallelo nel codice di input. La funzione @code{\parallelMusic} accetta una lista contenente diff --git a/Documentation/it/notation/staff.itely b/Documentation/it/notation/staff.itely index b62e4e4473..e5511734d9 100644 --- a/Documentation/it/notation/staff.itely +++ b/Documentation/it/notation/staff.itely @@ -65,7 +65,6 @@ Questa sezione presenta i diversi metodi per creare e raggruppare i righi. @cindex tablatura @funindex \drummode -@funindex drummode @funindex DrumStaff @funindex RhythmicStaff @funindex TabStaff @@ -421,9 +420,7 @@ le sezioni ossia. @cindex tagli addizionali, modificare @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff I comandi @code{\stopStaff} e @code{\startStaff} servono a fermare o (ri)avviare le linee del rigo, per impedire che appaiano in un punto @@ -595,9 +592,7 @@ Guida al funzionamento interno: @cindex ridimensionamento dei righi @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff I righi @notation{ossia} si possono creare aggiungendo un nuovo rigo simultaneo nel punto giusto: @@ -753,7 +748,6 @@ Guida al funzionamento interno: @funindex \RemoveAllEmptyStaves @funindex Staff_symbol_engraver @funindex \stopStaff -@funindex stopStaff Le linee del rigo si possono nascondere togliendo l'incisore @@ -1040,11 +1034,8 @@ Guida al funzionamento interno: @cindex note in corpo più piccolo @funindex \addQuote -@funindex addQuote @funindex \quoteDuring -@funindex quoteDuring @funindex \transposition -@funindex transposition È molto comune che una voce usi le stesse note di un'altra voce. Per esempio, il primo e il secondo violino che suonano la stessa frase durante un particolare @@ -1241,13 +1232,9 @@ terzine annidate potrebbe produrre una notazione mediocre. @funindex \cueDuring -@funindex cueDuring @funindex \cueClef -@funindex cueClef @funindex \cueDuringWithClef -@funindex cueDuringWithClef @funindex \quoteDuring -@funindex quoteDuring @cindex note più piccole @cindex CueVoice @@ -1430,7 +1417,6 @@ bassoonNotes = \relative c { @end lilypond @funindex \transposedCueDuring -@funindex transposedCueDuring Come @code{\quoteDuring}, @code{\cueDuring} prende in considerazione la trasposizione degli strumenti. Le citazioni in corpo più piccolo vengono mostrate nelle altezze @@ -1471,7 +1457,6 @@ bassClarinetNotes = \relative c' { @cindex citazioni in corpo più piccolo, togliere le @funindex \killCues -@funindex killCues Il comando @code{\killCues} toglie le citazioni in corpo più piccolo da un'espressione musicale, in modo che la stessa espressione musicale possa essere diff --git a/Documentation/it/notation/text.itely b/Documentation/it/notation/text.itely index a1bee4233e..8b0f382a56 100644 --- a/Documentation/it/notation/text.itely +++ b/Documentation/it/notation/text.itely @@ -98,9 +98,7 @@ Per maggiori informazioni sull'ordinamento relativo delle scritte e delle articolazioni si veda @rlearning{Posizionamento degli oggetti}. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @predefined @code{\textLengthOn}, @@ -179,11 +177,8 @@ Lo stile della linea, così come la stringa testuale, può essere definito come una proprietà dell'oggetto. Questa sintassi è descritta in @ref{Line styles}. @funindex \textSpannerUp -@funindex textSpannerUp @funindex \textSpannerDown -@funindex textSpannerDown @funindex \textSpannerNeutral -@funindex textSpannerNeutral @predefined @@ -231,9 +226,7 @@ Guida al funzionamento interno: @cindex stanghette, simboli sulle @funindex \mark -@funindex mark @funindex \markup -@funindex markup Si possono aggiungere vari elementi testuali a una partitura tramite la sintassi descritta in @ref{Rehearsal marks}: @@ -295,9 +288,7 @@ successiva. @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff @predefined @code{\markLengthOn}, @@ -337,7 +328,6 @@ Guida al funzionamento interno: @cindex testo al livello superiore @funindex \markup -@funindex markup Un blocco @code{\markup} può esistere di per sé, fuori da qualsiasi blocco @code{\score}, come un'@tie{@qq{espressione di livello superiore}}. Questa @@ -372,9 +362,7 @@ Questa funzionalità, e la sintassi specifica che richiede, è descritta in @ref{Multi-page markup}. @funindex \markup -@funindex markup @funindex \markuplist -@funindex markuplist @predefined @code{\markup}, @@ -426,7 +414,6 @@ usando la sintassi specifica della modalità @code{\markup}. @cindex annotazione @funindex \markup -@funindex markup Un blocco @code{\markup} permette di comporre del testo con un'ampia sintassi chiamata @qq{modalità markup}. @@ -536,11 +523,8 @@ Gli errori di sintassi relativi alla modalità markup possono essere poco chiari @cindex font, cambiare @funindex \italic -@funindex italic @funindex \bold -@funindex bold @funindex \underline -@funindex underline La modalità markup permette di cambiare il tipo di carattere: @@ -563,13 +547,9 @@ La modalità markup permette di cambiare il tipo di carattere: @funindex \abs-fontsize @funindex \fontsize -@funindex fontsize @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @funindex \magnify -@funindex magnify Si può modificare la dimensione del tipo di carattere, rispetto alla dimensione globale del rigo, in vari modi. @@ -629,11 +609,8 @@ altri caratteri. @cindex apice @funindex \super -@funindex super @funindex \sub -@funindex sub @funindex \normal-size-super -@funindex normal-size-super È possibile stampare il testo come pedice o apice. Per impostazione predefinita, questo appaiono in corpo più piccolo, ma si può usare @@ -704,21 +681,13 @@ tipi di carattere personalizzati si trova in @ref{Font}. è spiegato in @ref{Fonts}. @funindex \teeny -@funindex teeny @funindex \tiny -@funindex tiny @funindex \small -@funindex small @funindex \normalsize -@funindex normalsize @funindex \large -@funindex large @funindex \huge -@funindex huge @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @predefined @@ -774,11 +743,8 @@ tramite la sintassi descritta in @rlearning{Spostare gli oggetti}. @cindex allineamento orizzontale del testo @funindex \left-align -@funindex left-align @funindex \center-align -@funindex center-align @funindex \right-align -@funindex right-align Gli oggetti di markup possono essere allineati in vari modi. Per impostazione predefinita, l'indicazione testuale è allineata rispetto al suo margine @@ -798,7 +764,6 @@ secondo markup. @end lilypond @funindex \halign -@funindex halign L'allineamento orizzontale può essere ritoccato usando un valore numerico: @@ -824,11 +789,8 @@ oggetti di markup tutti insieme, come mostrato ad esempio in @cindex allineamento verticale del testo @funindex \raise -@funindex raise @funindex \lower -@funindex lower @funindex \null -@funindex null @c QUERY Should the function of ``\null'' be clarified? rp @@ -860,11 +822,8 @@ punto di riferimento e di conseguenza non si muove. @end lilypond @funindex \general-align -@funindex general-align @funindex \translate -@funindex translate @funindex \translate-scaled -@funindex translate-scaled Alcuni comandi possono cambiare l'allineamento sia orizzontale che verticale degli oggetti testuali in modalità markup. Qualsiasi oggetto interessato @@ -898,9 +857,7 @@ da questi comandi deve essere preceduto da un punto di riferimento: @cindex colonne, testo @funindex \column -@funindex column @funindex \center-column -@funindex center-column Un oggetto markup può includere varie linee di testo. Nell'esempio seguente, ogni elemento o espressione viene posizionato sulla sua @@ -927,7 +884,6 @@ linea, allineato a sinistra o centrato: @cindex markup, centrare sulla pagina @funindex \fill-line -@funindex fill-line Analogalmente, una lista di elementi o espressioni può essere distesa per riempire l'intera larghezza orizzontale della linea (se c'è un solo @@ -960,9 +916,7 @@ espressione di markup: @cindex markup, testo giustificato @funindex \wordwrap -@funindex wordwrap @funindex \justify -@funindex justify Indicazioni testuali lunghe possono andare a capo automaticamente in base alla larghezza della linea specificata. Possono essere allineate a @@ -1040,15 +994,10 @@ i comandi di markup. @cindex markup, incorniciatura @funindex \box -@funindex box @funindex \circle -@funindex circle @funindex \rounded-box -@funindex rounded-box @funindex \bracket -@funindex bracket @funindex \hbracket -@funindex hbracket Alcuni comandi di markup consentono di decorare gli elementi testuali con degli elementi grafici, come è illustrato nell'esempio seguente. @@ -1075,13 +1024,9 @@ degli elementi grafici, come è illustrato nell'esempio seguente. @cindex markup, padding @funindex \pad-markup -@funindex pad-markup @funindex \pad-x -@funindex pad-x @funindex \pad-to-box -@funindex pad-to-box @funindex \pad-around -@funindex pad-around Alcuni comandi possono richiedere un aumento del padding intorno al testo; per farlo si usano dei comandi di markup, descritti in modo @@ -1113,17 +1058,11 @@ Flute quartet keeps very uneven time." @cindex simboli non musicali @funindex \combine -@funindex combine @funindex \draw-circle -@funindex draw-circle @funindex \filled-box -@funindex filled-box @funindex \triangle -@funindex triangle @funindex \draw-line -@funindex draw-line @funindex \arrow-head -@funindex arrow-head Si possono produrre altri elementi grafici o simboli che non richiedono alcun testo. Come con qualsiasi espressione di markup, tali oggetti @@ -1150,9 +1089,7 @@ possono essere combinati. @cindex postscript @funindex \epsfile -@funindex epsfile @funindex \postscript -@funindex postscript Le funzionalità grafiche avanzate comprendono la possibilità di includere file di immagini convertite nel formato Encapsulated PostScript @@ -1348,11 +1285,8 @@ Guida al funzionamento interno: @cindex testo esteso su più pagine @funindex \markuplist -@funindex markuplist @funindex \justified-lines -@funindex justified-lines @funindex \wordwrap-lines -@funindex wordwrap-lines Sebbene gli oggetti di markup standard non possano avere interruzioni, una specifica sintassi permette di inserire linee di testo che possono estendersi @@ -1402,7 +1336,6 @@ Guida al funzionamento interno: @rinternals{TextScript}. @funindex \markuplist -@funindex markuplist @predefined @code{\markuplist}. diff --git a/Documentation/ja/learning/common-notation.itely b/Documentation/ja/learning/common-notation.itely index ea545600af..6dca8c5856 100644 --- a/Documentation/ja/learning/common-notation.itely +++ b/Documentation/ja/learning/common-notation.itely @@ -191,11 +191,8 @@ LilyPond の音符名はピッチを示しています。 @cindex layout vs. content (レイアウト vs. 内容) @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor 音楽用語集: @rglos{key signature}, @rglos{major}, @rglos{minor} @@ -464,11 +461,8 @@ A フラット メジャーの調では、@code{b} には臨時記号が付き @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! 音楽用語集: @rglos{dynamics}, @rglos{crescendo} @rglos{decrescendo} @@ -511,7 +505,6 @@ A フラット メジャーの調では、@code{b} には臨時記号が付き @cindex markup (マークアップ) @funindex \markup -@funindex markup テキストをあなたの楽譜に追加することができます: @@ -549,9 +542,7 @@ a'2_\markup { @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn 音楽用語集: @rglos{beam} @@ -609,7 +600,6 @@ a'2_\markup { @cindex partial measure (部分小節) @funindex \partial -@funindex partial 音楽用語集: @rglos{anacrusis} @@ -636,7 +626,6 @@ a'2_\markup { @cindex triplets (3 連符) @funindex \tuplet -@funindex tuplet 音楽用語集: @rglos{note value}, @rglos{triplet} @@ -665,9 +654,7 @@ a'2_\markup { @cindex appoggiatura (前打音) @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -861,10 +848,8 @@ LilyPond は最初の音楽表記の始まりを調べます。@c @cindex notation context (記譜コンテキスト) @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -1067,7 +1052,6 @@ LilyPond での多声音楽はまだ説明していないコンセプトを用 @cindex songs (歌) @funindex \addlyrics -@funindex addlyrics 音楽用語集: @rglos{lyrics} @@ -1444,7 +1428,6 @@ aFivePaper = \paper @{ paperheight = 21.0 \cm @} @cindex header block (ヘッダ ブロック) @funindex \header -@funindex header タイトル、作曲者、作品番号、それに類似の情報は @code{\header} ブロックの中に挿入されます。@c diff --git a/Documentation/ja/learning/fundamental.itely b/Documentation/ja/learning/fundamental.itely index 34897fcf25..3ae1f86046 100644 --- a/Documentation/ja/learning/fundamental.itely +++ b/Documentation/ja/learning/fundamental.itely @@ -77,9 +77,7 @@ LilyPond 入力ファイルの基本例は以下のようなものです: しかしながら、この例はスタート地点として役に立ちます。 @funindex \book -@funindex book @funindex \score -@funindex score @cindex book @cindex score @@ -168,11 +166,8 @@ LilyPond はまるでその音楽表記が上で示されたコマンドで包 @end example @funindex \header -@funindex header @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex header (ヘッダ) @cindex layout (レイアウト) @cindex midi @@ -199,7 +194,6 @@ MIDI 出力を作り出します。@c @cindex book block, implicit (暗黙の book ブロック) @cindex implicit book block (暗黙の book ブロック) @funindex \book -@funindex book あなたは複数の @code{\score} ブロックを記述するかもしれません。@c それらはそれぞれ別々の楽譜として扱われますが、それらは結合されて@c @@ -271,7 +265,6 @@ LilyPond がこのファイルを見ると、@code{melody} の値 @translationof Score is a (single) compound musical expression @funindex \score -@funindex score @cindex score @cindex contents of a score block (score ブロックの内容) @cindex score block, contents of (score ブロックの内容) @@ -1000,15 +993,10 @@ LilyPond は音符の水平方向の位置を調節するための手段をい @translationof Explicitly instantiating voices @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex voice contexts, creating (ボイス コンテキストを作成する) @@ -1190,13 +1178,9 @@ LilyPond は音符の水平方向の位置を調節するための手段をい @cindex collisions, notes (音符の衝突) @cindex shift commands (シフト コマンド) @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn 和音の中で小さな間隔で置かれる音符、@c あるいは異なるボイスで同時に発生する音符は、@c @@ -1244,7 +1228,6 @@ LilyPond は音符の水平方向の位置を調節するための手段をい @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics context, creating (歌詞コンテキストを作成する) @cindex lyrics, linking to voice (歌詞をボイスにリンクさせる) @@ -1279,7 +1262,6 @@ LilyPond は音符の水平方向の位置を調節するための手段をい @cindex lyrics and beaming (歌詞と連桁) @cindex beaming and lyrics (連桁と歌詞) @funindex \autoBeamOff -@funindex autoBeamOff LilyPond がデフォルトで使用する自動連桁は楽器だけの音楽では@c うまく機能しますが、歌詞を持つ音楽ではそれほどうまく機能しません。@c @@ -1291,7 +1273,6 @@ LilyPond がデフォルトで使用する自動連桁は楽器だけの音楽 @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex vocal score structure (ボーカル譜構造) @cindex choir staff @@ -1506,7 +1487,6 @@ LilyPond 内部では、これらの規則と情報ビットは@emph{コンテ @translationof Creating contexts @funindex \new -@funindex new @cindex new contexts (新しいコンテキスト) @cindex creating contexts (コンテキストを作成する) @cindex contexts, creating (コンテキストを作成する) @@ -1720,9 +1700,7 @@ LilyPond によって作成された楽譜上にあるすべての記号は @cindex context properties, modifying (コンテキスト プロパティを変更する) @cindex modifying context properties (コンテキスト プロパティを変更する) @funindex \set -@funindex set @funindex \unset -@funindex unset コンテキストにはいくつかのコンテキスト プロパティを保持する責任があります。@c それらプロパティの多くは変更可能であり、変更することで入力の構文解釈に影響を@c @@ -1924,7 +1902,6 @@ LilyPond 入力ファイルに対する特別なサポートを持つ@c @c Setting context properties with @code{\with} @funindex \with -@funindex with @cindex context properties, setting with \with (\with でコンテキスト プロパティを設定する) コンテキスト プロパティはコンテキストが作成されるときに@c @@ -1978,7 +1955,6 @@ like this: @cindex context properties, setting with \context (\context でコンテキスト プロパティを設定する) @funindex \context -@funindex context コンテキスト プロパティの値は単一のコマンドによってある特定のタイプの@c コンテキスト@emph{すべて} -- すべての @code{Staff} コンテキストなどのように @@ -2062,9 +2038,7 @@ like this: @cindex removing engravers (エングラーバを削除する) @funindex \consists -@funindex consists @funindex \remove -@funindex remove これまでに、コンテキストはそれぞれにいくつかのエングラーバを保持し、@c それぞれのエングラーバは出力のある特定部分 @@ -2163,7 +2137,6 @@ like this: @c Changing all contexts of the same type @funindex \layout -@funindex layout 上の例では、個々のコンテキストにエングラーバを追加あるいは削除する方法を@c 示しました。@c diff --git a/Documentation/ja/learning/tutorial.itely b/Documentation/ja/learning/tutorial.itely index e75bd42ef2..8e48c14456 100644 --- a/Documentation/ja/learning/tutorial.itely +++ b/Documentation/ja/learning/tutorial.itely @@ -224,7 +224,6 @@ LilyPond はいくつかの記譜要素を自動的に追加します。@c @cindex relative mode, and accidentals (臨時記号と相対モード) @funindex \relative -@funindex relative @funindex ' @funindex , @@ -409,7 +408,6 @@ A, G, F である場合は B の下に置かれます。 @cindex time signature (拍子記号) @funindex \time -@funindex time 音楽用語集: @rglos{time signature} @c 拍子記号 (time signature) @@ -436,7 +434,6 @@ A, G, F である場合は B の下に置かれます。 @cindex metronome marks (メトロノーム記号) @funindex \tempo -@funindex tempo 音楽用語集: @rglos{tempo indication}, @rglos{metronome} @@ -469,7 +466,6 @@ A, G, F である場合は B の下に置かれます。 @cindex bass (バス) @funindex \clef -@funindex clef 音楽用語集: @rglos{clef} @c : 音部記号 (clef) diff --git a/Documentation/ja/learning/tweaks.itely b/Documentation/ja/learning/tweaks.itely index 5f78d60981..303625837f 100644 --- a/Documentation/ja/learning/tweaks.itely +++ b/Documentation/ja/learning/tweaks.itely @@ -201,7 +201,6 @@ LilyPond が @code{\new Staff} のようなコマンドに遭遇した場合、@ @cindex override syntax (override 構文) @funindex \override -@funindex override 我々はすでに @ref{コンテキスト プロパティを変更する} と @ref{エングラーバを追加 / 削除する} で @strong{コンテキスト} のプロパティを@c @@ -276,7 +275,6 @@ Scheme モードについての更なる情報は @rextend{LilyPond Scheme synta @cindex revert command (revert コマンド) @funindex \revert -@funindex revert 一旦オーバライドされると、そのプロパティは再度オーバライドされるか @code{\revert} コマンドに遭遇するまで新しい値のままでいます。@c @@ -316,7 +314,6 @@ Scheme モードについての更なる情報は @rextend{LilyPond Scheme synta @translationof The \once prefix @funindex \once -@funindex once @code{\override} コマンドと @code{\set} コマンドには両方とも@c 接頭辞 @code{\once} が付く可能性があります。@c @@ -364,7 +361,6 @@ b c | @cindex overrideProperty command (overrideProperty コマンド) @funindex \overrideProperty -@funindex overrideProperty オーバライド コマンドには @code{\overrideProperty} という@c もう 1 つのフォーマットがあり、時々必要となります。@c @@ -379,7 +375,6 @@ b c | @cindex tweak command (tweak コマンド) @funindex \tweak -@funindex tweak 利用可能な最後の調整コマンドは @code{\tweak} です。@c これは同じ音楽タイミングで発生するいくつかのオブジェクトのうち、@c @@ -754,7 +749,6 @@ Slur へのリンクを選択すると、Slur のプロパティがリスト ア @cindex once override (一度だけオーバライドする) @funindex \once -@funindex once 上記の最後の例では @emph{すべて} のスラーが太くなっています。@c しかし、最初のスラーだけを太くしたい場合はどうでしょうか？@c @@ -801,7 +795,6 @@ Slur へのリンクを選択すると、Slur のプロパティがリスト ア @cindex default properties, reverting to (デフォルトのプロパティに戻す) @funindex \revert -@funindex revert 最後に、最初の 2 つだけのスラーを太くしたい場合はどうでしょうか？@c その場合、2 つのコマンド -- それぞれの前に @code{\once} を付けた -- @@ -2235,9 +2228,7 @@ LilyPond はこれらの制約を受け取り、 @cindex ottava bracket (オッターバ囲み) @funindex \startTextSpan -@funindex startTextSpan @funindex \stopTextSpan -@funindex stopTextSpan @cindex TextSpanner, example of overriding (TextSpanner をオーバライドする例) @cindex bound-details property, example (bound-details プロパティの例) @@ -2393,9 +2384,7 @@ c''2^"Text4" | @cindex notes, spreading out with text (テキストに合わせて音符の間隔を広げる) @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff デフォルトでは、音楽のレイアウトが考慮されている限り、@c マークアップによって作り出されるテキストは水平方向のスペースと関係しません。@c diff --git a/Documentation/ja/notation/changing-defaults.itely b/Documentation/ja/notation/changing-defaults.itely index 750d367770..b9aa8ebc54 100644 --- a/Documentation/ja/notation/changing-defaults.itely +++ b/Documentation/ja/notation/changing-defaults.itely @@ -1118,17 +1118,11 @@ StaffDefaults = \with { @cindex engravers, including in contexts (エングラーバをコンテキストに含める) @funindex \alias -@funindex alias @funindex \name -@funindex name @funindex \type -@funindex type @funindex \consists -@funindex consists @funindex \accepts -@funindex accepts @funindex \denies -@funindex denies @code{Staff} や @code{Voice} のようなコンテキストは、@c 簡単なブロックの組み合わせで構成されています。 diff --git a/Documentation/ja/notation/editorial.itely b/Documentation/ja/notation/editorial.itely index ca863bd1a4..12341e03e5 100644 --- a/Documentation/ja/notation/editorial.itely +++ b/Documentation/ja/notation/editorial.itely @@ -157,7 +157,6 @@ c4.-> d8---3 @cindex finger change (指を変える) @funindex \finger -@funindex finger 運指の指示は @var{音符}-@var{数字} を用いることで挿入することができます: @@ -182,7 +181,6 @@ c4-1 d-2 f-4 e-3 @cindex thumb-script (サム-スクリプト) @funindex \thumb -@funindex thumb ある音符を親指で演奏するよう指示するために、@c サム-スクリプト (thumb-script) を付け加えることができます @@ -247,9 +245,7 @@ c4-1 d-2 f-4 e-3 @cindex notes, transparent @funindex \hideNotes -@funindex hideNotes @funindex \unHideNotes -@funindex unHideNotes @c 未訳 隠された (または不可視、透明の) 音符は、preparing theory や作曲の演習の際に@c @@ -321,7 +317,6 @@ Notation Reference: @funindex color @funindex \with-color -@funindex with-color @funindex x11-color 個々のオブジェクトに色を割り振ることができます。@c @@ -437,7 +432,6 @@ Web 向けでは、ノーマル カラーを使用することを推奨します @cindex brackets (囲み) @funindex \parenthesize -@funindex parenthesize 音楽イベントの前に @code{\parenthesize} を置くことによって、@c そのオブジェクトに括弧を付けることができます。@c @@ -487,11 +481,8 @@ Web 向けでは、ノーマル カラーを使用することを推奨します @cindex invisible stem (不可視の符幹) @funindex \stemUp -@funindex stemUp @funindex \stemDown -@funindex stemDown @funindex \stemNeutral -@funindex stemNeutral @cindex stem, direction (符幹の向き) @cindex stem, up (符幹を上向きにする) @cindex stem, down (符幹を下向きにする) @@ -559,9 +550,7 @@ Web 向けでは、ノーマル カラーを使用することを推奨します @funindex balloonGrobText @funindex balloonText @funindex \balloonLengthOn -@funindex balloonLengthOn @funindex \balloonLengthOff -@funindex balloonLengthOff 記譜要素に四角いバルーンで印を付けて、テキストを付け加えることができます。@c この機能の主目的は記譜法を説明することです。 @@ -702,9 +691,7 @@ altered: @funindex Horizontal_bracket_engraver @funindex \startGroup -@funindex startGroup @funindex \stopGroup -@funindex stopGroup 音楽分析では、囲みを使って楽曲の構造を示します。@c シンプルな水平な囲みがサポートされています。 diff --git a/Documentation/ja/notation/expressive.itely b/Documentation/ja/notation/expressive.itely index f28c43a396..02f8b4e6ff 100644 --- a/Documentation/ja/notation/expressive.itely +++ b/Documentation/ja/notation/expressive.itely @@ -238,43 +238,24 @@ R1\fermataMarkup @cindex dynamics, absolute (絶対強弱記号) @funindex \ppppp -@funindex ppppp @funindex \pppp -@funindex pppp @funindex \ppp -@funindex ppp @funindex \pp -@funindex pp @funindex \p -@funindex p @funindex \mp -@funindex mp @funindex \mf -@funindex mf @funindex \f -@funindex f @funindex \ff -@funindex ff @funindex \fff -@funindex fff @funindex \ffff -@funindex ffff @funindex \fffff -@funindex fffff @funindex \fp -@funindex fp @funindex \sf -@funindex sf @funindex \sff -@funindex sff @funindex \sp -@funindex sp @funindex \spp -@funindex spp @funindex \sfz -@funindex sfz @funindex \rfz -@funindex rfz 絶対強弱記号は音符の後にコマンドを用いて -- @code{c4\ff} などのように @@ -305,9 +286,7 @@ R1\fermataMarkup @funindex \> @funindex \! @funindex \cr -@funindex cr @funindex \decr -@funindex decr @notation{クレッシェンド} 記号は @code{\<} で始まり、@code{\!}、@c 絶対強弱記号あるいは追加のクレッシェンド記号またはデクレッシェンド記号で@c @@ -370,7 +349,6 @@ R1\fermataMarkup @cindex espressivo articulation (表現的なアーティキュレーション) @funindex \espressivo -@funindex espressivo @code{\espressivo} コマンドを用いて、同じ音符にクレッシェンドとデクレッシェンドを@c 付けることができます。@c @@ -386,11 +364,8 @@ R1\fermataMarkup @funindex \cresc -@funindex cresc @funindex \decresc -@funindex decresc @funindex \dim -@funindex dim テキストのクレッシェンド記号は @code{\cresc} で開始します。@c テキストのデクレッシェンド記号は @code{\decresc} または @code{\dim} で開始します。@c @@ -406,17 +381,11 @@ R1\fermataMarkup @end lilypond @funindex \crescTextCresc -@funindex crescTextCresc @funindex \dimTextDecresc -@funindex dimTextDecresc @funindex \dimTextDecr -@funindex dimTextDecr @funindex \dimTextDim -@funindex dimTextDim @funindex \crescHairpin -@funindex crescHairpin @funindex \dimHairpin -@funindex dimHairpin 強弱のテキスト符号の変更でヘアピンを置換することもできます: @lilypond[verbatim,quote] @@ -447,11 +416,8 @@ R1\fermataMarkup 強弱記号の垂直方向の位置は @rinternals{DynamicLineSpanner} によって処理されます。 @funindex \dynamicUp -@funindex dynamicUp @funindex \dynamicDown -@funindex dynamicDown @funindex \dynamicNeutral -@funindex dynamicNeutral @code{Dynamics} を用いて水平線上に強弱記号を譜刻することができます。@c タイミングを示すために空白休符を使用します。@c @@ -562,9 +528,7 @@ moltoF = \markup { molto \dynamic f } @cindex dynamics, parenthesis (括弧の強弱記号) @cindex editorial dynamics (注釈の強弱記号) @funindex \bracket -@funindex bracket @funindex \dynamic -@funindex dynamic マークアップ モードでは、@c 注釈の強弱記号 (括弧や角括弧で囲まれます) を作成することができます。@c @@ -709,9 +673,7 @@ LilyPond の拡張: @cindex slurs, below notes (音符の下にスラーを配置する) @cindex slurs, above notes (音符の上にスラーを配置する) @funindex \slurDown -@funindex slurDown @funindex \slurNeutral -@funindex slurNeutral スラーを手動で音符の上または下に配置することができます。@c @ref{Direction and placement} を参照してください。 @@ -738,11 +700,8 @@ LilyPond の拡張: @cindex slur, dashed (破線のスラー) @cindex style, slur (スラーのスタイル) @funindex \slurDashed -@funindex slurDashed @funindex \slurDotted -@funindex slurDotted @funindex \slurSolid -@funindex slurSolid スラーは実線、点線あるいは破線のどれかになります。@c 実線がスラーのデフォルト スタイルです: @@ -760,9 +719,7 @@ LilyPond の拡張: @end lilypond @funindex \slurHalfDashed -@funindex slurHalfDashed @funindex \slurHalfSolid -@funindex slurHalfSolid @cindex slur, half dashed and half solid (半分が破線で半分が実線のスラー) スラーの半分を破線 (前半を破線、後半を実線) にする、あるいは、@c @@ -781,7 +738,6 @@ LilyPond の拡張: @end lilypond @funindex \slurDashPattern -@funindex slurDashPattern @cindex slur, defining dash patterns (スラーの破線パターンを定義する) スラーの破線パターンを定義することができます: @@ -801,7 +757,6 @@ LilyPond の拡張: @funindex \slurUp -@funindex slurUp @predefined @@ -868,11 +823,8 @@ LilyPond の拡張: @end lilypond @funindex \phrasingSlurUp -@funindex phrasingSlurUp @funindex \phrasingSlurDown -@funindex phrasingSlurDown @funindex \phrasingSlurNeutral -@funindex phrasingSlurNeutral 印刷の上では、フレージング スラーは通常のスラーとほとんど同じです。@c しかしながら、それぞれ異なるオブジェクトとして取り扱われます。@c @@ -889,12 +841,9 @@ LilyPond の拡張: 同時進行あるいは重なり合うフレージング スラーは許可されません。 -@funindex phrasingSlurDashed @funindex \phrasingSlurDashed @funindex \phrasingSlurDotted -@funindex phrasingSlurDotted @funindex \phrasingSlurSolid -@funindex phrasingSlurSolid @cindex phrasing slur, dashed (破線のフレージング スラー) @cindex dashed phrasing slur (破線のフレージング スラー) @cindex phrasing slur, dotted (点線のフレージング スラー) @@ -917,10 +866,8 @@ LilyPond の拡張: } @end lilypond -@funindex phrasingSlurHalfDashed @funindex \phrasingSlurHalfDashed @funindex \phrasingSlurHalfSolid -@funindex phrasingSlurHalfSolid @cindex phrasing slur, half solid and half dashed (半分が実線で半分が破線のフレージング スラー) @cindex slur, half solid and half dashed phrasing (半分が実線で半分が破線のフレージング スラー) @@ -940,7 +887,6 @@ LilyPond の拡張: @end lilypond @funindex \phrasingSlurDashPattern -@funindex phrasingSlurDashPattern @cindex phrasing slur, defining dash patterns @cindex slur, phrasing, defining dash patterns (フレージング スラーの破線パターンを定義する) @cindex slur, defining dash patterns for phrasing (フレージング スラーの破線パターンを定義する) @@ -998,7 +944,6 @@ LilyPond の拡張: @cindex breath marks (ブレス記号) @cindex pause mark (休止記号) @funindex \breathe -@funindex breathe ブレス記号は @code{\breathe} を用いて入力します: @@ -1061,7 +1006,6 @@ divisiones (ディビジョン: 区切り) がサポートされています。@ @cindex falls (Fall) @cindex doits (Doit) @funindex \bendAfter -@funindex bendAfter @code{\bendAfter} コマンドを用いて、@c @notation{Fall} と @notation{Doit} 音符にを付け加えることができます。@c @@ -1112,7 +1056,6 @@ Fall あるいは Doit の向きはプラスあるいはマイナス (上ある @cindex glissando (グリッサンド) @funindex \glissando -@funindex glissando @notation{グリッサンド} は音符の後に @code{\glissando} を付けることに@c よって作成されます: @@ -1211,13 +1154,9 @@ Fall あるいは Doit の向きはプラスあるいはマイナス (上ある @cindex chord, broken (変則和音) @funindex \arpeggio -@funindex arpeggio @funindex \arpeggioArrowUp -@funindex arpeggioArrowUp @funindex \arpeggioArrowDown -@funindex arpeggioArrowDown @funindex \arpeggioNormal -@funindex arpeggioNormal 和音の @notation{アルペジオ} (変則和音とも呼ばれます) は和音構造の後に @code{\arpeggio} を付けることによって記述されます: @@ -1248,11 +1187,8 @@ Fall あるいは Doit の向きはプラスあるいはマイナス (上ある @cindex special arpeggio symbols (特殊なアルペジオ シンボル) @funindex \arpeggioBracket -@funindex arpeggioBracket @funindex \arpeggioParenthesis -@funindex arpeggioParenthesis @funindex \arpeggioParenthesisDashed -@funindex arpeggioParenthesisDashed 特殊な @emph{括弧スタイル} のアルペジオ シンボルを作成することができます: @@ -1338,11 +1274,8 @@ Fall あるいは Doit の向きはプラスあるいはマイナス (上ある @cindex trills (トリル) @funindex \trill -@funindex trill @funindex \startTrillSpan -@funindex startTrillSpan @funindex \stopTrillSpan -@funindex stopTrillSpan 延長線を持たない短い @notation{トリル} は @code{\trill} で譜刻されます。@c @ref{アーティキュレーションと装飾} を参照してください。 @@ -1399,7 +1332,6 @@ Fall あるいは Doit の向きはプラスあるいはマイナス (上ある @cindex pitched trills (ピッチを持つトリル) @cindex trills, pitched (ピッチを持つトリル) @funindex \pitchedTrill -@funindex pitchedTrill 明示的なピッチを持つ予備の音符を必要とするトリルは @code{\pitchedTrill} コマンドを用いて譜刻することができます。@c diff --git a/Documentation/ja/notation/fretted-strings.itely b/Documentation/ja/notation/fretted-strings.itely index f4b7d0abf9..da57b16580 100644 --- a/Documentation/ja/notation/fretted-strings.itely +++ b/Documentation/ja/notation/fretted-strings.itely @@ -572,7 +572,6 @@ LilyPond は、あらかじめ定義されたチューニングに対して、@c あらかじめ定義された弦チューニングは @file{ly/string-tunings-init.ly} の中に@c あります。 -@funindex stringTunings @funindex \stringTunings @cindex tablature, custom string tunings (カスタム弦チューニングのタブ譜) @cindex custom string tunings (カスタム弦チューニング) @@ -779,7 +778,6 @@ fret-diagram マークアップ文字列のダイアグラムに、@c @cindex fret-diagram markup (フレット ダイアグラムのマークアップ) @cindex ukulele (ウクレレ) -@funindex fret-diagram @funindex \fret-diagram フレット ダイアグラムのサイズ、それにダイアグラムの中のフレット数を@c @@ -870,7 +868,6 @@ fret-diagram マークアップ文字列でドットの大きさと位置を制 @cindex fret-diagram-terse markup (fret-diagram-terse マークアップ) -@funindex fret-diagram-terse @funindex \fret-diagram-terse fret-diagram-terse マークアップ文字列は弦番号を省略します。@c @@ -950,7 +947,6 @@ fret-diagram-terse マークアップを使っている時、@c @cindex fret-diagram-verbose markup (fret-diagram-verbose マークアップ) @cindex capo (カポ) -@funindex fret-diagram-verbose @funindex \fret-diagram-verbose fret-diagram-verbose マークアップ文字列のフォーマットは Scheme リストです。@c @@ -1209,7 +1205,6 @@ myChords = \chordmode { c1 c:m7.5- c:aug } @cindex fret diagrams with chord names @funindex ChordNames -@funindex chordmode @funindex \chordmode コード ネームとフレット ダイアグラムを一緒に表示させることが@c @@ -1364,8 +1359,6 @@ mychords = \chordmode { @cindex chord shapes for fretted instruments (フレットのある楽器のコード シェイプ) @funindex \addChordShape -@funindex addChordShape -@funindex storePredefinedDiagram @funindex \storePredefinedDiagram @ignore @@ -1491,9 +1484,7 @@ mychords = \chordmode{ >> @end lilypond -@funindex predefinedFretboardsOff @funindex \predefinedFretboardsOff -@funindex predefinedFretboardsOn @funindex \predefinedFretboardsOn デフォルトではあらかじめ定義されたダイアグラムは読み込まれないため、@c @@ -1627,7 +1618,6 @@ property. @cindex fingerings, right hand for fretted instruments (フレットのある楽器での右手の運指) @cindex right hand fingerings for fretted instruments (フレットのある楽器での右手の運指) -@funindex rightHandFinger @funindex \rightHandFinger 右手の運指 @var{p-i-m-a} は後に数字が続く @code{\rightHandFinger} を用いて@c @@ -1801,7 +1791,6 @@ LilyPond は、符頭を三角形に変更することで、@c @unnumberedsubsubsec パワー コードの指示 @translationof Indicating power chords -@funindex powerChords @funindex \powerChords @cindex power chords (パワー コード) diff --git a/Documentation/ja/notation/keyboards.itely b/Documentation/ja/notation/keyboards.itely index 1408879288..0a28ca77a8 100644 --- a/Documentation/ja/notation/keyboards.itely +++ b/Documentation/ja/notation/keyboards.itely @@ -155,7 +155,6 @@ @cindex beams, cross-staff (譜を跨ぐ連桁) @funindex \change -@funindex change 以下のコマンドを用いて、ボイスの譜を手動で切り換えることができます: @@ -271,7 +270,6 @@ @cindex staff changes, automatic (譜の自動変更) @funindex \autochange -@funindex autochange @funindex PianoStaff 譜の上端と下端の間で、ボイスを自動的に切り換えることができます。@c @@ -301,7 +299,6 @@ @cindex autochange and relative music (自動変更と相対モード) @funindex \relative -@funindex relative @code{\autochange} の外側にある @code{\relative} セクションは、@c @code{\autochange} の内部にある音符のピッチに影響を与えません。@c @@ -376,9 +373,7 @@ @funindex followVoice @funindex \showStaffSwitch -@funindex showStaffSwitch @funindex \hideStaffSwitch -@funindex hideStaffSwitch ボイスが他の譜に切り替わる時に、音符を繋げる線を自動的に譜刻することができます: @@ -478,17 +473,11 @@ @cindex U.C. @funindex \sustainOn -@funindex sustainOn @funindex \sustainOff -@funindex sustainOff @funindex \sostenutoOn -@funindex sostenutoOn @funindex \sostenutoOff -@funindex sostenutoOff @funindex \unaCorda -@funindex unaCorda @funindex \treCorde -@funindex treCorde 一般的に、ピアノは音を変化させるために 3 本のペダルを持ちます: @notation{サステイン}, @notation{ソステヌート} (@notation{sos.}), diff --git a/Documentation/ja/notation/pitches.itely b/Documentation/ja/notation/pitches.itely index c0db5f7521..b5e85815e1 100644 --- a/Documentation/ja/notation/pitches.itely +++ b/Documentation/ja/notation/pitches.itely @@ -114,7 +114,6 @@ @cindex relative octave specification (相対オクターブ指定) @cindex ocatve specification, relative (相対オクターブ指定) -@funindex relative @funindex \relative 絶対オクターブ入力は、一つ一つの音符のオクターブを指定する必要があります。@c @@ -302,11 +301,8 @@ B の後の F ダブル フラットは B よりも下に配置されます。@c @cindex transposition and relative octave entry (移調と相対オクターブ入力) @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @node 臨時記号 @@ -631,7 +627,6 @@ LilyPond ではどちらの形式も認められます。@c @funindex = @funindex \octaveCheck -@funindex octaveCheck @funindex controlpitch 相対モードでは、オクターブ変更記号を付け忘れることが容易に起こり得ます。@c @@ -710,7 +705,6 @@ LilyPond ではどちらの形式も認められます。@c @cindex notes, transposition of (音符の移調) @funindex \transpose -@funindex transpose 音楽表記は @code{\transpose} で移調させることができます。@c 構文は以下の通りです: @@ -829,11 +823,8 @@ musicInBflat = @{ e4 @dots{} @} @rinternals{TransposedMusic} @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @knownissues 相対変換コマンドはその引数の中にある @code{\transpose}, @code{\chordmode}, @@ -892,7 +883,6 @@ music = \relative { c' d e f } @cindex transformation, retrograde (逆行変換) @cindex operation, retrograde (逆行操作) @funindex \retrograde -@funindex retrograde 音楽表記を後ろから前に演奏する逆行を作り出すことができます: @@ -939,7 +929,6 @@ music = \relative { c'8. ees16( fis8. a16 b8.) gis16 f8. d16 } @cindex transposition, modal (様式的な移調) @cindex operation, transposition (移調操作) @funindex \modalTranspose -@funindex modalTranspose 以下により、与えられた音階でモチーフを移調させることができます: @@ -994,7 +983,6 @@ motif = \relative { c'8 d e f g a b c } @cindex inversion, modal (様式的な反転) @cindex operation, modal inversion (様式的な反転操作) @funindex \modalInversion -@funindex modalInversion モチーフを与えられた音階に従って与えられた旋回点 (音符) で反転させて、 移調させることを 1 つの操作でできます: @@ -1110,7 +1098,6 @@ motif = \relative { c'8. ees16 fis8. a16 b8. gis16 f8. d16 } @cindex clef, subbass (低バス音部記号) @funindex \clef -@funindex clef 音部記号を変えることができます。@c 以下のそれぞれの例の中にある音符はすべてミドル C です。@c @@ -1254,7 +1241,6 @@ c'2 c' @cindex key signature (調号) @funindex \key -@funindex key @c duplicated in Key signature and Accidentals @warning{LilyPond を始めたばかりのユーザは@c @@ -1274,23 +1260,14 @@ LilyPond では、音符名は未加工の入力です。@c @end example @funindex \major -@funindex major @funindex \minor -@funindex minor @funindex \ionian -@funindex ionian @funindex \locrian -@funindex locrian @funindex \aeolian -@funindex aeolian @funindex \mixolydian -@funindex mixolydian @funindex \lydian -@funindex lydian @funindex \phrygian -@funindex phrygian @funindex \dorian -@funindex dorian @cindex church modes (チャーチ モード) @cindex modes (モード) @@ -1395,7 +1372,6 @@ freygish = #`((0 . ,NATURAL) (1 . ,FLAT) (2 . ,NATURAL) @funindex set-octavation @funindex \ottava -@funindex ottava @notation{オッターバ囲み} は譜をオクターブ単位で移調します: @@ -1444,7 +1420,6 @@ freygish = #`((0 . ,NATURAL) (1 . ,FLAT) (2 . ,NATURAL) @cindex MIDI transposition (MIDI の移調) @funindex \transposition -@funindex transposition 楽器の移調を含む楽器を譜刻するとき、いくつかのパートは@c @notation{コンサート ピッチ} とは異なるピッチで譜刻される可能性があります。@c @@ -2913,9 +2888,7 @@ forget = #(define-music-function (music) (ly:music?) #{ @cindex note heads, easy play (演奏を容易にする符頭) @funindex \easyHeadsOn -@funindex easyHeadsOn @funindex \easyHeadsOff -@funindex easyHeadsOff @q{演奏を容易にする} 符頭は、符頭の中に音符名を含みます。@c これは、初心者のための楽譜で使用されます。@c @@ -2982,15 +2955,10 @@ forget = #(define-music-function (music) (ly:music?) #{ @cindex note heads, Walker @funindex \aikenHeads -@funindex aikenHeads @funindex \sacredHarpHeads -@funindex sacredHarpHeads @funindex \southernHarmonyHeads -@funindex southernHarmonyHeads @funindex \funkHeads -@funindex funkHeads @funindex \walkerHeads -@funindex walkerHeads シェイプ ノート記譜法では、@c 符頭の形状は音階の中での音符の位置付けに対応します。@c @@ -3015,17 +2983,11 @@ Funk (Harmonica Sacra)、Walker、それに Aiken (Christian Harmony) スタイ @end lilypond @funindex \key -@funindex key @funindex \aikenHeadsMinor -@funindex aikenHeadsMinor @funindex \sacredHarpHeadsMinor -@funindex sacredHarpHeadsMinor @funindex \southernHarmonyHeadsMinor -@funindex southernHarmonyHeadsMinor @funindex \funkHeadsMinor -@funindex funkHeadsMinor @funindex \walkerHeadsMinor -@funindex walkerHeadsMinor 符頭の形状は音階の中での位置に対応し、@c 音階のベースは @code{\key} コマンドによって決まります。@c @@ -3094,9 +3056,7 @@ Funk (Harmonica Sacra)、Walker、それに Aiken (Christian Harmony) スタイ @cindex note heads, slashed (スラッシュ形の符頭) @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff 即興はしばしばスラッシュ形の符頭で記されます。@c そのような表記では、演奏者は好みのピッチを選ぶことができますが、@c diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely index 79127b122d..2f91192bb6 100644 --- a/Documentation/ja/notation/rhythms.itely +++ b/Documentation/ja/notation/rhythms.itely @@ -51,11 +51,8 @@ @cindex note lengths (音符の長さ) @funindex \longa -@funindex longa @funindex \breve -@funindex breve @funindex \maxima -@funindex maxima 演奏時間は数とドットで指定されます。@c 演奏時間はその演奏時間の逆数で入力されます。@c @@ -131,11 +128,8 @@ 詳細は @ref{Proportional notation} を参照してください。 @funindex \dotsUp -@funindex dotsUp @funindex \dotsDown -@funindex dotsDown @funindex \dotsNeutral -@funindex dotsNeutral 通常、多声でない限り、ドットは譜線を避けるために上に移動させられます。@c ある特定のドットの移動方向を手動で指定するための定義済みコマンドがあります @@ -203,7 +197,6 @@ @cindex triplets (3 連符) @funindex \tuplet -@funindex tuplet 連符は @code{\tuplet} を使った音楽表記から作られ、@c 音楽表記の速度に分数を掛け合わせます。 @@ -241,11 +234,8 @@ @cindex tuplet bracket placement (連符囲みの配置) @funindex \tupletUp -@funindex tupletUp @funindex \tupletDown -@funindex tupletDown @funindex \tupletNeutral -@funindex tupletNeutral 連符囲みは手動で譜の上または下に配置することができます: @@ -372,7 +362,6 @@ b16*4 c4 @cindex expanding music (音楽を伸長する) @funindex \scaleDurations -@funindex scaleDurations 同様の方法で分数を使うことで、長く伸びた音楽を圧縮することができます。@c それによりそれぞれの音符、和音、休符には@c @@ -468,7 +457,6 @@ a2 ~ 2 @cindex ties and volta brackets (タイと volta 囲み) @funindex \repeatTie -@funindex repeatTie 繰り返しの 2 回目の差し替え部分はタイで結ばれた音符で始まっています。@c そのような繰り返し部分でのタイは以下のように指定する必要があります: @@ -487,7 +475,6 @@ a2 ~ 2 @cindex ties, laissez vibrer (レセ ヴィブレのタイ) @funindex \laissezVibrer -@funindex laissezVibrer @notation{L.v.}@: タイ (@notation{レセ ヴィブレ: laissez vibrer}) は@c 音符を終端で途切れさせないということを示します。@c @@ -501,11 +488,8 @@ L.v. タイは以下のように入力します: @cindex ties, placement (タイの配置) @funindex \tieUp -@funindex tieUp @funindex \tieDown -@funindex tieDown @funindex \tieNeutral -@funindex tieNeutral タイを手動で譜の上または下に配置することができます。 @ref{Direction and placement} を参照してください。 @@ -517,11 +501,8 @@ L.v. タイは以下のように入力します: @cindex dotted ties (点線のタイ) @funindex \tieDotted -@funindex tieDotted @funindex \tieDashed -@funindex tieDashed @funindex \tieSolid -@funindex tieSolid タイを破線、点線、実線と破線の組み合わせにすることができます。 @@ -640,14 +621,10 @@ c2 ~ 2 @cindex breve rest (二全休符) @funindex \rest -@funindex rest @funindex r @funindex \maxima -@funindex maxima @funindex \longa -@funindex longa @funindex \breve -@funindex breve 休符は音符名 @code{r} を持つ音符として入力されます。@c 全休符よりも長い演奏時間を持つ休符には以下に示す定義済みコマンドを使用します: @@ -730,7 +707,6 @@ c2 ~ 2 @funindex s @funindex \skip -@funindex skip 不可視の休符 (@q{空白休符} とも呼ばれます) は音符名@tie{}@code{s} を@c 持つ音符として入力することができます: @@ -868,9 +844,7 @@ R1*2 | @cindex multi-measure rest, contracting (複数小節にまたがる休符をまとめる) @funindex \expandFullBarRests -@funindex expandFullBarRests @funindex \compressFullBarRests -@funindex compressFullBarRests デフォルトでは、複数小節にまたがる休符は@c 休みの小節すべてを明示的に示すように譜刻される楽譜に展開されます。@c @@ -903,7 +877,6 @@ R2.*2 | @cindex multi-measure rest with markup (マークアップを持つ複数小節にまたがる休符) @funindex \fermataMarkup -@funindex fermataMarkup @funindex MultiMeasureRestText マークアップを複数小節にまたがる休符に付け加えることができます。@c @@ -941,15 +914,11 @@ R1^"right" @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff @funindex textLenthOff @funindex \fermataMarkup -@funindex fermataMarkup @funindex \compressFullBarRests -@funindex compressFullBarRests @funindex \expandFullBarRests -@funindex expandFullBarRests @predefined @code{\textLengthOn}, @@ -1036,7 +1005,6 @@ R1^"right" @cindex meter (拍) @funindex \time -@funindex time 拍子は以下のようにセットします: @@ -1068,9 +1036,7 @@ R1^"right" @cindex meter style (拍スタイル) @funindex \numericTimeSignature -@funindex numericTimeSignature @funindex \defaultTimeSignature -@funindex defaultTimeSignature 2/2 や 4/4 で使用される拍子は数字を使用するスタイルに変更することができます: @@ -1282,7 +1248,6 @@ R1^"right" @cindex metronome marking with text (テキストを持つメトロノーム記号) @funindex \tempo -@funindex tempo 基本的なメトロノーム記号は単純に以下のように記述します: @@ -1391,7 +1356,6 @@ R1^"right" @funindex measurePosition @funindex \partial -@funindex partial @emph{弱拍} や @emph{上拍} などのような部分小節またはピックアップ小節は、@c @code{\partial} コマンドを使って入力します:@c @@ -1495,9 +1459,7 @@ r8 e,8 | a4 c8 b[ c b] | @cindex beams, unmetered music (無韻律の音楽での連桁) @funindex \cadenzaOn -@funindex cadenzaOn @funindex \cadenzaOff -@funindex cadenzaOff 韻律のある音楽では、自動的に小節線が挿入され、小節番号が算出されます。@c 無韻律の音楽 (例えばカデンツァ) では、これは望ましくなく、コマンド @@ -1643,9 +1605,7 @@ cis4 d cis! d @funindex timeSignatureFraction @funindex \scaleDurations -@funindex scaleDurations @funindex \times -@funindex times 多拍子記譜法がサポートされます。 複合拍子記譜法がサポートされます。@c @@ -1912,9 +1872,7 @@ cis4 d cis! d @funindex Pitch_squash_engraver @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff ギター コード表はしばしばつま弾き (ストラム) のリズムを示します。@c これは @code{Pitch_squash_engraver} と @code{\improvisationOn} を@c @@ -1984,9 +1942,7 @@ cis4 d cis! d @cindex beams, customizing rules (連桁の規則をカスタマイズする) @funindex \autoBeamOn -@funindex autoBeamOn @funindex \autoBeamOff -@funindex autoBeamOff @lilypond[quote,verbatim] \relative c'' { @@ -2092,9 +2048,7 @@ cis4 d cis! d @funindex beatStructure @funindex measureLength @funindex \time -@funindex time @funindex \set -@funindex set たいていの場合、自動連桁は拍の終わりで終了します。@c 拍の終了点はコンテキスト プロパティ @code{baseMoment} と @@ -2452,7 +2406,6 @@ c16 c c | @end lilypond @funindex \noBeam -@funindex noBeam 連桁でつながれないようにするために、個々の音符には @code{\noBeam} が記されるかもしれません: @@ -2535,7 +2488,6 @@ c16 c c | @cindex feathered beams (羽状の連桁) @funindex \featherDurations -@funindex featherDurations @funindex grow-direction 羽状の連桁は、楽曲全体のテンポを変えることなく、音符の小さなグループを@c @@ -2620,7 +2572,6 @@ MIDI 出力での演奏時間は正確です。 @cindex repeat bars (繰り返しの小節線) @funindex \bar -@funindex bar 小節線は小節を区切り、繰り返しを示すためにも使用されます。@c 通常、単線の小節線が拍子に基づいて出力に自動的に挿入されます。 @@ -2845,7 +2796,6 @@ to use @code{\divisioMinima} there instead, described in the section @funindex whichBar @funindex defaultBarType @funindex \bar -@funindex bar @funindex bartype コマンド @code{\bar }@var{bartype} は @@ -3033,7 +2983,6 @@ c1 | c | c | c @end lilypond @funindex \barNumberCheck -@funindex barNumberCheck 大きな楽曲をコピーしている場合、LilyPond の小節番号と@c コピー元のオリジナルの小節番号の対応をチェックすると役に立ちます。@c @@ -3061,7 +3010,6 @@ c1 | c | c | c @cindex mark, rehearsal (リハーサル記号) @funindex \mark -@funindex mark リハーサル記号を譜刻するには、@code{\mark} コマンドを使用します: @@ -3175,7 +3123,6 @@ c1 | c | c | c @cindex glyphs, music (音楽的図柄) @funindex \musicglyph -@funindex musicglyph 音楽的図柄 (セーニョ記号など) を @code{\mark} の中に譜刻することができます: @@ -3296,7 +3243,6 @@ Lilypond はさらに 2 つ特殊なタイプの装飾小音符をサポート @cindex grace notes, following (装飾小音符を後ろに配置する) @funindex \afterGrace -@funindex afterGrace 装飾小音符で記譜を終えたいのならば、@c @code{\afterGrace} コマンドを使用します。@c diff --git a/Documentation/ja/notation/simultaneous.itely b/Documentation/ja/notation/simultaneous.itely index b15c17a18e..c89e52bebd 100644 --- a/Documentation/ja/notation/simultaneous.itely +++ b/Documentation/ja/notation/simultaneous.itely @@ -353,7 +353,6 @@ warning: ignoring too many clashing note columns @cindex note cluster (音符のクラスタ) @funindex \makeClusters -@funindex makeClusters クラスタは演奏すべき連続したピッチの範囲を示します。@c クラスタは 1 組の音符の範囲 (envelope) として表されます。@c @@ -420,11 +419,9 @@ warning: ignoring too many clashing note columns @cindex lyrics assigned to one voice (1 つのボイスに代入される歌詞) @funindex \voiceOne -@funindex voiceOne @funindex \voiceOne ... \voiceFour @funindex Voice @funindex \oneVoice -@funindex oneVoice @subsubsubheading 明示的にボイスをインスタンス化する @@ -684,21 +681,13 @@ etc. @cindex voices, multiple (複数のボイス) @cindex shift rest, automatic (自動的な休符のシフト) @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn @funindex \shiftOff -@funindex shiftOff @funindex \mergeDifferentlyDottedOn -@funindex mergeDifferentlyDottedOn @funindex \mergeDifferentlyDottedOff -@funindex mergeDifferentlyDottedOff @funindex \mergeDifferentlyHeadedOn -@funindex mergeDifferentlyHeadedOn @funindex \mergeDifferentlyHeadedOff -@funindex mergeDifferentlyHeadedOff 同じピッチ、同じ符頭を持ち、符幹の方向が逆で異なるボイスの中にある符頭は@c 自動的に 1 つの符頭にまとめられます -- マージされます。@c @@ -932,7 +921,6 @@ are at the same time differently dotted are not clear. @cindex a due part (二重奏パート) @cindex solo part (ソロ パート) @funindex \partcombine -@funindex partcombine 自動パート結合は 2 つのパートに分かれた音楽を単一の譜にマージします。@c これはオーケストラ譜を譜刻する時に特に有用です。@c @@ -1007,17 +995,11 @@ instrumentTwo = \relative { と @var{musicexpr2} のピッチには影響を与えません。 @funindex \partcombineChords -@funindex partcombineChords @funindex \partcombineApart -@funindex partcombineApart @funindex \partcombineUnisono -@funindex partcombineUnisono @funindex \partcombineSoloI -@funindex partcombineSoloI @funindex \partcombineSoloII -@funindex partcombineSoloII @funindex \partcombineAutomatic -@funindex partcombineAutomatic プロの楽譜では長いパッセージで、@c 2 つのボイスの音符のいくつかが同じでユニゾンとして譜刻できる場合であっても、@c @@ -1149,7 +1131,6 @@ instrumentTwo = \relative { @cindex interleaved music (間奏) @cindex parallel music (並列な音楽) @funindex \parallelMusic -@funindex parallelMusic 複数のパートを持つ音楽を入力コードの途中に挿入することができます。@c 関数 @code{\parallelMusic} は、@c diff --git a/Documentation/ja/notation/staff.itely b/Documentation/ja/notation/staff.itely index b552b63b26..cfae43a644 100644 --- a/Documentation/ja/notation/staff.itely +++ b/Documentation/ja/notation/staff.itely @@ -65,7 +65,6 @@ @cindex tablature (タブ譜) @funindex \drummode -@funindex drummode @funindex DrumStaff @funindex RhythmicStaff @funindex TabStaff @@ -423,9 +422,7 @@ turned on with a @code{\paper} option. @cindex ledger lines, modifying (加線を変更する) @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff @code{\stopStaff} コマンドと @code{\startStaff} コマンドを使って、@c 楽譜内の任意の場所で譜線を停止あるいは (再) 開始させることができます。 @@ -588,9 +585,7 @@ d4 e f g @cindex resizing of staves (譜をリサイズする) @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff 適切な位置で新しく同時進行の譜を作成することによって、@c @notation{オッシア} 譜をセットすることができます: @@ -759,7 +754,6 @@ d4 e f g @funindex \RemoveEmptyStaves @funindex Staff_symbol_engraver @funindex \stopStaff -@funindex stopStaff @code{Staff} コンテキストから @code{Staff_symbol_engraver} を@c 削除することによって、譜線を隠すことができます。@c @@ -1020,9 +1014,7 @@ d4 e f g @cindex switching instruments (楽器を切り換える) @funindex \addInstrumentDefinition -@funindex addInstrumentDefinition @funindex \instrumentSwitch -@funindex instrumentSwitch 楽器の @emph{切り替え} が必要な場合、切り替えのために必要とされる@c 変更の詳細なリストを作成するために、@code{\addInstrumentDefinition} を @@ -1081,11 +1073,8 @@ d4 e f g @cindex cue notes (演奏指示音符) @funindex \addQuote -@funindex addQuote @funindex \quoteDuring -@funindex quoteDuring @funindex \transposition -@funindex transposition あるボイスが他のボイスと同じ音符を演奏することはごく一般的なことです。@c 例えば、第 1 バイオリンと第2バイオリンがあるパッセージで同じフレーズを@c @@ -1243,13 +1232,9 @@ LilyPond がクラッシュする可能性さえあります。 @cindex voices, quoting(ボイスを引用する) @funindex \cueDuring -@funindex cueDuring @funindex \cueClef -@funindex cueClef @funindex \cueDuringWithClef -@funindex cueDuringWithClef @funindex \quoteDuring -@funindex quoteDuring @cindex notes, smaller (小さな音符) @cindex smaller notes (小さな音符) @@ -1448,7 +1433,6 @@ bassoonNotes = \relative c { @end lilypond @funindex \transposedCueDuring -@funindex transposedCueDuring @code{\quoteDuring} と同様に、@code{\cueDuring} は楽器の移調を考慮します。@c 合図音符は合図を受け取る楽器のピッチで作り出され、@c @@ -1487,9 +1471,7 @@ bassClarinetNotes = \relative c' { @cindex cue notes, removing (合図音符を削除する) @funindex \killCues -@funindex killCues @funindex \addInstrumentDefinition -@funindex addInstrumentDefinition @code{\killCues} コマンドは音楽表記から合図音符を削除します。@c これにより、同じ音楽表記を使って合図を持つ楽器パートと楽譜を作り出すことが@c diff --git a/Documentation/ja/notation/text.itely b/Documentation/ja/notation/text.itely index f9e9e13011..5af7134be3 100644 --- a/Documentation/ja/notation/text.itely +++ b/Documentation/ja/notation/text.itely @@ -106,9 +106,7 @@ @rlearning{オブジェクトの配置} を参照してください。 @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @predefined @code{\textLengthOn}, @@ -190,11 +188,8 @@ 線スタイルの構文は @ref{Line styles} で記述されています。 @funindex \textSpannerUp -@funindex textSpannerUp @funindex \textSpannerDown -@funindex textSpannerDown @funindex \textSpannerNeutral -@funindex textSpannerNeutral @predefined @@ -242,9 +237,7 @@ LilyPond が処理できるテキスト スパナは 1 ボイスにつき、1 @cindex bar lines, symbols on (小節線上のシンボル) @funindex \mark -@funindex mark @funindex \markup -@funindex markup @ref{リハーサル記号} で記述されている構文を用いて、@c さまざまなテキスト要素を楽譜に付け加えることができます: @@ -305,9 +298,7 @@ LilyPond が処理できるテキスト スパナは 1 ボイスにつき、1 @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff @predefined @code{\markLengthOn}, @@ -350,7 +341,6 @@ LilyPond が処理できるテキスト スパナは 1 ボイスにつき、1 @cindex text, top-level (最上位レベルのテキスト) @funindex \markup -@funindex markup @code{\markup} ブロックはそれ自体で、@c すべての @code{\score} ブロックの外側に、@c @@ -389,9 +379,7 @@ LilyPond が処理できるテキスト スパナは 1 ボイスにつき、1 @funindex \markup -@funindex markup @funindex \markuplist -@funindex markuplist @predefined @code{\markup}, @@ -443,7 +431,6 @@ LilyPond が処理できるテキスト スパナは 1 ボイスにつき、1 @cindex typeset text (テキストの譜刻) @funindex \markup -@funindex markup @code{\markup} ブロックは @qq{マークアップ モード} と呼ばれる@c 拡張可能な構文でテキストを譜刻するために用いられます。 @@ -559,11 +546,8 @@ allegro = \markup { \bold \large Allegro } @cindex switching fonts (フォントを切り換える) @funindex \italic -@funindex italic @funindex \bold -@funindex bold @funindex \underline -@funindex underline マークアップ モードでは、基本的なフォント切り替えがサポートされています: @@ -584,13 +568,9 @@ allegro = \markup { \bold \large Allegro } @funindex \abs-fontsize @funindex \fontsize -@funindex fontsize @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @funindex \magnify -@funindex magnify フォント サイズをいくつかの方法でグローバル譜サイズとの相対値で変更することができます。 @@ -649,11 +629,8 @@ allegro = \markup { \bold \large Allegro } @cindex superscript (上付き文字) @funindex \super -@funindex super @funindex \sub -@funindex sub @funindex \normal-size-super -@funindex normal-size-super テキストを下付き文字あるいは上付き文字として譜刻することができます。@c デフォルトでは、それらは小さなサイズで譜刻されますが、@c @@ -723,21 +700,13 @@ allegro = \markup { \bold \large Allegro } カスタム フォント セットを定義することも可能です。 @funindex \teeny -@funindex teeny @funindex \tiny -@funindex tiny @funindex \small -@funindex small @funindex \normalsize -@funindex normalsize @funindex \large -@funindex large @funindex \huge -@funindex huge @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @predefined @code{\teeny}, @@ -795,11 +764,8 @@ allegro = \markup { \bold \large Allegro } @cindex horizontal text alignment (テキストを水平方向に揃える) @funindex \left-align -@funindex left-align @funindex \center-align -@funindex center-align @funindex \right-align -@funindex right-align マークアップ オブジェクトの揃え方はいくつかあります。@c デフォルトでは、テキスト指示はそのテキストの左端で揃えられます: @@ -819,7 +785,6 @@ allegro = \markup { \bold \large Allegro } @end lilypond @funindex \halign -@funindex halign 水平方向の揃え方は、数値を使って、微調整することができます: @@ -845,11 +810,8 @@ allegro = \markup { \bold \large Allegro } @cindex vertical text alignment (テキストを垂直方向に揃える) @funindex \raise -@funindex raise @funindex \lower -@funindex lower @funindex \null -@funindex null @c QUERY Should the function of ``\null'' be clarified? rp @@ -883,11 +845,8 @@ allegro = \markup { \bold \large Allegro } @end lilypond @funindex \general-align -@funindex general-align @funindex \translate -@funindex translate @funindex \translate-scaled -@funindex translate-scaled コマンドの中にはマークアップ モードの中にあるテキスト オブジェクトの@c 水平方向と垂直方向の両方の揃え方に影響を与えることができるものもあります。@c @@ -922,9 +881,7 @@ allegro = \markup { \bold \large Allegro } @cindex columns, text (縦に積み重ねたテキスト) @funindex \column -@funindex column @funindex \center-column -@funindex center-column マークアップ オブジェクトに何行かのテキストが含まれる場合もあります。@c 以下の例では、それぞれの要素あるいは表記はそれ自体の行に配置され、@c @@ -951,7 +908,6 @@ allegro = \markup { \bold \large Allegro } @cindex markup, centering on the page (マークアップをページの中央に揃える) @funindex \fill-line -@funindex fill-line 同様に、要素あるいは表記のリストの広がりが水平の行幅いっぱいを占める@c ことがあります (要素が 1 つだけの場合、その要素はページの中央に揃えられます)。@c @@ -983,9 +939,7 @@ allegro = \markup { \bold \large Allegro } @cindex markup text, justified (両端揃えのマークアップ テキスト) @funindex \wordwrap -@funindex wordwrap @funindex \justify -@funindex justify さらに、長いテキスト指示を自動的に行幅に合わせて折り返すことができます。@c そのようなテキスト指示は、以下の例で示すように、左揃えされるか両端揃えされます。 @@ -1061,15 +1015,10 @@ allegro = \markup { \bold \large Allegro } @cindex markup text, framing (マークアップ テキストにフレームを付ける) @funindex \box -@funindex box @funindex \circle -@funindex circle @funindex \rounded-box -@funindex rounded-box @funindex \bracket -@funindex bracket @funindex \hbracket -@funindex hbracket 以下の例で示すように、@c マークアップ コマンドの中にはテキスト要素を@c @@ -1097,13 +1046,9 @@ allegro = \markup { \bold \large Allegro } @cindex markup text padding (マークアップ テキスト パディング) @funindex \pad-markup -@funindex pad-markup @funindex \pad-x -@funindex pad-x @funindex \pad-to-box -@funindex pad-to-box @funindex \pad-around -@funindex pad-around コマンドの中にはテキストの周りのパディングを増やすことを必要とするものも@c あります。@c @@ -1138,17 +1083,11 @@ Flute quartet keeps very uneven time." @cindex notation, graphic (グラフィック記譜法) @funindex \combine -@funindex combine @funindex \draw-circle -@funindex draw-circle @funindex \filled-box -@funindex filled-box @funindex \triangle -@funindex triangle @funindex \draw-line -@funindex draw-line @funindex \arrow-head -@funindex arrow-head テキストを持たないグラフィック要素やシンボルを譜刻することもできます。@c 他のマークアップ表記と同様に、@c @@ -1176,9 +1115,7 @@ Flute quartet keeps very uneven time." @cindex postscript @funindex \epsfile -@funindex epsfile @funindex \postscript -@funindex postscript 高度なグラフィック機能として、@c 外部画像ファイルを Encapsulated PostScript フォーマット (@emph{eps}) @@ -1376,11 +1313,8 @@ a'1_\markup { @cindex text spread over multiple pages (複数ページに広がるテキスト) @funindex \markuplist -@funindex markuplist @funindex \justified-lines -@funindex justified-lines @funindex \wordwrap-lines -@funindex wordwrap-lines 標準のマークアップ オブジェクトは分割することができません。@c しかしながら、 @@ -1432,7 +1366,6 @@ a'1_\markup { @rinternals{TextScript} @funindex \markuplist -@funindex markuplist @predefined @code{\markuplist} diff --git a/Documentation/ja/notation/wind.itely b/Documentation/ja/notation/wind.itely index 8317cf945f..398df05c6a 100644 --- a/Documentation/ja/notation/wind.itely +++ b/Documentation/ja/notation/wind.itely @@ -153,11 +153,8 @@ @cindex Scottish highland bagpipe (スコティッシュ ハイランド バグパイプ) @cindex grace notes (装飾小音符) @funindex \taor -@funindex taor @funindex \hideKeySignature -@funindex hideKeySignature @funindex \showKeySignature -@funindex showKeySignature LilyPond はスコティッシュ、ハイランド バグパイプ音楽のための特殊な定義を@c 保持しています。@c diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely index 1f68b2b5c7..b51766c0a2 100644 --- a/Documentation/learning/common-notation.itely +++ b/Documentation/learning/common-notation.itely @@ -178,11 +178,8 @@ like German and Dutch. To use other names for @cindex layout vs. content @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Music Glossary: @rglos{key signature}, @rglos{major}, @rglos{minor}. @@ -441,11 +438,8 @@ to let LilyPond determine the articulation directions. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Music Glossary: @rglos{dynamics}, @rglos{crescendo}, @rglos{decrescendo}. @@ -483,7 +477,6 @@ Notation Reference: @cindex markup @funindex \markup -@funindex markup Text may be added to your scores: @@ -520,9 +513,7 @@ Notation Reference: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Music Glossary: @rglos{beam}. @@ -579,7 +570,6 @@ Notation Reference: @cindex partial measure @funindex \partial -@funindex partial Music Glossary: @rglos{anacrusis}. @@ -602,7 +592,6 @@ is a quarter note pickup and @code{\partial 8} an eighth note. @cindex triplets @funindex \tuplet -@funindex tuplet Music Glossary: @rglos{note value}, @rglos{triplet}. @@ -631,9 +620,7 @@ For triplets, there are three notes instead of two, so @cindex appoggiatura @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -821,10 +808,8 @@ out on a single staff. @cindex notation context @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -1020,7 +1005,6 @@ This section introduces vocal music and simple song sheets. @cindex songs @funindex \addlyrics -@funindex addlyrics Music Glossary: @rglos{lyrics}. @@ -1387,7 +1371,6 @@ places. The following example uses the above variables: @cindex header block @funindex \header -@funindex header The title, composer, opus number, and similar information are entered in the @code{\header} block. This exists outside of the diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely index b936ca4971..6b74fe954a 100644 --- a/Documentation/learning/fundamental.itely +++ b/Documentation/learning/fundamental.itely @@ -68,9 +68,7 @@ There are many variations of this basic pattern, but this example serves as a useful starting place. @funindex \book -@funindex book @funindex \score -@funindex score @cindex book @cindex score @@ -154,11 +152,8 @@ things, such as @end example @funindex \header -@funindex header @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex header @cindex layout @cindex midi @@ -184,7 +179,6 @@ Notation Reference -- @ruser{Score layout}, and @cindex book block, implicit @cindex implicit book block @funindex \book -@funindex book You may code multiple @code{\score} blocks. Each will be treated as a separate score, but they will be all combined into @@ -252,7 +246,6 @@ For a complete definition of the input format, see @subsection Score is a (single) compound musical expression @funindex \score -@funindex score @cindex score @cindex contents of a score block @cindex score block, contents of @@ -944,15 +937,10 @@ Notation Reference: @ruser{Multiple voices}. @subsection Explicitly instantiating voices @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex voice contexts, creating @@ -1139,13 +1127,9 @@ as here: @cindex collisions, notes @cindex shift commands @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Closely spaced notes in a chord, or notes occurring at the same time in different voices, are arranged in two, occasionally more, @@ -1196,7 +1180,6 @@ expressions -- notes and lyrics. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics context, creating @cindex lyrics, linking to voice @@ -1232,7 +1215,6 @@ explicitly. @cindex lyrics and beaming @cindex beaming and lyrics @funindex \autoBeamOff -@funindex autoBeamOff The automatic beaming which LilyPond uses by default works well for instrumental music, but not so well for music with lyrics, @@ -1243,7 +1225,6 @@ melismata in the lyrics. In the example above we use the command @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex vocal score structure @cindex choir staff @@ -1451,7 +1432,6 @@ Notation Reference: @ruser{Contexts explained}. @subsection Creating contexts @funindex \new -@funindex new @cindex new contexts @cindex creating contexts @cindex contexts, creating @@ -1653,9 +1633,7 @@ Internals reference: @rinternals{Engravers and Performers}. @cindex context properties, modifying @cindex modifying context properties @funindex \set -@funindex set @funindex \unset -@funindex unset Contexts are responsible for holding the values of a number of context @emph{properties}. Many of them can be changed to @@ -1849,7 +1827,6 @@ general way by using the very powerful @code{\markup} command. @subsubheading Setting context properties with @code{\with} @funindex \with -@funindex with @cindex context properties, setting with \with The default value of context properties may be set at the time the @@ -1898,7 +1875,6 @@ with @code{\set}, this new default value may be restored with the @cindex context properties, setting with \context @funindex \context -@funindex context The values of context properties may be set in @emph{all} contexts of a particular type, such as all @code{Staff} contexts, with a single @@ -1977,9 +1953,7 @@ Internals Reference: @cindex removing engravers @funindex \consists -@funindex consists @funindex \remove -@funindex remove We have seen that contexts each contain several engravers, each of which is responsible for producing a particular part of the @@ -2075,7 +2049,6 @@ the notes in all the voices on that staff: @subsubheading Changing all contexts of the same type @funindex \layout -@funindex layout The examples above show how to remove or add engravers to individual contexts. It is also possible to remove or add diff --git a/Documentation/learning/tutorial.itely b/Documentation/learning/tutorial.itely index f4e9302eae..27084f32ea 100644 --- a/Documentation/learning/tutorial.itely +++ b/Documentation/learning/tutorial.itely @@ -206,7 +206,6 @@ values are useful. @cindex relative mode, and accidentals @funindex \relative -@funindex relative @funindex ' @funindex , @@ -379,7 +378,6 @@ A @notation{rest} is entered just like a note with the name @cindex time signature @funindex \time -@funindex time Music Glossary: @rglos{time signature}. @@ -404,7 +402,6 @@ command: @cindex metronome marks @funindex \tempo -@funindex tempo Music Glossary: @rglos{tempo indication}, @rglos{metronome}. @@ -436,7 +433,6 @@ set with the @code{\tempo} command: @cindex bass @funindex \clef -@funindex clef Music Glossary: @rglos{clef}. diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely index 95229692d6..001f4136a3 100644 --- a/Documentation/learning/tweaks.itely +++ b/Documentation/learning/tweaks.itely @@ -207,7 +207,6 @@ Notation Reference: @cindex override syntax @funindex \override -@funindex override We have already met the commands @code{\set} and @code{\with}, used to change the properties of @strong{contexts} and to remove and add @@ -280,7 +279,6 @@ color of the note head: @cindex revert command @funindex \revert -@funindex revert Once overridden, the property retains its new value until it is overridden again or a @code{\revert} command is encountered. @@ -318,7 +316,6 @@ of the note head to the default value for the final two notes: @unnumberedsubsubsec The @code{@bs{}once} prefix @funindex \once -@funindex once @code{\override}, @code{\revert}, @code{\set}, and @code{\unset} commands may be prefixed with @code{\once}. This causes such a @@ -365,7 +362,6 @@ predefined commands to limit their effect to one musical moment: @cindex overrideProperty command @funindex \overrideProperty -@funindex overrideProperty There is another form of the override command, @code{\overrideProperty}, which is occasionally required. @@ -380,7 +376,6 @@ We mention it here for completeness, but for details see @cindex tweak command @funindex \tweak -@funindex tweak The final tweaking command which is available is @code{\tweak}. This should be used when several objects occur at the same musical moment, @@ -787,7 +782,6 @@ location. @cindex once override @funindex \once -@funindex once As you can see, @emph{all} the slurs are thicker in the final example above. But what if we wanted just the first slur to be thicker? This @@ -832,7 +826,6 @@ command. @cindex default properties, reverting to @funindex \revert -@funindex revert Finally, what if we wanted just the first two slurs to be heavier? Well, we could use two commands, each preceded by @@ -2243,9 +2236,7 @@ these. @cindex ottava bracket @funindex \startTextSpan -@funindex startTextSpan @funindex \stopTextSpan -@funindex stopTextSpan @cindex TextSpanner, example of overriding @cindex bound-details property, example @@ -2393,9 +2384,7 @@ command. @cindex notes, spreading out with text @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff By default, text produced by markup takes up no horizontal space as far as laying out the music is concerned. The @code{\textLengthOn} @@ -2906,13 +2895,9 @@ and notes in different voices. @cindex collisions, notes @cindex shift commands @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Within a voice, all the notes occuring at the same musical moment are grouped into a note column, and a @code{NoteColumn} object is created diff --git a/Documentation/nl/learning/common-notation.itely b/Documentation/nl/learning/common-notation.itely index c2f3b9b7cb..99d69db33a 100644 --- a/Documentation/nl/learning/common-notation.itely +++ b/Documentation/nl/learning/common-notation.itely @@ -140,11 +140,8 @@ other languages}. @cindex layout versus invoer @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Terminologie: @rglos{key signature}, @rglos{major}, @rglos{minor}. @@ -388,11 +385,8 @@ uitzoeken. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Terminologie: @rglos{dynamics}, @rglos{crescendo}, @rglos{decrescendo}. @@ -433,7 +427,6 @@ Notatiehandleiding: @cindex markup @funindex \markup -@funindex markup Je kunt tekst aan je muziek toevoegen door: @@ -472,9 +465,7 @@ Notatiehandleiding: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Terminologie: @rglos{beam}. @@ -525,7 +516,6 @@ Notatiehandleiding: @cindex onvolledige maat @funindex \partial -@funindex partial Terminologie: @rglos{anacrusis}. @@ -550,7 +540,6 @@ nootlengte: @code{\partial 4} is een opmaat van een kwart en @cindex triolen @funindex \times -@funindex times Terminologie: @rglos{note value}, @rglos{triplet}. @@ -579,9 +568,7 @@ maakt dat de noten 2/3 van hun lengte duren, dus een @cindex appoggiatura @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -773,10 +760,8 @@ genoteerd op een enkele notenbalk. @cindex notatiecontext @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -994,7 +979,6 @@ liedjes. @cindex liedjes @funindex \addlyrics -@funindex addlyrics Terminologie: @rglos{lyrics}. @@ -1411,7 +1395,6 @@ gebruik van de bovenstaande variabelen: @cindex titelblok @funindex \header -@funindex header De titel, componist, opusnummer, en soortgelijke informatie worden ingevoerd in het @code{\header}-blok. Deze bevindt diff --git a/Documentation/nl/learning/fundamental.itely b/Documentation/nl/learning/fundamental.itely index f453c3bd8f..8d5e90aea4 100644 --- a/Documentation/nl/learning/fundamental.itely +++ b/Documentation/nl/learning/fundamental.itely @@ -173,9 +173,7 @@ allerlei andere dingen bevatten, zoals @funindex \header @funindex kop @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex kop @cindex opmaak @cindex midi @@ -278,7 +276,6 @@ Voor een volledige definitie van het invoerformaat, zie @subsection Score is a (single) compound musical expression @funindex \score -@funindex score @cindex score @cindex contents of a score block @cindex score block, contents of @@ -970,15 +967,10 @@ Notation Reference: @ruser{Multiple voices}. @subsection Explicitly instantiating voices @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex voice contexts, creating @@ -1165,13 +1157,9 @@ as here: @cindex collisions, notes @cindex shift commands @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Closely spaced notes in a chord, or notes occurring at the same time in different voices, are arranged in two, occasionally more, @@ -1217,7 +1205,6 @@ expressions -- notes and lyrics. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics context, creating @cindex lyrics, linking to voice @@ -1253,7 +1240,6 @@ explicitly. @cindex lyrics and beaming @cindex beaming and lyrics @funindex \autoBeamOff -@funindex autoBeamOff The automatic beaming which LilyPond uses by default works well for instrumental music, but not so well for music with lyrics, @@ -1264,7 +1250,6 @@ melismata in the lyrics. In the example above we use the command @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex vocal score structure @cindex choir staff @@ -1472,7 +1457,6 @@ Notation Reference: @ruser{Contexts explained}. @subsection Creating contexts @funindex \new -@funindex new @cindex new contexts @cindex creating contexts @cindex contexts, creating @@ -1674,9 +1658,7 @@ Internals reference: @rinternals{Engravers and Performers}. @cindex context properties, modifying @cindex modifying context properties @funindex \set -@funindex set @funindex \unset -@funindex unset Contexts are responsible for holding the values of a number of context @emph{properties}. Many of them can be changed to @@ -1870,7 +1852,6 @@ general way by using the very powerful @code{\markup} command. @subsubheading Setting context properties with @code{\with} @funindex \with -@funindex with @cindex context properties, setting with \with The default value of context properties may be set at the time the @@ -1919,7 +1900,6 @@ with @code{\set}, this new default value may be restored with the @cindex context properties, setting with \context @funindex \context -@funindex context The values of context properties may be set in @emph{all} contexts of a particular type, such as all @code{Staff} contexts, with a single @@ -1998,9 +1978,7 @@ Internals Reference: @cindex removing engravers @funindex \consists -@funindex consists @funindex \remove -@funindex remove We have seen that contexts each contain several engravers, each of which is responsible for producing a particular part of the @@ -2096,7 +2074,6 @@ the notes in all the voices on that staff: @subsubheading Changing all contexts of the same type @funindex \layout -@funindex layout The examples above show how to remove or add engravers to individual contexts. It is also possible to remove or add diff --git a/Documentation/nl/learning/tutorial.itely b/Documentation/nl/learning/tutorial.itely index 0e3991a182..8075c98beb 100644 --- a/Documentation/nl/learning/tutorial.itely +++ b/Documentation/nl/learning/tutorial.itely @@ -208,7 +208,6 @@ zijn deze automatische waarden heel handig. @cindex relatieve modus, en toevallige tekens @funindex \relative -@funindex relative @funindex ' @funindex , @@ -385,7 +384,6 @@ naam @code{r}@tie{}: @cindex maatsoort @funindex \time -@funindex time Terminologie: @rglos{time signature}. @@ -408,7 +406,6 @@ De @notation{maatsoort} kun je aangeven met het @code{\time}-commando: @cindex metronome marks @funindex \tempo -@funindex tempo Terminologie: @rglos{tempo indication}, @rglos{metronome}. @@ -440,7 +437,6 @@ gezet met het @code{\tempo}-commando: @cindex bas @funindex \clef -@funindex clef Terminologie: @rglos{clef}. diff --git a/Documentation/nl/learning/tweaks.itely b/Documentation/nl/learning/tweaks.itely index d8981b84ac..51bac2fbc2 100644 --- a/Documentation/nl/learning/tweaks.itely +++ b/Documentation/nl/learning/tweaks.itely @@ -187,7 +187,6 @@ the types of objects and properties from their names. @cindex override syntax @funindex \override -@funindex override We have already met the commands @code{\set} and @code{\with}, used to change the properties of @strong{contexts} and to remove and add @@ -260,7 +259,6 @@ color of the note head: @cindex revert command @funindex \revert -@funindex revert Once overridden, the property retains its new value until it is overridden again or a @code{\revert} command is encountered. @@ -298,7 +296,6 @@ of the note head to the default value for the final two notes: @unnumberedsubsubsec The @code{\once} prefix @funindex \once -@funindex once Both the @code{\override} and the @code{\set} commands may be prefixed by @code{\once}. This causes the following @code{\override} or @@ -328,7 +325,6 @@ b c | @cindex overrideProperty command @funindex \overrideProperty -@funindex overrideProperty There is another form of the override command, @code{\overrideProperty}, which is occasionally required. @@ -343,7 +339,6 @@ We mention it here for completeness, but for details see @cindex tweak command @funindex \tweak -@funindex tweak The final tweaking command which is available is @code{\tweak}. This should be used when several objects occur at the same musical moment, @@ -696,7 +691,6 @@ location. @cindex once override @funindex \once -@funindex once As you can see, @emph{all} the slurs are thicker in the final example above. But what if we wanted just the first slur to be thicker? This @@ -741,7 +735,6 @@ command. @cindex default properties, reverting to @funindex \revert -@funindex revert Finally, what if we wanted just the first two slurs to be heavier? Well, we could use two commands, each preceded by @@ -2123,9 +2116,7 @@ these. @cindex ottava bracket @funindex \startTextSpan -@funindex startTextSpan @funindex \stopTextSpan -@funindex stopTextSpan @cindex TextSpanner, example of overriding @cindex bound-details property, example @@ -2273,9 +2264,7 @@ command. @cindex notes, spreading out with text @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff By default, text produced by markup takes up no horizontal space as far as laying out the music is concerned. The @code{\textLengthOn} diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely index 9f2f25690e..714584210a 100644 --- a/Documentation/notation/ancient.itely +++ b/Documentation/notation/ancient.itely @@ -2651,7 +2651,6 @@ same source. @node Incipits @unnumberedsubsubsec Incipits @funindex \incipit -@funindex incipit @cindex incipits, adding It is customary when transcribing mensural music into modern notation to place diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index b79b69100d..7cca8e59af 100644 --- a/Documentation/notation/changing-defaults.itely +++ b/Documentation/notation/changing-defaults.itely @@ -1125,17 +1125,11 @@ Notation Reference: @cindex engravers, including in contexts @funindex \alias -@funindex alias @funindex \name -@funindex name @funindex \type -@funindex type @funindex \consists -@funindex consists @funindex \accepts -@funindex accepts @funindex \denies -@funindex denies Specific contexts, like @code{Staff} and @code{Voice}, are made from simple building blocks. It is possible to create new types of diff --git a/Documentation/notation/editorial.itely b/Documentation/notation/editorial.itely index 96d0a75356..e329810ae5 100644 --- a/Documentation/notation/editorial.itely +++ b/Documentation/notation/editorial.itely @@ -330,7 +330,6 @@ and @code{\revert} commands: @cindex finger change @funindex \finger -@funindex finger Fingering instructions can be entered using @samp{@var{note}-@var{digit}}: @@ -350,7 +349,6 @@ Markup texts or strings may be used for finger changes. @cindex thumb-script @funindex \thumb -@funindex thumb A thumb-script can be added (e.g. cello music) to indicate that a note should be played with the thumb. @@ -412,9 +410,7 @@ Internals Reference: @cindex notes, transparent @funindex \hideNotes -@funindex hideNotes @funindex \unHideNotes -@funindex unHideNotes Hidden (or invisible or transparent) notes can be useful in preparing theory or composition exercises. @@ -484,7 +480,6 @@ Internals Reference: @funindex color @funindex \with-color -@funindex with-color @funindex x11-color Individual objects may be assigned colors. Valid color names @@ -596,7 +591,6 @@ Notes in a chord cannot be separately colored with @cindex brackets @funindex \parenthesize -@funindex parenthesize Objects may be parenthesized by prefixing @code{\parenthesize} to the music event. When prefixed to a chord, it parenthesizes every @@ -643,11 +637,8 @@ chord. @cindex invisible stem @funindex \stemUp -@funindex stemUp @funindex \stemDown -@funindex stemDown @funindex \stemNeutral -@funindex stemNeutral @cindex stem, direction @cindex stem, up @cindex stem, down @@ -715,9 +706,7 @@ from outside of the staff. @funindex balloonGrobText @funindex balloonText @funindex \balloonLengthOn -@funindex balloonLengthOn @funindex \balloonLengthOff -@funindex balloonLengthOff Elements of notation can be marked and named with the help of a square balloon. The primary purpose of this feature is to explain @@ -853,9 +842,7 @@ Internals Reference: @funindex Horizontal_bracket_engraver @funindex \startGroup -@funindex startGroup @funindex \stopGroup -@funindex stopGroup Brackets are used in musical analysis to indicate structure in musical pieces. Simple horizontal brackets are supported. diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely index f999363cb4..defe8ad946 100644 --- a/Documentation/notation/expressive.itely +++ b/Documentation/notation/expressive.itely @@ -229,43 +229,24 @@ Internals Reference: @cindex dynamics, absolute @funindex \ppppp -@funindex ppppp @funindex \pppp -@funindex pppp @funindex \ppp -@funindex ppp @funindex \pp -@funindex pp @funindex \p -@funindex p @funindex \mp -@funindex mp @funindex \mf -@funindex mf @funindex \f -@funindex f @funindex \ff -@funindex ff @funindex \fff -@funindex fff @funindex \ffff -@funindex ffff @funindex \fffff -@funindex fffff @funindex \fp -@funindex fp @funindex \sf -@funindex sf @funindex \sff -@funindex sff @funindex \sp -@funindex sp @funindex \spp -@funindex spp @funindex \sfz -@funindex sfz @funindex \rfz -@funindex rfz Absolute dynamic marks are specified using a command after a note, such as @code{c4\ff}. The available dynamic marks are @@ -293,9 +274,7 @@ marks may be manually placed above or below the staff; see @funindex \> @funindex \! @funindex \cr -@funindex cr @funindex \decr -@funindex decr A @notation{crescendo} mark is started with @code{\<} and terminated with @code{\!}, an absolute dynamic, or an additional @@ -360,7 +339,6 @@ This is particularly useful when adding a @notation{crescendo} and @cindex espressivo articulation @funindex \espressivo -@funindex espressivo The @code{\espressivo} command can be used to indicate a crescendo and decrescendo on the same note. However, be warned that this is @@ -374,11 +352,8 @@ implemented as an articulation, not a dynamic. @end lilypond @funindex \cresc -@funindex cresc @funindex \decresc -@funindex decresc @funindex \dim -@funindex dim Textual crescendo marks begin with @code{\cresc}. Textual decrescendos begin with @code{\decresc} or @code{\dim}. Extender lines are engraved as required. @@ -393,17 +368,11 @@ Extender lines are engraved as required. @end lilypond @funindex \crescTextCresc -@funindex crescTextCresc @funindex \dimTextDecresc -@funindex dimTextDecresc @funindex \dimTextDecr -@funindex dimTextDecr @funindex \dimTextDim -@funindex dimTextDim @funindex \crescHairpin -@funindex crescHairpin @funindex \dimHairpin -@funindex dimHairpin Textual marks for dynamic changes can also replace hairpins: @lilypond[verbatim,quote] @@ -435,11 +404,8 @@ aligned with dynamics, see @ref{New dynamic marks}. Vertical positioning of dynamics is handled by @rinternals{DynamicLineSpanner}. @funindex \dynamicUp -@funindex dynamicUp @funindex \dynamicDown -@funindex dynamicDown @funindex \dynamicNeutral -@funindex dynamicNeutral A @code{Dynamics} context is available to engrave dynamics on their own horizontal line. Use spacer rests to indicate timing. @@ -559,9 +525,7 @@ moltoF = \markup { molto \dynamic f } @cindex dynamics, parenthesis @cindex editorial dynamics @funindex \bracket -@funindex bracket @funindex \dynamic -@funindex dynamic In markup mode, editorial dynamics (within parentheses or square brackets) can be created. The syntax for markup mode is described @@ -701,9 +665,7 @@ in the same voice it began.} @cindex slurs, below notes @cindex slurs, above notes @funindex \slurDown -@funindex slurDown @funindex \slurNeutral -@funindex slurNeutral Slurs may be manually placed above or below the staff; see @ref{Direction and placement}. @@ -738,11 +700,8 @@ them with @code{\=} followed by an identifying number or string. @cindex dashed slur @cindex style, slur @funindex \slurDashed -@funindex slurDashed @funindex \slurDotted -@funindex slurDotted @funindex \slurSolid -@funindex slurSolid Slurs can be solid, dotted, or dashed. Solid is the default slur style: @@ -760,9 +719,7 @@ style: @end lilypond @funindex \slurHalfDashed -@funindex slurHalfDashed @funindex \slurHalfSolid -@funindex slurHalfSolid @cindex slur, half dashed and half solid Slurs can also be made half-dashed (the first half dashed, the @@ -782,7 +739,6 @@ half dashed): @end lilypond @funindex \slurDashPattern -@funindex slurDashPattern @cindex slur, defining dash patterns Custom dash patterns for slurs can be defined: @@ -802,7 +758,6 @@ Custom dash patterns for slurs can be defined: @funindex \slurUp -@funindex slurUp @predefined @@ -869,11 +824,8 @@ musical sentence are written using the commands @code{\(} and @end lilypond @funindex \phrasingSlurUp -@funindex phrasingSlurUp @funindex \phrasingSlurDown -@funindex phrasingSlurDown @funindex \phrasingSlurNeutral -@funindex phrasingSlurNeutral Typographically, a phrasing slur behaves almost exactly like a normal slur. However, they are treated as different objects; a @@ -891,12 +843,9 @@ may be manually placed above or below the staff; see Simultaneous or overlapping phrasing slurs are entered using @code{\=} as with regular slurs, see @ref{Slurs}. -@funindex phrasingSlurDashed @funindex \phrasingSlurDashed @funindex \phrasingSlurDotted -@funindex phrasingSlurDotted @funindex \phrasingSlurSolid -@funindex phrasingSlurSolid @cindex phrasing slur, dashed @cindex dashed phrasing slur @cindex phrasing slur, dotted @@ -919,10 +868,8 @@ style for phrasing slurs: } @end lilypond -@funindex phrasingSlurHalfDashed @funindex \phrasingSlurHalfDashed @funindex \phrasingSlurHalfSolid -@funindex phrasingSlurHalfSolid @cindex phrasing slur, half solid and half dashed @cindex slur, half solid and half dashed phrasing @@ -943,7 +890,6 @@ half dashed): @end lilypond @funindex \phrasingSlurDashPattern -@funindex phrasingSlurDashPattern @cindex phrasing slur, defining dash patterns @cindex slur, phrasing, defining dash patterns @cindex slur, defining dash patterns for phrasing @@ -999,7 +945,6 @@ Internals Reference: @cindex breath marks @cindex pause mark @funindex \breathe -@funindex breathe Breath marks are entered using @code{\breathe}: @@ -1062,7 +1007,6 @@ Internals Reference: @cindex falls @cindex doits @funindex \bendAfter -@funindex bendAfter @notation{Falls} and @notation{doits} can be added to notes using the @code{\bendAfter} command. The direction of the fall or doit @@ -1112,7 +1056,6 @@ follow a linear path: glissandos, arpeggios, and trills. @cindex glissando @funindex \glissando -@funindex glissando A @notation{glissando} is created by appending @code{\glissando} to a note: @@ -1211,13 +1154,9 @@ supported. @cindex chord, broken @funindex \arpeggio -@funindex arpeggio @funindex \arpeggioArrowUp -@funindex arpeggioArrowUp @funindex \arpeggioArrowDown -@funindex arpeggioArrowDown @funindex \arpeggioNormal -@funindex arpeggioNormal An @notation{arpeggio} on a chord (also known as a broken chord) is denoted by appending @code{\arpeggio} to the chord construct: @@ -1248,11 +1187,8 @@ Different types of arpeggios may be written. @cindex special arpeggio symbols @funindex \arpeggioBracket -@funindex arpeggioBracket @funindex \arpeggioParenthesis -@funindex arpeggioParenthesis @funindex \arpeggioParenthesisDashed -@funindex arpeggioParenthesisDashed Special @emph{bracketed} arpeggio symbols can be created: @@ -1339,11 +1275,8 @@ cross-staff arpeggios; see @ref{Cross-staff stems}. @cindex trills @funindex \trill -@funindex trill @funindex \startTrillSpan -@funindex startTrillSpan @funindex \stopTrillSpan -@funindex stopTrillSpan Short trills without an extender line are printed with @code{\trill}; see @ref{Articulations and ornamentations}. @@ -1402,7 +1335,6 @@ described in @ref{Grace notes}. @cindex pitched trills @cindex trills, pitched @funindex \pitchedTrill -@funindex pitchedTrill Trills that require an auxiliary note with an explicit pitch can be typeset with the @code{\pitchedTrill} command. The first diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely index c7c18bacb6..a69f678735 100644 --- a/Documentation/notation/fretted-strings.itely +++ b/Documentation/notation/fretted-strings.itely @@ -597,7 +597,6 @@ is the standard EADGBE tuning. Some other predefined tunings are @code{banjo-open-g-tuning}. The predefined string tunings are found in @file{ly/string-tunings-init.ly}. -@funindex stringTuning @funindex \stringTuning @cindex tablature, custom string tunings @cindex custom string tunings @@ -843,7 +842,6 @@ the fret-diagram markup string. @cindex fret-diagram markup @cindex ukulele -@funindex fret-diagram @funindex \fret-diagram The size of the fret diagram, and the number of frets in the diagram @@ -934,7 +932,6 @@ markup string. @cindex fret-diagram-terse markup -@funindex fret-diagram-terse @funindex \fret-diagram-terse The fret-diagram-terse markup string omits string numbers; the string @@ -1012,7 +1009,6 @@ Other fret diagram properties must be adjusted using @cindex fret-diagram-verbose markup @cindex capo -@funindex fret-diagram-verbose @funindex \fret-diagram-verbose The fret-diagram-verbose markup string is in the format of a Scheme list. Each @@ -1299,7 +1295,6 @@ either as simultaneous music or using chord mode (see @cindex fret diagrams with chord names @funindex ChordNames -@funindex chordmode @funindex \chordmode It is common that both chord names and fret diagrams are displayed together. @@ -1443,8 +1438,6 @@ mychords = \chordmode { @cindex chord shapes for fretted instruments @funindex \addChordShape -@funindex addChordShape -@funindex storePredefinedDiagram @funindex \storePredefinedDiagram In addition to fret diagrams, LilyPond stores an internal list of chord @@ -1561,9 +1554,7 @@ calculates strings and frets that can be used to play the notes. >> @end lilypond -@funindex predefinedFretboardsOff @funindex \predefinedFretboardsOff -@funindex predefinedFretboardsOn @funindex \predefinedFretboardsOn As no predefined diagrams are loaded by default, automatic calculation @@ -1698,7 +1689,6 @@ with non-monotonic tunings. @cindex fingerings, right hand for fretted instruments @cindex right hand fingerings for fretted instruments -@funindex rightHandFinger @funindex \rightHandFinger Right-hand fingerings @var{p-i-m-a} must be entered using @@ -1869,7 +1859,6 @@ Notation Reference: @node Indicating power chords @unnumberedsubsubsec Indicating power chords -@funindex powerChords @funindex \powerChords @cindex power chords diff --git a/Documentation/notation/keyboards.itely b/Documentation/notation/keyboards.itely index 3d2919edc7..db8057b67f 100644 --- a/Documentation/notation/keyboards.itely +++ b/Documentation/notation/keyboards.itely @@ -150,7 +150,6 @@ Snippets: @cindex beams, cross-staff @funindex \change -@funindex change Voices can be switched between staves manually, using the command @@ -262,7 +261,6 @@ right before a change in staff. In this case use manual beams. @cindex staff changes, automatic @funindex \autochange -@funindex autochange @funindex PianoStaff Voices can be made to switch automatically between the top and the @@ -308,7 +306,6 @@ music = { @cindex autochange and relative music @funindex \relative -@funindex relative A @code{\relative} section that is outside of @code{\autochange} has no effect on the pitches of the music, so if necessary, put @@ -381,9 +378,7 @@ staff based on the first note named in the chord construct. @funindex followVoice @funindex \showStaffSwitch -@funindex showStaffSwitch @funindex \hideStaffSwitch -@funindex hideStaffSwitch Whenever a voice switches to another staff, a line connecting the notes can be printed automatically: @@ -485,17 +480,11 @@ piano. @cindex U.C. @funindex \sustainOn -@funindex sustainOn @funindex \sustainOff -@funindex sustainOff @funindex \sostenutoOn -@funindex sostenutoOn @funindex \sostenutoOff -@funindex sostenutoOff @funindex \unaCorda -@funindex unaCorda @funindex \treCorde -@funindex treCorde Pianos generally have three pedals that alter the way sound is produced: @notation{sustain}, @notation{sostenuto} diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely index 9529c6704b..3aa7738e2b 100644 --- a/Documentation/notation/pitches.itely +++ b/Documentation/notation/pitches.itely @@ -87,7 +87,6 @@ octave. } @end lilypond -@funindex fixed @funindex \fixed Common octave marks can be entered just once on a reference pitch after @code{\fixed} placed before the music. Pitches inside @@ -129,7 +128,6 @@ Snippets: @cindex relative octave specification @cindex octave specification, relative -@funindex relative @funindex \relative Absolute octave entry requires specifying the octave for every @@ -319,11 +317,8 @@ Internals Reference: @cindex transposition and relative octave entry @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @node Accidentals @@ -645,7 +640,6 @@ This section discusses how to modify pitches. @funindex = @funindex \octaveCheck -@funindex octaveCheck @funindex controlpitch In relative mode, it is easy to forget an octave changing mark. @@ -720,7 +714,6 @@ Internals Reference: @cindex notes, transposition of @funindex \transpose -@funindex transpose A music expression can be transposed with @code{\transpose}. The syntax is @@ -838,11 +831,8 @@ Internals Reference: @rinternals{TransposedMusic}. @funindex \transpose -@funindex transpose @funindex \chordmode -@funindex chordmode @funindex \relative -@funindex relative @knownissues The relative conversion will not affect @code{\transpose}, @@ -900,7 +890,6 @@ Notation Reference: @cindex transformation, retrograde @cindex operation, retrograde @funindex \retrograde -@funindex retrograde A music expression can be reversed to produce its retrograde: @@ -948,7 +937,6 @@ left untransformed.} @cindex transposition, modal @cindex operation, transposition @funindex \modalTranspose -@funindex modalTranspose A motif can be transposed within a given scale with: @@ -1005,7 +993,6 @@ motif = \relative { c'8 d e f g a b c } @cindex inversion, modal @cindex operation, modal inversion @funindex \modalInversion -@funindex modalInversion A motif can be inverted within a given scale around a given pivot note and transposed in a single operation with: @@ -1119,7 +1106,6 @@ This section discusses how to alter the output of pitches. @funindex \clef -@funindex clef Without any explicit command, the default clef for LilyPond is the treble (or @emph{G}) clef. @@ -1296,7 +1282,6 @@ need to be applied, as a separate @code{\override}, to the @cindex key signature @funindex \key -@funindex key @c duplicated in Key signature and Accidentals @warning{New users are sometimes confused about accidentals and @@ -1315,23 +1300,14 @@ at the start of the staff. The key signature may be altered: @end example @funindex \major -@funindex major @funindex \minor -@funindex minor @funindex \ionian -@funindex ionian @funindex \locrian -@funindex locrian @funindex \aeolian -@funindex aeolian @funindex \mixolydian -@funindex mixolydian @funindex \lydian -@funindex lydian @funindex \phrygian -@funindex phrygian @funindex \dorian -@funindex dorian @cindex church modes @cindex modes @@ -1434,7 +1410,6 @@ Internals Reference: @funindex set-octavation @funindex \ottava -@funindex ottava @notation{Ottava brackets} introduce an extra transposition of an octave for the staff: @@ -1489,7 +1464,6 @@ Internals Reference: @cindex MIDI transposition @funindex \transposition -@funindex transposition When typesetting scores that involve transposing instruments, some parts can be typeset in a different pitch than the @@ -3070,9 +3044,7 @@ Internals Reference: @cindex note heads, easy play @funindex \easyHeadsOn -@funindex easyHeadsOn @funindex \easyHeadsOff -@funindex easyHeadsOff The @q{easy play} note head includes a note name inside the head. It is used in music for beginners. To make the letters readable, @@ -3137,15 +3109,10 @@ Internals Reference: @cindex note heads, Walker @funindex \aikenHeads -@funindex aikenHeads @funindex \sacredHarpHeads -@funindex sacredHarpHeads @funindex \southernHarmonyHeads -@funindex southernHarmonyHeads @funindex \funkHeads -@funindex funkHeads @funindex \walkerHeads -@funindex walkerHeads In shape note head notation, the shape of the note head corresponds to the harmonic function of a note in the scale. This @@ -3169,17 +3136,11 @@ Funk (Harmonica Sacra), Walker, and Aiken (Christian Harmony) styles: @end lilypond @funindex \key -@funindex key @funindex \aikenHeadsMinor -@funindex aikenHeadsMinor @funindex \sacredHarpHeadsMinor -@funindex sacredHarpHeadsMinor @funindex \southernHarmonyHeadsMinor -@funindex southernHarmonyHeadsMinor @funindex \funkHeadsMinor -@funindex funkHeadsMinor @funindex \walkerHeadsMinor -@funindex walkerHeadsMinor Shapes are typeset according to the step in the scale, where the base of the scale is determined by the @code{\key} command. When writing @@ -3249,9 +3210,7 @@ Internals Reference: @cindex note heads, slashed @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff Improvisation is sometimes denoted with slashed note heads, where the performer may choose any pitch but should play the specified diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index 27241d8fde..05d71edc49 100644 --- a/Documentation/notation/rhythms.itely +++ b/Documentation/notation/rhythms.itely @@ -45,11 +45,8 @@ This section discusses rhythms, rests, durations, beaming and bars. @cindex note lengths @funindex \longa -@funindex longa @funindex \breve -@funindex breve @funindex \maxima -@funindex maxima Durations are designated by numbers and dots. Durations are entered as their reciprocal values. For example, a quarter note is entered @@ -135,11 +132,8 @@ duration. For details of this and other settings which control proportional notation, see @ref{Proportional notation}. @funindex \dotsUp -@funindex dotsUp @funindex \dotsDown -@funindex dotsDown @funindex \dotsNeutral -@funindex dotsNeutral Dots are normally moved up to avoid staff lines, except in polyphonic situations. Dots may be manually placed above or below @@ -202,7 +196,6 @@ rests from 128th to maxima (8 x whole) may be printed. @cindex triplets @funindex \tuplet -@funindex tuplet Tuplets are made from a music expression with the @code{\tuplet} command, multiplying the speed of the music expression by a fraction: @@ -239,11 +232,8 @@ in order to have the tuplets grouped automatically: @cindex tuplet bracket placement @funindex \tupletUp -@funindex tupletUp @funindex \tupletDown -@funindex tupletDown @funindex \tupletNeutral -@funindex tupletNeutral Tuplet brackets may be manually placed above or below the staff: @@ -371,7 +361,6 @@ a multiplier. This is useful for skipping many measures, e.g., @cindex expanding music @funindex \scaleDurations -@funindex scaleDurations Longer stretches of music may be compressed by a fraction in the same way, as if every note, chord or rest had the fraction as a @@ -486,7 +475,6 @@ the chord. @cindex ties and volta brackets @funindex \repeatTie -@funindex repeatTie When a second alternative of a repeat starts with a tied note, you have to specify the repeated tie as follows: @@ -507,7 +495,6 @@ have to specify the repeated tie as follows: @cindex ties, laissez vibrer @funindex \laissezVibrer -@funindex laissezVibrer @notation{L.v.}@: ties (@notation{laissez vibrer}) indicate that notes must not be damped at the end. It is used in notation for @@ -521,11 +508,8 @@ be entered as follows: @cindex ties, placement @funindex \tieUp -@funindex tieUp @funindex \tieDown -@funindex tieDown @funindex \tieNeutral -@funindex tieNeutral Ties may be made to curve up or down manually; see @ref{Direction and placement}. @@ -537,11 +521,8 @@ Ties may be made to curve up or down manually; see @cindex dotted ties @funindex \tieDotted -@funindex tieDotted @funindex \tieDashed -@funindex tieDashed @funindex \tieSolid -@funindex tieSolid Ties may be made dashed, dotted, or a combination of solid and dashed. @@ -662,14 +643,10 @@ Rests are entered as part of the music in music expressions. @cindex breve rest @funindex \rest -@funindex rest @funindex r @funindex \maxima -@funindex maxima @funindex \longa -@funindex longa @funindex \breve -@funindex breve Rests are entered like notes with the note name @code{r}. Durations longer than a whole rest use the following predefined @@ -750,7 +727,6 @@ are rests from 128th to maxima (8 x whole). @funindex s @funindex \skip -@funindex skip An invisible rest (also called a @q{spacer rest}) can be entered like a note with the note name@tie{}@code{s}: @@ -841,7 +817,6 @@ Internals Reference: @cindex whole rest for a full measure @cindex rest, whole for a full measure -@funindex compressMMRests @funindex \compressMMRests @funindex R @@ -921,7 +896,6 @@ R2.*2 | @cindex multi-measure rest with markup @funindex \fermataMarkup -@funindex fermataMarkup @funindex MultiMeasureRestText Markups can be added to multi-measure rests. @@ -955,13 +929,9 @@ setting, resulting bar-check warnings may not be displayed. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @funindex \fermataMarkup -@funindex fermataMarkup @funindex \compressMMRests -@funindex compressMMRests @predefined @code{\textLengthOn}, @@ -1046,7 +1016,6 @@ Multi-measure rests do not take part in rest collisions. @cindex meter @funindex \time -@funindex time The time signature is set as follows: @@ -1081,9 +1050,7 @@ there. This default behavior may be changed, see @cindex meter style @funindex \numericTimeSignature -@funindex numericTimeSignature @funindex \defaultTimeSignature -@funindex defaultTimeSignature The time signature symbol that is used in 2/2 and 4/4 time can be changed to a numeric style: @@ -1292,7 +1259,6 @@ Internals Reference: @cindex metronome marking with text @funindex \tempo -@funindex tempo A basic metronome mark is simple to write: @@ -1355,9 +1321,7 @@ written by including an empty string in the input: @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff In a part for an instrument with long periods of rests, tempo indications sometimes follow each other closely. @@ -1425,7 +1389,6 @@ Internals Reference: @funindex measurePosition @funindex \partial -@funindex partial Partial or pick-up measures, such as an @emph{anacrusis} or an @emph{upbeat}, are entered using the @code{\partial} command: @@ -1523,9 +1486,7 @@ Internal Reference: @cindex beams, unmetered music @funindex \cadenzaOn -@funindex cadenzaOn @funindex \cadenzaOff -@funindex cadenzaOff In metered music bar lines are inserted and bar numbers are calculated automatically. In unmetered music (i.e. cadenzas), this is not @@ -1653,9 +1614,7 @@ stretches of unmetered music to permit breaking: @funindex timeSignatureFraction @funindex \scaleDurations -@funindex scaleDurations @funindex \tuplet -@funindex tuplet Polymetric notation is supported explicitly or by manually modifying the visible time signature symbol and/or scaling note durations. @@ -1944,9 +1903,7 @@ staff are squashed, and the staff itself has a single line @funindex Pitch_squash_engraver @funindex \improvisationOn -@funindex improvisationOn @funindex \improvisationOff -@funindex improvisationOff Guitar chord charts often show the strumming rhythms. This can be done with the @code{Pitch_squash_engraver} and @@ -2013,9 +1970,7 @@ By default, beams are inserted automatically: @cindex beams, customizing rules @funindex \autoBeamOn -@funindex autoBeamOn @funindex \autoBeamOff -@funindex autoBeamOff @lilypond[quote,verbatim] \relative c'' { @@ -2112,14 +2067,11 @@ new beam starts. @funindex autoBeaming @funindex baseMoment -@funindex beamExceptions @funindex \beamExceptions @funindex beatStructure @funindex measureLength @funindex \time -@funindex time @funindex \set -@funindex set When automatic beaming is enabled, the placement of automatic beams is determined by three context properties: @@ -2528,7 +2480,6 @@ Beaming direction can be set manually using direction indicators: @end lilypond @funindex \noBeam -@funindex noBeam Individual notes may be marked with @code{\noBeam} to prevent them from being beamed: @@ -2611,7 +2562,6 @@ Internals Reference: @cindex feathered beams @funindex \featherDurations -@funindex featherDurations @funindex grow-direction Feathered beams are used to indicate that a small group of notes @@ -2692,7 +2642,6 @@ music snippets, and when numbers in the fraction are small. @cindex repeat bars @funindex \bar -@funindex bar Bar lines delimit measures, and are also used to indicate repeats. Normally, simple bar lines are automatically inserted @@ -2902,7 +2851,6 @@ when used with a @code{\repeat volta} command, see @ref{Normal repeats}. @funindex \defineBarLine -@funindex defineBarLine @cindex bar lines, defining @cindex defining bar lines @@ -3022,7 +2970,6 @@ connected between different staves of a @code{StaffGroup}, @funindex whichBar @funindex defaultBarType @funindex \bar -@funindex bar @funindex bartype The command @samp{\bar @var{bartype}} is a shortcut for @@ -3221,7 +3168,6 @@ for end of bar. @end lilypond @funindex \barNumberCheck -@funindex barNumberCheck When copying large pieces of music, it can be helpful to check that the LilyPond bar number corresponds to the original that you are @@ -3248,7 +3194,6 @@ Snippets: @cindex mark, rehearsal @funindex \mark -@funindex mark To print a rehearsal mark, use the @code{\mark} command. @@ -3367,7 +3312,6 @@ string. @cindex glyphs, music @funindex \musicglyph -@funindex musicglyph Music glyphs (such as the segno sign) may be printed inside a @code{\mark} @@ -3479,7 +3423,6 @@ eighth grace note @cindex grace notes, following @funindex \afterGrace -@funindex afterGrace If you want to end a note with a grace, use the @code{\afterGrace} command. It takes two arguments: the main note, and the grace diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely index b7b2f3e7ea..a29dd9c4ae 100644 --- a/Documentation/notation/simultaneous.itely +++ b/Documentation/notation/simultaneous.itely @@ -341,7 +341,6 @@ collision resolution whatsover and may have other unintended effects @cindex note cluster @funindex \makeClusters -@funindex makeClusters A cluster indicates a continuous range of pitches to be played. They can be denoted as the envelope of a set of notes. They are @@ -404,11 +403,9 @@ multiple staves. @cindex lyrics assigned to one voice @funindex \voiceOne -@funindex voiceOne @funindex \voiceOne ... \voiceFour @funindex Voice @funindex \oneVoice -@funindex oneVoice @subsubsubheading Explicitly instantiating voices @@ -667,21 +664,13 @@ Snippets: @cindex voices, multiple @cindex shift rest, automatic @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn @funindex \shiftOff -@funindex shiftOff @funindex \mergeDifferentlyDottedOn -@funindex mergeDifferentlyDottedOn @funindex \mergeDifferentlyDottedOff -@funindex mergeDifferentlyDottedOff @funindex \mergeDifferentlyHeadedOn -@funindex mergeDifferentlyHeadedOn @funindex \mergeDifferentlyHeadedOff -@funindex mergeDifferentlyHeadedOff The note heads of notes in different voices with the same pitch, same note head and opposite stem direction are automatically @@ -907,7 +896,6 @@ are at the same time differently dotted are not clear. @cindex a due part @cindex solo part @funindex \partcombine -@funindex partcombine Automatic part combining is used to merge two separate parts of music onto a single staff. This can be especially helpful when typesetting @@ -1010,17 +998,11 @@ effect on the pitches of @code{@var{musicexpr1}} or @code{@var{musicexpr2}}. @funindex \partcombineChords -@funindex partcombineChords @funindex \partcombineApart -@funindex partcombineApart @funindex \partcombineUnisono -@funindex partcombineUnisono @funindex \partcombineSoloI -@funindex partcombineSoloI @funindex \partcombineSoloII -@funindex partcombineSoloII @funindex \partcombineAutomatic -@funindex partcombineAutomatic In professional scores, voices are often kept apart from each other for long passages of music even if some of the notes are the same in both @@ -1159,7 +1141,6 @@ Refer also to @emph{Known issues and warnings} when using @cindex interleaved music @cindex parallel music @funindex \parallelMusic -@funindex parallelMusic Music for multiple parts can be interleaved in input code. The function @code{\parallelMusic} accepts a list with the names of a diff --git a/Documentation/notation/staff.itely b/Documentation/notation/staff.itely index 1a2f07566d..ce859e2bb5 100644 --- a/Documentation/notation/staff.itely +++ b/Documentation/notation/staff.itely @@ -59,7 +59,6 @@ grouping staves. @cindex tablature @funindex \drummode -@funindex drummode @funindex DrumStaff @funindex RhythmicStaff @funindex TabStaff @@ -409,9 +408,7 @@ sections are also described. @cindex ledger lines, modifying @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff The @code{\stopStaff} and @code{\startStaff} commands can be used to stop or (re)start the staff lines respectively, from being printed at @@ -582,9 +579,7 @@ Internals Reference: @cindex resizing of staves @funindex \startStaff -@funindex startStaff @funindex \stopStaff -@funindex stopStaff @notation{Ossia} staves can be set by creating a new simultaneous staff in the appropriate location: @@ -741,7 +736,6 @@ Internals Reference: @funindex \RemoveAllEmptyStaves @funindex Staff_symbol_engraver @funindex \stopStaff -@funindex stopStaff Staff lines can be hidden by removing the @@ -1025,11 +1019,8 @@ Internals Reference: @cindex cue notes @funindex \addQuote -@funindex addQuote @funindex \quoteDuring -@funindex quoteDuring @funindex \transposition -@funindex transposition It is very common for one voice to use the same notes as those from another voice. For example, first and second violins playing the same @@ -1225,13 +1216,9 @@ triplets may result in poor notation. @funindex \cueDuring -@funindex cueDuring @funindex \cueClef -@funindex cueClef @funindex \cueDuringWithClef -@funindex cueDuringWithClef @funindex \quoteDuring -@funindex quoteDuring @cindex notes, smaller @cindex smaller notes @@ -1415,7 +1402,6 @@ bassoonNotes = \relative c { @end lilypond @funindex \transposedCueDuring -@funindex transposedCueDuring Like @code{\quoteDuring}, @code{\cueDuring} takes instrument transpositions into account. Cue notes are produced at the @@ -1456,7 +1442,6 @@ bassClarinetNotes = \relative c' { @cindex cue notes, removing @funindex \killCues -@funindex killCues The @code{\killCues} command removes cue notes from a music expression, so the same music expression can be used to produce diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely index 3a9cdbd6d2..22471b86b3 100644 --- a/Documentation/notation/text.itely +++ b/Documentation/notation/text.itely @@ -92,9 +92,7 @@ For more information about the relative ordering of text scripts and articulations, see @rlearning{Placement of objects}. @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff @predefined @code{\textLengthOn}, @@ -172,11 +170,8 @@ The line style, as well as the text string, can be defined as an object property. This syntax is described in @ref{Line styles}. @funindex \textSpannerUp -@funindex textSpannerUp @funindex \textSpannerDown -@funindex textSpannerDown @funindex \textSpannerNeutral -@funindex textSpannerNeutral @predefined @@ -223,9 +218,7 @@ Internals Reference: @cindex bar lines, symbols on @funindex \mark -@funindex mark @funindex \markup -@funindex markup Various text elements may be added to a score using the syntax described in @ref{Rehearsal marks}: @@ -287,9 +280,7 @@ the next line. @end lilypond @funindex \markLengthOn -@funindex markLengthOn @funindex \markLengthOff -@funindex markLengthOff @predefined @code{\markLengthOn}, @@ -331,7 +322,6 @@ Internals Reference: @cindex text, standalone @funindex \markup -@funindex markup A @code{\markup} block can exist by itself, outside of any @code{\score} block, as a @qq{top-level expression}. This syntax @@ -367,9 +357,7 @@ requires, are described in @ref{Multi-page markup}. @funindex \markup -@funindex markup @funindex \markuplist -@funindex markuplist @predefined @code{\markup}, @@ -420,7 +408,6 @@ using the @code{\markup} mode specific syntax. @cindex typeset text @funindex \markup -@funindex markup A @code{\markup} block is used to typeset text with an extensible syntax called @qq{markup mode}. @@ -529,11 +516,8 @@ Syntax errors for markup mode can be confusing. @cindex switching fonts @funindex \italic -@funindex italic @funindex \bold -@funindex bold @funindex \underline -@funindex underline Basic font switching is supported in markup mode: @@ -554,13 +538,9 @@ Basic font switching is supported in markup mode: @funindex \abs-fontsize @funindex \fontsize -@funindex fontsize @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @funindex \magnify -@funindex magnify The font size can be altered, relative to the global staff size, in a number of different ways @@ -620,11 +600,8 @@ other characters. @cindex superscript @funindex \super -@funindex super @funindex \sub -@funindex sub @funindex \normal-size-super -@funindex normal-size-super Text may be printed as subscript or superscript. By default these are printed in a smaller size, but a normal size can be used as well: @@ -691,21 +668,13 @@ Defining custom font sets is also possible, as explained in @ref{Fonts}. @funindex \teeny -@funindex teeny @funindex \tiny -@funindex tiny @funindex \small -@funindex small @funindex \normalsize -@funindex normalsize @funindex \large -@funindex large @funindex \huge -@funindex huge @funindex \smaller -@funindex smaller @funindex \larger -@funindex larger @predefined @@ -763,11 +732,8 @@ objects can also be moved as a whole, using the syntax described in @cindex horizontal text alignment @funindex \left-align -@funindex left-align @funindex \center-align -@funindex center-align @funindex \right-align -@funindex right-align Markup objects may be aligned in different ways. By default, a text indication is aligned on its left edge: in the following example, @@ -786,7 +752,6 @@ there is no difference between the first and the second markup. @end lilypond @funindex \halign -@funindex halign Horizontal alignment may be fine-tuned using a numeric value: @@ -812,11 +777,8 @@ markup objects as a whole, as shown for instance in @cindex vertical text alignment @funindex \raise -@funindex raise @funindex \lower -@funindex lower @funindex \null -@funindex null @c QUERY Should the function of ``\null'' be clarified? rp @@ -848,11 +810,8 @@ has no anchor point, and therefore is not moved. @end lilypond @funindex \general-align -@funindex general-align @funindex \translate -@funindex translate @funindex \translate-scaled -@funindex translate-scaled Some commands can affect both the horizontal and vertical alignment of text objects in markup mode. Any object affected by these commands @@ -886,9 +845,7 @@ must be preceded with an anchor point: @cindex columns, text @funindex \column -@funindex column @funindex \center-column -@funindex center-column A markup object may include several lines of text. In the following example, each element or expression is placed on its own line, either @@ -915,7 +872,6 @@ left-aligned or centered: @cindex markup, centering on the page @funindex \fill-line -@funindex fill-line Similarly, a list of elements or expressions may be spread to fill the entire horizontal line width (if there is only one element, it will be @@ -947,9 +903,7 @@ multi-line text or any other markup expression: @cindex markup text, justified @funindex \wordwrap -@funindex wordwrap @funindex \justify -@funindex justify Long text indications can also be automatically wrapped accordingly to the given line width. These will be either left-aligned or justified, @@ -1026,15 +980,10 @@ commands. @cindex markup text, framing @funindex \box -@funindex box @funindex \circle -@funindex circle @funindex \rounded-box -@funindex rounded-box @funindex \bracket -@funindex bracket @funindex \hbracket -@funindex hbracket Some markup commands allow decoration of text elements with graphics, as demonstrated in the following example. @@ -1061,13 +1010,9 @@ as demonstrated in the following example. @cindex markup text padding @funindex \pad-markup -@funindex pad-markup @funindex \pad-x -@funindex pad-x @funindex \pad-to-box -@funindex pad-to-box @funindex \pad-around -@funindex pad-around Some commands may require an increase in the padding around the text; this is achieved with some markup commands exhaustively described in @@ -1101,17 +1046,11 @@ Flute quartet keeps very uneven time." @cindex notation, graphic @funindex \combine -@funindex combine @funindex \draw-circle -@funindex draw-circle @funindex \filled-box -@funindex filled-box @funindex \triangle -@funindex triangle @funindex \draw-line -@funindex draw-line @funindex \arrow-head -@funindex arrow-head Other graphic elements or symbols may be printed without requiring any text. As with any markup expression, such objects can be combined. @@ -1138,9 +1077,7 @@ text. As with any markup expression, such objects can be combined. @cindex postscript @funindex \epsfile -@funindex epsfile @funindex \postscript -@funindex postscript Advanced graphic features include the ability to include external image files converted to the Encapsulated PostScript format @@ -1335,11 +1272,8 @@ Internals Reference: @cindex text spread over multiple pages @funindex \markuplist -@funindex markuplist @funindex \justified-lines -@funindex justified-lines @funindex \wordwrap-lines -@funindex wordwrap-lines Although standard markup objects are not breakable, a specific syntax makes it possible to enter lines of text that can spread over multiple @@ -1389,7 +1323,6 @@ Internals Reference: @rinternals{TextScript}. @funindex \markuplist -@funindex markuplist @predefined @code{\markuplist}. diff --git a/Documentation/notation/wind.itely b/Documentation/notation/wind.itely index 3d518817ae..73d8c36b38 100644 --- a/Documentation/notation/wind.itely +++ b/Documentation/notation/wind.itely @@ -143,11 +143,8 @@ This section discusses notation common bagpipes. @cindex Scottish highland bagpipe @cindex grace notes @funindex \taor -@funindex taor @funindex \hideKeySignature -@funindex hideKeySignature @funindex \showKeySignature -@funindex showKeySignature LilyPond contains special definitions for Scottish, Highland Bagpipe music; to use them, add diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi index 675244a213..41f4229ab0 100644 --- a/Documentation/web/news-front.itexi +++ b/Documentation/web/news-front.itexi @@ -9,10 +9,10 @@ @c used for news about the upcoming release; see CG 10.2 @newsItem -@subheading LilyPond 2.19.43 released @emph{June 8, 2016} +@subheading LilyPond 2.19.44 released @emph{June 21, 2016} We are happy to announce the release of LilyPond -2.19.43. This release includes a number of enhancements, and contains some +2.19.44. This release includes a number of enhancements, and contains some work in progress. You will have access to the very latest features, but some may be incomplete, and you may encounter bugs and crashes. If you require a stable version of Lilypond, we recommend using the 2.18 diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi index fbabbd846e..137443318e 100644 --- a/Documentation/web/news.itexi +++ b/Documentation/web/news.itexi @@ -26,6 +26,18 @@ NOTE: * don't duplicate entries from news-front.itexi @end ignore +@newsItem +@subheading LilyPond 2.19.43 released @emph{June 8, 2016} + +We are happy to announce the release of LilyPond +2.19.43. This release includes a number of enhancements, and contains some +work in progress. You will have access to the very latest features, but +some may be incomplete, and you may encounter bugs and crashes. If you +require a stable version of Lilypond, we recommend using the 2.18 +version. + +@newsEnd + @newsItem @subheading LilyPond 2.19.42 released @emph{May 15, 2016} diff --git a/VERSION b/VERSION index f18fd1a1d6..12e6a20a57 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=19 -PATCH_LEVEL=44 +PATCH_LEVEL=45 MY_PATCH_LEVEL= VERSION_STABLE=2.18.2 -VERSION_DEVEL=2.19.43 +VERSION_DEVEL=2.19.44 diff --git a/input/regression/halfopenvertical.ly b/input/regression/halfopenvertical.ly new file mode 100644 index 0000000000..c0e0f03e31 --- /dev/null +++ b/input/regression/halfopenvertical.ly @@ -0,0 +1,19 @@ +\version "2.19.43" + +\header { + + texidoc = "The halfopenvertical articulation is available." + +} +#(define mydrums '( + (hihat cross #f 5) + (openhihat cross "open" 5) + (closedhihat cross "stopped" 5) + (halfopenhihat cross "halfopenvertical" 5))) + +\new DrumStaff << + \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) + + \drummode { hh4 hhc hho hhho } +>> + diff --git a/input/regression/midi/crescendo-abutting.ly b/input/regression/midi/crescendo-abutting.ly new file mode 100644 index 0000000000..da0ff4ffa0 --- /dev/null +++ b/input/regression/midi/crescendo-abutting.ly @@ -0,0 +1,10 @@ +\version "2.19.44" + +\header { + texidoc="One (de)crescendo ends as the next begins." +} + +\score { + { c\< c\> c\! } + \midi {} +} diff --git a/input/regression/midi/dynamic-initial.ly b/input/regression/midi/dynamic-initial.ly new file mode 100644 index 0000000000..fca7c8ab81 --- /dev/null +++ b/input/regression/midi/dynamic-initial.ly @@ -0,0 +1,15 @@ +\version "2.19.44" + +\header { + texidoc="The MIDI performer uses a default initial dynamic" +} + +\score { + { c\< c\f } + \midi {} +} + +\score { + { c c\< c\f } + \midi {} +} diff --git a/input/regression/system-start-nesting.ly b/input/regression/system-start-nesting.ly index d169a8cae2..b8bbfd62a5 100644 --- a/input/regression/system-start-nesting.ly +++ b/input/regression/system-start-nesting.ly @@ -11,7 +11,7 @@ \new StaffGroup \relative << \set StaffGroup.systemStartDelimiterHierarchy - = #'(SystemStartSquare (SystemStartBracket a (SystemStartSquare b)) d) + = #'(SystemStartSquare (SystemStartBracket a (SystemStartSquare b c)) d) \new Staff { c'1 } \new Staff { c1 } \new Staff { c1 } diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly index c915c7fe52..836088123b 100644 --- a/input/regression/typography-demo.ly +++ b/input/regression/typography-demo.ly @@ -9,7 +9,6 @@ heavily mutilated Edition Peters Morgenlied by Schubert" } \version "2.19.21" -#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI.")) ignoreMelisma = \set ignoreMelismata = ##t ignoreMelismaOff = \unset ignoreMelismata diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index a7a92d9d6d..3f03362b3b 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -45,7 +45,6 @@ protected: virtual void finalize (); virtual void derived_mark () const; -public: void acknowledge_rest (Grob_info); void acknowledge_beam (Grob_info); void acknowledge_bar_line (Grob_info); @@ -639,12 +638,12 @@ Grace_auto_beam_engraver::test_moment (Direction dir, Moment test_mom, Moment) void Grace_auto_beam_engraver::boot () { - ADD_LISTENER (Auto_beam_engraver, beam_forbid); - ADD_ACKNOWLEDGER (Auto_beam_engraver, stem); - ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line); - ADD_ACKNOWLEDGER (Auto_beam_engraver, beam); - ADD_ACKNOWLEDGER (Auto_beam_engraver, breathing_sign); - ADD_ACKNOWLEDGER (Auto_beam_engraver, rest); + ADD_LISTENER (Grace_auto_beam_engraver, beam_forbid); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, stem); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, bar_line); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, beam); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, breathing_sign); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, rest); } ADD_TRANSLATOR (Grace_auto_beam_engraver, diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 2bc4858479..2a5f71e275 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -116,15 +116,20 @@ Axis_group_engraver::finalize () void Axis_group_engraver::acknowledge_grob (Grob_info i) { - if (staffline_) - elts_.push_back (i.grob ()); + if (!staffline_) + return; + + elts_.push_back (i.grob ()); - if (staffline_ && to_boolean(staffline_->get_property("remove-empty"))) + if (to_boolean (staffline_->get_property ("remove-empty"))) { for (SCM s = interesting_; scm_is_pair (s); s = scm_cdr (s)) { if (i.grob ()->internal_has_interface (scm_car (s))) - Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob ()); + { + Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob ()); + break; + } } } } diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 277d1b0a0e..9b4df64d9c 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -40,6 +40,7 @@ class Beam_engraver : public Engraver public: void acknowledge_stem (Grob_info); void acknowledge_rest (Grob_info); + void listen_beam (Stream_event *); protected: Stream_event *start_ev_; @@ -77,7 +78,6 @@ protected: virtual bool valid_start_point (); virtual bool valid_end_point (); - void listen_beam (Stream_event *); public: TRANSLATOR_DECLARATIONS (Beam_engraver); }; @@ -343,7 +343,6 @@ class Grace_beam_engraver : public Beam_engraver public: TRANSLATOR_DECLARATIONS (Grace_beam_engraver); TRANSLATOR_INHERIT (Beam_engraver); - void listen_beam (Stream_event *); protected: virtual bool valid_start_point (); @@ -368,27 +367,12 @@ Grace_beam_engraver::valid_end_point () return beam_ && valid_start_point (); } -/* - Ugh, C&P code. - */ -void -Grace_beam_engraver::listen_beam (Stream_event *ev) -{ - Direction d = to_dir (ev->get_property ("span-direction")); - - if (d == START && valid_start_point ()) - start_ev_ = ev; - else if (d == STOP && valid_end_point ()) - stop_ev_ = ev; -} - - void Grace_beam_engraver::boot () { ADD_LISTENER (Grace_beam_engraver, beam); - ADD_ACKNOWLEDGER (Beam_engraver, stem); - ADD_ACKNOWLEDGER (Beam_engraver, rest); + ADD_ACKNOWLEDGER (Grace_beam_engraver, stem); + ADD_ACKNOWLEDGER (Grace_beam_engraver, rest); } ADD_TRANSLATOR (Grace_beam_engraver, diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index 46a8a446d3..5ce67f0463 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -41,7 +41,6 @@ private: Drul_array span_events_; Drul_array grow_dir_; Real last_volume_; - bool last_volume_initialized_; Audio_dynamic *absolute_; Audio_span_dynamic *span_dynamic_; Audio_span_dynamic *finished_span_dynamic_; @@ -49,8 +48,7 @@ private: Dynamic_performer::Dynamic_performer () { - last_volume_ = 0.0; - last_volume_initialized_ = false; + last_volume_ = -1; script_event_ = 0; absolute_ = 0; span_events_[LEFT] @@ -105,9 +103,10 @@ Dynamic_performer::equalize_volume (Real volume) void Dynamic_performer::process_music () { - if (span_events_[STOP] || script_event_) + if (span_events_[START] || span_events_[STOP] || script_event_) { - // End of a dynamic spanner, or an explicit dynamic script event. + // End the previous spanner when a new one begins or at an explicit stop + // or absolute dynamic. finished_span_dynamic_ = span_dynamic_; span_dynamic_ = 0; } @@ -120,16 +119,6 @@ Dynamic_performer::process_music () announce_element (Audio_element_info (span_dynamic_, span_events_[START])); span_dynamic_->grow_dir_ = grow_dir_[START]; - - if (!last_volume_initialized_ && !script_event_) - { - // No explicit dynamic script events have occurred yet, but there is - // nevertheless a dynamic spanner. Initialize last_volume_ to a - // value within the available range. - span_events_[START]->origin ()->warning (_ ("(De)crescendo with unspecified starting volume in MIDI.")); - last_volume_ = equalize_volume (0.5); - last_volume_initialized_ = true; - } } if (script_event_ @@ -155,20 +144,18 @@ Dynamic_performer::process_music () last_volume_ = absolute_->volume_ = equalize_volume (volume); - last_volume_initialized_ = true; } Audio_element_info info (absolute_, script_event_); announce_element (info); } - if (!last_volume_initialized_) + if (last_volume_ < 0) { absolute_ = new Audio_dynamic (); last_volume_ = absolute_->volume_ = equalize_volume (0.71); // Backward compatible - last_volume_initialized_ = true; Audio_element_info info (absolute_, script_event_); announce_element (info); @@ -190,14 +177,16 @@ Dynamic_performer::stop_translation_timestep () finished_span_dynamic_ = 0; } - if (absolute_ && absolute_->volume_ < 0) - { - absolute_->volume_ = last_volume_; - } - else if (absolute_) + if (absolute_) { - last_volume_ = absolute_->volume_; - last_volume_initialized_ = true; + if (absolute_->volume_ < 0) + { + absolute_->volume_ = last_volume_; + } + else + { + last_volume_ = absolute_->volume_; + } } absolute_ = 0; diff --git a/lily/engraver-scheme.cc b/lily/engraver-scheme.cc index 587a93199f..970aebde55 100644 --- a/lily/engraver-scheme.cc +++ b/lily/engraver-scheme.cc @@ -33,7 +33,6 @@ LY_DEFINE (ly_engraver_make_grob, "ly:engraver-make-grob", Grob *g = unsmob (engraver)-> internal_make_grob (grob_name, cause, - ly_symbol2string (grob_name).c_str (), "scheme", 0, "scheme"); return g->self_scm (); } diff --git a/lily/engraver.cc b/lily/engraver.cc index 5a1486927a..daf055ccf7 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -106,7 +106,6 @@ LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback", Grob * Engraver::internal_make_grob (SCM symbol, SCM cause, - char const * /* name */, char const *file, int line, char const *fun) @@ -146,26 +145,24 @@ Engraver::internal_make_grob (SCM symbol, Item * Engraver::internal_make_item (SCM x, SCM cause, - char const *name, char const *file, int line, char const *fun) { - Item *it = dynamic_cast (internal_make_grob (x, cause, name, file, line, fun)); + Item *it = dynamic_cast (internal_make_grob (x, cause, file, line, fun)); assert (it); return it; } Paper_column * -Engraver::internal_make_column (SCM x, char const *name, - char const *file, int line, char const *fun) +Engraver::internal_make_column (SCM x, char const *file, int line, char const *fun) { - return dynamic_cast (internal_make_grob (x, SCM_EOL, name, file, line, fun)); + return dynamic_cast (internal_make_grob (x, SCM_EOL, file, line, fun)); } Spanner * -Engraver::internal_make_spanner (SCM x, SCM cause, char const *name, +Engraver::internal_make_spanner (SCM x, SCM cause, char const *file, int line, char const *fun) { - Spanner *sp = dynamic_cast (internal_make_grob (x, cause, name, file, line, fun)); + Spanner *sp = dynamic_cast (internal_make_grob (x, cause, file, line, fun)); assert (sp); return sp; } diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index d5fe89024c..02cf2fa76b 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -595,7 +595,9 @@ LY_DEFINE (ly_format, "ly:format", char *ptr = result; for (vsize i = 0; i < results.size (); i++) { - strncpy (ptr, results[i].c_str (), results[i].size ()); + // strcpy and strncpy cannot be used here + // because std::string may contain '\0' in its contents. + results[i].copy (ptr, results[i].size ()); ptr += results[i].size (); } *ptr = '\0'; diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index 928f6a969d..868af25d45 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -31,7 +31,7 @@ */ class Engraver : public Translator { - Grob *internal_make_grob (SCM sym, SCM cause, char const *name, + Grob *internal_make_grob (SCM sym, SCM cause, char const *f, int l, char const *fun); friend SCM ly_engraver_make_grob (SCM, SCM, SCM); friend class Engraver_group; @@ -67,11 +67,11 @@ public: Grob_info make_grob_info (Grob *, SCM cause); - Item *internal_make_item (SCM sym, SCM cause, char const *name, + Item *internal_make_item (SCM sym, SCM cause, char const *f, int l, char const *fun); - Spanner *internal_make_spanner (SCM sym, SCM cause, char const *name, + Spanner *internal_make_spanner (SCM sym, SCM cause, char const *f, int l, char const *fun); - Paper_column *internal_make_column (SCM sym, char const *name, + Paper_column *internal_make_column (SCM sym, char const *f, int l, char const *fun); /** @@ -82,9 +82,9 @@ public: Engraver (); }; -#define make_item(x, cause) internal_make_item (ly_symbol2scm (x), cause, x, __FILE__, __LINE__, __FUNCTION__) -#define make_spanner(x, cause) internal_make_spanner (ly_symbol2scm (x), cause, x, __FILE__, __LINE__, __FUNCTION__) -#define make_paper_column(x) internal_make_column (ly_symbol2scm (x), x, __FILE__, __LINE__, __FUNCTION__) +#define make_item(x, cause) internal_make_item (ly_symbol2scm (x), cause, __FILE__, __LINE__, __FUNCTION__) +#define make_spanner(x, cause) internal_make_spanner (ly_symbol2scm (x), cause, __FILE__, __LINE__, __FUNCTION__) +#define make_paper_column(x) internal_make_column (ly_symbol2scm (x), __FILE__, __LINE__, __FUNCTION__) bool ly_is_grob_cause (SCM obj); diff --git a/lily/include/gregorian-ligature-engraver.hh b/lily/include/gregorian-ligature-engraver.hh index d7011bda99..fcac99c322 100644 --- a/lily/include/gregorian-ligature-engraver.hh +++ b/lily/include/gregorian-ligature-engraver.hh @@ -26,7 +26,6 @@ class Gregorian_ligature_engraver : public Coherent_ligature_engraver Stream_event *pes_or_flexa_req_; public: - void listen_pes_or_flexa (Stream_event *ev); // no TRANSLATOR_DECLARATIONS (Gregorian_ligature_engraver) needed // since this class is abstract @@ -35,6 +34,7 @@ public: protected: Gregorian_ligature_engraver (); + void listen_pes_or_flexa (Stream_event *ev); virtual void build_ligature (Spanner *ligature, vector const &primitives); virtual void transform_heads (Spanner *ligature, diff --git a/lily/include/ligature-engraver.hh b/lily/include/ligature-engraver.hh index 1f8fd8b85f..a46c3fe22a 100644 --- a/lily/include/ligature-engraver.hh +++ b/lily/include/ligature-engraver.hh @@ -30,6 +30,9 @@ protected: void stop_translation_timestep (); virtual void finalize (); + void acknowledge_rest (Grob_info); + void acknowledge_ligature_head (Grob_info); + void listen_ligature (Stream_event *ev); void process_music (); virtual Spanner *create_ligature_spanner () = 0; virtual void typeset_ligature (Spanner *ligature, @@ -38,9 +41,6 @@ protected: SCM brew_ligature_primitive_proc; public: - void acknowledge_rest (Grob_info); - void acknowledge_ligature_head (Grob_info); - void listen_ligature (Stream_event *ev); // no TRANSLATOR_DECLARATIONS (Ligature_engraver) needed since this // class is abstract DECLARE_TRANSLATOR_CALLBACKS (Ligature_engraver); diff --git a/lily/include/slur-engraver.hh b/lily/include/slur-engraver.hh new file mode 100644 index 0000000000..1f057069d1 --- /dev/null +++ b/lily/include/slur-engraver.hh @@ -0,0 +1,81 @@ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2013--2015 Mike Solomon + Copyright (C) 2016 David Kastrup + + 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 . +*/ + +#ifndef SLUR_ENGRAVER_HH +#define SLUR_ENGRAVER_HH + +#include "engraver.hh" +#include + +class Slur_engraver : public Engraver +{ +protected: + struct Event_info { + Stream_event *slur_, *note_; + Event_info (Stream_event *slur, Stream_event *note) + : slur_ (slur), note_ (note) + { } + }; + // protected so that subclasses can see them + vector start_events_; + vector stop_events_; + + typedef std::multimap Note_slurs; + Drul_array note_slurs_; + vector slurs_; + vector end_slurs_; + vector objects_to_acknowledge_; + + virtual SCM event_symbol () const; + virtual bool double_property () const; + virtual SCM grob_symbol () const; + virtual const char* object_name () const; + + void acknowledge_inline_accidental (Grob_info); + void acknowledge_fingering (Grob_info); + void acknowledge_note_column (Grob_info); + void acknowledge_script (Grob_info); + void acknowledge_dots (Grob_info); + void acknowledge_text_script (Grob_info); + void acknowledge_end_tie (Grob_info); + void acknowledge_tuplet_number (Grob_info); + + void listen_note (Stream_event *ev); + // A slur on an in-chord note is not actually announced as an event + // but rather produced by the note listener. + void listen_note_slur (Stream_event *ev, Stream_event *note); + void listen_slur (Stream_event *ev) { listen_note_slur (ev, 0); } + void acknowledge_extra_object (Grob_info); + void stop_translation_timestep (); + void process_music (); + + bool can_create_slur (const string&, vsize, vsize *, Stream_event *); + void create_slur (const string &spanner_id, Event_info evi, Grob *g_cause, Direction dir, bool left_broken); + bool try_to_end (Event_info evi); + + virtual void set_melisma (bool); + virtual void finalize (); + virtual void derived_mark () const; + +public: + TRANSLATOR_DECLARATIONS (Slur_engraver); +}; + +#endif // SLUR_ENGRAVER_HH diff --git a/lily/include/slur-proto-engraver.hh b/lily/include/slur-proto-engraver.hh deleted file mode 100644 index 97ed1a6637..0000000000 --- a/lily/include/slur-proto-engraver.hh +++ /dev/null @@ -1,88 +0,0 @@ -/* - This file is part of LilyPond, the GNU music typesetter. - - Copyright (C) 2013--2015 Mike Solomon - - 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 . -*/ - -#ifndef SLUR_PROTO_ENGRAVER_HH -#define SLUR_PROTO_ENGRAVER_HH - -#include "engraver.hh" -#include "moment.hh" -#include - -class Slur_proto_engraver : public Engraver -{ -protected: - Slur_proto_engraver (const char* double_property_name, - const char* grob_name, const char* object_name, const char* event_name) : - double_property_name_ (double_property_name), - grob_name_ (grob_name), object_name_ (object_name), - event_name_ (event_name) {} - - struct Event_info { - Stream_event *slur_, *note_; - Event_info (Stream_event *slur, Stream_event *note) - : slur_ (slur), note_ (note) - { } - }; - // protected so that subclasses can see them - vector start_events_; - vector stop_events_; - - typedef std::multimap Note_slurs; - Drul_array note_slurs_; - vector slurs_; - vector end_slurs_; - vector objects_to_acknowledge_; - const char* double_property_name_; - const char* grob_name_; - const char* object_name_; - const char* event_name_; - virtual SCM event_symbol () = 0; - - void acknowledge_extra_object (Grob_info); - void stop_translation_timestep (); - void process_music (); - - bool can_create_slur (const string&, vsize, vsize *, Stream_event *); - void create_slur (const string &spanner_id, Event_info evi, Grob *g_cause, Direction dir, bool left_broken); - bool try_to_end (Event_info evi); - - virtual void set_melisma (bool); - virtual void finalize (); - virtual void derived_mark () const; - -public: - void acknowledge_inline_accidental (Grob_info); - void acknowledge_fingering (Grob_info); - void acknowledge_note_column (Grob_info); - void acknowledge_script (Grob_info); - void acknowledge_dots (Grob_info); - void acknowledge_text_script (Grob_info); - void acknowledge_end_tie (Grob_info); - void acknowledge_tuplet_number (Grob_info); - void listen_note (Stream_event *ev); - void listen_slur (Stream_event *ev, Stream_event *note); - // You'd think the following is the same as defaulting `note' to 0, - // but template resolution for trampolines disagrees. Huh. - void listen_slur (Stream_event *ev) { listen_slur (ev, 0); } - // no TRANSLATOR_DECLARATIONS (Slur_proto_engraver) needed since this - // class is abstract - DECLARE_TRANSLATOR_CALLBACKS (Slur_proto_engraver); -}; - -#endif // SLUR_PROTO_ENGRAVER_HH diff --git a/lily/include/translator.hh b/lily/include/translator.hh index dd0659bf50..667fd6ddbd 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -26,6 +26,7 @@ #include "callback.hh" #include "input.hh" // for error reporting #include "smobs.hh" +#include "stream-event.hh" #include "std-vector.hh" #include "protected-scm.hh" @@ -38,11 +39,24 @@ /* end #define */ #define TRANSLATOR_INHERIT(BASE) \ - using BASE::method_finder + using BASE::method_finder; \ + using BASE::ack_finder; #define DECLARE_TRANSLATOR_CALLBACKS(NAME) \ template \ - static SCM method_finder () { return method_find_base (); } \ + static SCM method_finder () \ + { \ + return Callback0_wrapper::make_smob (); \ + } \ + template \ + static SCM method_finder () \ + { \ + return Callback_wrapper::make_smob > (); \ + } \ + template \ + static SCM ack_finder () { \ + return Callback2_wrapper::make_smob > (); \ + } \ /* end #define */ /* @@ -146,16 +160,20 @@ protected: // should be private. return SCM_UNSPECIFIED; } - template - static SCM - method_find_base () { return Callback0_wrapper::make_smob (); } - // Fallback for non-overriden callbacks for which &T::x degrades to // &Translator::x template static SCM method_finder () { return SCM_UNDEFINED; } + // Overriden in Engraver. Don't instantiate. + template + static SCM ack_trampoline (SCM, SCM, SCM); + + // Overriden in Engraver. Don't instantiate. + template + static SCM ack_finder (); + virtual void derived_mark () const; static SCM event_class_symbol (const char *ev_class); SCM static_translator_description (const char *grobs, diff --git a/lily/include/translator.icc b/lily/include/translator.icc index b649a1a197..3d038b68e6 100644 --- a/lily/include/translator.icc +++ b/lily/include/translator.icc @@ -97,15 +97,14 @@ void add_acknowledger (SCM ptr, SCM &ack_hash); #define ADD_ACKNOWLEDGER(CLASS, NAME) \ - add_acknowledger (Callback2_wrapper::make_smob \ - > (), \ + add_acknowledger (ack_finder<&CLASS::acknowledge_ ## NAME> (), \ #NAME, acknowledge_static_array_drul_[START]) #define ADD_END_ACKNOWLEDGER(CLASS, NAME) \ - add_acknowledger (Callback2_wrapper::make_smob \ - > (), \ + add_acknowledger (ack_finder<&CLASS::acknowledge_end_ ## NAME> (), \ #NAME, acknowledge_static_array_drul_[STOP]) + /* Implement the method cl::listen_##m, and make it listen to stream events of class m. @@ -113,7 +112,7 @@ void add_acknowledger (SCM ptr, #define ADD_LISTENER(cl, m) \ listener_list_ = scm_acons \ (event_class_symbol (#m), \ - Callback_wrapper::make_smob \ - > (), listener_list_) + method_finder<&cl::listen_ ## m> (), \ + listener_list_) #endif /* TRANSLATOR_ICC */ diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 8c907dc7cc..115902e89d 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -117,6 +117,7 @@ Key_engraver::create_key (bool is_default) { SCM visibility = get_property ("explicitKeySignatureVisibility"); item_->set_property ("break-visibility", visibility); + item_->set_property ("non-default", SCM_BOOL_T); } } diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc index 3249a736c3..79e2bd9948 100644 --- a/lily/key-signature-interface.cc +++ b/lily/key-signature-interface.cc @@ -136,4 +136,5 @@ ADD_INTERFACE (Key_signature_interface, "sharp-positions " "padding " "padding-pairs " + "non-default " ); diff --git a/lily/kievan-ligature-engraver.cc b/lily/kievan-ligature-engraver.cc index cdb51de3ad..ff9e7b942b 100644 --- a/lily/kievan-ligature-engraver.cc +++ b/lily/kievan-ligature-engraver.cc @@ -132,9 +132,9 @@ Kievan_ligature_engraver::build_ligature (Spanner *ligature, void Kievan_ligature_engraver::boot () { - ADD_LISTENER (Ligature_engraver, ligature); - ADD_ACKNOWLEDGER (Ligature_engraver, rest); - ADD_ACKNOWLEDGER (Ligature_engraver, ligature_head); + ADD_LISTENER (Kievan_ligature_engraver, ligature); + ADD_ACKNOWLEDGER (Kievan_ligature_engraver, rest); + ADD_ACKNOWLEDGER (Kievan_ligature_engraver, ligature_head); } ADD_TRANSLATOR (Kievan_ligature_engraver, diff --git a/lily/line-interface.cc b/lily/line-interface.cc index b90be8c04c..f23b58e308 100644 --- a/lily/line-interface.cc +++ b/lily/line-interface.cc @@ -123,8 +123,8 @@ Line_interface::make_dashed_line (Real thick, Offset from, Offset to, Real dash_period, Real dash_fraction) { dash_fraction = min (max (dash_fraction, 0.0), 1.0); - Real on = dash_fraction * dash_period + thick; - Real off = max (0.0, dash_period - on); + Real on = dash_fraction * dash_period; + Real off = max (0.0, dash_period - on - thick); SCM at = scm_list_n (ly_symbol2scm ("dashed-line"), scm_from_double (thick), diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index 41652a1006..874b2ebb35 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -492,9 +492,9 @@ Mensural_ligature_engraver::build_ligature (Spanner *ligature, void Mensural_ligature_engraver::boot () { - ADD_LISTENER (Ligature_engraver, ligature); - ADD_ACKNOWLEDGER (Ligature_engraver, rest); - ADD_ACKNOWLEDGER (Ligature_engraver, ligature_head); + ADD_LISTENER (Mensural_ligature_engraver, ligature); + ADD_ACKNOWLEDGER (Mensural_ligature_engraver, rest); + ADD_ACKNOWLEDGER (Mensural_ligature_engraver, ligature_head); } ADD_TRANSLATOR (Mensural_ligature_engraver, diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index 75eccf69fc..047a547525 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -176,9 +176,7 @@ New_fingering_engraver::add_fingering (Grob *head, { Finger_tuple ft; - ft.script_ = internal_make_item (grob_sym, event->self_scm (), - ly_symbol2string (grob_sym).c_str (), - __FILE__, __LINE__, __FUNCTION__); + ft.script_ = make_item (grob_sym, event->self_scm ()); Side_position_interface::add_support (ft.script_, head); diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc index 365ccb1a63..2797ac3e9e 100644 --- a/lily/open-type-font-scheme.cc +++ b/lily/open-type-font-scheme.cc @@ -172,3 +172,49 @@ LY_DEFINE (ly_get_font_format, "ly:get-font-format", return asscm; } + +LY_DEFINE (ly_has_glyph_names_p, "ly:has-glyph-names?", + 1, 1, 0, (SCM font_file_name, SCM idx), + "Does the font for @var{font_file_name} have glyph names?" + " The optional @var{idx} argument is useful for" + " TrueType Collections (TTC) and" + " OpenType/CFF collections (OTC) only;" + " it specifies the font index within the TTC/OTC." + " The default value of @var{idx} is@tie{}0.") +{ + LY_ASSERT_TYPE (scm_is_string, font_file_name, 1); + + int i = 0; + if (!SCM_UNBNDP (idx)) + { + LY_ASSERT_TYPE (scm_is_integer, idx, 2); + i = scm_to_int (idx); + if (i < 0) + { + warning (_ ("font index must be non-negative, using index 0")); + i = 0; + } + } + + string file_name = ly_scm2string (font_file_name); + + FT_Face face; + /* check whether font index is valid */ + if (i > 0) + { + face = open_ft_face (file_name, -1); + if (i >= face->num_faces) + { + warning (_f ("font index %d too large for font `%s', using index 0", + i, file_name.c_str ())); + i = 0; + } + FT_Done_Face (face); + } + + face = open_ft_face (file_name, i); + bool has_glyph_names = FT_HAS_GLYPH_NAMES(face); + FT_Done_Face (face); + + return has_glyph_names ? SCM_BOOL_T : SCM_BOOL_F; +} diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index 8cb99ecbb6..0e32f6e644 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -229,6 +229,18 @@ Paper_column_engraver::stop_translation_timestep () command_column_->set_property ("when", m); musical_column_->set_property ("when", m); + SCM mpos = get_property ("measurePosition"); + SCM barnum = get_property ("internalBarNumber"); + if (unsmob (mpos) + && scm_is_integer (barnum)) + { + SCM where = scm_cons (barnum, + mpos); + + command_column_->set_property ("rhythmic-location", where); + musical_column_->set_property ("rhythmic-location", where); + } + for (vsize i = 0; i < items_.size (); i++) { Item *elem = items_[i]; @@ -274,18 +286,6 @@ Paper_column_engraver::stop_translation_timestep () first_ = false; label_events_.clear (); - - SCM mpos = get_property ("measurePosition"); - SCM barnum = get_property ("internalBarNumber"); - if (unsmob (mpos) - && scm_is_integer (barnum)) - { - SCM where = scm_cons (barnum, - mpos); - - command_column_->set_property ("rhythmic-location", where); - musical_column_->set_property ("rhythmic-location", where); - } } void diff --git a/lily/parser.yy b/lily/parser.yy index 1695aea625..741aee7d73 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1486,16 +1486,40 @@ context_modification_arg: | MUSIC_IDENTIFIER ; -optional_context_mod: - /**/ { - $$ = SCM_EOL; - } - | context_modification +/* A list of single mods collected from a (possibly empty) sequence of + * context modifications, usually written as \with ... \with ... + */ + +optional_context_mods: + context_modification_mods_list { - $$ = $1; + if (scm_is_pair ($1)) + $$ = scm_append_x (scm_reverse_x ($1, SCM_EOL)); } ; +/* The worker for optional_context_mods conses a (reversed) list where + * each element contains the list of single context mods from one + * context modification block. Context_mod::get_mods creates fresh + * copies, so it's okay to use append! on them. + */ + +context_modification_mods_list: + /**/ { + $$ = SCM_EOL; + } + | context_modification_mods_list context_modification + { + if (Context_mod *m = unsmob ($2)) + $$ = scm_cons (m->get_mods (), $1); + } + ; + +/* A Context_mod is a container for a list of context mods like + * \consists ... \override ... . context_mod_list produces a + * Context_mod from the inside of a \with { ... } statement. + */ + context_mod_list: /**/ { $$ = Context_mod ().smobbed_copy (); @@ -1526,36 +1550,20 @@ context_mod_list: ; context_prefix: - CONTEXT symbol optional_id optional_context_mod { - Context_mod *ctxmod = unsmob ($4); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_F); + CONTEXT symbol optional_id optional_context_mods { + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, $4, SCM_BOOL_F); } - | NEWCONTEXT symbol optional_id optional_context_mod { - Context_mod *ctxmod = unsmob ($4); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_T); + | NEWCONTEXT symbol optional_id optional_context_mods { + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, $4, SCM_BOOL_T); } ; new_lyrics: - ADDLYRICS optional_context_mod lyric_mode_music { - Context_mod *ctxmod = unsmob ($2); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = scm_acons ($3, mods, SCM_EOL); + ADDLYRICS optional_context_mods lyric_mode_music { + $$ = scm_acons ($3, $2, SCM_EOL); } - | new_lyrics ADDLYRICS optional_context_mod lyric_mode_music { - Context_mod *ctxmod = unsmob ($3); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = scm_acons ($4, mods, $1); + | new_lyrics ADDLYRICS optional_context_mods lyric_mode_music { + $$ = scm_acons ($4, $3, $1); } ; @@ -2510,12 +2518,8 @@ mode_changed_music: } parser->lexer_->pop_state (); } - | mode_changing_head_with_context optional_context_mod grouped_music_list { - Context_mod *ctxmod = unsmob ($2); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX (context_specification, @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); + | mode_changing_head_with_context optional_context_mods grouped_music_list { + $$ = MAKE_SYNTAX (context_specification, @$, $1, SCM_EOL, $2, SCM_BOOL_T, $3); if (scm_is_eq ($1, ly_symbol2scm ("ChordNames"))) { $$ = MAKE_SYNTAX (unrelativable_music, @$, $$); diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc index f708c098a0..e718a13bf0 100644 --- a/lily/pfb-scheme.cc +++ b/lily/pfb-scheme.cc @@ -7,22 +7,35 @@ #include "main.hh" #include "warn.hh" -LY_DEFINE (ly_pfb_2_pfa, "ly:pfb->pfa", - 1, 0, 0, (SCM pfb_file_name), +LY_DEFINE (ly_type1_2_pfa, "ly:type1->pfa", + 1, 0, 0, (SCM type1_file_name), "Convert the contents of a Type@tie{}1 font in PFB format" - " to PFA format.") + " to PFA format. If the file is already in PFA format," + " pass through it.") { - LY_ASSERT_TYPE (scm_is_string, pfb_file_name, 1); + LY_ASSERT_TYPE (scm_is_string, type1_file_name, 1); - string file_name = ly_scm2string (pfb_file_name); + string file_name = ly_scm2string (type1_file_name); debug_output ("[" + file_name); // start message on a new line - vector pfb_string = gulp_file (file_name, 0); - char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ()); + vector type1_string = gulp_file (file_name, 0); + SCM pfa_scm; - SCM pfa_scm = scm_from_latin1_string (pfa); - free (pfa); + if ((Byte) type1_string[0] == 0x80) + { + /* The file is in PFB format. Convert it to PFA format. */ + char *pfa = pfb2pfa ((Byte *) &type1_string[0], + (int) type1_string.size ()); + pfa_scm = scm_from_latin1_string (pfa); + free (pfa); + } + else + { + /* The file is in PFA format. Pass it through. */ + type1_string.push_back(0); + pfa_scm = scm_from_latin1_string (&type1_string[0]); + } debug_output ("]", false); diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index ee7a96a2d7..cdb50cd9c4 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -17,48 +17,64 @@ along with LilyPond. If not, see . */ -#include "engraver.hh" - -#include "context.hh" -#include "directional-element-interface.hh" -#include "international.hh" -#include "note-column.hh" -#include "slur.hh" -#include "slur-proto-engraver.hh" -#include "spanner.hh" -#include "stream-event.hh" -#include "warn.hh" +#include "slur-engraver.hh" #include "translator.icc" -class Phrasing_slur_engraver : public Slur_proto_engraver +class Phrasing_slur_engraver : public Slur_engraver { + virtual SCM event_symbol () const; + virtual bool double_property () const; + virtual SCM grob_symbol () const; + virtual const char* object_name () const; + virtual void set_melisma (bool); + protected: void listen_phrasing_slur (Stream_event *); void acknowledge_slur (Grob_info); public: - SCM event_symbol (); TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); - TRANSLATOR_INHERIT (Slur_proto_engraver); + TRANSLATOR_INHERIT (Slur_engraver); }; -Phrasing_slur_engraver::Phrasing_slur_engraver () : - Slur_proto_engraver (0, "PhrasingSlur", "phrasing slur", "phrasing-slur-event") +SCM +Phrasing_slur_engraver::event_symbol () const { + return ly_symbol2scm ("phrasing-slur-event"); +} + +bool +Phrasing_slur_engraver::double_property () const +{ + return false; } SCM -Phrasing_slur_engraver::event_symbol () +Phrasing_slur_engraver::grob_symbol () const +{ + return ly_symbol2scm ("PhrasingSlur"); +} + +const char * +Phrasing_slur_engraver::object_name () const +{ + return "phrasing slur"; +} + +Phrasing_slur_engraver::Phrasing_slur_engraver () +{ +} + +void +Phrasing_slur_engraver::set_melisma (bool) { - // Need a string constant for memoization - return ly_symbol2scm ("phrasing-slur-event"); } void Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - Slur_proto_engraver::listen_slur (ev); + Slur_engraver::listen_slur (ev); } void @@ -72,16 +88,16 @@ void Phrasing_slur_engraver::boot () { ADD_LISTENER (Phrasing_slur_engraver, phrasing_slur); - ADD_LISTENER (Slur_proto_engraver, note); - ADD_ACKNOWLEDGER (Slur_proto_engraver, inline_accidental); - ADD_ACKNOWLEDGER (Slur_proto_engraver, fingering); - ADD_ACKNOWLEDGER (Slur_proto_engraver, note_column); + ADD_LISTENER (Phrasing_slur_engraver, note); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, inline_accidental); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column); ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur); - ADD_ACKNOWLEDGER (Slur_proto_engraver, script); - ADD_ACKNOWLEDGER (Slur_proto_engraver, dots); - ADD_ACKNOWLEDGER (Slur_proto_engraver, text_script); - ADD_END_ACKNOWLEDGER (Slur_proto_engraver, tie); - ADD_ACKNOWLEDGER (Slur_proto_engraver, tuplet_number); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dots); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script); + ADD_END_ACKNOWLEDGER (Phrasing_slur_engraver, tie); + ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number); } ADD_TRANSLATOR (Phrasing_slur_engraver, diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 75091e1901..a9fabdc4f2 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -72,7 +72,9 @@ Protected_scm::operator = (Protected_scm const &s) Protected_scm::operator SCM const & () const { - return SCM_CONSP (object_) ? *SCM_CARLOC (object_) : object_; + if (SCM_CONSP (object_)) + return *SCM_CARLOC (object_); + return object_; } Protected_scm::operator SCM & () diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 2ea4595fc1..ff9065ca10 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -17,40 +17,44 @@ along with LilyPond. If not, see . */ -#include "engraver.hh" - #include "context.hh" #include "directional-element-interface.hh" #include "international.hh" #include "note-column.hh" +#include "pointer-group-interface.hh" +#include "slur-engraver.hh" #include "slur.hh" -#include "slur-proto-engraver.hh" #include "spanner.hh" -#include "stream-event.hh" #include "warn.hh" #include "translator.icc" -class Slur_engraver : public Slur_proto_engraver +SCM +Slur_engraver::event_symbol () const { - virtual void set_melisma (bool); - -public: - SCM event_symbol (); - TRANSLATOR_DECLARATIONS (Slur_engraver); - TRANSLATOR_INHERIT (Slur_proto_engraver); -}; + return ly_symbol2scm ("slur-event"); +} -Slur_engraver::Slur_engraver () : - Slur_proto_engraver ("doubleSlurs", "Slur", "slur", "slur-event") +bool +Slur_engraver::double_property () const { + return to_boolean (get_property ("doubleSlurs")); } SCM -Slur_engraver::event_symbol () +Slur_engraver::grob_symbol () const +{ + return ly_symbol2scm ("Slur"); +} + +const char * +Slur_engraver::object_name () const +{ + return "slur"; +} + +Slur_engraver::Slur_engraver () { - // Need a string constant for memoization - return ly_symbol2scm ("slur-event"); } void @@ -62,16 +66,16 @@ Slur_engraver::set_melisma (bool m) void Slur_engraver::boot () { - ADD_LISTENER (Slur_proto_engraver, slur); - ADD_LISTENER (Slur_proto_engraver, note); - ADD_ACKNOWLEDGER (Slur_proto_engraver, inline_accidental); - ADD_ACKNOWLEDGER (Slur_proto_engraver, fingering); - ADD_ACKNOWLEDGER (Slur_proto_engraver, note_column); - ADD_ACKNOWLEDGER (Slur_proto_engraver, script); - ADD_ACKNOWLEDGER (Slur_proto_engraver, text_script); - ADD_ACKNOWLEDGER (Slur_proto_engraver, dots); - ADD_END_ACKNOWLEDGER (Slur_proto_engraver, tie); - ADD_ACKNOWLEDGER (Slur_proto_engraver, tuplet_number); + ADD_LISTENER (Slur_engraver, slur); + ADD_LISTENER (Slur_engraver, note); + ADD_ACKNOWLEDGER (Slur_engraver, inline_accidental); + ADD_ACKNOWLEDGER (Slur_engraver, fingering); + ADD_ACKNOWLEDGER (Slur_engraver, note_column); + ADD_ACKNOWLEDGER (Slur_engraver, script); + ADD_ACKNOWLEDGER (Slur_engraver, text_script); + ADD_ACKNOWLEDGER (Slur_engraver, dots); + ADD_END_ACKNOWLEDGER (Slur_engraver, tie); + ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); } ADD_TRANSLATOR (Slur_engraver, @@ -88,3 +92,314 @@ ADD_TRANSLATOR (Slur_engraver, /* write */ "" ); + +void +Slur_engraver::derived_mark () const +{ + for (vsize i = start_events_.size (); i--;) + { + scm_gc_mark (start_events_[i].slur_->self_scm ()); + if (start_events_[i].note_) + scm_gc_mark (start_events_[i].note_->self_scm ()); + } + for (vsize i = stop_events_.size (); i--;) + { + scm_gc_mark (stop_events_[i].slur_->self_scm ()); + if (stop_events_[i].note_) + scm_gc_mark (stop_events_[i].note_->self_scm ()); + } +} + +void +Slur_engraver::listen_note_slur (Stream_event *ev, Stream_event *note) +{ + Direction d = to_dir (ev->get_property ("span-direction")); + if (d == START) + start_events_.push_back (Event_info (ev, note)); + else if (d == STOP) + stop_events_.push_back (Event_info (ev, note)); + else ev->origin ()->warning (_f ("direction of %s invalid: %d", + ev->name ().c_str (), + int (d))); +} + +void +Slur_engraver::listen_note (Stream_event *ev) +{ + for (SCM arts = ev->get_property ("articulations"); + scm_is_pair (arts); arts = scm_cdr (arts)) + { + Stream_event *art = unsmob (scm_car (arts)); + if (art->in_event_class (event_symbol ())) + listen_note_slur (art, ev); + } +} + +void +Slur_engraver::acknowledge_note_column (Grob_info info) +{ + Grob *e = info.grob (); + for (vsize i = slurs_.size (); i--;) + Slur::add_column (slurs_[i], e); + for (vsize i = end_slurs_.size (); i--;) + Slur::add_column (end_slurs_[i], e); + // Now cater for slurs starting/ending at a notehead: those override + // the column bounds + if (note_slurs_[START].empty () && note_slurs_[STOP].empty ()) + return; + extract_grob_set (e, "note-heads", heads); + for (vsize i = heads.size (); i--;) + { + if (Stream_event *ev = + unsmob (heads[i]->get_property ("cause"))) + for (LEFT_and_RIGHT (d)) + { + std::pair its + = note_slurs_[d].equal_range (ev); + for (Note_slurs::const_iterator it = its.first; + it != its.second; + ++it) + it->second->set_bound (d, heads[i]); + } + } +} + +void +Slur_engraver::acknowledge_extra_object (Grob_info info) +{ + objects_to_acknowledge_.push_back (info); +} + +void +Slur_engraver::acknowledge_inline_accidental (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_dots (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_fingering (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_tuplet_number (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_script (Grob_info info) +{ + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_text_script (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_end_tie (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::finalize () +{ + for (vsize i = 0; i < slurs_.size (); i++) + { + slurs_[i]->warning (_f ("unterminated %s", object_name ())); + slurs_[i]->suicide (); + } + slurs_.clear (); +} + +void +Slur_engraver::create_slur (const string &spanner_id, Event_info evi, Grob *g_cause, Direction dir, bool left_broken) +{ + Grob *ccc = left_broken + ? unsmob (get_property ("currentCommandColumn")) + : 0; // efficiency + SCM cause = evi.slur_ ? evi.slur_->self_scm () : g_cause->self_scm (); + Spanner *slur = make_spanner (grob_symbol (), cause); + slur->set_property ("spanner-id", ly_string2scm (spanner_id)); + if (dir) + set_grob_direction (slur, dir); + if (left_broken) + slur->set_bound (LEFT, ccc); + slurs_.push_back (slur); + if (evi.note_) + note_slurs_[START].insert (Note_slurs::value_type (evi.note_, slur)); + + if (double_property ()) + { + set_grob_direction (slur, DOWN); + slur = make_spanner (grob_symbol (), cause); + slur->set_property ("spanner-id", ly_string2scm (spanner_id)); + set_grob_direction (slur, UP); + if (left_broken) + slur->set_bound (LEFT, ccc); + slurs_.push_back (slur); + if (evi.note_) + note_slurs_[START].insert(Note_slurs::value_type (evi.note_, slur)); + } + +} + +bool +Slur_engraver::can_create_slur (const string &id, vsize old_slurs, vsize *event_idx, Stream_event *ev) +{ + for (vsize j = slurs_.size (); j--;) + { + Grob *slur = slurs_[j]; + Direction updown = to_dir (ev->get_property ("direction")); + + // Check if we already have a slur with the same spanner-id. + if (id == robust_scm2string (slur->get_property ("spanner-id"), "")) + { + if (j < old_slurs) + { + // We already have an old slur, so give a warning + // and completely ignore the new slur. + ev->origin ()->warning (_f ("already have %s", object_name ())); + if (event_idx) + start_events_.erase (start_events_.begin () + (*event_idx)); + return false; + } + + // If this slur event has no direction, it will not + // contribute anything new to the existing slur(s), so + // we can ignore it. + + if (!updown) + return false; + + Stream_event *c = unsmob (slur->get_property ("cause")); + + if (!c) + { + slur->programming_error (_f ("%s without a cause", object_name ())); + return true; + } + + Direction slur_dir = to_dir (c->get_property ("direction")); + + // If the existing slur does not have a direction yet, + // we'd rather take the new one. + + if (!slur_dir) + { + slur->suicide (); + slurs_.erase (slurs_.begin () + j); + return true; + } + + // If the existing slur has the same direction as ours, drop ours + + if (slur_dir == updown) + return false; + } + } + return true; +} + +bool +Slur_engraver::try_to_end (Event_info evi) +{ + string id = robust_scm2string (evi.slur_->get_property ("spanner-id"), ""); + + // Find the slurs that are ended with this event (by checking the spanner-id) + bool ended = false; + for (vsize j = slurs_.size (); j--;) + { + if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), "")) + { + ended = true; + end_slurs_.push_back (slurs_[j]); + if (evi.note_) + note_slurs_[STOP].insert + (Note_slurs::value_type + (evi.note_, dynamic_cast (slurs_[j]))); + slurs_.erase (slurs_.begin () + j); + } + } + return ended; +} + +void +Slur_engraver::process_music () +{ + for (vsize i = 0; i < stop_events_.size (); i++) + { + string id = robust_scm2string + (stop_events_[i].slur_->get_property ("spanner-id"), ""); + bool ended = try_to_end (stop_events_[i]); + if (ended) + { + // Ignore redundant stop events for this id + for (vsize j = stop_events_.size (); --j > i;) + { + if (id == robust_scm2string + (stop_events_[j].slur_->get_property ("spanner-id"), "")) + stop_events_.erase (stop_events_.begin () + j); + } + } + else + stop_events_[i].slur_->origin ()->warning (_f ("cannot end %s", object_name ())); + } + + vsize old_slurs = slurs_.size (); + for (vsize i = start_events_.size (); i--;) + { + Stream_event *ev = start_events_[i].slur_; + string id = robust_scm2string (ev->get_property ("spanner-id"), ""); + Direction updown = to_dir (ev->get_property ("direction")); + + if (can_create_slur (id, old_slurs, &i, ev)) + create_slur (id, start_events_[i], 0, updown, false); + } + + set_melisma (slurs_.size ()); +} + +void +Slur_engraver::stop_translation_timestep () +{ + if (Grob *g = unsmob (get_property ("currentCommandColumn"))) + { + for (vsize i = 0; i < end_slurs_.size (); i++) + Slur::add_extra_encompass (end_slurs_[i], g); + + if (!start_events_.size ()) + for (vsize i = 0; i < slurs_.size (); i++) + Slur::add_extra_encompass (slurs_[i], g); + } + + for (vsize i = 0; i < end_slurs_.size (); i++) + { + Spanner *s = dynamic_cast (end_slurs_[i]); + if (!s->get_bound (RIGHT)) + s->set_bound (RIGHT, unsmob (get_property ("currentMusicalColumn"))); + announce_end_grob (s, SCM_EOL); + } + + for (vsize i = 0; i < objects_to_acknowledge_.size (); i++) + Slur::auxiliary_acknowledge_extra_object (objects_to_acknowledge_[i], slurs_, end_slurs_); + + note_slurs_[LEFT].clear (); + note_slurs_[RIGHT].clear (); + objects_to_acknowledge_.clear (); + end_slurs_.clear (); + start_events_.clear (); + stop_events_.clear (); +} diff --git a/lily/slur-proto-engraver.cc b/lily/slur-proto-engraver.cc deleted file mode 100644 index 99e8e8ebfc..0000000000 --- a/lily/slur-proto-engraver.cc +++ /dev/null @@ -1,352 +0,0 @@ -/* - This file is part of LilyPond, the GNU music typesetter. - - Copyright (C) 2013--2015 Mike Solomon - - 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 . -*/ - -#include "engraver.hh" - -#include "context.hh" -#include "directional-element-interface.hh" -#include "international.hh" -#include "note-column.hh" -#include "pointer-group-interface.hh" -#include "slur.hh" -#include "slur-proto-engraver.hh" -#include "spanner.hh" -#include "stream-event.hh" -#include "warn.hh" - -#include "translator.icc" - -void -Slur_proto_engraver::derived_mark () const -{ - for (vsize i = start_events_.size (); i--;) - { - scm_gc_mark (start_events_[i].slur_->self_scm ()); - if (start_events_[i].note_) - scm_gc_mark (start_events_[i].note_->self_scm ()); - } - for (vsize i = stop_events_.size (); i--;) - { - scm_gc_mark (stop_events_[i].slur_->self_scm ()); - if (stop_events_[i].note_) - scm_gc_mark (stop_events_[i].note_->self_scm ()); - } -} - -void -Slur_proto_engraver::listen_slur (Stream_event *ev, Stream_event *note) -{ - Direction d = to_dir (ev->get_property ("span-direction")); - if (d == START) - start_events_.push_back (Event_info (ev, note)); - else if (d == STOP) - stop_events_.push_back (Event_info (ev, note)); - else ev->origin ()->warning (_f ("direction of %s invalid: %d", - event_name_, int (d))); -} - -void -Slur_proto_engraver::listen_note (Stream_event *ev) -{ - for (SCM arts = ev->get_property ("articulations"); - scm_is_pair (arts); arts = scm_cdr (arts)) - { - Stream_event *art = unsmob (scm_car (arts)); - if (art->in_event_class (event_symbol ())) - listen_slur (art, ev); - } -} - -void -Slur_proto_engraver::acknowledge_note_column (Grob_info info) -{ - Grob *e = info.grob (); - for (vsize i = slurs_.size (); i--;) - Slur::add_column (slurs_[i], e); - for (vsize i = end_slurs_.size (); i--;) - Slur::add_column (end_slurs_[i], e); - // Now cater for slurs starting/ending at a notehead: those override - // the column bounds - if (note_slurs_[START].empty () && note_slurs_[STOP].empty ()) - return; - extract_grob_set (e, "note-heads", heads); - for (vsize i = heads.size (); i--;) - { - if (Stream_event *ev = - unsmob (heads[i]->get_property ("cause"))) - for (LEFT_and_RIGHT (d)) - { - std::pair its - = note_slurs_[d].equal_range (ev); - for (Note_slurs::const_iterator it = its.first; - it != its.second; - ++it) - it->second->set_bound (d, heads[i]); - } - } -} - -void -Slur_proto_engraver::acknowledge_extra_object (Grob_info info) -{ - objects_to_acknowledge_.push_back (info); -} - -void -Slur_proto_engraver::acknowledge_inline_accidental (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_proto_engraver::acknowledge_dots (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_proto_engraver::acknowledge_fingering (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_proto_engraver::acknowledge_tuplet_number (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_proto_engraver::acknowledge_script (Grob_info info) -{ - if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) - acknowledge_extra_object (info); -} - -void -Slur_proto_engraver::acknowledge_text_script (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_proto_engraver::acknowledge_end_tie (Grob_info info) -{ - acknowledge_extra_object (info); -} - -void -Slur_proto_engraver::finalize () -{ - for (vsize i = 0; i < slurs_.size (); i++) - { - slurs_[i]->warning (_f ("unterminated %s", object_name_)); - slurs_[i]->suicide (); - } - slurs_.clear (); -} - -void -Slur_proto_engraver::create_slur (const string &spanner_id, Event_info evi, Grob *g_cause, Direction dir, bool left_broken) -{ - Grob *ccc = left_broken - ? unsmob (get_property ("currentCommandColumn")) - : 0; // efficiency - SCM cause = evi.slur_ ? evi.slur_->self_scm () : g_cause->self_scm (); - Spanner *slur = make_spanner (grob_name_, cause); - slur->set_property ("spanner-id", ly_string2scm (spanner_id)); - if (dir) - set_grob_direction (slur, dir); - if (left_broken) - slur->set_bound (LEFT, ccc); - slurs_.push_back (slur); - if (evi.note_) - note_slurs_[START].insert (Note_slurs::value_type (evi.note_, slur)); - - if (double_property_name_ - && to_boolean (get_property (double_property_name_))) - { - set_grob_direction (slur, DOWN); - slur = make_spanner (grob_name_, cause); - slur->set_property ("spanner-id", ly_string2scm (spanner_id)); - set_grob_direction (slur, UP); - if (left_broken) - slur->set_bound (LEFT, ccc); - slurs_.push_back (slur); - if (evi.note_) - note_slurs_[START].insert(Note_slurs::value_type (evi.note_, slur)); - } - -} - -bool -Slur_proto_engraver::can_create_slur (const string &id, vsize old_slurs, vsize *event_idx, Stream_event *ev) -{ - for (vsize j = slurs_.size (); j--;) - { - Grob *slur = slurs_[j]; - Direction updown = to_dir (ev->get_property ("direction")); - - // Check if we already have a slur with the same spanner-id. - if (id == robust_scm2string (slur->get_property ("spanner-id"), "")) - { - if (j < old_slurs) - { - // We already have an old slur, so give a warning - // and completely ignore the new slur. - ev->origin ()->warning (_f ("already have %s", object_name_)); - if (event_idx) - start_events_.erase (start_events_.begin () + (*event_idx)); - return false; - } - - // If this slur event has no direction, it will not - // contribute anything new to the existing slur(s), so - // we can ignore it. - - if (!updown) - return false; - - Stream_event *c = unsmob (slur->get_property ("cause")); - - if (!c) - { - slur->programming_error (_f ("%s without a cause", object_name_)); - return true; - } - - Direction slur_dir = to_dir (c->get_property ("direction")); - - // If the existing slur does not have a direction yet, - // we'd rather take the new one. - - if (!slur_dir) - { - slur->suicide (); - slurs_.erase (slurs_.begin () + j); - return true; - } - - // If the existing slur has the same direction as ours, drop ours - - if (slur_dir == updown) - return false; - } - } - return true; -} - -bool -Slur_proto_engraver::try_to_end (Event_info evi) -{ - string id = robust_scm2string (evi.slur_->get_property ("spanner-id"), ""); - - // Find the slurs that are ended with this event (by checking the spanner-id) - bool ended = false; - for (vsize j = slurs_.size (); j--;) - { - if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), "")) - { - ended = true; - end_slurs_.push_back (slurs_[j]); - if (evi.note_) - note_slurs_[STOP].insert - (Note_slurs::value_type - (evi.note_, dynamic_cast (slurs_[j]))); - slurs_.erase (slurs_.begin () + j); - } - } - return ended; -} - -void -Slur_proto_engraver::process_music () -{ - for (vsize i = 0; i < stop_events_.size (); i++) - { - string id = robust_scm2string - (stop_events_[i].slur_->get_property ("spanner-id"), ""); - bool ended = try_to_end (stop_events_[i]); - if (ended) - { - // Ignore redundant stop events for this id - for (vsize j = stop_events_.size (); --j > i;) - { - if (id == robust_scm2string - (stop_events_[j].slur_->get_property ("spanner-id"), "")) - stop_events_.erase (stop_events_.begin () + j); - } - } - else - stop_events_[i].slur_->origin ()->warning (_f ("cannot end %s", object_name_)); - } - - vsize old_slurs = slurs_.size (); - for (vsize i = start_events_.size (); i--;) - { - Stream_event *ev = start_events_[i].slur_; - string id = robust_scm2string (ev->get_property ("spanner-id"), ""); - Direction updown = to_dir (ev->get_property ("direction")); - - if (can_create_slur (id, old_slurs, &i, ev)) - create_slur (id, start_events_[i], 0, updown, false); - } - - set_melisma (slurs_.size ()); -} - -void -Slur_proto_engraver::set_melisma (bool) -{ -} - -void -Slur_proto_engraver::stop_translation_timestep () -{ - if (Grob *g = unsmob (get_property ("currentCommandColumn"))) - { - for (vsize i = 0; i < end_slurs_.size (); i++) - Slur::add_extra_encompass (end_slurs_[i], g); - - if (!start_events_.size ()) - for (vsize i = 0; i < slurs_.size (); i++) - Slur::add_extra_encompass (slurs_[i], g); - } - - for (vsize i = 0; i < end_slurs_.size (); i++) - { - Spanner *s = dynamic_cast (end_slurs_[i]); - if (!s->get_bound (RIGHT)) - s->set_bound (RIGHT, unsmob (get_property ("currentMusicalColumn"))); - announce_end_grob (s, SCM_EOL); - } - - for (vsize i = 0; i < objects_to_acknowledge_.size (); i++) - Slur::auxiliary_acknowledge_extra_object (objects_to_acknowledge_[i], slurs_, end_slurs_); - - note_slurs_[LEFT].clear (); - note_slurs_[RIGHT].clear (); - objects_to_acknowledge_.clear (); - end_slurs_.clear (); - start_events_.clear (); - stop_events_.clear (); -} - -// no ADD_ACKNOWLEDGER / ADD_TRANSLATOR macro calls -// since this class is abstract diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index ddd1386872..6c34e9eb61 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -728,10 +728,10 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature, void Vaticana_ligature_engraver::boot () { - ADD_LISTENER (Gregorian_ligature_engraver, pes_or_flexa); - ADD_LISTENER (Ligature_engraver, ligature); - ADD_ACKNOWLEDGER (Ligature_engraver, rest); - ADD_ACKNOWLEDGER (Ligature_engraver, ligature_head); + ADD_LISTENER (Vaticana_ligature_engraver, pes_or_flexa); + ADD_LISTENER (Vaticana_ligature_engraver, ligature); + ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, rest); + ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, ligature_head); } ADD_TRANSLATOR (Vaticana_ligature_engraver, diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly index 972b6abd4a..417b993a2c 100644 --- a/ly/Welcome-to-LilyPond-MacOS.ly +++ b/ly/Welcome-to-LilyPond-MacOS.ly @@ -23,7 +23,7 @@ That's it. For more information, visit http://lilypond.org . %} -\version "2.19.43" % necessary for upgrading to future LilyPond versions. +\version "2.19.44" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly index 8f3351a705..6e3e604a31 100644 --- a/ly/Welcome_to_LilyPond.ly +++ b/ly/Welcome_to_LilyPond.ly @@ -32,7 +32,7 @@ Good luck with LilyPond! Happy engraving. %} -\version "2.19.43" % necessary for upgrading to future LilyPond versions. +\version "2.19.44" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 6421d9efa1..3637871a66 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1122,6 +1122,7 @@ accommodated for typesetting a piece in mensural style." \override TimeSignature.style = #'mensural \override KeySignature.glyph-name-alist = #alteration-mensural-glyph-name-alist \override Accidental.glyph-name-alist = #alteration-mensural-glyph-name-alist + \override AccidentalSuggestion.glyph-name-alist = #alteration-mensural-glyph-name-alist \override Custos.style = #'mensural \override Custos.neutral-position = #3 \override Custos.neutral-direction = #DOWN diff --git a/mf/99-lilypond-fonts.conf.in b/mf/99-lilypond-fonts.conf.in index 0831bf062c..83f8b5376e 100644 --- a/mf/99-lilypond-fonts.conf.in +++ b/mf/99-lilypond-fonts.conf.in @@ -16,45 +16,4 @@ - - - - - - */NotoSansCJK*.ttc - - - */SourceHanSans*.ttc - - - */SourceHanCodeJP.ttc - - - diff --git a/po/lilypond.pot b/po/lilypond.pot index d10065e32d..c2da03f5a1 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lilypond 2.19.43\n" +"Project-Id-Version: lilypond 2.19.44\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu." "lilypond.bugs\n" -"POT-Creation-Date: 2016-06-08 13:09+0100\n" +"POT-Creation-Date: 2016-06-21 12:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -835,60 +835,86 @@ msgstr "" msgid "Usage: %s" msgstr "" -#: musicexp.py:224 musicexp.py:229 +#: musicexp.py:307 musicexp.py:312 msgid "Language does not support microtones contained in the piece" msgstr "" -#: musicexp.py:497 +#: musicexp.py:601 msgid "Tuplet brackets of curved shape are not correctly implemented" msgstr "" -#: musicexp.py:683 +#: musicexp.py:787 #, python-format msgid "unable to set the music %(music)s for the repeat %(repeat)s" msgstr "" -#: musicexp.py:692 +#: musicexp.py:796 msgid "encountered repeat without body" msgstr "" #. no self.elements! -#: musicexp.py:862 +#: musicexp.py:1009 #, python-format msgid "Grace note with no following music: %s" msgstr "" -#: musicexp.py:1024 +#: musicexp.py:1204 #, python-format msgid "Invalid octave shift size found: %s. Using no shift." msgstr "" -#: musicexp.py:1482 +#: musicexp.py:1803 #, python-format msgid "Unable to convert alteration %s to a lilypond expression" msgstr "" #. TODO: Handle pieces without a time signature! -#: musicxml.py:362 +#: musicxml.py:515 msgid "Senza-misura time signatures are not yet supported!" msgstr "" -#: musicxml.py:380 +#: musicxml.py:533 msgid "Unable to interpret time signature! Falling back to 4/4." msgstr "" -#: musicxml.py:436 +#: musicxml.py:589 #, python-format msgid "" "Key alteration octave given for a non-existing alteration nr. %s, available " "numbers: %s!" msgstr "" -#: musicxml.py:524 +#: musicxml.py:825 +#, python-format +msgid "Encountered note at %s without type and duration(=%s)" +msgstr "" + +#: musicxml.py:867 +#, python-format +msgid "drum %s type unknown, please add to instrument_drumtype_dict" +msgstr "" + +#: musicxml.py:888 +msgid "cannot find suitable event" +msgstr "" + +#: musicxml.py:927 #, python-format msgid "Unable to find instrument for ID=%s\n" msgstr "" +#: musicxml2ly_conversion.py:23 +#, python-format +msgid "" +"Encountered rational duration with denominator %s, unable to convert to " +"lilypond duration" +msgstr "" + +#: musicxml2ly_conversion.py:42 +#, python-format +msgid "Encountered unprocessed marker %s\n" +msgstr "" + #: abc2ly.py:1389 convert-ly.py:85 lilypond-book.py:122 midi2ly.py:1046 #, python-format msgid "%s [OPTION]... FILE" @@ -902,12 +928,12 @@ msgid "" msgstr "" #: abc2ly.py:1398 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231 -#: midi2ly.py:1097 musicxml2ly.py:2590 main.cc:184 +#: midi2ly.py:1097 musicxml2ly.py:2766 main.cc:184 msgid "show version number and exit" msgstr "" #: abc2ly.py:1401 convert-ly.py:96 etf2ly.py:1204 lilypond-book.py:140 -#: midi2ly.py:1064 musicxml2ly.py:2572 main.cc:163 +#: midi2ly.py:1064 musicxml2ly.py:2747 main.cc:163 msgid "show this help and exit" msgstr "" @@ -932,7 +958,7 @@ msgstr "" #. or if there is a LilyPond users list or forum in your language #. "Report bugs in English via %s or in YOUR_LANG via URI" #: abc2ly.py:1416 convert-ly.py:157 etf2ly.py:1218 lilypond-book.py:258 -#: midi2ly.py:1109 musicxml2ly.py:2674 main.cc:318 +#: midi2ly.py:1109 musicxml2ly.py:2909 main.cc:318 #, c-format, python-format msgid "Report bugs via %s" msgstr "" @@ -976,14 +1002,14 @@ msgstr "" msgid "edit in place" msgstr "" -#: convert-ly.py:109 lilypond-book.py:179 musicxml2ly.py:2627 +#: convert-ly.py:109 lilypond-book.py:179 musicxml2ly.py:2803 msgid "" "Print log messages according to LOGLEVEL (NONE, ERROR, WARNING, PROGRESS " "(default), DEBUG)" msgstr "" #: convert-ly.py:111 lilypond-book.py:163 lilypond-book.py:181 -#: musicxml2ly.py:2629 main.cc:177 +#: musicxml2ly.py:2805 main.cc:177 msgid "LOGLEVEL" msgstr "" @@ -1073,7 +1099,7 @@ msgid "" "file.\n" msgstr "" -#: etf2ly.py:1210 midi2ly.py:1069 midi2ly.py:1074 musicxml2ly.py:2659 +#: etf2ly.py:1210 midi2ly.py:1069 midi2ly.py:1074 musicxml2ly.py:2859 #: main.cc:169 main.cc:181 msgid "FILE" msgstr "" @@ -1180,7 +1206,7 @@ msgstr "" msgid "write snippet output files with the same base name as their source file" msgstr "" -#: lilypond-book.py:223 midi2ly.py:1092 musicxml2ly.py:2596 +#: lilypond-book.py:223 midi2ly.py:1092 musicxml2ly.py:2772 msgid "be verbose" msgstr "" @@ -1372,215 +1398,256 @@ msgstr "" msgid "no files specified on command line." msgstr "" -#: musicxml2ly.py:228 +#: musicxml2ly.py:260 #, python-format msgid "" "Encountered file created by %s, containing wrong beaming information. All " "beaming information in the MusicXML file will be ignored" msgstr "" -#: musicxml2ly.py:247 musicxml2ly.py:249 +#: musicxml2ly.py:302 musicxml2ly.py:304 #, python-format msgid "Unprocessed PartGroupInfo %s encountered" msgstr "" -#: musicxml2ly.py:500 -#, python-format -msgid "Encountered note at %s without type and duration (=%s)" -msgstr "" - -#: musicxml2ly.py:520 -#, python-format -msgid "" -"Encountered rational duration with denominator %s, unable to convert to " -"lilypond duration" -msgstr "" - -#: musicxml2ly.py:767 +#: musicxml2ly.py:792 msgid "Unable to extract key signature!" msgstr "" -#: musicxml2ly.py:794 +#: musicxml2ly.py:819 #, python-format msgid "unknown mode %s, expecting 'major' or 'minor' or a church mode!" msgstr "" -#: musicxml2ly.py:932 -#, python-format -msgid "Encountered unprocessed marker %s\n" -msgstr "" - -#: musicxml2ly.py:1026 +#: musicxml2ly.py:988 #, python-format msgid "unknown span event %s" msgstr "" -#: musicxml2ly.py:1036 +#: musicxml2ly.py:1000 #, python-format msgid "unknown span type %s for %s" msgstr "" -#: musicxml2ly.py:1456 +#: musicxml2ly.py:1497 msgid "Unknown metronome mark, ignoring" msgstr "" #. TODO: Implement the other (more complex) way for tempo marks! -#: musicxml2ly.py:1461 +#: musicxml2ly.py:1502 msgid "" "Metronome marks with complex relations ( in MusicXML) are " "not yet implemented." msgstr "" -#: musicxml2ly.py:1663 +#: musicxml2ly.py:1653 #, python-format msgid "Unable to convert chord type %s to lilypond." msgstr "" -#: musicxml2ly.py:1816 -#, python-format -msgid "drum %s type unknown, please add to instrument_drumtype_dict" -msgstr "" - -#: musicxml2ly.py:1820 -msgid "cannot find suitable event" -msgstr "" - -#: musicxml2ly.py:1968 +#: musicxml2ly.py:2007 #, python-format msgid "Negative skip %s (from position %s to %s)" msgstr "" -#: musicxml2ly.py:2109 +#: musicxml2ly.py:2237 #, python-format msgid "Negative skip found: from %s to %s, difference is %s" msgstr "" -#: musicxml2ly.py:2190 +#: musicxml2ly.py:2338 #, python-format msgid "unexpected %s; expected %s or %s or %s" msgstr "" -#: musicxml2ly.py:2296 +#: musicxml2ly.py:2467 msgid "Encountered closing slur, but no slur is open" msgstr "" -#: musicxml2ly.py:2299 +#: musicxml2ly.py:2470 msgid "Cannot have two simultaneous (closing) slurs" msgstr "" -#: musicxml2ly.py:2308 +#: musicxml2ly.py:2479 msgid "Cannot have a slur inside another slur" msgstr "" -#: musicxml2ly.py:2311 +#: musicxml2ly.py:2482 msgid "Cannot have two simultaneous slurs" msgstr "" -#: musicxml2ly.py:2445 +#: musicxml2ly.py:2608 #, python-format msgid "cannot simultaneously have more than one mode: %s" msgstr "" -#: musicxml2ly.py:2553 +#: musicxml2ly.py:2727 msgid "Converting to LilyPond expressions..." msgstr "" -#: musicxml2ly.py:2564 +#: musicxml2ly.py:2739 msgid "musicxml2ly [OPTION]... FILE.xml" msgstr "" -#: musicxml2ly.py:2566 +#: musicxml2ly.py:2741 msgid "" "Convert MusicXML from FILE.xml to LilyPond input.\n" "If the given filename is -, musicxml2ly reads from the command line.\n" msgstr "" -#: musicxml2ly.py:2576 +#: musicxml2ly.py:2751 msgid "" -"Copyright (c) 2005--2015 by\n" +"Copyright (c) 2005--2016 by\n" " Han-Wen Nienhuys ,\n" " Jan Nieuwenhuizen and\n" " Reinhold Kainhofer \n" +" Patrick L. Schmidt \n" msgstr "" -#: musicxml2ly.py:2602 +#: musicxml2ly.py:2778 msgid "use lxml.etree; uses less memory and cpu time" msgstr "" -#: musicxml2ly.py:2608 +#: musicxml2ly.py:2784 msgid "input file is a zip-compressed MusicXML file" msgstr "" -#: musicxml2ly.py:2614 +#: musicxml2ly.py:2790 msgid "convert pitches in relative mode (default)" msgstr "" -#: musicxml2ly.py:2619 +#: musicxml2ly.py:2795 msgid "convert pitches in absolute mode" msgstr "" -#: musicxml2ly.py:2622 +#: musicxml2ly.py:2798 msgid "LANG" msgstr "" -#: musicxml2ly.py:2624 +#: musicxml2ly.py:2800 msgid "use LANG for pitch names, e.g. 'deutsch' for note names in German" msgstr "" -#: musicxml2ly.py:2638 +#: musicxml2ly.py:2814 msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc." msgstr "" -#: musicxml2ly.py:2644 +#: musicxml2ly.py:2820 msgid "do not convert exact vertical positions of rests" msgstr "" -#: musicxml2ly.py:2650 -msgid "do not convert the exact page layout and breaks" +#: musicxml2ly.py:2826 +msgid "ignore system breaks" +msgstr "" + +#: musicxml2ly.py:2832 +msgid "ignore page breaks" +msgstr "" + +#: musicxml2ly.py:2838 +msgid "ignore page margins" +msgstr "" + +#: musicxml2ly.py:2844 +msgid "" +"do not convert the exact page layout and breaks (shortcut for \"--nsb --npb " +"--npm\" options)" +msgstr "" + +#: musicxml2ly.py:2850 +msgid "" +"ignore stem directions from MusicXML, use lilypond's automatic stemming " +"instead" msgstr "" -#: musicxml2ly.py:2656 +#: musicxml2ly.py:2856 msgid "" "do not convert beaming information, use lilypond's automatic beaming instead" msgstr "" -#: musicxml2ly.py:2664 +#: musicxml2ly.py:2864 msgid "set output filename to FILE, stdout if -" msgstr "" -#: musicxml2ly.py:2670 -msgid "activate midi-block" +#: musicxml2ly.py:2870 +msgid "activate midi-block in .ly file" +msgstr "" + +#: musicxml2ly.py:2874 +msgid "TOPITCH" +msgstr "" + +#: musicxml2ly.py:2877 +msgid "set pitch to transpose by the interval between pitch 'c' and TOPITCH" +msgstr "" + +#: musicxml2ly.py:2881 +msgid "BEATS/BEATTYPE" +msgstr "" + +#: musicxml2ly.py:2884 +msgid "" +"change the length|duration of notes as a function of a given time signature " +"to make the score look faster or slower, (eg. '4/4' or '2/2')" +msgstr "" + +#: musicxml2ly.py:2888 +msgid "TABCLEFNAME" +msgstr "" + +#: musicxml2ly.py:2891 +msgid "switch between two versions of tab clefs (\"tab\" and \"moderntab\")" msgstr "" -#: musicxml2ly.py:2754 +#: musicxml2ly.py:2895 +msgid "t[rue]/f[alse]" +msgstr "" + +#: musicxml2ly.py:2898 +msgid "" +"deactivate string number stencil with --string-numbers f[alse]. Default is t" +"[rue]" +msgstr "" + +#: musicxml2ly.py:2905 +msgid "" +"converts '' events to a separate FretBoards voice instead of markups" +msgstr "" + +#: musicxml2ly.py:2979 #, python-format msgid "unknown part in part-list: %s" msgstr "" -#: musicxml2ly.py:2816 +#: musicxml2ly.py:3069 msgid "Input is compressed, extracting raw MusicXML data from stdin" msgstr "" -#: musicxml2ly.py:2829 +#: musicxml2ly.py:3082 #, python-format msgid "Input file %s is compressed, extracting raw MusicXML data" msgstr "" -#: musicxml2ly.py:2859 +#: musicxml2ly.py:3112 msgid "Reading MusicXML from Standard input ..." msgstr "" -#: musicxml2ly.py:2861 +#: musicxml2ly.py:3114 #, python-format msgid "Reading MusicXML from %s ..." msgstr "" -#: musicxml2ly.py:2894 +#: musicxml2ly.py:3146 #, python-format msgid "Output to `%s'" msgstr "" -#: musicxml2ly.py:2964 +#: musicxml2ly.py:3172 +#, python-format +msgid "Converting to current version (%s) notations ..." +msgstr "" + +#: musicxml2ly.py:3246 #, python-format msgid "Unable to find input file %s" msgstr "" @@ -1682,7 +1749,7 @@ msgstr "" msgid "natural alteration glyph not found" msgstr "" -#: all-font-metrics.cc:161 +#: all-font-metrics.cc:159 #, c-format msgid "cannot find font: `%s'" msgstr "" @@ -1695,15 +1762,15 @@ msgstr "" msgid "no heads for arpeggio found?" msgstr "" -#: axis-group-engraver.cc:149 +#: axis-group-engraver.cc:154 msgid "Axis_group_engraver: vertical group already has a parent" msgstr "" -#: axis-group-engraver.cc:150 +#: axis-group-engraver.cc:155 msgid "are there two Axis_group_engravers?" msgstr "" -#: axis-group-engraver.cc:151 +#: axis-group-engraver.cc:156 msgid "removing this vertical group" msgstr "" @@ -1871,13 +1938,6 @@ msgstr "" msgid "unterminated %s" msgstr "" -#. No explicit dynamic script events have occurred yet, but there is -#. nevertheless a dynamic spanner. Initialize last_volume_ to a -#. value within the available range. -#: dynamic-performer.cc:129 -msgid "(De)crescendo with unspecified starting volume in MIDI." -msgstr "" - #: episema-engraver.cc:74 msgid "already have an episema" msgstr "" @@ -2050,7 +2110,7 @@ msgstr "" msgid "position unknown" msgstr "" -#: key-engraver.cc:196 +#: key-engraver.cc:197 msgid "Incomplete keyAlterationOrder for key signature" msgstr "" @@ -2515,6 +2575,15 @@ msgstr "" msgid "NoteEvent without pitch" msgstr "" +#: open-type-font-scheme.cc:148 pfb-scheme.cc:62 ttf.cc:512 ttf.cc:562 +msgid "font index must be non-negative, using index 0" +msgstr "" + +#: open-type-font-scheme.cc:162 pfb-scheme.cc:77 ttf.cc:480 ttf.cc:528 +#, c-format +msgid "font index %d too large for font `%s', using index 0" +msgstr "" + #: open-type-font.cc:45 #, c-format msgid "cannot allocate %lu bytes" @@ -2749,15 +2818,6 @@ msgstr "" msgid "MIDI output to `%s'..." msgstr "" -#: pfb-scheme.cc:49 ttf.cc:512 ttf.cc:562 -msgid "font index must be non-negative, using index 0" -msgstr "" - -#: pfb-scheme.cc:64 ttf.cc:480 ttf.cc:528 -#, c-format -msgid "font index %d too large for font `%s', using index 0" -msgstr "" - #: piano-pedal-engraver.cc:276 #, c-format msgid "expect 3 strings for piano pedals, found: %ld" @@ -3103,119 +3163,119 @@ msgstr "" msgid "giving up" msgstr "" -#: parser.yy:480 parser.yy:971 parser.yy:1052 parser.yy:1272 +#: parser.yy:479 parser.yy:969 parser.yy:1050 parser.yy:1270 msgid "bad expression type" msgstr "" -#: parser.yy:883 parser.yy:1482 parser.yy:1527 +#: parser.yy:881 parser.yy:1478 parser.yy:1523 msgid "not a context mod" msgstr "" -#: parser.yy:1078 +#: parser.yy:1076 msgid "Missing music in \\score" msgstr "" -#: parser.yy:1115 +#: parser.yy:1113 msgid "\\paper cannot be used in \\score, use \\layout instead" msgstr "" -#: parser.yy:1150 +#: parser.yy:1148 msgid "Spurious expression in \\score" msgstr "" -#: parser.yy:1180 +#: parser.yy:1178 msgid "need \\paper for paper block" msgstr "" -#: parser.yy:1355 +#: parser.yy:1352 msgid "music expected" msgstr "" -#: parser.yy:1365 parser.yy:1399 +#: parser.yy:1362 parser.yy:1396 msgid "unexpected post-event" msgstr "" -#: parser.yy:1407 +#: parser.yy:1404 msgid "Ignoring non-music expression" msgstr "" -#: parser.yy:1723 parser.yy:1742 +#: parser.yy:1719 parser.yy:1738 msgid "not a key" msgstr "" -#: parser.yy:2611 parser.yy:2729 parser.yy:2742 parser.yy:2751 +#: parser.yy:2602 parser.yy:2720 parser.yy:2733 parser.yy:2742 msgid "bad grob property path" msgstr "" -#: parser.yy:2709 +#: parser.yy:2700 msgid "only \\consists and \\remove take non-string argument." msgstr "" -#: parser.yy:2770 +#: parser.yy:2761 msgid "bad context property path" msgstr "" -#: parser.yy:2855 +#: parser.yy:2846 msgid "markup expected" msgstr "" -#: parser.yy:2867 +#: parser.yy:2858 msgid "simple string expected" msgstr "" -#: parser.yy:2884 +#: parser.yy:2875 msgid "symbol expected" msgstr "" -#: parser.yy:3028 +#: parser.yy:3019 msgid "not a rhythmic event" msgstr "" -#: parser.yy:3078 +#: parser.yy:3069 msgid "post-event expected" msgstr "" -#: parser.yy:3087 parser.yy:3092 +#: parser.yy:3078 parser.yy:3083 msgid "have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:3168 +#: parser.yy:3159 msgid "expecting string or post-event as script definition" msgstr "" -#: parser.yy:3272 +#: parser.yy:3263 msgid "not an articulation" msgstr "" -#: parser.yy:3338 parser.yy:3390 +#: parser.yy:3329 parser.yy:3381 msgid "not a duration" msgstr "" -#: parser.yy:3411 +#: parser.yy:3402 msgid "bass number expected" msgstr "" -#: parser.yy:3503 +#: parser.yy:3494 msgid "have to be in Note mode for notes" msgstr "" -#: parser.yy:3542 +#: parser.yy:3533 msgid "have to be in Chord mode for chords" msgstr "" -#: parser.yy:3585 +#: parser.yy:3576 msgid "markup outside of text script or \\lyricmode" msgstr "" -#: parser.yy:3590 +#: parser.yy:3581 msgid "unrecognized string, not in text script or \\lyricmode" msgstr "" -#: parser.yy:3742 parser.yy:3751 +#: parser.yy:3733 parser.yy:3742 msgid "not an unsigned integer" msgstr "" -#: parser.yy:3838 +#: parser.yy:3829 msgid "not a markup" msgstr "" @@ -3357,43 +3417,43 @@ msgstr "" msgid "missing stencil expression `~S'" msgstr "" -#: bar-line.scm:133 +#: bar-line.scm:142 #, scheme-format msgid "Bar glyph ~a not known. Ignoring." msgstr "" -#: bar-line.scm:161 +#: bar-line.scm:170 #, scheme-format msgid "" "Annotation '~a' is allowed in the first argument of a bar line definition " "only." msgstr "" -#: bar-line.scm:169 +#: bar-line.scm:178 #, scheme-format msgid "" "Replacement '~a' is allowed in the last argument of a bar line definition " "only." msgstr "" -#: bar-line.scm:230 +#: bar-line.scm:239 #, scheme-format msgid "" "add-bar-glyph-print-procedure: glyph '~a' has to be a single ASCII character." msgstr "" -#: bar-line.scm:795 +#: bar-line.scm:807 #, scheme-format msgid "No span bar glyph defined for bar glyph '~a'; ignoring." msgstr "" -#: chord-entry.scm:55 +#: chord-entry.scm:57 #, scheme-format msgid "Spurious garbage following chord: ~A" msgstr "" #: define-context-properties.scm:31 define-grob-properties.scm:21 -#: define-music-properties.scm:21 +#: define-music-properties.scm:21 lily.scm:102 #, scheme-format msgid "symbol ~S redefined" msgstr "" @@ -3457,16 +3517,16 @@ msgstr "" msgid "bad make-music argument: ~S" msgstr "" -#: define-note-names.scm:1107 +#: define-note-names.scm:1112 msgid "Select note names language." msgstr "" -#: define-note-names.scm:1113 +#: define-note-names.scm:1118 #, scheme-format msgid "Using `~a' note names..." msgstr "" -#: define-note-names.scm:1116 +#: define-note-names.scm:1121 #, scheme-format msgid "Could not find language `~a'. Ignoring." msgstr "" @@ -3526,17 +3586,17 @@ msgstr "" msgid "cannot extract file matching ~a from ~a" msgstr "" -#: framework-ps.scm:353 +#: framework-ps.scm:346 #, scheme-format msgid "do not know how to embed ~S=~S" msgstr "" -#: framework-ps.scm:378 +#: framework-ps.scm:371 #, scheme-format msgid "do not know how to embed font ~s ~s ~s" msgstr "" -#: framework-ps.scm:760 +#: framework-ps.scm:753 msgid "" "\n" "The PostScript backend does not support the\n" @@ -3606,58 +3666,54 @@ msgstr "" msgid "call-after-session used after session start" msgstr "" -#: lily.scm:112 +#: lily.scm:99 msgid "define-session used after session start" msgstr "" -#: lily.scm:122 -msgid "define-session-public used after session start" -msgstr "" - -#: lily.scm:434 +#: lily.scm:444 msgid "Using (ice-9 curried-definitions) module\n" msgstr "" -#: lily.scm:437 +#: lily.scm:447 msgid "Guile 1.8\n" msgstr "" -#: lily.scm:494 +#: lily.scm:504 #, scheme-format msgid "cannot find: ~A" msgstr "" -#: lily.scm:924 +#: lily.scm:934 msgid "Success: compilation successfully completed" msgstr "" -#: lily.scm:925 +#: lily.scm:935 msgid "Compilation completed with warnings or errors" msgstr "" -#: lily.scm:986 +#: lily.scm:996 #, scheme-format msgid "job ~a terminated with signal: ~a" msgstr "" -#: lily.scm:989 +#: lily.scm:999 #, scheme-format msgid "" "logfile ~a (exit ~a):\n" "~a" msgstr "" -#: lily.scm:1011 lily.scm:1100 +#: lily.scm:1021 lily.scm:1110 #, scheme-format msgid "failed files: ~S" msgstr "" -#: lily.scm:1091 +#: lily.scm:1101 #, scheme-format msgid "Redirecting output to ~a..." msgstr "" -#: lily.scm:1110 +#: lily.scm:1120 #, scheme-format msgid "Invoking `~a'...\n" msgstr "" diff --git a/scm/bar-line.scm b/scm/bar-line.scm index 296d86787a..86d12d9b21 100644 --- a/scm/bar-line.scm +++ b/scm/bar-line.scm @@ -27,7 +27,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; helper functions for staff and layout properties -(define (calc-blot thickness extent grob) +(define (bar-line::calc-blot thickness extent grob) "Calculate the blot diameter by taking @code{'rounded} and the dimensions of the extent into account." (let* ((rounded (ly:grob-property grob 'rounded #f)) @@ -39,9 +39,18 @@ and the dimensions of the extent into account." ((< height blot-diameter) height) (else blot-diameter))) 0))) - blot)) +(define-public (bar-line::draw-filled-box x-ext y-ext thickness extent grob) + "Return a straight bar-line created by @code{ly:round-filled-box} looking at +@var{x-ext}, @var{y-ext}, @var{thickness}. The blot is calculated by +@code{bar-line::calc-blot}, which needs @var{extent} and @var{grob}. +@var{y-ext} is not necessarily of same value as @var{extent}." + (ly:round-filled-box + x-ext + y-ext + (bar-line::calc-blot thickness extent grob))) + (define (get-span-glyph bar-glyph) "Get the corresponding span glyph from the @code{span-glyph-bar-alist}. Pad the string with @code{annotation-char}s to the length of the @@ -250,35 +259,38 @@ is not used within the routine." (let* ((line-thickness (layout-line-thickness grob)) (thickness (* (ly:grob-property grob 'hair-thickness 1) line-thickness)) - (blot (calc-blot thickness extent grob)) (extent (bar-line::widen-bar-extent-on-span grob extent))) - - (ly:round-filled-box (cons 0 thickness) - extent - blot))) + (bar-line::draw-filled-box + (cons 0 thickness) + extent + thickness + extent + grob))) (define (make-thick-bar-line grob extent) "Draw a thick bar line." (let* ((line-thickness (layout-line-thickness grob)) (thickness (* (ly:grob-property grob 'thick-thickness 1) line-thickness)) - (blot (calc-blot thickness extent grob)) (extent (bar-line::widen-bar-extent-on-span grob extent))) - - (ly:round-filled-box (cons 0 thickness) - extent - blot))) + (bar-line::draw-filled-box + (cons 0 thickness) + extent + thickness + extent + grob))) (define (make-tick-bar-line grob extent) "Draw a tick bar line." (let* ((half-staff (* 1/2 (ly:staff-symbol-staff-space grob))) (staff-line-thickness (ly:staff-symbol-line-thickness grob)) - (height (interval-end extent)) - (blot (calc-blot staff-line-thickness extent grob))) - - (ly:round-filled-box (cons 0 staff-line-thickness) - (cons (- height half-staff) (+ height half-staff)) - blot))) + (height (interval-end extent))) + (bar-line::draw-filled-box + (cons 0 staff-line-thickness) + (cons (- height half-staff) (+ height half-staff)) + staff-line-thickness + extent + grob))) (define (make-colon-bar-line grob extent) "Draw repeat dots." diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 60b9d5b000..cb9103a6fc 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -675,7 +675,7 @@ object.") get stems extending to the middle staff line.") (non-break-align-symbols ,list? "A list of symbols that determine which NON-break-aligned interfaces to align this to.") - (non-default ,boolean? "Set for manually specified clefs.") + (non-default ,boolean? "Set for manually specified clefs and keys.") (non-musical ,boolean? "True if the grob belongs to a @code{NonMusicalPaperColumn}.") (nonstaff-nonstaff-spacing ,list? "The spacing alist diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index c874eae7b9..f525edd69a 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -2328,6 +2328,7 @@ (SystemStartSquare . ( + (collapse-height . 5.0) (direction . ,LEFT) (stencil . ,ly:system-start-delimiter::print) (style . line-bracket) diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index a781055f50..36c4dda9cb 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -257,6 +257,18 @@ (ly:get-option 'datadir))))) (define (load-font-via-GS font-name-filename) + (define (is-collection-font? file-name) + (let ((port (open-file file-name "rb"))) + (if (eq? (read-char port) #\t) + (if (eq? (read-char port) #\t) + (if (eq? (read-char port) #\c) + (if (eq? (read-char port) #\f) + #t + #f) + #f) + #f) + #f))) + (define (ps-load-file file-name) (if (string? file-name) (if (string-contains file-name (ly:get-option 'datadir)) @@ -272,19 +284,39 @@ (let* ((font (car font-name-filename)) (name (cadr font-name-filename)) (file-name (caddr font-name-filename)) + (font-index (cadddr font-name-filename)) (bare-file-name (ly:find-file file-name))) - (cons name - (if (mac-font? bare-file-name) - (handle-mac-font name bare-file-name) - (cond - ((and font (cff-font? font)) - (ps-load-file (ly:find-file - (format #f "~a.otf" file-name)))) - ((string? bare-file-name) - (ps-load-file file-name)) - (else - (ly:warning (_ "cannot embed ~S=~S") name file-name) - "")))))) + (cond + ((and (number? font-index) + (!= font-index 0)) + (ly:warning (_ "Font ~a cannot be loaded via Ghostscript because its font-index (~a) is not zero.") + name font-index) + (load-font font-name-filename)) + ((and (string? bare-file-name) + (eq? (ly:get-font-format bare-file-name font-index) 'CFF) + (is-collection-font? bare-file-name)) + (ly:warning (_ "Font ~a cannot be loaded via Ghostscript because it is an OpenType/CFF (OTC) font.") + name) + (load-font font-name-filename)) + ((and (string? bare-file-name) + (eq? (ly:get-font-format bare-file-name font-index) 'TrueType) + (not (ly:has-glyph-names? bare-file-name font-index))) + (ly:warning (_ "Font ~a cannot be used via Ghostscript because it is a TrueType font that does not have glyph names.") + name) + (load-font font-name-filename)) + (else + (cons name + (if (mac-font? bare-file-name) + (handle-mac-font name bare-file-name) + (cond + ((and font (cff-font? font)) + (ps-load-file (ly:find-file + (format #f "~a.otf" file-name)))) + ((string? bare-file-name) + (ps-load-file file-name)) + (else + (ly:warning (_ "cannot embed ~S=~S") name file-name) + "")))))))) (define (dir-join a b) (if (equal? a "") @@ -331,24 +363,17 @@ embed)) (define (font-file-as-ps-string name file-name font-index) - (let* ((downcase-file-name (string-downcase file-name))) + (let ((font-format (ly:get-font-format file-name font-index))) (cond - ((and file-name (string-endswith downcase-file-name ".pfa")) - (embed-document file-name)) - ((and file-name (string-endswith downcase-file-name ".pfb")) - (ly:pfb->pfa file-name)) - ((and file-name (string-endswith downcase-file-name ".ttf")) - (ly:ttf->pfa file-name)) - ((and file-name (string-endswith downcase-file-name ".ttc")) - ;; TODO: distinguish files which have extension `*.ttc' - ;; whether TrueType Collection (TTC) fonts - ;; or OpenType/CFF Collection (OTC) fonts. - (ly:ttf->pfa file-name font-index)) ;; TTC fonts - ((and file-name (string-endswith downcase-file-name ".otf")) - (ps-embed-cff (ly:otf->cff file-name) name 0)) - ((and file-name (string-endswith downcase-file-name ".otc")) - ;; The files which have the extension `*.otc' are OTC fonts. - (ps-embed-cff (ly:otf->cff file-name font-index) name 0)) ;; OTC fonts + ((eq? font-format (string->symbol "Type 1")) + ;; Type 1 (PFA and PFB) fonts + (ly:type1->pfa file-name)) + ((eq? font-format 'TrueType) + ;; TrueType fonts (TTF) and TrueType Collection (TTC) + (ly:ttf->pfa file-name font-index)) + ((eq? font-format 'CFF) + ;; OpenType/CFF fonts (OTF) and OpenType/CFF Collection (OTC) + (ps-embed-cff (ly:otf->cff file-name font-index) name 0)) (else (ly:warning (_ "do not know how to embed ~S=~S") name file-name) "")))) diff --git a/scm/script.scm b/scm/script.scm index 5d975fe0ec..c8eb8b39b9 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -110,6 +110,13 @@ (script-stencil . (feta . ("halfopen" . "halfopen"))) (direction . ,UP))) + ("halfopenvertical" + . ( + (avoid-slur . outside) + (padding . 0.20) + (script-stencil . (feta . ("halfopenvertical" . "halfopenvertical"))) + (direction . ,UP))) + ("ictus" . (