X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linus-and-lucy.ly;h=d53bd967c580c8057389756eb020470ea4b28ff5;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=970094eaff50d95f9c476a3ab9e2df2093f023c1;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/linus-and-lucy.ly b/linus-and-lucy.ly
index 970094e..d53bd96 100644
--- a/linus-and-lucy.ly
+++ b/linus-and-lucy.ly
@@ -1,8 +1,8 @@
-\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 = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,15 +12,11 @@ staffSize = #18
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Linus and Lucy" }
 	subtitle = \markup { \override #'(font-family . sans) \fontsize #1.3 "Main Theme" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Vince Guaraldi" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. S. Hammons" }
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
-% Let's try a chord dictionary
-%	subtitle = \markup { \center-column { "F#m" \fret-diagram-terse #"x;x;4;2;2;2;" } "       " \center-column { "F#m/F" \fret-diagram-terse #"x;x;3;2;2;2;" } "       " \center-column { "F#m/E" \fret-diagram-terse #"x;x;2;2;2;2;" }  "       " \center-column { "F#m/Eb" \fret-diagram-terse #"x;x;1;2;2;2;" }  "       " \center-column { "Em7" \fret-diagram-terse #"o;2;2;o;3;o;" }  "       " \center-column { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" }  }
 }
 
 % Useful tweak abbreviations (hn = harmony note)
@@ -38,7 +34,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key af \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -61,11 +57,8 @@ Global =
 %
 LeftHand = \relative c,
 {
-%	\set Staff.instrument = #"Lead vox"
 	\clef F
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
+	\numericTimeSignature
 
 	\ottava #-1
 	af8 ef' af af, ef' af4 af,8 ~ |
@@ -113,11 +106,8 @@ LeftHand = \relative c,
 %
 RightHand = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
+	\numericTimeSignature
 
 	r1 |
 	r1 |
@@ -165,11 +155,8 @@ RightHand = \relative c'
 Riffs = \relative c''
 {
 	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
-
 %{
 	\tiny
 	\normalsize
@@ -182,9 +169,6 @@ Riffs = \relative c''
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally? YES!!!
-%	\popChords
-
 	s4. d8 g4/a |   % 0
 	d2 g4 |   % 1
 	a4:sus4 a b:m |   % 2
@@ -211,15 +195,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
+	\teeny
 
 	r4 r8 c c4 |   % 0
 	c4 c c |   % 1
@@ -290,11 +270,11 @@ Dynamics =
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "JazzText"
-    "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
@@ -305,6 +285,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)
 }
+