Fixes to charts to point to LilyJAZZ text font mostly, other changes.

diff --git a/.gitignore b/.gitignore
index 02268b2386dfa27bbc688706edf6f270877a8372..1f294a39cbc827d1e7b32c361c1a039f49ac8150 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 *.pdf
+*.ps
 covers/*.pdf
 covers/*.gif
+*.midi
+*.zip

diff --git a/away-in-a-manger.ly b/away-in-a-manger.ly
index f5ca9154a95946c6db83b8b95dc2bbd34032fa26..8c82cc639b34e35be0654f1c31d3eb5967fb0fb0 100644 (file)
--- a/away-in-a-manger.ly
+++ b/away-in-a-manger.ly
@@ -305,7 +305,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "JazzText"
+    "LilyJazz Text"
     "Luxi Mono"
     (/ staffSize 20)))
 

diff --git a/bless-the-lord-o-my-soul.ly b/bless-the-lord-o-my-soul.ly
index 6f7b6383c7dd5e4f0dab6133cd195b5bdf5382d3..c7093f7f79354b6366e8cad99819e646bcaf3d9a 100644 (file)
--- a/bless-the-lord-o-my-soul.ly
+++ b/bless-the-lord-o-my-soul.ly
@@ -607,7 +607,7 @@ Dynamics =
 {
        #(define fonts (make-pango-font-tree
                "Times New Roman"
-               "JazzText"
+               "LilyJazz Text"
                "Luxi Mono"
                (/ staffSize 20)))
 

diff --git a/blessed-quietness-satb.ly b/blessed-quietness-satb.ly
index 4731b7964b1033e73945ecbddac21cc42328ff59..966b7094a34f3a9d746215301e77d0b37c0409b4 100644 (file)
--- a/blessed-quietness-satb.ly
+++ b/blessed-quietness-satb.ly
@@ -253,7 +253,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
        "Times New Roman"
-       "JazzText"
+       "LilyJazz Text"
        "Luxi Mono"
        (/ staffSize 20)))
 

diff --git a/brethren-we-have-met-to-worship.ly b/brethren-we-have-met-to-worship.ly
index 3153a99cc5fc9051c9b92f722be09281ff248d6a..175f8533398a6086a212d6865e9633eb15ff9d5f 100644 (file)
--- a/brethren-we-have-met-to-worship.ly
+++ b/brethren-we-have-met-to-worship.ly
@@ -191,7 +191,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
        "Times New Roman"
-       "JazzText"
+       "LilyJazz Text"
        "Luxi Mono"
        (/ staffSize 20)))
 

diff --git a/christmas-time-is-here.ly b/christmas-time-is-here.ly
index 4bf0101b66d4d6327a504a79c737548d89cb6548..914b5690ae5de34f2741fbfa8a19851785fca8fe 100644 (file)
--- a/christmas-time-is-here.ly
+++ b/christmas-time-is-here.ly
@@ -244,7 +244,7 @@ scoreAll =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "JazzText"
+    "LilyJazz Text"
     "Luxi Mono"
     (/ staffSize 20)))
 

diff --git a/covers/don't-touch-me.ly b/covers/don't-touch-me.ly
index 23c601839603f744468bf5b5234355f0ee011efb..26a3487e486e0f66d26d0853c7665d3edc6f9e61 100644 (file)
--- a/covers/don't-touch-me.ly
+++ b/covers/don't-touch-me.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.22.0"
 \include "../pop-chords.ly"
 \include "english.ly"
 
@@ -19,12 +19,12 @@ staffSize = #18
        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-align { "F13" \fret-diagram-terse #"x;8;7;8;8;10;" } "       " \center-align { "F7#9" \fret-diagram-terse #"x;8;7;8;9;x;" } } %  "       " \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;" }  }
+       subtitle = \markup { \center-column { "F13" \fret-diagram-terse "x;8;7;8;8;10;" } "      " \center-column { "F7#9" \fret-diagram-terse "x;8;7;8;9;x;" } } %  "       " \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?)
+hn = #(define-music-function (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)
@@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
        \key bf \major
-       \override Staff.TimeSignature #'style = #'()
+       \override Staff.TimeSignature.style = #'numbered
        \time 4/4
 
        % Intro
@@ -46,7 +46,7 @@ Global =
 %      s1*0^\markup { \hspace #0.0 \raise #2.0 \bigger \bold { "Moderate pop (*** CAPO 4 ***)" } }
 
        s1 | % 1
-       \once \override TextScript #'padding = #2.0
+       \once \override TextScript.padding = #2.0
        s1*0^\markup { \large \bold { Moderate shuffle } }
 
        \repeat volta 2
@@ -90,9 +90,9 @@ LeadVox = \relative c'
 {
 %      \set Staff.instrument = #"Lead vox"
        \clef G
-       \override Staff.TimeSignature #'style = #'()
+       \override Staff.TimeSignature.style = #'numbered
 %Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
+%      \override Score.SpacingSpanner.average-spacing-wishes = ##f
 
         |   % 1
 
@@ -182,12 +182,12 @@ Riffs = \relative c'
 {
        \clef G
 %Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
+%      \override Score.SpacingSpanner.average-spacing-wishes = ##f
 
        % Intro
 
        \tiny
-       f8 a ef' g d' r s4
+       f8 a ef' g d'-\fermata r s4
        \normalsize
 }
 
@@ -203,8 +203,8 @@ Chords = \chordmode
        bf1 |   % 3
        ef1 |   % 4
        af1 |   % 5
-       bf2 \times 2/3 { s8 g af a bf b } |   % 6
-       c4 s \times 2/3 { s8 f4:7 s4. } |   % 7
+       bf2 \tuplet 3/2 { s8 g af a bf b } |   % 6
+       c4 s \tuplet 3/2 { s8 f4:7 s4. } |   % 7
        bf1 |   % 8
 
        f1:7 |   % 9
@@ -224,8 +224,8 @@ Chords = \chordmode
        bf1 |   % 20
        ef1 |   % 21
        af1 |   % 22
-       bf2 \times 2/3 { s8 g af a bf b } |   % 23
-       c4 s \times 2/3 { s8 f4:7 s4. } |   % 24
+       bf2 \tuplet 3/2 { s8 g af a bf b } |   % 23
+       c4 s \tuplet 3/2 { s8 f4:7 s4. } |   % 24
        bf1 |   % 25
 
        bf1 |   % 26
@@ -244,8 +244,8 @@ Rhythm = \relative c
 {
 %%     \set Voice.autoBeaming = ##f
 %%     \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
-       \override NoteHead #'style = #'slash
+       \override Staff.TimeSignature.style = #'numbered
+       \override NoteHead.style = #'slash
 
        c1-\fermata |   % 1
 
@@ -253,8 +253,8 @@ Rhythm = \relative c
        c4 c c c |   % 3
        c4 c c c |   % 4
        c4 c c c |   % 5
-       c4 c \times 2/3 { r8 c c } \times 2/3 { c c c } |   % 6
-       c8-. r r4 \times 2/3 { r8 c c } \times 2/3 { c c c } |   % 7
+       c4 c \tuplet 3/2 { r8 c c } \tuplet 3/2 { c c c } |   % 6
+       c8-. r r4 \tuplet 3/2 { r8 c c } \tuplet 3/2 { c c c } |   % 7
        c4 c c c |   % 8
 
        c4 c c c |   % 9
@@ -274,8 +274,8 @@ Rhythm = \relative c
        c4 c c c |   % 20
        c4 c c c |   % 21
        c4 c c c |   % 22
-       c4 c \times 2/3 { r8 c c } \times 2/3 { c c c } |   % 23
-       c8-. r r4 \times 2/3 { r8 c c } \times 2/3 { c c c } |   % 24
+       c4 c \tuplet 3/2 { r8 c c } \tuplet 3/2 { c c c } |   % 23
+       c8-. r r4 \tuplet 3/2 { r8 c c } \tuplet 3/2 { c c c } |   % 24
        c4 c c c |   % 25
 
        c4 c c c |   % 26
@@ -330,7 +330,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "JazzText"
+    "LilyJAZZ Text"
     "Luxi Mono"
     (/ staffSize 20)))
 
@@ -344,5 +344,5 @@ Dynamics =
 % To find out what's eating the space at the top...
 %      annotate-spacing = ##t
 %let's try this: [It works! Huzzah!][Nope!]
-%      obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
+%      obsolete-page-top-space = 0  top-system-spacing.basic-distance = #(/ obsolete-page-top-space staff-space)
 }

diff --git a/covers/let-it-rain.ly b/covers/let-it-rain.ly
index 921ddc61187fc112729f6f01432c3c74610550b8..c386df74acf1546266bc22d0afcafb538d6a6cc3 100644 (file)
--- a/covers/let-it-rain.ly
+++ b/covers/let-it-rain.ly
@@ -19,7 +19,7 @@ staffSize = #18
 %      arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. " }
        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;" }  }
+       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)
@@ -571,7 +571,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "LilyJAZZ Text"
     "Luxi Mono"
     (/ staffSize 20)))
 

diff --git a/he-who-began-a-good-work-in-you.ly b/he-who-began-a-good-work-in-you.ly
index 47e36cbc24c2a21eb11e62834ace72cd5b0dec37..8ac5295d367d7d1cdf3b0848846ba22450a19e16 100644 (file)
--- a/he-who-began-a-good-work-in-you.ly
+++ b/he-who-began-a-good-work-in-you.ly
@@ -633,7 +633,7 @@ StaffC = \relative c
 {
        #(define fonts (make-pango-font-tree
                "Times New Roman"
-               "JazzText"
+               "LilyJazz Text"
                "Luxi Mono"
                (/ staffSize 20)))
 

diff --git a/lo-how-a-rose-e'er-blooming.ly b/lo-how-a-rose-e'er-blooming.ly
index f6f573535fb272897d09acd8ab861cd551b3b2df..e87ecde23715237520243e6e7106d794867c7c16 100644 (file)
--- a/lo-how-a-rose-e'er-blooming.ly
+++ b/lo-how-a-rose-e'er-blooming.ly
@@ -180,7 +180,7 @@ VerseC = \lyricmode
 {
        #(define fonts (make-pango-font-tree
                "Times New Roman"
-               "LilyJAZZText"
+               "LilyJAZZ Text"
                "Luxi Mono"
                (/ staffSize 20)))
 

diff --git a/pop-chords-test.ly b/pop-chords-test.ly
index cd4eaf7da3348b330477b3b3377a583a383ab552..8480e82437c5d15e3636b320d4f3edc3742bb9cf 100644 (file)
--- a/pop-chords-test.ly
+++ b/pop-chords-test.ly
@@ -109,7 +109,7 @@ Chords = \chordmode
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "JazzText"
+    "LilyJazz Text"
     "Luxi Mono"
     (/ staffSize 20)))
 }

diff --git a/the-lord's-prayer.ly b/the-lord's-prayer.ly
index 9e1e23d685964d8c5cc0d2d8dbac098aeaa28891..df15150b5319d07a92764e98fb00c5f7b5522a00 100644 (file)
--- a/the-lord's-prayer.ly
+++ b/the-lord's-prayer.ly
@@ -27,7 +27,7 @@ staffSize = #18
 Global =
 {
        \key bf \major
-%New key!
+%New key! (C version)
 %      \key c \major
        \numericTimeSignature
        \time 4/4
@@ -153,7 +153,7 @@ LeadVoxText = \lyricmode
        Our Fa -- ther, _ who art in hea -- ven, _
        hal -- low -- ed be _ thy _ name. _
        Thy king -- dom come, thy will be done,
-       on Earth, as it in in hea -- _ _ ven.
+       on Earth, as it is in hea -- _ _ ven.
 
        Give us this day our dai -- ly bread
        and for -- give us our debts