X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=one-small-child.ly;h=0c1cf14b4437a0fedd7ccadaa0201338b40ab2b4;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=6e8715f3259591544d850f9df4dca5502b02811d;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/one-small-child.ly b/one-small-child.ly
index 6e8715f..0c1cf14 100644
--- a/one-small-child.ly
+++ b/one-small-child.ly
@@ -1,35 +1,21 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
 staffSize = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
 
-%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %}
-
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "One Small Child" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "D. Meece" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
-% Let's try a chord dictionary
-%	subtitle =  \markup { \center-align { "F#m" \fret-diagram-terse #"x;x;4;2;2;2;" } "       " \center-align { "F#m/F" \fret-diagram-terse #"x;x;3;2;2;2;" } "       " \center-align { "F#m/E" \fret-diagram-terse #"x;x;2;2;2;2;" }  "       " \center-align { "F#m/Eb" \fret-diagram-terse #"x;x;1;2;2;2;" }  "       " \center-align { "Em7" \fret-diagram-terse #"o;2;2;o;3;o;" }  "       " \center-align { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" }  }
 }
 
-% Useful tweak abbreviations (hn = harmony note)
-
-hn = #(define-music-function (parser location arg) (ly:music?)
-;; Harmony Note: Set the tweaks property of the passed in note to use a smaller font
-
-  (set! (ly:music-property arg 'tweaks)
-    (acons 'font-size -3.0 (ly:music-property arg 'tweaks))) arg)
-
 
 %
 % Song's structure
@@ -37,14 +23,9 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key d \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
-%	\once \override TextScript #'padding = #2.0
-%	s1*0^\markup { \large \bold { Samba } }
-% Capo 4 version
-%	s1*0^\markup { \hspace #0.0 \raise #2.0 \bigger \bold { "Moderate pop (*** CAPO 4 ***)" } }
-
 	% Intro
 
 	s1*4 \bar "||"   % 1-4
@@ -58,7 +39,7 @@ Global =
 	\once \override Score.RehearsalMark #'self-alignment-X = #right
 	\mark \markup { { To Coda } \hspace #0.5 \musicglyph #"scripts.coda" }
 
-	s1 \bar "||:"   % 14
+	s1 \bar ".|:-||"   % 14
 
 	\repeat volta 2
 	{
@@ -80,10 +61,11 @@ Global =
 			\time 6/4 s1. |   % 32
 		}
 		{
-			s1. \bar "||"   % 33
+			\time 6/4 s1. \bar "||"   % 33
 		}
 	}
 
+	\time 4/4
 	\once \override Score.RehearsalMark #'self-alignment-X = #right
 	\mark \markup { \hspace #0.0 \raise #1.0 \italic { D.C. al Coda } }
 
@@ -91,14 +73,14 @@ Global =
 
 	% blank measure between last measure and coda
 %	\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
-	\stopStaff s1 \startStaff   % That removed the spurious floating bar line from line break
+	\stopStaff s1 \startStaff
 %	\break % Meh
 	\set Score.currentBarNumber = #34
 
 	\once \override Score.RehearsalMark #'self-alignment-X = #left
 	\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
 
-	\time 4/4 s1*5 \bar "|."   % 34-38
+	s1*5 \bar "|."   % 34-38
 }
 
 
@@ -107,12 +89,6 @@ Global =
 %
 LeadVox = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
-	\clef G
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	s1*4 |    % 1-4
@@ -215,10 +191,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c'''
 {
-%	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
@@ -305,19 +277,11 @@ Chords = \chordmode
 %
 % Chord rhythms
 %
-% Use a RhythmicStaff on the chords instead of this?
-% It almost works, but not quite. Doesn't collapse chords above to single notes...
-%
 Rhythm = \relative c
 {
-%%	\set Voice.autoBeaming = ##f
-%%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
-
-%Not small enough...
 	\teeny
-%	\magnify #0.3
 
 	% Intro
 
@@ -368,7 +332,7 @@ Rhythm = \relative c
 
 	% Coda
 
-	s1   % For blank measure
+\stopStaff s1 \startStaff   % For blank measure
 
 	c4 c c c |    % 34
 	c4 c c2-\fermata |    % 35
@@ -392,36 +356,36 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new Staff
+		\context Staff
 		<<
-			\new ChordNames \Chords
-%Capo 4 edition
-%			\new ChordNames \transpose b g \Chords
-			\new RhythmicStaff << \Rhythm \Dynamics >>
-		>>
-
-		\new Staff
-		<<
-			\Global						% The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
 			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
+
+		\new ChoirStaff
+		<<
+			\new ChordNames \Chords
+%Capo 4 edition
+%			\new ChordNames \transpose b g \Chords
+			\new RhythmicStaff << \Rhythm \Dynamics >>
+		>>
 	>>
 }
 
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
+	#(define fonts (make-pango-font-tree
+		"Times New Roman"
+		"LilyJAZZText"
+		"Luxi Mono"
+		(/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
 	ragged-last-bottom = ##f
@@ -432,6 +396,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
+