From 96542edfa8dd5d5e9ccaac765677e747ce3c51e3 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 24 Jan 2010 14:32:52 +0000 Subject: [PATCH] Build: move headwords into LSR staging area. --- .../new}/ancient-headword.ly | 9 ++- .../new}/chords-headword.ly | 49 +++++++------ .../new}/editorial-headword.ly | 11 ++- .../new}/expressive-headword.ly | 15 ++-- .../new}/figured-bass-headword.ly | 49 +++++++------ .../new}/fretted-headword.ly | 71 ++++++++++--------- .../new}/keyboard-headword.ly | 7 ++ .../new}/pitches-headword.ly | 15 ++-- .../new}/repeats-headword.ly | 11 ++- .../new}/rhythms-headword.ly | 15 ++-- .../new}/simultaneous-headword.ly | 13 +++- .../new}/staff-headword.ly | 7 ++ .../new}/text-headword.ly | 19 +++-- .../new}/unfretted-headword.ly | 7 ++ .../new}/wind-headword.ly | 8 ++- 15 files changed, 205 insertions(+), 101 deletions(-) rename Documentation/{included => snippets/new}/ancient-headword.ly (97%) rename Documentation/{included => snippets/new}/chords-headword.ly (73%) rename Documentation/{included => snippets/new}/editorial-headword.ly (95%) rename Documentation/{included => snippets/new}/expressive-headword.ly (94%) rename Documentation/{included => snippets/new}/figured-bass-headword.ly (83%) rename Documentation/{included => snippets/new}/fretted-headword.ly (92%) rename Documentation/{included => snippets/new}/keyboard-headword.ly (98%) rename Documentation/{included => snippets/new}/pitches-headword.ly (95%) rename Documentation/{included => snippets/new}/repeats-headword.ly (95%) rename Documentation/{included => snippets/new}/rhythms-headword.ly (97%) rename Documentation/{included => snippets/new}/simultaneous-headword.ly (98%) rename Documentation/{included => snippets/new}/staff-headword.ly (97%) rename Documentation/{included => snippets/new}/text-headword.ly (94%) rename Documentation/{included => snippets/new}/unfretted-headword.ly (98%) rename Documentation/{included => snippets/new}/wind-headword.ly (93%) diff --git a/Documentation/included/ancient-headword.ly b/Documentation/snippets/new/ancient-headword.ly similarity index 97% rename from Documentation/included/ancient-headword.ly rename to Documentation/snippets/new/ancient-headword.ly index 3b1136e989..6fb70574b4 100644 --- a/Documentation/included/ancient-headword.ly +++ b/Documentation/snippets/new/ancient-headword.ly @@ -7,6 +7,13 @@ indent=0\cm } + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + \layout { \context { \Score \override PaperColumn #'keep-inside-line = ##t @@ -14,7 +21,7 @@ } } -\include "gregorian.ly" +\include "gregorian.ly" \score { << diff --git a/Documentation/included/chords-headword.ly b/Documentation/snippets/new/chords-headword.ly similarity index 73% rename from Documentation/included/chords-headword.ly rename to Documentation/snippets/new/chords-headword.ly index f8a661fd71..9fcc5ce5b6 100644 --- a/Documentation/included/chords-headword.ly +++ b/Documentation/snippets/new/chords-headword.ly @@ -6,6 +6,13 @@ indent=0\cm } +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + + \layout { \context { \Score \override PaperColumn #'keep-inside-line = ##t @@ -15,8 +22,8 @@ theChords = \chordmode { \time 2/2 - f1 | c2 f2 | f1 | c2 f2| %\break - f2 bes2 | f1 | c2:7 f | c1 | \break + f1 | c2 f2 | f1 | c2 f2| %\break + f2 bes2 | f1 | c2:7 f | c1 | \break } verseOne = \lyricmode{ @@ -29,47 +36,47 @@ verseOne = \lyricmode{ verseTwo = \lyricmode{ \set stanza = "2. " Fair are the mead - ows, - Fair - er the wood - land, + Fair - er the wood - land, Robed in the flow -- ers of bloom -- ing spring; } -Soprano = { - \time 2/2 +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 +Alto = { + \key f \major c'2 c'4 c' | d'4 c' c'2 | f'4. f'8 f'4 fis' | g'4 e' f'2 | - f'2 f'4 f' | f'2 g'4 f' | e'2 f' | e'1 | + 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 | +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 + \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 - >> + \Soprano + \Alto + >> } } \context Lyrics="LyrOne" \lyricsto "sop" {\verseOne} @@ -77,10 +84,10 @@ Bass = { \context Staff = lower { \new Voice { \clef bass - #(set-accidental-style 'modern-cautionary) + #(set-accidental-style 'modern-cautionary) << - \Tenor - \Bass + \Tenor + \Bass >> } } @@ -93,7 +100,7 @@ Bass = { \Score \remove "Bar_number_engraver" } - \context { \Staff + \context { \Staff \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) } } diff --git a/Documentation/included/editorial-headword.ly b/Documentation/snippets/new/editorial-headword.ly similarity index 95% rename from Documentation/included/editorial-headword.ly rename to Documentation/snippets/new/editorial-headword.ly index b834181f48..e884268ef7 100644 --- a/Documentation/included/editorial-headword.ly +++ b/Documentation/snippets/new/editorial-headword.ly @@ -6,7 +6,14 @@ line-width=17\cm indent=0\cm } - + + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + \layout { \context { \Score \override PaperColumn #'keep-inside-line = ##t @@ -61,7 +68,7 @@ c'4 r4 } - + % LH Staff \new Staff { \key af \major diff --git a/Documentation/included/expressive-headword.ly b/Documentation/snippets/new/expressive-headword.ly similarity index 94% rename from Documentation/included/expressive-headword.ly rename to Documentation/snippets/new/expressive-headword.ly index ed62f91ee1..f186e93d0b 100644 --- a/Documentation/included/expressive-headword.ly +++ b/Documentation/snippets/new/expressive-headword.ly @@ -8,15 +8,22 @@ % NR 1.3 Expressive marks -% L. v. Beethoven, Op. 49 no. 1 + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + +% L. v. Beethoven, Op. 49 no. 1 % Piano sonata 19 - "Leichte Sonate" % measures 1 - 12 %\layout { % \context { % \Score -% \override SpacingSpanner #'base-shortest-duration = -% #(ly:make-moment 1 20) +% \override SpacingSpanner #'base-shortest-duration = +% #(ly:make-moment 1 20) % } %} @@ -210,7 +217,7 @@ r8 r8 8 \staccato - 8 \staccato + 8 \staccato | diff --git a/Documentation/included/figured-bass-headword.ly b/Documentation/snippets/new/figured-bass-headword.ly similarity index 83% rename from Documentation/included/figured-bass-headword.ly rename to Documentation/snippets/new/figured-bass-headword.ly index 8f666920c0..db86c2cac1 100644 --- a/Documentation/included/figured-bass-headword.ly +++ b/Documentation/snippets/new/figured-bass-headword.ly @@ -15,6 +15,13 @@ % NR 2.7.3 Figured bass + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + % Arcangelo Corelli, 12 Sonate da Camera, Op. 2 % Sonata II, Allemanda % measures 1 - 88 @@ -24,11 +31,11 @@ extendOn = \bassFigureExtendersOn extendOff = \bassFigureExtendersOff \score { - + \new StaffGroup << - + \new GrandStaff << - + \new Staff = "violinoI" { \set Staff.instrumentName = \markup { \hcenter-in #11 @@ -41,13 +48,13 @@ extendOff = \bassFigureExtendersOff 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 + 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 @@ -60,13 +67,13 @@ extendOff = \bassFigureExtendersOff 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 | + 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 { @@ -79,23 +86,23 @@ extendOff = \bassFigureExtendersOff \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 | + 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 | + 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 + \set figuredBassPlusDirection = #RIGHT \override VerticalAxisGroup #'minimum-Y-extent = #'() \override BassFigureAlignment #'stacking-dir = #DOWN s8 | - s4 <6>4 <_+>4 <6>4 | + 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 | @@ -103,9 +110,9 @@ extendOff = \bassFigureExtendersOff <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 diff --git a/Documentation/included/fretted-headword.ly b/Documentation/snippets/new/fretted-headword.ly similarity index 92% rename from Documentation/included/fretted-headword.ly rename to Documentation/snippets/new/fretted-headword.ly index f2d13ee0af..0bede7ca79 100644 --- a/Documentation/included/fretted-headword.ly +++ b/Documentation/snippets/new/fretted-headword.ly @@ -11,6 +11,13 @@ indent = 0\cm } +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + + \layout { \context { \Score @@ -54,39 +61,39 @@ melody = \relative c { \time 4/4 \voiceOne \sfol - e,32 a' c e - e, a c e - e,, a' c e - e, a c e + e,32 a' c e + e, a c e + e,, a' c e + e, a c e f4\rest 4-> | % m. 1 - - e,,,32 gis' b e - e, gis b e - e,, gis' b e - e, gis b e + + e,,,32 gis' b e + e, gis b e + e,, gis' b e + e, gis b e f4\rest \FO #'0.4 #'0.5 4 | % m. 2 - + d4\rest -> d4\rest^\rit 4-> | % m. 3 1 | % m. 4 - + \bar "||" \key a \minor R1 % m. 5 - - e'4^\benmarcato e8. d16-4 + + e'4^\benmarcato e8. d16-4 d4-4 \times 2/3 { \sfou \FO #'-0.3 #'0.6 4 b8 } | % end of m. 6 - - \FO #'-0.3 #'0.3 + + \FO #'-0.3 #'0.3 4 \times 2/3 { c4 b8 } a4 e'8. e16 | % m. 7 - - \FO #'-0.3 #'0.3 + + \FO #'-0.3 #'0.3 4 \times 2/3 { \sfol \FO #'0.3 #'0.0 4 e8 } e4 % beg of m. 8 \times 2/3 { \sfou 4 c8 } | % end of m. 8 - + b4 \times 2/3 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 4 e | % end of m. 9 - + e4 e8. d16-4 d4 \times 2/3 { c4 b8 } | % m. 10 - + \times 2/3 { a4 a8 b4 c8 } % beg of m. 11 \sfou \FO #'-0.3 #'0.3 4^\< \times 2/3 { e4 8\! } | % end of m. 11 @@ -96,35 +103,35 @@ bass = \relative c { \key d \major \time 4/4 \voiceTwo - + e,8\fp[ e'] e,[ e'] e, \sfol c, | % m. 1 - + e,,8\fp[ e'] e,[ e'] e, \sfod \FO #'0.2 #'-0.2 % beg m. 2 \sfol \FO #'0.3 #'0.0 b | % end m. 2 - + e,,8 e' gis e e, e' gis_\dim e | % m. 3 - + e,1 | % m. 4 - + %% new section starts here in A minor - \overrideBeamSettings #'Score #'(4 . 4) #'end + \overrideBeamSettings #'Score #'(4 . 4) #'end #'((* . (1 1 1 1)) ((1 . 12) . (3 3 3 3))) \once \override TextScript #'staff-padding = #1.7 \times 2/3 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5 - + \times 2/3 { a,8\pdolce e' a c a e } % beg m. 6 \times 2/3 { e,8 \sfou c gis e } | % end m. 6 - + \times 2/3 { a,8 a c e, b' a, e' a c a e } | % m. 7 - + \times 2/3 { f,8 f' a \sfol \FO #'0.3 #'-0.5 a f fis, d' a' d a d, } | % m. 8 - + \times 2/3 { 8 d' g d' g, d % beg m. 9 \sfod \FO #'0.0 #'-2.0 \sfou b gis e } | % end m. 9 - + \times 2/3 { a,8 e' a c a e e, e' gis c gis e } | % m. 10 - + \times 2/3 { a,8 e' a b a e f, f' a d a f } | % m. 11 } diff --git a/Documentation/included/keyboard-headword.ly b/Documentation/snippets/new/keyboard-headword.ly similarity index 98% rename from Documentation/included/keyboard-headword.ly rename to Documentation/snippets/new/keyboard-headword.ly index 8793965d37..57d59a74c4 100644 --- a/Documentation/included/keyboard-headword.ly +++ b/Documentation/snippets/new/keyboard-headword.ly @@ -9,6 +9,13 @@ % NR 2.2 Keyboard instruments + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + % M. Ravel, Sonatine (1905) % First movement diff --git a/Documentation/included/pitches-headword.ly b/Documentation/snippets/new/pitches-headword.ly similarity index 95% rename from Documentation/included/pitches-headword.ly rename to Documentation/snippets/new/pitches-headword.ly index d69c44a97f..0af775ec6e 100644 --- a/Documentation/included/pitches-headword.ly +++ b/Documentation/snippets/new/pitches-headword.ly @@ -6,7 +6,7 @@ line-width=17\cm indent=0\cm } - + \layout { \context { \Score \override PaperColumn #'keep-inside-line = ##t @@ -16,7 +16,14 @@ % NR 1.1 Pitches -% L. v. Beethoven +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + + +% L. v. Beethoven % Piano sonata 21 - Dem Grafen von Waldstein Gewidmet % chorale at measures 34 - 40+ @@ -79,7 +86,7 @@ 4 | b'2. ( \sf \> - a'4 ) + a'4 ) \clef bass | \break s1 \p @@ -127,7 +134,7 @@ | %\break \clef bass - 2 ( + 2 ( 4 4 | diff --git a/Documentation/included/repeats-headword.ly b/Documentation/snippets/new/repeats-headword.ly similarity index 95% rename from Documentation/included/repeats-headword.ly rename to Documentation/snippets/new/repeats-headword.ly index faba778a12..75a99b825c 100644 --- a/Documentation/included/repeats-headword.ly +++ b/Documentation/snippets/new/repeats-headword.ly @@ -13,6 +13,13 @@ % Movt II, Andante con moto % Measures 9 - 16 +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + + \new PianoStaff << \new Staff = RH { @@ -112,7 +119,7 @@ gf,4 ( af,4 ~ ) | - af,16. [ ( + af,16. [ ( gf,32 f,16. ef,32 ] @@ -120,5 +127,5 @@ \oneVoice r8 } - + >> diff --git a/Documentation/included/rhythms-headword.ly b/Documentation/snippets/new/rhythms-headword.ly similarity index 97% rename from Documentation/included/rhythms-headword.ly rename to Documentation/snippets/new/rhythms-headword.ly index a48f05ca9e..9a80e6e687 100644 --- a/Documentation/included/rhythms-headword.ly +++ b/Documentation/snippets/new/rhythms-headword.ly @@ -8,6 +8,13 @@ % NR 1.2 Rhythms +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + + % Beethoven, Op. 81a % Piano sonata 26 - Das Lebewohl % Movt II - Abwesenheit @@ -64,7 +71,7 @@ 32 ) | - + \once \override DynamicLineSpanner #'padding = #2 b''32 ( \p \> c'''32 @@ -92,7 +99,7 @@ c'''128 f'''64 f''64 ) ] - + | \afterGrace @@ -140,7 +147,7 @@ c'32 | - + 32 c'32 32 @@ -184,7 +191,7 @@ c'32 | - + 32 c'32 32 diff --git a/Documentation/included/simultaneous-headword.ly b/Documentation/snippets/new/simultaneous-headword.ly similarity index 98% rename from Documentation/included/simultaneous-headword.ly rename to Documentation/snippets/new/simultaneous-headword.ly index a6b5ff8e47..71574f738f 100644 --- a/Documentation/included/simultaneous-headword.ly +++ b/Documentation/snippets/new/simultaneous-headword.ly @@ -14,6 +14,13 @@ } } + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + % NR 1.5 Simultaneous notes % L. v. Beethoven, Op. 111 @@ -206,7 +213,7 @@ trillflat = \clef bass \key c \major \time 9/16 - + r8. r8. 8 [ ( @@ -307,7 +314,7 @@ trillflat = r8. r8. r8. - + } - + >> diff --git a/Documentation/included/staff-headword.ly b/Documentation/snippets/new/staff-headword.ly similarity index 97% rename from Documentation/included/staff-headword.ly rename to Documentation/snippets/new/staff-headword.ly index f7fa2e4145..7eb5514bcc 100644 --- a/Documentation/included/staff-headword.ly +++ b/Documentation/snippets/new/staff-headword.ly @@ -7,6 +7,13 @@ indent=0\cm } + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + \header { mutopiatitle = "Napolitan Dance (Swan Lake)" mutopiacomposer = "TchaikovskyPI" diff --git a/Documentation/included/text-headword.ly b/Documentation/snippets/new/text-headword.ly similarity index 94% rename from Documentation/included/text-headword.ly rename to Documentation/snippets/new/text-headword.ly index 40af604f84..8a0237f0fd 100644 --- a/Documentation/included/text-headword.ly +++ b/Documentation/snippets/new/text-headword.ly @@ -5,7 +5,14 @@ line-width = 16\cm indent = 0\cm } - + + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + \layout { \context { \Score \override PaperColumn #'keep-inside-line = ##t @@ -22,8 +29,8 @@ \layout { \context { \Score - \override SpacingSpanner #'base-shortest-duration = - #(ly:make-moment 1 20) + \override SpacingSpanner #'base-shortest-duration = + #(ly:make-moment 1 20) %\override NonMusicalPaperColumn #'line-break-system-details = %#'((alignment-offsets . (0 -12))) } @@ -88,9 +95,9 @@ \oneVoice \once \override TextScript #'staff-padding = #4 - df''32 + df''32 _ \markup { \italic dolce } - c''32 + c''32 df''32 ef''32 \acciaccatura { df''[ ef'' ] } @@ -124,7 +131,7 @@ } % LH - \new Staff { + \new Staff { \clef bass \key af \major \time 3/4 diff --git a/Documentation/included/unfretted-headword.ly b/Documentation/snippets/new/unfretted-headword.ly similarity index 98% rename from Documentation/included/unfretted-headword.ly rename to Documentation/snippets/new/unfretted-headword.ly index e859e1357b..a01259b23d 100644 --- a/Documentation/included/unfretted-headword.ly +++ b/Documentation/snippets/new/unfretted-headword.ly @@ -21,6 +21,13 @@ %% Statement Date: Octber the 9th, 2008 +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} + + \version "2.12.0" #(set-global-staff-size 15) diff --git a/Documentation/included/wind-headword.ly b/Documentation/snippets/new/wind-headword.ly similarity index 93% rename from Documentation/included/wind-headword.ly rename to Documentation/snippets/new/wind-headword.ly index 6d8fa0a27b..d40a9febe3 100644 --- a/Documentation/included/wind-headword.ly +++ b/Documentation/snippets/new/wind-headword.ly @@ -5,7 +5,13 @@ indent = 0\cm } -% NR 2.whatever Wind +% NR 2.whatever Wind + +\header { + lsrtags = "headwords" + texidoc = "" + doctitle = "headword" +} % Tchaikovsky % Nutcracker Suite, VII Dance of the Merlitons -- 2.39.5