From: James Lowe Date: Sat, 10 Sep 2011 15:09:03 +0000 (+0100) Subject: Doc: Added \compoundMeter function to NR X-Git-Tag: release/2.15.12-1~41 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=c358ec6f8ed8f31b5fa1d97da6a2284b3759bdfd;p=lilypond.git Doc: Added \compoundMeter function to NR This is for Tracker issue 1776 Added function to Polymetric Noation sections removed an old snippet from NR (which has been deprecated by this function). Also took the opportunity to make some other minor grammatical changes to make (hopefully) the other examples and their explanations clearer. Some style changes needed (used @subheading instead of @strong{}) Also removed other references to the snipped including in the translated tely files and moved cindex entries to the new location. --- diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely index 131dbf8adf..41551e7194 100644 --- a/Documentation/de/notation/rhythms.itely +++ b/Documentation/de/notation/rhythms.itely @@ -1259,9 +1259,6 @@ Notensysteme können eingerichtet werden, indem man den @cindex compound time signatures @cindex time signature, compound -@lilypondfile[verbatim,quote,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly} @@ -1693,12 +1690,6 @@ verschoben werden. >> @end lilypond -@snippets - -@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle] -{compound-time-signatures.ly} - - @seealso Glossar: @rglos{polymetric}, diff --git a/Documentation/de/notation/world.itely b/Documentation/de/notation/world.itely index 336710e2f8..e438b16da4 100644 --- a/Documentation/de/notation/world.itely +++ b/Documentation/de/notation/world.itely @@ -380,9 +380,6 @@ zu benutzen. @snippets -@lilypondfile[verbatim,quote,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {arabic-improvisation.ly} diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely index 83416309fb..391d4fcc23 100644 --- a/Documentation/es/notation/rhythms.itely +++ b/Documentation/es/notation/rhythms.itely @@ -1249,9 +1249,6 @@ moviendo el @code{Timing_translator} y el @cindex compuesto, indicaciones de compás @cindex compás compuesto, indicaciones de -@lilypondfile[verbatim,quote,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly} @@ -1688,12 +1685,6 @@ independiente trasladando los grabadores @code{Timing_translator} y >> @end lilypond -@snippets - -@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle] -{compound-time-signatures.ly} - - @seealso Glosario musical: @rglos{polymetric}, diff --git a/Documentation/es/notation/world.itely b/Documentation/es/notation/world.itely index c9117b1883..f910f0930a 100644 --- a/Documentation/es/notation/world.itely +++ b/Documentation/es/notation/world.itely @@ -386,9 +386,6 @@ barrado automático y/o utilizar indicaciones de compás compuestas. @snippets -@lilypondfile[verbatim,quote,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {arabic-improvisation.ly} diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely index 3ddf15c2dd..cd27e50e59 100644 --- a/Documentation/fr/notation/rhythms.itely +++ b/Documentation/fr/notation/rhythms.itely @@ -1250,9 +1250,6 @@ particuliers pour les différentes portées d'un regroupement@tie{}: @cindex métriques composites @cindex métriques décomposées -@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly} @@ -1688,12 +1685,6 @@ parviendrez en déplaçant le @code{Timing_translator} et le >> @end lilypond -@snippets - -@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle] -{compound-time-signatures.ly} - - @seealso Glossaire musicologique : @rglosnamed{polymetric,polymétrie}, diff --git a/Documentation/fr/notation/world.itely b/Documentation/fr/notation/world.itely index d2f45e01c3..0c6cec63bc 100644 --- a/Documentation/fr/notation/world.itely +++ b/Documentation/fr/notation/world.itely @@ -362,9 +362,6 @@ chiffres de mesure composés. @snippets -@lilypondfile[verbatim,quote,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {arabic-improvisation.ly} diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely index a78d3d3935..af15ccadca 100644 --- a/Documentation/ja/notation/rhythms.itely +++ b/Documentation/ja/notation/rhythms.itely @@ -1230,9 +1230,6 @@ c c c c @cindex compound time signatures @cindex time signature, compound -@lilypondfile[verbatim,quote,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly} @@ -1676,12 +1673,6 @@ LilyPond は改行と改ページを小節線の箇所にのみ挿入します >> @end lilypond -@snippets - -@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle] -{compound-time-signatures.ly} - - @seealso 音楽用語集: @rglos{polymetric}, diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely index d822de1dfe..fff26f135e 100644 --- a/Documentation/music-glossary.tely +++ b/Documentation/music-glossary.tely @@ -2102,29 +2102,16 @@ A meter that includes a triplet subdivision within the beat: see @ref{compound meter}. @item -A time signature that additively combines two or more unequal meters, e.g., -@q{3/8 + 2/8} instead of @q{5/8}. Sometimes called additive time signatures. +A time signature that additively combines two or more unequal meters, +e.g., @q{3/8 + 2/8} instead of @q{5/8}. Sometimes called additive time +signatures. @end enumerate -@lilypond[quote,line-width=13.0\cm] -#(define ((compound-time one two three num) grob) - (grob-interpret-markup grob - (markup - #:override '(baseline-skip . 0) - #:number - #:line ( - #:left-column (one num) - #:vcenter "+" - #:left-column (two num) - #:vcenter "+" - #:left-column (three num))))) - +@lilypond[quote,verbatim] \relative c' { \key f \major - #(set-time-signature 8 8 '(3 2 3)) - \override Staff.TimeSignature #'stencil = - #(compound-time "3" "2" "3" "8") + \compoundMeter #'((3 8) (2 8) (3 8)) c8 d e f4 d8 c bes c4 g'8 e c f4. \bar "||" @@ -2132,7 +2119,9 @@ A time signature that additively combines two or more unequal meters, e.g., @end lilypond @seealso -@ref{compound meter}, @ref{meter}, @ref{polymetric time signature}. +@ref{compound meter}, +@ref{meter}, +@ref{polymetric time signature}. @node concert pitch diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index c81adae6db..4637bd51c5 100644 --- a/Documentation/notation/rhythms.itely +++ b/Documentation/notation/rhythms.itely @@ -1205,12 +1205,6 @@ for different staves by moving the @code{Timing_translator} and the @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle] {changing-the-time-signature-without-affecting-the-beaming.ly} -@cindex compound time signatures -@cindex time signature, compound - -@lilypondfile[verbatim,quote,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly} @@ -1542,36 +1536,32 @@ piece with @code{\cadenzaOn}, otherwise strange errors may occur. @funindex \times @funindex times -Polymetric notation is supported, either explicitly or by modifying -the visible time signature symbol and scaling the note durations. +Polymetric notation is supported explicitly or by manually modifying the +visible time signature symbol and/or scaling note durations. -@strong{@i{Staves with different time signatures, equal measure lengths}} +@subsubheading Different time signatures with equal-length measures -This notation can be created by setting a common time signature -for each staff but replacing the symbol manually by setting -@code{timeSignatureFraction} to the desired fraction and scaling -the printed durations in each staff to the common time -signature; see @ref{Time signature}. The scaling is done with -@code{\scaleDurations}, which is used in a similar way to -@code{\times}, but does not create a tuplet bracket; see -@ref{Scaling durations}. +Set a common time signature for each staff, and set the +@code{timeSignatureFraction} to the desired fraction. Then use the +@code{\scaleDurations} function to scale the durations of the notes in +each staff to the common time signature. @cindex beams, with polymetric meters @cindex polymetric meters, with beams -In this example, music with the time signatures of 3/4, 9/8, and -10/8 are used in parallel. In the second staff, shown durations -are multiplied by 2/3, as 2/3 * 9/8 = 3/4, and in the third -staff, shown durations are multiplied by 3/5, as 3/5 * 10/8 = 3/4. -It will often be necessary to insert beams manually, as the -duration scaling affects the autobeaming rules. +In the following example, music with the time signatures of 3/4, 9/8 and +10/8 are used in parallel. In the second staff, shown durations are +multiplied by 2/3 (because 2/3 * 9/8 = 3/4) and in the third staff, the +shown durations are multiplied by 3/5 (because 3/5 * 10/8 = 3/4). It +may be necessary to insert beams manually, as the duration scaling will +affect the autobeaming rules. @lilypond[quote,verbatim] \relative c' << \new Staff { \time 3/4 c4 c c | - c c c | + c4 c c | } \new Staff { \time 3/4 @@ -1585,13 +1575,13 @@ duration scaling affects the autobeaming rules. \scaleDurations #'(3 . 5) { \repeat unfold 2 { c8[ c c] } \repeat unfold 2 { c8[ c] } | - c4. c4. \times 2/3 { c8[ c c] } c4 + c4. c \times 2/3 { c8[ c c] } c4 } } >> @end lilypond -@strong{@i{Staves with different time signatures, unequal bar lengths}} +@subsubheading Different time signatures with unequal-length measures Each staff can be given its own independent time signature by moving the @code{Timing_translator} and the @@ -1635,11 +1625,44 @@ moving the @code{Timing_translator} and the >> @end lilypond -@snippets +@funindex \compoundMeter +@cindex compound time signatures +@cindex time signature, compound -@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle] -{compound-time-signatures.ly} +@subsubheading Compound time signatures + +These are created using the @code{\compoundMeter} function. The syntax +for this is: + +@example +\compoundMeter #'@var{(list of lists)} +@end example + +The simplest construction is a single list, where the @emph{last} number +indicates the bottom number of the time signature and those that come +before it, the top numbers. +@lilypond[quote,verbatim] +\relative c' { + \compoundMeter #'((2 2 2 8)) + \repeat unfold 6 c8 \repeat unfold 12 c16 +} +@end lilypond + +More complex meters can be constructed using additional lists. Also, +automatic beaming settings will be adjusted depending on the values. + +@lilypond[quote,verbatim] +\relative c' { + \compoundMeter #'((1 4) (3 8)) + \repeat unfold 5 c8 \repeat unfold 10 c16 +} + +\relative c' { + \compoundMeter #'((1 2 3 8) (3 4)) + \repeat unfold 12 c8 +} +@end lilypond @seealso Music Glossary: @@ -1648,6 +1671,8 @@ Music Glossary: @rglos{meter}. Notation Reference: +@ref{Automatic beams}, +@ref{Manual beams}, @ref{Time signature}, @ref{Scaling durations}. @@ -1662,13 +1687,11 @@ Internals Reference: @knownissues - -When using different time signatures in parallel, notes -at the same moment will be placed at the same horizontal -location. However, the bar lines in the different staves -will cause the note spacing to be less regular in each of the -individual staves than would be normal without the different -time signatures. +When using different time signatures in parallel, notes at the same +moment will be placed at the same horizontal location. However, the bar +lines in the different staves will cause the note spacing to be less +regular in each of the individual staves than would be normal without +the different time signatures. @node Automatic note splitting @unnumberedsubsubsec Automatic note splitting diff --git a/Documentation/notation/world.itely b/Documentation/notation/world.itely index 428c35f201..1863feb7cd 100644 --- a/Documentation/notation/world.itely +++ b/Documentation/notation/world.itely @@ -371,9 +371,6 @@ the automatic beaming behaviour and/or use compound time signatures. @snippets -@lilypondfile[verbatim,quote,texidoc,doctitle] -{compound-time-signatures.ly} - @lilypondfile[verbatim,quote,texidoc,doctitle] {arabic-improvisation.ly} diff --git a/Documentation/snippets/alternative-breve-note.ly b/Documentation/snippets/alternative-breve-note.ly index 4face77811..fe72189155 100644 --- a/Documentation/snippets/alternative-breve-note.ly +++ b/Documentation/snippets/alternative-breve-note.ly @@ -7,6 +7,8 @@ %% Note: this file works from version 2.14.0 \version "2.14.0" \header { +%% Translation of GIT committish: 8cbb38db1591ab95a178643e7bf41db018aa22c0 + texidocde = "Dieses Schnipsel zeigt, wie man die alternative Brevis mit zwei vertikalen Linien an jeder Seite des Notenkopfes benutzt." diff --git a/Documentation/snippets/changing-fret-orientations.ly b/Documentation/snippets/changing-fret-orientations.ly index 973b68da07..ab151a2c4b 100644 --- a/Documentation/snippets/changing-fret-orientations.ly +++ b/Documentation/snippets/changing-fret-orientations.ly @@ -7,8 +7,21 @@ \version "2.14.0" \header { +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd + + texidocfr = " +Les diagrammes de fret peuvent s'orienter de trois manières différentes. +Ils s'aligneront par défaut sur la corde du haut ou le sommet du fret. + + +" + + doctitlefr = "Orientation des diagrammes de fret" + + lsrtags = "fretted-strings" + %% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c texidoces = " diff --git a/Documentation/snippets/chord-glissando-in-tablature.ly b/Documentation/snippets/chord-glissando-in-tablature.ly index 94bcb6af5a..c8aa0bf3b7 100644 --- a/Documentation/snippets/chord-glissando-in-tablature.ly +++ b/Documentation/snippets/chord-glissando-in-tablature.ly @@ -29,6 +29,19 @@ Akkorde und einzelne Noten funktioniert. doctitlede = "Akkordglissando in Tabulaturen" +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd + + texidocfr = " +Un glissando sur des accords s'indique dans un @code{TabStaff} de la +même manière que dans un @code{Staff}, à ceci près que nous aurons +besoin des numéros de corde afin de déterminer correctement les frets +d'arrivée. + +" + + doctitlefr = "Glissando d'accords et tablature" + + lsrtags = "fretted-strings" texidoc = " Slides for chords can be indicated in both Staff and TabStaff. diff --git a/Documentation/snippets/chordchanges-for-fretboards.ly b/Documentation/snippets/chordchanges-for-fretboards.ly index 0665939afb..0f10aac169 100644 --- a/Documentation/snippets/chordchanges-for-fretboards.ly +++ b/Documentation/snippets/chordchanges-for-fretboards.ly @@ -27,6 +27,16 @@ wenn der Akkord sich ändert oder eine neue Zeile anfängt. doctitlede = "Akkordänderungen für Bunddiagramme" +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd + texidocfr = " +Vous pouvez opter pour n'imprimer les diagrammes de fret qu'à l'occasion +d'un changement d'accord ou de saut de ligne. + +" + + doctitlefr = "Changement d'accord et diagramme de fret" + + lsrtags = "fretted-strings" texidoc = "FretBoards can be set to display only when the chord changes or at the beginning of a new line." diff --git a/Documentation/snippets/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly index 27b618f2e8..f5b622d47d 100644 --- a/Documentation/snippets/compound-time-signatures.ly +++ b/Documentation/snippets/compound-time-signatures.ly @@ -61,18 +61,6 @@ database.) } % begin verbatim -#(define ((compound-time one two num) grob) - (grob-interpret-markup grob - (markup #:override '(baseline-skip . 0) #:number - (#:line ((#:column (one num)) - #:vcenter "+" - (#:column (two num))))))) - -\relative c' { - \override Staff.TimeSignature #'stencil = #(compound-time "2" "3" "8") - \time 5/8 - \set Staff.beatStructure = #'(2 3) - c8 d e fis gis - c8 fis, gis e d - c8 d e4 gis8 +\markup { + This snippet is deprecated as of 2.15.9 and will be removed in 2.16 } diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly index 9bc14d13a0..a3e48c96f2 100644 --- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly +++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly @@ -7,8 +7,22 @@ \version "2.15.7" \header { +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd + texidocfr = " +Les propriétés d'un diagramme de fret sont définies par les +@code{fret-diagram-details}. En matière de diagramme FretBoards, les +adaptations s'appliquent à l'objet @code{FretBoards.FretBoard}. Un +@code{FretBoard} est comparable à un @code{Voice}@tie{}: il s'agit +d'un contexte du plus bas niveau, et il n'est donc pas primordial de +l'instancier de manière explicite pour adapter ses propriétés. + +" + doctitlefr = "Personnalisation de diagrammes de fret" + + lsrtags = "fretted-strings, tweaks-and-overrides" + %% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c texidoces = " Se pueden establecer las propiedades de los diagramas de diff --git a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly index fc4b01f2fb..75d791b77e 100644 --- a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly +++ b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly @@ -32,12 +32,12 @@ zugewiesen. doctitlede = "Eigene Dynamiktextspanner nachgestellt" -%% Translation of GIT committish: a06cb0b0d9593ba110e001f2b0f44b8bef084693 +%% Translation of GIT committish: a6b5eea83ddcdd8e1fd0760db385176ff9b2b1cd texidocfr = " Il s'agit de fonctions postfix pour personnaliser l'extension des crescendos textuels. L'extension devrait débuter sur la première notte -de la mesure. Il faut utiliser @code{-\mycresc} -- comme une +de la mesure. Il faut utiliser @w{@code{-\mycresc}} -- comme une articulation -- sous peine que le départ de l'extension n'apparaisse qu'à la note suivante. " diff --git a/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly b/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly index 6717be0a26..4b2a677e7c 100644 --- a/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly +++ b/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly @@ -27,14 +27,14 @@ und Fingersatz für die rechte Hand. " doctitlede = "Fingersatz Saitennummern und Fingersatz für die rechte Hand" -%% Translation of GIT committish: ac6297e4fa174ac5759cc450ad085c2fac9ba00b +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd texidocfr = " L'exemple suivant illustre comment combiner des doigtés pour la main -gauche, des indications de corrde et des doigtés pour la main droite. +gauche, des indications de corde et des doigtés pour la main droite. " - doctitlefr = "Doigtés indications de cordeet doigtés main droite" + doctitlefr = "Doigtés indications de corde et doigtés main droite" texidoc = " diff --git a/Documentation/snippets/fretboards-alternate-tables.ly b/Documentation/snippets/fretboards-alternate-tables.ly index f2ab3d2dac..bfc663de68 100644 --- a/Documentation/snippets/fretboards-alternate-tables.ly +++ b/Documentation/snippets/fretboards-alternate-tables.ly @@ -47,6 +47,28 @@ wird mit der Eigenschaft @code{\\predefinedDiagramTable} ausgewählt. doctitlede = "Alternative Bunddiagrammtabellen" +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd + + texidocfr = " +Vous pouvez tout à fait créer des tables de diagrammes de fret +supplémentaires, notamment dans l'optique d'un fret alternatif pour un +accord donné. + +Avant de pouvoir utiliser un diagramme alternatif, vous devrez alimenter +une table à cet effet. Les différents diagrammes seront ajoutés à cette +table. + +Il peut aussi bien s'agir d'une table vide, que de la recopie d'une +table existante. + +La table servant de base pour les diagrammes prédéfinis est sélectionnée +par la propriété @code{\\predefinedDiagramTable}. + +" + + doctitlefr = "Diagrammes de fret alternatifs" + + lsrtags = "fretted-strings" texidoc = " diff --git a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly index 32cf25a6d1..c7f12d8d4e 100644 --- a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly +++ b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly @@ -22,6 +22,13 @@ Flageolett für Bundinstrumente: " doctitlede = "Flageolett von Bundinstrumenten in einer Tabulatur" +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd + texidocfr = " +Harmoniques et tablature (harmoniques artificielles) +" + doctitlefr = "Harmoniques et tablature" + + lsrtags = "fretted-strings" texidoc = " Fretted-string harmonics: diff --git a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly index 552259dff9..1bf7312380 100644 --- a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly +++ b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly @@ -39,14 +39,14 @@ assoziieren, muss der Wert @code{trill} der Variable " doctitlede = "Die Standardwerte der Abkürzungen von Artikulationen verändern" -%% Translation of GIT committish: 217cd2b9de6e783f2a5c8a42be9c70a82195ad20 +%% Translation of GIT committish: a6b5eea83ddcdd8e1fd0760db385176ff9b2b1cd texidocfr = " Les raccourcis sont répertoriés dans le fichier @file{ly/script-init.ly}, dans lequel on retrouve les variables @code{dashHat}, @code{dashPlus}, @code{dashDash}, @code{dashBar}, @code{dashLarger}, @code{dashDot}, et @code{dashUnderscore} ainsi que leur valeur par défaut. Ces valeurs peuvent être modifiées selon vos -besoins. Il suffit par exemple, pour affecter au raccourci @code{-+} +besoins. Il suffit par exemple, pour affecter au raccourci @w{@code{-+}} (@code{dashPlus}) le symbole du trille en lieu et place du @code{+} (caractère plus), d'assigner la valeur @code{trill} à la variable @code{dashPlus} : diff --git a/Documentation/snippets/new/compound-time-signatures.ly b/Documentation/snippets/new/compound-time-signatures.ly index 04dc1c2359..de0d73f6d5 100644 --- a/Documentation/snippets/new/compound-time-signatures.ly +++ b/Documentation/snippets/new/compound-time-signatures.ly @@ -14,18 +14,6 @@ database.) doctitle = "Compound time signatures" } -#(define ((compound-time one two num) grob) - (grob-interpret-markup grob - (markup #:override '(baseline-skip . 0) #:number - (#:line ((#:column (one num)) - #:vcenter "+" - (#:column (two num))))))) - -\relative c' { - \override Staff.TimeSignature #'stencil = #(compound-time "2" "3" "8") - \time 5/8 - \set Staff.beatStructure = #'(2 3) - c8 d e fis gis - c8 fis, gis e d - c8 d e4 gis8 +\markup { + This snippet is deprecated as of 2.15.9 and will be removed in 2.16 } diff --git a/Documentation/snippets/open-string-harmonics-in-tablature.ly b/Documentation/snippets/open-string-harmonics-in-tablature.ly index 4469dbc2d8..f33d81eda4 100644 --- a/Documentation/snippets/open-string-harmonics-in-tablature.ly +++ b/Documentation/snippets/open-string-harmonics-in-tablature.ly @@ -21,6 +21,15 @@ Referenz für Flageolett von offenen Saiten: " doctitlede = "Referenz für Flageolett von offenen Saiten" +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd + texidocfr = " +Table des harmoniques sur corde à vide (harmoniques naturelles): + +" + doctitlefr = "Table des harmoniques sur corde à vide" + + + lsrtags = "fretted-strings" texidoc = " Reference for open-string harmonics: diff --git a/Documentation/snippets/slides-in-tablature.ly b/Documentation/snippets/slides-in-tablature.ly index c85065de85..1267ce2ecb 100644 --- a/Documentation/snippets/slides-in-tablature.ly +++ b/Documentation/snippets/slides-in-tablature.ly @@ -24,6 +24,16 @@ Gleiten kann sowohl in normalem Notensystem als auch in Tabulaturen notiert werd " doctitlede = "Gleiten (Glissando) in Tabulatur" +%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd + texidocfr = " +Un glissando s'indique dans un @code{TabStaff} tout comme dans un +@code{Staff}. + +" + + doctitlefr = "Glissando et tablature" + + lsrtags = "fretted-strings" texidoc = " Slides can be typeset in both @code{Staff} and @code{TabStaff} contexts: