From 158bc27db6d0e35d7b199a5264528d5b98bd59e1 Mon Sep 17 00:00:00 2001 From: gpercival Date: Wed, 13 Oct 2004 04:06:28 +0000 Subject: [PATCH] Minor fixes from Pedro Kroger. --- ChangeLog | 8 ++++++++ Documentation/user/introduction.itely | 20 ++++++++++++-------- Documentation/user/notation.itely | 24 +++++++++++++----------- Documentation/user/tutorial.itely | 4 ++-- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba4c48edff..936473486d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-10-12 Pedro Kroger + + * Documentation/user/introduction.itely: Minor corrections. + + * Documentation/user/notation.itely: Minor corrections. + + * Documentation/user/tutorial.itely: Minor corrections. + 2004-10-11 Jan Nieuwenhuizen * scm/framework-ps.scm (page-header): Fix Layout renaming bug. diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 60c97d6096..904d233a13 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -477,14 +477,18 @@ polyphony? In polyphonic notation, many voices can share a staff. \new Staff << \topVoice \\ \botVoice >> @end lilypond -In this situation, the accidentals and staff are shared, but the -stems, slurs, beams, etc., are private to each voice. Hence, engravers -should be grouped. The engravers for note heads, stems, slurs, etc., go -into a group called `Voice context,' while the engravers for key, -accidental, bar, etc., go into a group called `Staff context.' In the -case of polyphony, a single Staff context contains more than one Voice -context. -Similarly, more Staff contexts can be put into a single Score context. +In this situation, the accidentals and staff are shared, but the stems, +slurs, beams, etc., are private to each voice. Hence, engravers should +be grouped. The engravers for note heads, stems, slurs, etc., go into a +group called `Voice context,' while the engravers for key, accidental, +bar, etc., go into a group called `Staff context.' In the case of +polyphony, a single Staff context contains more than one Voice context. +Similarly, more Staff contexts can be put into a single Score +context. The Score context is the top level notation context. + +@seealso + +Program reference: @internalsref{Contexts}. @lilypond[quote,raggedright] \include "engraver-example.lyinc" diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index fade972c13..df79b699f2 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -236,9 +236,10 @@ must be done with multi-measure rests. They are discussed in A rest's vertical position may be explicitly specified by entering a -note with the @code{\rest} keyword appended. This makes manual -formatting in polyphonic music easier. Automatic rest collision -formatting will leave these rests alone +note with the @code{\rest} keyword appended, the rest will be placed at +the note's place. This makes manual formatting in polyphonic music +easier. Automatic rest collision formatting will leave these rests +alone @lilypond[fragment,quote,raggedright,verbatim] a'4\rest d'4\rest @@ -305,11 +306,12 @@ Program reference: @internalsref{SkipEvent}, @internalsref{SkipMusic}. @cindex @code{\maxima} -In Note, Chord, and Lyrics mode, durations are designated by numbers -and dots: durations are entered as their reciprocal values. For example, -a quarter note is entered using a @code{4} (since it is a 1/4 note), while -a half note is entered using a @code{2} (since it is a 1/2 note). For notes -longer than a whole you must use variables +In Note, Chord, and Lyrics mode, durations are designated by numbers and +dots: durations are entered as their reciprocal values. For example, a +quarter note is entered using a @code{4} (since it is a 1/4 note), while +a half note is entered using a @code{2} (since it is a 1/2 note). For +notes longer than a whole you must use the variables @code{\longa} and +@code{\breve} @example c'\breve @@ -884,9 +886,9 @@ exactly on the bar line. @cindex @code{\key} -The key signature indicates the scale in which a piece is played. It -is denoted by a set of alterations (flats or sharps) at the start of -the staff. +The key signature indicates the tonality in which a piece is played. It +is denoted by a set of alterations (flats or sharps) at the start of the +staff. Setting or changing the key signature is done with the @code{\key} diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 3cb6f8e3d7..327769a551 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -420,7 +420,7 @@ Here are key signatures, accidentals and ties in action \relative c'' { \time 4/4 \key g \minor - \clef violin + \clef treble r4 r8 a8 gis4 b a8 d4.~ d e,8 fis4 fis8 fis8 eis4 a8 gis~ @@ -1131,7 +1131,7 @@ Again, these expressions can be nested arbitrarily \new Staff << \clef bass { 1 ~ 4 } \\ - { f4 d e2 ~ e4} + { e,4 d e2 ~ e4} >> >> @end lilypond -- 2.39.5