Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / conducting-signs,-measure-grouping-signs.ly

diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
index fbe2e227bb0c5076b559812152d82aff5478e995..514718f9bd6492de682430688fdb73bd49c4eeab 100644 (file)
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -1,42 +1,39 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.15.19
-\version "2.16.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
+
   texidoc = "
 Beat grouping within a measure is controlled by the context property
-@code{beatStructure}.  Values of @code{beatStructure} are
-established for many time signatures in
-@file{scm/time-signature-settings.scm}.  Values of @code{beatStructure}
-can be changed or set with @code{\\set}.
-Alternatively, @code{\\time} can be used to both
-set the time signature and establish the beat structure.
-For this, you specify the internal grouping of beats in a measure
-as a list of numbers (in Scheme syntax) before the time signature.
+@code{beatStructure}.  Values of @code{beatStructure} are established
+for many time signatures in @@file@{scm/time-signature-settings.scm@}.
+Values of @code{beatStructure} can be changed or set with @code{\\set}.
+Alternatively, @code{\\time} can be used to both set the time signature
+and establish the beat structure. For this, you specify the internal
+grouping of beats in a measure as a list of numbers (in Scheme syntax)
+before the time signature.
 
 @code{\\time} applies to the @code{Timing} context, so it will not
 reset values of @code{beatStructure} or @code{baseMoment} that are set
 in other lower-level contexts, such as @code{Voice}.
 
-If the @code{Measure_grouping_engraver} is included
-in one of the display contexts, measure grouping signs will be
-created.  Such signs ease reading rhythmically complex modern music.
-In the example, the 9/8 measure is grouped in two different
-patterns using the two different methods, while the 5/8 measure
-is grouped according to the default setting in
-@file{scm/time-signature-settings.scm}:
+If the @code{Measure_grouping_engraver} is included in one of the
+display contexts, measure grouping signs will be created.  Such signs
+ease reading rhythmically complex modern music. In the example, the 9/8
+measure is grouped in two different patterns using the two different
+methods, while the 5/8 measure is grouped according to the default
+setting in @@file@{scm/time-signature-settings.scm@}:
+
 "
   doctitle = "Conducting signs measure grouping signs"
 } % begin verbatim
 
-
-
 \score {
   \new Voice \relative c'' {
     \time 9/8