diff options
author | Werner Lemberg <wl@gnu.org> | 2016-07-23 13:13:23 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2016-07-23 13:13:23 +0200 |
commit | b680788cd1c671d52819d69e9e130ff45361a590 (patch) | |
tree | 2ff4a79903f9b85056b1c4efc7c24548e8beae90 | |
parent | 445bf3bb2fbd1f259fe43ade204fb34d68bdd581 (diff) |
Doc: In NR, use comma before and after `etc.' where appropriate.
-rw-r--r-- | Documentation/notation/ancient.itely | 2 | ||||
-rw-r--r-- | Documentation/notation/changing-defaults.itely | 6 | ||||
-rw-r--r-- | Documentation/notation/fretted-strings.itely | 2 | ||||
-rw-r--r-- | Documentation/notation/input.itely | 4 | ||||
-rw-r--r-- | Documentation/notation/simultaneous.itely | 6 | ||||
-rw-r--r-- | Documentation/notation/staff.itely | 2 | ||||
-rw-r--r-- | Documentation/notation/vocal.itely | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely index 1fda153665..7e44224426 100644 --- a/Documentation/notation/ancient.itely +++ b/Documentation/notation/ancient.itely @@ -1554,7 +1554,7 @@ with the corresponding modifier, @code{\quilisma}, Virtually, within the ligature delimiters @code{\[} and @code{\]}, any number of heads may be accumulated to form a single ligature, and head prefixes like @code{\pes}, @code{\flexa}, @code{\virga}, -@code{\inclinatum}, etc. may be mixed in as desired. The use of +@code{\inclinatum}, etc., may be mixed in as desired. The use of the set of rules that underlies the construction of the ligatures in the above table is accordingly extrapolated. This way, infinitely many different ligatures can be created. diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index 60702dc4f7..d213342754 100644 --- a/Documentation/notation/changing-defaults.itely +++ b/Documentation/notation/changing-defaults.itely @@ -522,8 +522,8 @@ Notation Reference: Contexts are usually terminated at the first musical moment in which they have nothing to do. So @code{Voice} contexts die as -soon as they contain no events; @code{Staff} contexts die as soon -as all the @code{Voice} contexts within them contain no events; etc. +soon as they contain no events, @code{Staff} contexts die as soon +as all the @code{Voice} contexts within them contain no events, etc. This can cause difficulties if earlier contexts which have died have to be referenced, for example, when changing staves with @code{\change} commands, associating lyrics with a voice with @@ -4146,7 +4146,7 @@ The VerticalAlignment and VerticalAxisGroup grobs work together. VerticalAxisGroup groups together different grobs like Staff, Lyrics, etc. VerticalAlignment then vertically aligns the different grobs grouped together by VerticalAxisGroup. There is usually only one -VerticalAlignment per score but every Staff, Lyrics, etc. has its own +VerticalAlignment per score but every Staff, Lyrics, etc., has its own VerticalAxisGroup. diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely index f9a587a930..bd0dfca32d 100644 --- a/Documentation/notation/fretted-strings.itely +++ b/Documentation/notation/fretted-strings.itely @@ -2019,7 +2019,7 @@ LilyPond supports tablature for lute. To get additional bass strings use @code{additionalBassStrings}, where the pitches of those strings are set. They will be printed below lowest line as: -a, /a, //a, ///a, 4, 5 etc. +a, /a, //a, ///a, 4, 5, etc. @code{fret-letter-tablature-format} for @code{tablatureFormat} should be used, probably @code{fretLabels} for further customizing. diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely index 24ccf61d1b..33ae3079f0 100644 --- a/Documentation/notation/input.itely +++ b/Documentation/notation/input.itely @@ -367,7 +367,7 @@ A direct scheme expression, such as @item A @code{\header} block. This sets the global (i.e., the top of file) header block. This is the block containing the default -settings of titling fields like composer, title, etc. for all +settings of titling fields like composer, title, etc., for all books within the file (see @ref{Titles explained}). @item @@ -2257,7 +2257,7 @@ music = \relative { } @end lilypond -Tagged filtering can be applied to articulations, texts, etc. by +Tagged filtering can be applied to articulations, texts, etc., by prepending @example diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely index 337fef0953..fc31736c09 100644 --- a/Documentation/notation/simultaneous.itely +++ b/Documentation/notation/simultaneous.itely @@ -180,7 +180,7 @@ chord. The chord repetition symbol is @code{q}: @end lilypond As with regular chords, the chord repetition symbol can be used with -durations, articulations, markups, slurs, beams, etc. as only the +durations, articulations, markups, slurs, beams, etc., as only the pitches of the previous chord are duplicated. @lilypond[verbatim,quote] @@ -559,7 +559,7 @@ upstems, and the even-numbered voices are given downstems: >> @end lilypond -@warning{Lyrics, spanners (such as slurs, ties, hairpins etc.) cannot be +@warning{Lyrics, spanners (such as slurs, ties, hairpins, etc.) cannot be created @q{across} voices.} @subsubsubheading Identical rhythms @@ -1118,7 +1118,7 @@ started when combining notes that have just started in the other @code{Voice}. This can lead to a number of unexpected issues including @qq{Solo} or @qq{Unison} marks being printed incorrectly. -@code{\partcombine} keeps all spanners (slurs, ties, hairpins etc.) in +@code{\partcombine} keeps all spanners (slurs, ties, hairpins, etc.) in the same @code{Voice} so that if any such spanners start or end in a different @code{Voice}, they may not be printed properly or at all. diff --git a/Documentation/notation/staff.itely b/Documentation/notation/staff.itely index ce859e2bb5..a114434664 100644 --- a/Documentation/notation/staff.itely +++ b/Documentation/notation/staff.itely @@ -1326,7 +1326,7 @@ It is possible to adjust which aspects of the music are quoted with property. Its default value is @code{'(note-event rest-event tie-event beam-event tuplet-span-event)}, which means that only notes, rests, ties, beams and tuplets are quoted, but not -articulations, dynamic marks, markup etc. +articulations, dynamic marks, markup, etc. @warning{When a @code{Voice} starts with @code{\cueDuring}, as in the following example, the @code{Voice} context must be explicitly declared, diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely index ccd67dd53b..118a58e482 100644 --- a/Documentation/notation/vocal.itely +++ b/Documentation/notation/vocal.itely @@ -63,7 +63,7 @@ introduction to this notation is to be found in @item Vocal music is likely to require the use of @code{markup} mode, either for lyrics or for other text elements (characters' names, -etc.) This syntax is described in @ref{Text markup introduction}. +etc.). This syntax is described in @ref{Text markup introduction}. @item @notation{Ambitus} may be added at the beginning of vocal staves, |