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 131dbf8adf6547dd6cd00ab9daca9d1ea13ad000..41551e7194e55aa21314a916ffddd726a3a8e3d6 100644 (file)
--- 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
 
 @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}
 
 @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
 
 >>
 @end lilypond
 

-@snippets
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{compound-time-signatures.ly}
-
-

 @seealso
 Glossar:
 @rglos{polymetric},
 @seealso
 Glossar:
 @rglos{polymetric},

diff --git a/Documentation/de/notation/world.itely b/Documentation/de/notation/world.itely
index 336710e2f88d9749b9aeef3fbf98e3b00258adf4..e438b16da4262bd299e3146b610337ac21fced88 100644 (file)
--- a/Documentation/de/notation/world.itely
+++ b/Documentation/de/notation/world.itely
@@ -380,9 +380,6 @@ zu benutzen.
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,quote,texidoc,doctitle]
-{compound-time-signatures.ly}
-

 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {arabic-improvisation.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {arabic-improvisation.ly}
 

diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely
index 83416309fb002a2833e692f7a631299c9a0d263b..391d4fcc2357bfee1aeda87cded02f8dcafbcdba 100644 (file)
--- 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
 
 @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}
 
 @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
 
 >>
 @end lilypond
 

-@snippets
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{compound-time-signatures.ly}
-
-

 @seealso
 Glosario musical:
 @rglos{polymetric},
 @seealso
 Glosario musical:
 @rglos{polymetric},

diff --git a/Documentation/es/notation/world.itely b/Documentation/es/notation/world.itely
index c9117b1883a1442952db776a10681afa0f03af29..f910f0930a48c2ae4a6d9e0741ccc630ab747130 100644 (file)
--- 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
 
 
 @snippets
 

-@lilypondfile[verbatim,quote,texidoc,doctitle]
-{compound-time-signatures.ly}
-

 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {arabic-improvisation.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {arabic-improvisation.ly}
 

diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely
index 3ddf15c2dd434b9e9ca5be68349d40f940f19cc4..cd27e50e59e561bd6ed224c3368deaf1dc5c0066 100644 (file)
--- 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
 
 @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}
 
 @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
 
 >>
 @end lilypond
 

-@snippets
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{compound-time-signatures.ly}
-
-

 @seealso
 Glossaire musicologique :
 @rglosnamed{polymetric,polymétrie},
 @seealso
 Glossaire musicologique :
 @rglosnamed{polymetric,polymétrie},

diff --git a/Documentation/fr/notation/world.itely b/Documentation/fr/notation/world.itely
index d2f45e01c354a4ee114ccbd9c8ec7215980d967c..0c6cec63bc9cc46e9370e47a2259f1dae5b3e7b2 100644 (file)
--- a/Documentation/fr/notation/world.itely
+++ b/Documentation/fr/notation/world.itely
@@ -362,9 +362,6 @@ chiffres de mesure composés.
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,quote,texidoc,doctitle]
-{compound-time-signatures.ly}
-

 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {arabic-improvisation.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {arabic-improvisation.ly}
 

diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely
index a78d3d3935deb7174bfac2fcf1e3391f0d046a2f..af15ccadca6bd8c729faa37a4592fecfabb43a33 100644 (file)
--- 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
 
 @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}
 
 @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
 
 >>
 @end lilypond
 

-@snippets
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{compound-time-signatures.ly}
-
-

 @seealso
 音楽用語集:
 @rglos{polymetric},
 @seealso
 音楽用語集:
 @rglos{polymetric},

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index d822de1dfe2cb7d0fa54c59ea2357e51601507ca..fff26f135edf880cfd280ef88df25751bb89c237 100644 (file)
--- 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
 @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
 
 
 @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
 \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 "||"
   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
 @end lilypond
 
 @seealso

-@ref{compound meter}, @ref{meter}, @ref{polymetric time signature}.
+@ref{compound meter},
+@ref{meter},
+@ref{polymetric time signature}.

 
 
 @node concert pitch
 
 
 @node concert pitch

diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index c81adae6dbc6d3a54698dcbec394d9566f42f79b..4637bd51c51322dc3278615a0d114db8f714480f 100644 (file)
--- 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}
 
 @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}
 
 @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
 
 @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
 
 
 @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 |
 
 @lilypond[quote,verbatim]
 \relative c' <<
   \new Staff {
     \time 3/4
     c4 c c |

-    c c c |
+    c4 c c |

   }
   \new Staff {
     \time 3/4
   }
   \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] } |
     \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
 
     }
   }
 >>
 @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
 
 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
 
 >>
 @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:
 
 @seealso
 Music Glossary:


@@ -1648,6 +1671,8 @@ Music Glossary:
 @rglos{meter}.
 
 Notation Reference:
 @rglos{meter}.
 
 Notation Reference:

+@ref{Automatic beams},
+@ref{Manual beams},

 @ref{Time signature},
 @ref{Scaling durations}.
 
 @ref{Time signature},
 @ref{Scaling durations}.
 


@@ -1662,13 +1687,11 @@ Internals Reference:
 
 
 @knownissues
 
 
 @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
 
 @node Automatic note splitting
 @unnumberedsubsubsec Automatic note splitting

diff --git a/Documentation/notation/world.itely b/Documentation/notation/world.itely
index 428c35f201c44d359e88fd67d6407552e1ea6d2a..1863feb7cde621adb546caf86dabd52fb5b630e7 100644 (file)
--- 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
 
 
 @snippets
 

-@lilypondfile[verbatim,quote,texidoc,doctitle]
-{compound-time-signatures.ly}
-

 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {arabic-improvisation.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 4face77811e6bd08a39cc7188ab1abad4c85c1bf..fe72189155d8ddf24e3f8edb322072a1b38a0ee3 100644 (file)
--- 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 {
 %% 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."
 
   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 973b68da071fb4f0d50c8d69223aacb5c98a9aec..ab151a2c4bf539810a0f085690dcb12f9479e9a1 100644 (file)
--- a/Documentation/snippets/changing-fret-orientations.ly
+++ b/Documentation/snippets/changing-fret-orientations.ly
@@ -7,8 +7,21 @@
 \version "2.14.0"
 
 \header {
 \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"
 
   lsrtags = "fretted-strings"
 

+

 %% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
 
   texidoces = "
 %% 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 94bcb6af5adc923896ce18067d0080a6e72f6ff3..c8aa0bf3b78b3a0a867526f2386fc64d5b853d63 100644 (file)
--- 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"
 
 
   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.
   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 0665939afb3158774e7a6fa8ff2c1df8d112edb9..0f10aac169f817d441e827eaad1c5377c63d9d7c 100644 (file)
--- 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"
 
 
   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."
   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 27b618f2e8185a83293477426362000821d48aee..f5b622d47d7e4f27fa09c27e71656ed4115b0574 100644 (file)
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -61,18 +61,6 @@ database.)
 } % begin verbatim
 
 
 } % 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 9bc14d13a0d9bb2bb9aef96d7a21414b0553435d..a3e48c96f22d43e8f6b15537c02859fa0851c7f1 100644 (file)
--- 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 {
 \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"
 
   lsrtags = "fretted-strings, tweaks-and-overrides"
 

+

 %% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
   texidoces = "
 Se pueden establecer las propiedades de los diagramas de
 %% 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 fc4b01f2fb06235fd771390122bd00b155d982e9..75d791b77eb1d37661174b66b238b3850ccca0d7 100644 (file)
--- 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"
 
 
   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
 
   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.
 "
 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 6717be0a263c56fd1d3bd0766c0015ed11aac820..4b2a677e7cc920592b8106322887c30864cb1371 100644 (file)
--- 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"
 
 "
   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
 
   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 = "
 
 
   texidoc = "

diff --git a/Documentation/snippets/fretboards-alternate-tables.ly b/Documentation/snippets/fretboards-alternate-tables.ly
index f2ab3d2dacd795b7de58f9604ca6c865defc833a..bfc663de681f0ed5377f01179cb855a915df8a42 100644 (file)
--- 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"
 
 
   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 = "
   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 32cf25a6d1d08bb4eb3a210c07b260eb99b9333f..c7f12d8d4e700631147e629e84d8bced5b613957 100644 (file)
--- 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"
 
 "
   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:
   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 552259dff9d16ff61860a4186f0cd7f1a1659875..1bf73123803c75fd438065fea948b238e7f60d78 100644 (file)
--- 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"
 
 "
   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
   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} :
 (@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 04dc1c2359f91a452081dae5d50b0928e92c768f..de0d73f6d5c2e2e7a671eb8c076f5328761204d1 100644 (file)
--- 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"
 }
 
   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 4469dbc2d8a4ce9422a7851db23db118d6fcbf4f..f33d81eda4aa9c028513ed5d5684833171da42e3 100644 (file)
--- 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"
 
 "
   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:
   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 c85065de859e92dc0bdbd6852f91a220636822f5..1267ce2ecbc3bba7ba2872f0f2e1e7fcd90b0694 100644 (file)
--- 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"
 
 "
   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:
   lsrtags = "fretted-strings"
   texidoc = "
 Slides can be typeset in both @code{Staff} and @code{TabStaff} contexts: