diff options
author | Simon Albrecht <simon.albrecht@mail.de> | 2016-01-11 17:40:42 +0000 |
---|---|---|
committer | James Lowe <pkx166h@gmail.com> | 2016-01-11 17:41:18 +0000 |
commit | 42cd2e57e37cbbf1fc5ccbe2bc83048761690f60 (patch) | |
tree | cb0790a5f0c34a4b7863a8a30e1d0c572944b34c | |
parent | 38bf956cd15ed3aa1cd296705f95bdbe56345e72 (diff) |
Doc: LM 2.4.1 and NR 3.3.2 additions and corrections
Issue 4721
NR 3.3.2: nitpicks in lily
example; add a missing space;
better code formatting with
\partcombine remove
printPartCombineTexts setting.
Issue 4717
LM 2.4.1: Replace incorrect
naming rule in LM. This
replaces the incorrect rule
about naming variables with a
simple reference to the
'alphabetic-only' _convention_.
A thorough explanation in the
NR remains to be done.
-rw-r--r-- | Documentation/learning/common-notation.itely | 3 | ||||
-rw-r--r-- | Documentation/notation/input.itely | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely index 9ce651fc02..1f68b2b5c7 100644 --- a/Documentation/learning/common-notation.itely +++ b/Documentation/learning/common-notation.itely @@ -1340,8 +1340,7 @@ cello = \new Staff { @end lilypond @noindent -The name of a variable must have alphabetic characters only, no -numbers, underscores, or dashes. +By convention, variable names consist of alphabetic characters only. Variables must be defined @emph{before} the main music expression, but may be used as many times as required anywhere after diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely index 768fab6841..ccfad7c9a7 100644 --- a/Documentation/notation/input.itely +++ b/Documentation/notation/input.itely @@ -2126,7 +2126,7 @@ sopranoMusic = \relative { a'4 b c b8( a) } altoMusic = \relative { e'4 e e f } tenorMusic = \relative { c'4 b e d8( c) } bassMusic = \relative { a4 gis a d, } -allLyrics = \lyricmode {King of glo -- ry } +allLyrics = \lyricmode { King of glo -- ry } << \new Staff = "Soprano" \sopranoMusic \new Lyrics \allLyrics @@ -2144,17 +2144,11 @@ allLyrics = \lyricmode {King of glo -- ry } \new Lyrics \allLyrics \new PianoStaff << \new Staff = "RH" { - \set Staff.printPartCombineTexts = ##f - \partcombine - \sopranoMusic - \altoMusic + \partcombine \sopranoMusic \altoMusic } \new Staff = "LH" { - \set Staff.printPartCombineTexts = ##f \clef "bass" - \partcombine - \tenorMusic - \bassMusic + \partcombine \tenorMusic \bassMusic } >> >> |