From: Carl Sorensen Date: Thu, 10 Jul 2008 03:54:42 +0000 (-0600) Subject: Update chords.itely, including two headwords X-Git-Tag: release/2.11.52-1~7 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1c5016b096554dbc67ae52e9471f0b9d425a419a;p=lilypond.git Update chords.itely, including two headwords --- diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely index f8bf98c1a1..ae77b67df1 100644 --- a/Documentation/user/chords.itely +++ b/Documentation/user/chords.itely @@ -12,8 +12,9 @@ @node Chord notation @section Chord notation -Chords can be entered in chord mode, which recognizes some -traditional European chord naming conventions. Chord names can also +@lilypondfile[quote]{chords-headword.ly} + +Chords can be entered in chord mode, which recognizes some traditional European chord naming conventions. Chord names can also be displayed. In addition, figured bass notation can be displayed. @menu @@ -188,9 +189,10 @@ larger value is interpreted as 13. @lilypond[quote,ragged-right,fragment,verbatim,relative=1] \chordmode { - c:2 c:3 c:4 c:5 + c1:2 c:3 c:4 c:5 c:6 c:7 c:8 c:9 c:10 c:11 c:12 c:13 + c:14 } @end lilypond @@ -554,21 +556,8 @@ and @q{m}. The spacer is not used when the root is altered. @c @lilypondfile[verbatim,lilyquote,texidoc,doctitle] @c {volta-brackets-over-chord-names.ly} -@c TODO convert to snippet -@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle] -@c {changing-chord-separator.ly} - -The separator between different parts of a chord name -can be set to any markup. - -@lilypond[quote,ragged-right,fragment,verbatim] -\chords { - c:7sus4 - \set chordNameSeparator - = \markup { \typewriter "|" } - c:7sus4 -} -@end lilypond +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{changing-chord-separator.ly} @seealso @@ -610,6 +599,8 @@ myChords = \relative c' { @node Figured bass @subsection Figured bass +@lilypondfile[quote]{figured-bass-headword.ly} + Figured bass notation can be displayed. @menu @@ -629,6 +620,7 @@ Figured bass notation can be displayed. @c TODO: musicological blurb about FB + LilyPond has support for figured bass, also called thorough bass or basso continuo: @@ -705,9 +697,8 @@ sixth steps) can be created. @lilypond[verbatim,quote,ragged-right,fragment] \figures { -<6> -% FIXME: broken. - %<6\\> + <6> + <6\\> } @end lilypond @@ -972,14 +963,32 @@ the bass line. >> @end lilypond -@c I have no idea what this means -cds -@c A predefined command for changing this has been proposed -cds -@c TODO -- put stacking direction snippet here -cds -When using figured bass above the staff with extender lines and -@code{implicitBassFigures} the lines may become swapped around. -Maintaining order consistently will be impossible when multiple figures -have overlapping extender lines. To avoid this problem, please -use @code{stacking-dir} on @code{BassFigureAlignment}. +When using extender lines, adjacent figures with the same number in +a different figure location can cause the figure positions to invert. + +@lilypond[verbatim,ragged-right,fragment,quote,relative=1] +<< + { fis g g, e' } + \figures { + \bassFigureExtendersOn + <6 5> <5\! 4> < 5 _!> <6> + } +>> +@end lilypond + +To avoid this problem, simply turn on extenders after the figure that +begins the extender line and turn them off at teh end of the extender line. +@lilypond[verbatim,ragged-right,fragment,quote,relative=1] +<< + { fis g g, e' } + \figures { + <6 5> <5 4> + \bassFigureExtendersOn + < 5 _!> <6> + \bassFigureExtendersOff + } +>> +@end lilypond @seealso diff --git a/input/manual/chords-headword.ly b/input/manual/chords-headword.ly new file mode 100644 index 0000000000..3328d2077d --- /dev/null +++ b/input/manual/chords-headword.ly @@ -0,0 +1,94 @@ +\version "2.11.51" +#(set-global-staff-size 15) +\paper{ + ragged-right=##f + line-width=17\cm + indent=0\cm +} + +theChords = \chordmode { + \time 2/2 + f1 | c2 f2 | f1 | c2 f2| %\break + f2 bes2 | f1 | c2:7 f | c1 | \break +} + +verseOne = \lyricmode{ + \set stanza = "1. " + Fair is the sun - shine, + Fair - er the moon - light + And all the stars __ _ in heav'n a -- bove; +} + +verseTwo = \lyricmode{ + \set stanza = "2. " + Fair are the mead - ows, + Fair - er the wood - land, + Robed in the flow -- ers of bloom -- ing spring; +} + +Soprano = { + \time 2/2 + \key f \major + \stemUp + f'2 f'4 f' | g'4 e' f'2 | a'4. a'8 a'4 a' | bes'4 g' a'2 | +c''2 f''4 d'' | c''2 bes'4 a' | bes'2 a' | g'1 | +} + +Alto = { + \key f \major + c'2 c'4 c' | d'4 c' c'2 | f'4. f'8 f'4 ges' | g'4 e' f'2 | + f'2 f'4 f' | f'2 g'4 f' | e'2 f' | e'1 | +} + +Tenor = { + \key f \major + \stemDown + a2 a4 a | bes4 g a2 | c'4. c'8 d'4 d' | d'4 c' c'2 | + a2 d'4 bes | a2 c'4 c' | c'2 c' | c'1 | +} + +Bass = { + \key f \major + f2 f4 f | bes,4 c f2 | f4. e8 d4 c | bes,4 c f2 | + f2 bes,4 d | f2 e4 f | g2 f | c1 | +} + + +\score { + << + \new ChordNames { \theChords } + \context Staff = upper { + \context Voice = sop { + << + \Soprano + \Alto + >> + } + } + \context Lyrics="LyrOne" \lyricsto "sop" {\verseOne} + \context Lyrics="LyrTwo" \lyricsto "sop" {\verseTwo} + \context Staff = lower { + \new Voice { + \clef bass + #(set-accidental-style 'modern-cautionary) + << + \Tenor + \Bass + >> + } + } + >> + +\layout { + %between-system-space = 1\mm + indent = 0 + \context { + \Score + \remove "Bar_number_engraver" + } + \context { \Staff + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) + } + } +} +\paper { } diff --git a/input/manual/figured-bass-headword.ly b/input/manual/figured-bass-headword.ly new file mode 100644 index 0000000000..a8c03c4292 --- /dev/null +++ b/input/manual/figured-bass-headword.ly @@ -0,0 +1,110 @@ +\version "2.11.51" +#(set-global-staff-size 15) +\paper{ + ragged-right=##f + line-width=17\cm + indent=0\cm +} + +% NR 2.7.3 Figured bass + +% Arcangelo Corelli, 12 Sonate da Camera, Op. 2 +% Sonata II, Allemanda +% measures 1 - 88 +% Coded by Neil Puttock; modified by Carl Sorensen + +extendOn = \bassFigureExtendersOn +extendOff = \bassFigureExtendersOff + +\score { + + \new StaffGroup << + + \new GrandStaff << + + \new Staff = "violinoI" { + \set Staff.instrumentName = \markup { + \hcenter-in #11 + \line { Violino I. } + } + \time 4/4 + \mark \markup { \italic Adagio. } + \partial 8 + r16 a'16 | + a'8. [ d''16 d''8. e''16 ] cis''8 a'4 a''16 bes''16 | + cis''8 d''16 ( e'' ) e''8. d''16 d''4 r8 d''16 e''16 | + f''8 f''4 g''16 ( f''16 ) e''8 e''4 f''16 ( e''16 ) | + d''8. d''16 g''16 ( f''16 ) e''16 ( d''16 ) cis''8 + cis''4 cis''16 cis''16 | + d''8 d''8 c''8. c''16 c''8 ( b'4 ) b'16 b'16 | + c''8 c''8 bes'8. bes'16 bes'8 ( a'4 ) a''16 a''16 | + a''8 g''8 g''8. g''16 g''8 ( f''8 ) r8 f''8 | + } + + \new Staff = "violinoII" { + \set Staff.instrumentName = \markup { + \hcenter-in #11 + \line { Violino II. } + } + \time 4/4 + \partial 8 + r16 f'16 | + f'8. g'16 g'4 a'4 r8 d''16 d''16 | + e''8 a'8 cis''8. d''16 d''4 r8 f''16 g''16 | + a''8 a''8 d''8. d''16 g'8 g'8 c''8. c''16 | + f'8. f''16 bes''16 ( a''16 ) g''16 ( f''16 ) e''8 e''4 e''16 e''16 | + a'8 fis''8 g''8 a''8 d''8 d''4 d''16 d''16 | + g'8 e''8 f''8 g''8 c''8 c''4 cis''16 cis''16 | + d''8 d''8 e''8. e''16 e''8 a'8 r8 d''8 | + } + + >> + + \new Staff = "violone" { + \set Staff.instrumentName = \markup { + \hcenter-in #13 { + \center-align { + Violone, + \line { e Cembalo. } + } + } + } + \time 4/4 + \clef bass + \partial 8 + r16 d16 | + d4 bes,4 a,4 f4 | + g8 f16 g16 a8 a,8 d4 d'4 ~ | + d'8 c'8 b4 c'8 c'16 bes16 a4 | + bes8 bes16 a16 g4 a8 a,4 a16 g16 | + fis8 d8 e8 fis8 g8 g,4 g16 f16 | + e8 c8 d8 e8 f8 f,4 a,8 | + b,4 cis4 d4 r8 d'8 | + } + + \new FiguredBass \figuremode { + \set figuredBassAlterationDirection = #RIGHT + \set figuredBassPlusDirection = #RIGHT + \override VerticalAxisGroup #'minimum-Y-extent = #'() + \override BassFigureAlignment #'stacking-dir = #DOWN + s8 | + s4 <6>4 <_+>4 <6>4 | + <6 4\+ 2>8 <6>8 <_+> s8 s2 | + <5>8 <6 4>8 <6 5>4 s4 <5>8 <6>8 | + s4 <6 5 _-> <_+>2 | + <6>8 <_+>8 <6>8 <6 5>8 <5 4>8 \extendOn <5 _!>8 \extendOff s4 | + <6>4 <6->8 <6 5->8 <5 4->8 \extendOn <5 3>4 \extendOff <5 _+>8 | + <7>8 <6>8 <5>4 <9 4>8 <8 3>8 s4 | + } + + >> + + \layout { + \context { + \Score + \override RehearsalMark #'break-align-symbols = #'(time-signature) + \override RehearsalMark #'self-alignment-X = #LEFT + \override TimeSignature #'break-align-anchor-alignment = #LEFT + } + } +}