From: James Lowe Date: Sun, 21 Mar 2010 21:48:46 +0000 (+0000) Subject: Doc: Tweaks.itely - tidy up more lilypond examples X-Git-Tag: release/2.13.17-1~28 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9a58ea05b087378acc81144b100276c09edb5b84;p=lilypond.git Doc: Tweaks.itely - tidy up more lilypond examples Removed unnecessary bar checks and spaces withink Braces and brackets broke some lines to add clarity --- diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely index e2ea8c1671..448892b696 100644 --- a/Documentation/learning/tweaks.itely +++ b/Documentation/learning/tweaks.itely @@ -2846,13 +2846,13 @@ was left looking like this: \key aes \major << { c2 aes4. bes8 } \\ - { aes2 f4 fes } \\ + { aes2 f4 fes } \\ { \voiceFour 2 des2 } - >> | - 1 | + >> + 1 } @end lilypond @@ -2876,13 +2876,15 @@ Here's the final result: \key aes \major << { c2 aes4. bes8 } \\ - { aes2 f4 fes } \\ + { aes2 f4 fes } \\ { \voiceFour - \once \override NoteColumn #'force-hshift = #0 2 - \once \override NoteColumn #'force-hshift = #0.5 des2 + \once \override NoteColumn #'force-hshift = #0 + 2 + \once \override NoteColumn #'force-hshift = #0.5 + des2 } - >> | - 1 | + >> + 1 } @end lilypond @@ -2910,26 +2912,29 @@ dynamics, fingering and pedalling. @lilypond[quote,ragged-right,line-width=5.5\in] rhMusic = \relative c'' { r2 - c4.\( g8 | + c4.\( g8 \once \override Tie #'staff-position = #3.5 - bes1~ | + bes1~ \bar "||" \time 6/4 \mergeDifferentlyHeadedOn \mergeDifferentlyDottedOn - bes2.^\markup {\bold "Moderato"} r8 + bes2.^\markup { \bold "Moderato" } r8 << - {c,8 d fis bes a | } + { c,8 d fis bes a } \\ % Reposition the c2 to the right of the merged note - {c,8~ \once \override NoteColumn #'force-hshift = #1.0 + { c,8~ \once \override NoteColumn #'force-hshift = #1.0 % Move the c2 out of the main note column so the merge will work - \shiftOnn c2} + \shiftOnn c2 } \\ % Stem on the d2 must be down to permit merging - {s8 \stemDown \once \override Stem #'transparent = ##t d2} + { s8 \stemDown + \once \override Stem #'transparent = ##t + d2 + } \\ - {s4 fis4.} + { s4 fis4. } >> \mergeDifferentlyHeadedOff \mergeDifferentlyDottedOff @@ -2937,9 +2942,9 @@ rhMusic = \relative c'' { } lhMusic = \relative c' { - r2 2( | - 1)\arpeggio | - r2. d,,4 r4 r | + r2 2( + 1)\arpeggio + r2. d,,4 r4 r r4 } @@ -2973,27 +2978,27 @@ default: @c line-width ensures no break @lilypond[quote,verbatim,ragged-right,line-width=5.5\in] rhMusic = \relative c'' { - r2 c4. g8 | - bes1~ | + r2 c4. g8 + bes1~ \time 6/4 bes2. r8 % Start polyphonic section of four voices << - {c,8 d fis bes a | } + { c,8 d fis bes a } \\ - {c,8~ c2 | } + { c,8~ c2 } \\ - {s8 d2 | } + { s8 d2 } \\ - {s4 fis4. | } + { s4 fis4. } >> g2. } lhMusic = \relative c' { - r2 2 | - 1 | - r2. d,,4 r4 r | + r2 2 + 1 + r2. d,,4 r4 r r4 } @@ -3022,27 +3027,27 @@ since these were all covered in the Tutorial. Doing this gives: @c line-width ensures no break @lilypond[quote,verbatim,ragged-right,line-width=5.5\in] rhMusic = \relative c'' { - r2 c4.\( g8 | - bes1~ | + r2 c4.\( g8 + bes1~ \time 6/4 bes2. r8 % Start polyphonic section of four voices << - {c,8 d fis bes a | } + { c,8 d fis bes a } \\ - {c,8~ c2 | } + { c,8~ c2 } \\ - {s8 d2 | } + { s8 d2 } \\ - {s4 fis4. | } + { s4 fis4. } >> g2.\) } lhMusic = \relative c' { - r2 2( | - 1) | - r2. d,,4 r4 r | + r2 2( + 1) + r2. d,,4 r4 r r4 } @@ -3084,29 +3089,29 @@ This completes bar two, giving: @c line-width ensures no break @lilypond[quote,verbatim,ragged-right,line-width=5.5\in] rhMusic = \relative c'' { - r2 c4.\( g8 | + r2 c4.\( g8 \once \override Tie #'staff-position = #3.5 - bes1~ | + bes1~ \bar "||" \time 6/4 bes2. r8 % Start polyphonic section of four voices << - {c,8 d fis bes a | } + { c,8 d fis bes a } \\ - {c,8~ c2 | } + { c,8~ c2 } \\ - {s8 d2 | } + { s8 d2 } \\ - {s4 fis4. | } + { s4 fis4. } >> g2.\) } lhMusic = \relative c' { - r2 2( | - 1)\arpeggio | - r2. d,,4 r4 r | + r2 2( + 1)\arpeggio + r2. d,,4 r4 r r4 } @@ -3155,23 +3160,23 @@ to the end, giving: @c line-width ensures no break @lilypond[quote,ragged-right,line-width=5.5\in] rhMusic = \relative c'' { - r2 c4.\( g8 | + r2 c4.\( g8 \once \override Tie #'staff-position = #3.5 - bes1~ | + bes1~ \bar "||" \time 6/4 - bes2.^\markup {\bold "Moderato"} r8 + bes2.^\markup { \bold "Moderato" } r8 \mergeDifferentlyHeadedOn \mergeDifferentlyDottedOn % Start polyphonic section of four voices << - {c,8 d fis bes a | } + { c,8 d fis bes a } \\ - {c,8~ c2 | } + { c,8~ c2 } \\ - {s8 d2 | } + { s8 d2 } \\ - {s4 fis4. | } + { s4 fis4. } >> \mergeDifferentlyHeadedOff \mergeDifferentlyDottedOff @@ -3179,9 +3184,9 @@ rhMusic = \relative c'' { } lhMusic = \relative c' { - r2 2( | - 1)\arpeggio | - r2. d,,4 r4 r | + r2 2( + 1)\arpeggio + r2. d,,4 r4 r r4 } @@ -3221,25 +3226,25 @@ Applying these changes gives: @c line-width ensures no break @lilypond[quote,verbatim,ragged-right,line-width=5.5\in] rhMusic = \relative c'' { - r2 c4.\( g8 | + r2 c4.\( g8 \once \override Tie #'staff-position = #3.5 - bes1~ | + bes1~ \bar "||" \time 6/4 - bes2.^\markup {\bold "Moderato"} r8 + bes2.^\markup { \bold "Moderato" } r8 \mergeDifferentlyHeadedOn \mergeDifferentlyDottedOn % Start polyphonic section of four voices << - {c,8 d fis bes a | } + { c,8 d fis bes a } \\ % Move the c2 out of the main note column so the merge will work - {c,8~ \shiftOnn c2 | } + { c,8~ \shiftOnn c2 } \\ % Stem on the d2 must be down to permit merging - {s8 \stemDown d2 | } + { s8 \stemDown d2 } \\ - {s4 fis4. | } + { s4 fis4. } >> \mergeDifferentlyHeadedOff \mergeDifferentlyDottedOff @@ -3247,9 +3252,9 @@ rhMusic = \relative c'' { } lhMusic = \relative c' { - r2 2( | - 1)\arpeggio | - r2. d,,4 r4 r | + r2 2( + 1)\arpeggio + r2. d,,4 r4 r r4 } @@ -3283,26 +3288,29 @@ the @code{force-hshift} property. Here's the final result: @lilypond[quote,verbatim,ragged-right,line-width=5.5\in] rhMusic = \relative c'' { r2 - c4.\( g8 | + c4.\( g8 \once \override Tie #'staff-position = #3.5 - bes1~ | + bes1~ \bar "||" \time 6/4 - bes2.^\markup {\bold "Moderato"} r8 + bes2.^\markup { \bold "Moderato" } r8 \mergeDifferentlyHeadedOn \mergeDifferentlyDottedOn << - {c,8 d fis bes a | } + { c,8 d fis bes a } \\ % Reposition the c2 to the right of the merged note - {c,8~ \once \override NoteColumn #'force-hshift = #1.0 + { c,8~ \once \override NoteColumn #'force-hshift = #1.0 % Move the c2 out of the main note column so the merge will work - \shiftOnn c2} + \shiftOnn c2 } \\ % Stem on the d2 must be down to permit merging - {s8 \stemDown \once \override Stem #'transparent = ##t d2} + { s8 \stemDown + \once \override Stem #'transparent = ##t + d2 + } \\ - {s4 fis4.} + { s4 fis4. } >> \mergeDifferentlyHeadedOff \mergeDifferentlyDottedOff @@ -3310,9 +3318,9 @@ rhMusic = \relative c'' { } lhMusic = \relative c' { - r2 2( | - 1)\arpeggio | - r2. d,,4 r4 r | + r2 2( + 1)\arpeggio + r2. d,,4 r4 r r4 }