reformat

diff --git a/README.txt b/README.txt
index 832d7fa8eff993532efd9eb258b994bc0e737224..7671e20edaabaf51ff32fba513a88ee81953d31f 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@ Usage
 
 Required Fonts:
 
-- haydn (https://github.com/OpenLilyPondFonts/haydn)
+- scorlatti (https://github.com/OpenLilyPondFonts/scorlatti)
 - Junicode
 - Syne
 

diff --git a/book.ly b/book.ly
index fa0a62374ba2598b5a60c6058c66aed6df742ad1..784e8ecf3e133a7734fe4edb54894f10d192f71c 100644 (file)
--- a/book.ly
+++ b/book.ly
@@ -1,4 +1,5 @@
 %fifteen inventions project
+
 \book {
   \outcover
   \pageBreak
@@ -48,18 +49,6 @@
     }
   }
 
-  \markuplist {
-    \fill-line {
-      \line { \null }
-    \center-column {
-      \vspace #15
-      \line { \caps "This page is intentionally left blank" }
-    }
-    \line { \null}
-  }
-  }
-  \pageBreak
-
   \bookpart {
     \tocItem \markup { "6. " \bold "Tempo giusto," \italic "spianato" }
     \score {
@@ -91,27 +80,12 @@
     \score {
       \include "manuscripts/8i.ly"
     }
-  }
-
-  \bookpart {
     \tocItem \markup { "9. " \bold "Largo," \italic "dolce; espressivo" }
     \score {
       \include "manuscripts/9i.ly"
     }
   }
 
-  \markuplist {
-    \fill-line {
-      \line { \null }
-    \center-column {
-      \vspace #15
-      \line { \caps "This page is intentionally left blank" }
-    }
-    \line { \null}
-  }
-  }
-  \pageBreak
-
   \bookpart {
     \tocItem \markup { "10. " \bold "Presto," \italic "staccatissimo/legato" }
     \score {
@@ -138,9 +112,6 @@
     \score {
       \include "manuscripts/13i.ly"
     }
-  }
-
-  \bookpart {
     \tocItem \markup { "14. " \bold "Molto rubato" }
     \score {
       \include "manuscripts/14i.ly"

diff --git a/eng-files/paper.ly b/eng-files/paper.ly
index 6029ffedff60032cb8317164934658aa1b95afdd..f38411f6f35cc2f2da29ae013765248aaeed5e26 100644 (file)
--- a/eng-files/paper.ly
+++ b/eng-files/paper.ly
@@ -4,19 +4,62 @@
   #(include-special-characters)
   first-page-number = -1
   print-page-number = ##f
-  oddHeaderMarkup = \markup { \tiny { "  " } }
-  evenHeaderMarkup = \markup { \tiny { "  " } }
+  tocTitleMarkup = \markup { \null }
+  tocItemMarkup = \markup \fill-line {
+    \fill-with-pattern #1.5 #CENTER .
+    \line {
+      \fromproperty #'toc:indent \fromproperty #'toc:text
+    }
+    \fromproperty #'toc:page
+  }
+  #(set-paper-size "arch a")
+  top-margin = 0.5\in
+  bottom-margin = 0.5\in
+  left-margin = 0.9\in
+  right-margin = 0.9\in
+  indent = 0.75\in
+  short-indent = 0\in
+  #(define fonts (set-global-fonts #:music "scorlatti" #:brace "scorlatti" #:roman "Junicode" #:sans "syne" ))
+  max-systems-per-page = #8
+
+  last-bottom-spacing = #'((basic-distance . 5) (minimum-distance . 5) (padding . 0))
+  system-system-spacing = #'((basic-distance . 3) (minimum-distance . 2) (padding . 7))
+  score-system-spacing = #'((basic-distance . 4) (minimum-distance . 4) (padding . 7))
+  top-system-spacing = #'((basic-distance . 1) (minimum-distance . 1) (padding . 1) (stretchability . 0))
+
+  oddHeaderMarkup = \markup {
+    \concat { \if \on-page #5 \oddhead }
+    \concat { \if \on-page #7 \oddhead }
+    \concat { \if \on-page #9 \oddhead }
+    \concat { \if \on-page #13 \oddhead }
+    \concat { \if \on-page #15 \oddhead }
+    \concat { \if \on-page #17 \oddhead }
+    \concat { \if \on-page #19 \oddhead }
+    \concat { \if \on-page #21 \oddhead }
+
+  }
+  evenHeaderMarkup = \markup {
+    \concat { \if \on-page #6 \evhead }
+    \concat { \if \on-page #8 \evhead }
+    \concat { \if \on-page #10 \evhead }
+    \concat { \if \on-page #12 \evhead }
+    \concat { \if \on-page #14 \evhead }
+    \concat { \if \on-page #16 \evhead }
+    \concat { \if \on-page #18 \evhead }
+    \concat { \if \on-page #20 \evhead }
+    \concat { \if \on-page #22 \evhead }
+
+  }
   oddFooterMarkup = \markup {
     \concat { \if \on-page #3 \oddfoot }
     \concat { \if \on-page #5 \oddfoot }
     \concat { \if \on-page #7 \oddfoot }
-    \concat { \if \on-page #11 \oddfoot }
+    \concat { \if \on-page #9 \oddfoot }
+    \concat { \if \on-page #13 \oddfoot }
     \concat { \if \on-page #15 \oddfoot }
     \concat { \if \on-page #17 \oddfoot }
     \concat { \if \on-page #19 \oddfoot }
     \concat { \if \on-page #21 \oddfoot }
-    \concat { \if \on-page #23 \oddfoot }
-    \concat { \if \on-page #25 \oddfoot }
   }
   evenFooterMarkup = \markup {
     \concat { \if \on-page #2 \evfoot }
@@ -30,42 +73,5 @@
     \concat { \if \on-page #18 \evfoot }
     \concat { \if \on-page #20 \evfoot }
     \concat { \if \on-page #22 \evfoot }
-    \concat { \if \on-page #24 \evfoot }
   }
-  tocTitleMarkup = \markup { \null }
-  tocItemMarkup = \markup { \center-column {
-    \fill-line {
-      \left-column { \concat { "                      " "       " \fromproperty #'toc:text } }
-      \right-column { \concat { \fromproperty #'toc:page "                      " "       " } }
-    }
-  }
-}
-#(set-paper-size "letter")
-        top-margin = 1\cm
-        bottom-margin = 0.8\cm
-        left-margin = 2\cm
-        right-margin = 2\cm
-        indent = 1.3\cm
-        short-indent = 0\cm
-        #(define fonts
-               (set-global-fonts
-                       #:music "haydn"
-                       #:brace "haydn"
-                       #:roman "Junicode"
-                       #:sans "syne"
-               ))
-        max-systems-per-page = #8
-        system-system-spacing =
-                #'((basic-distance . 3)
-                (minimum-distance . 2)
-                (padding . 7))
-score-system-spacing =
-#'((basic-distance . 4)
-   (minimum-distance . 4)
-   (padding . 7))
-top-system-spacing =
-#'((basic-distance . 1)
-   (minimum-distance . 1)
-   (padding . 1)
-   (stretchability . 0))
 }

diff --git a/front-matter/front matter.ly b/front-matter/front matter.ly
index 3b7dbcdabffa41280533b6c25cdf09a229134167..d3855f7812ff4aaa15e02e00f326062e2c2639af 100644 (file)
--- a/front-matter/front matter.ly
+++ b/front-matter/front matter.ly
@@ -1,27 +1,26 @@
 %fifteen inventions project
+
 front-matter = \markuplist {
- \fill-line {
-   \left-column {
-     \line { \bold \xtitle \concat { " [" \xyear "]" } }
-     \line { \xinst " | " \xdur }
-     \line { \xcomp }
-     \vspace #25
-   }
-   \center-column {
-     \vspace #3
-     \override #'(x-padding . -10)
-     \rounded-box \center-column { \table-of-contents }
-     \vspace #2.25
+  \fill-line {
+    \left-column {
+      \line { \bold \xtitle \concat { " [" \xyear "]" } }
+      \line { \xinst " | " \xdur }
+      \line { \xcomp }
+      \vspace #25
+    }
+    \center-column {
+      \vspace #5
+      \override #'(x-padding . -10)
+      \center-column { \table-of-contents }
+      \vspace #3
       \override #'(thickness . 5)
       \draw-squiggle-line #0.5 #'(20 . 0) ##t
-     \vspace #2.25
-     \line { \hbracket \bold "program notes"}
-     \vspace #0.2
-     \xpnote
-     \vspace #2.25
-      \override #'(thickness . 5)
-      \draw-squiggle-line #0.5 #'(20 . 0) ##t
-  }
-   \right-column { \vspace #2 }
- }
+      \vspace #3
+      \line { \hbracket \bold "program notes"}
+      \vspace #0.2
+      \xpnote
+      \vspace #3
+    }
+    \right-column { \vspace #2 }
   }
+}

diff --git a/front-matter/outside cover.ly b/front-matter/outside cover.ly
index 8ebcaa567cfcae98c52ee13d7aa11295fed5af2b..9bf5a782ba2e0fd6586ee4fdad3d5c75b04efeb1 100644 (file)
--- a/front-matter/outside cover.ly
+++ b/front-matter/outside cover.ly
@@ -17,24 +17,24 @@ outcover = \markuplist {
             \line { \null }
           }
         \right-column {
-            \vspace #14
+            \vspace #15
             \line { \fontsize #8 \bold \underline \xtitle }
            \vspace #-0.1
             \line { \fontsize #3 \sans \xcomp }
            \vspace #3
-           \line { \fontsize #2 \sans \concat { \xsub } }
+           \line { \fontsize #2 \sans \concat { "Fifteen Inventions for " \xinst } }
       }
     }
-    \vspace #23
+    \vspace #26.25
     \fill-line {
       \line { \null }
       \line { \null }
       \line { \null }
       \line { \null }
       \center-column {
-           \xumbel
-           \vspace #0.3
-        \line { \concat { " " \fontsize #1 \hbracket \sans \bold "  umbel press " \char ##x00A9 } }
+       \xumbel
+       \vspace #0.3
+         \line { \fontsize #1 \hbracket \sans \bold "  umbel press  " }
       }
       \line { \null }
     }

diff --git a/manuscripts/10i.ly b/manuscripts/10i.ly
index 2e0e822c8ceff665ccb2eafe317ec473c40a1210..fe2fb62f2547ff7bb39a1916dc66d80304294c35 100644 (file)
--- a/manuscripts/10i.ly
+++ b/manuscripts/10i.ly
@@ -78,7 +78,6 @@ r8 <d fis>4.(\mf\< <cis g'>8~ |
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
 }
 }

diff --git a/manuscripts/11i.ly b/manuscripts/11i.ly
index b27e0759dc4d511cef2373af65f4874ded083f7f..439f114330cadc5094361f736e7ad598abcb93ae 100644 (file)
--- a/manuscripts/11i.ly
+++ b/manuscripts/11i.ly
@@ -152,7 +152,6 @@ ges8 r8 r4 r4 |
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 }
 }

diff --git a/manuscripts/12i.ly b/manuscripts/12i.ly
index c015689da8dd6c913986ea9533aa82d2eb7251db..f9b66916805fbc090487f95b213ddf259ecc2788 100644 (file)
--- a/manuscripts/12i.ly
+++ b/manuscripts/12i.ly
@@ -152,7 +152,6 @@ s2. |
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 }
 }

diff --git a/manuscripts/13i.ly b/manuscripts/13i.ly
index c3dc9edca3caf63feeef030f42aec49b27d1783d..eb1e654503a6b3ce5067864055a08d1459a67a4a 100644 (file)
--- a/manuscripts/13i.ly
+++ b/manuscripts/13i.ly
@@ -62,7 +62,6 @@ r4 r8 a'''''8-. fis-. dis-. \tuplet 3/2 { bes-.\sustainOff ees,-. d-. } \clef ba
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/24)
 }
 }

diff --git a/manuscripts/14i.ly b/manuscripts/14i.ly
index ee23be8c0492224026f1bcb4c3a64d3cf8d2f556..3bfb3fc79c5d8854cfbcbdd8605850c75833472f 100644 (file)
--- a/manuscripts/14i.ly
+++ b/manuscripts/14i.ly
@@ -84,7 +84,6 @@
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/20)
 }
 }

diff --git a/manuscripts/15i.ly b/manuscripts/15i.ly
index 553ecf5749271c02310ceb796f10780ee591453e..557a9b895990d0d1d43caef20fcbbb9643994133 100644 (file)
--- a/manuscripts/15i.ly
+++ b/manuscripts/15i.ly
@@ -146,7 +146,6 @@
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 \override TimeSignature.stencil = ##f
 }

diff --git a/manuscripts/1i.ly b/manuscripts/1i.ly
index c3f87703c27587c5b6962a9574bab8a4b3657cea..b67a6157a5e9d38ecc18513124132e6120e97e0e 100644 (file)
--- a/manuscripts/1i.ly
+++ b/manuscripts/1i.ly
@@ -64,7 +64,6 @@
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 \override TimeSignature.stencil = ##f
 }

diff --git a/manuscripts/2i.ly b/manuscripts/2i.ly
index 6d752f340f293da7de0cfced4a313cc8d936a673..9f25bf8d8bfcc4c10c58145fc21edd01427c5aae 100644 (file)
--- a/manuscripts/2i.ly
+++ b/manuscripts/2i.ly
@@ -1,27 +1,29 @@
 %fifteen inventions project
 \new PianoStaff \with {
   instrumentName = \markup { \large "№" \number 2 }
-  \consists "Merge_rests_engraver" } <<
-\set PianoStaff.connectArpeggios = ##t
-\override PianoStaff.Arpeggio.arpeggio-direction = #UP
-\new Staff = "ui2" {
-\accidentalStyle piano
-<<
-\relative { \override Score.MetronomeMark.padding = #2.2 \tempo Presto 4=168
-\override DynamicLineSpanner.staff-padding = \phds
-\time 7/8 d'8[\offset Y-offset 2^\markup { \smaller \italic "bruscamente" } e-- \change Staff = "di2" fis,-.-> \change Staff = "ui2" g'( a) \change Staff = "di2" b,-- \change Staff = "ui2" cis']( |
-ees[ f) \change Staff = "di2" aes,,-- \change Staff = "ui2" bes''( c) \change Staff = "di2" g,,-- d-.->] |
-cis'[-- \change Staff = "ui2" b'' \change Staff = "di2" a,,,-.-> \change Staff = "ui2" gis'''( fis e) dis,]-- |
-c'[ \change Staff = "di2" bes,-- \change Staff = "ui2" f'' \change Staff = "di2" g,,,-.-> \change Staff = "ui2" a''' d,,-- e'] |
-f,[( ges) aes'( bes) \change Staff = "di2" ces,,,-.-> \change Staff = "ui2" des'''( ees)] |
-\change Staff = "di2" c,,[-- \change Staff = "ui2" b'' \change Staff = "di2" a,,-- \change Staff = "ui2" g''( fis) \change Staff = "di2" e,,,-.-> \change Staff = "ui2" d'''] |
-des[( c) \change Staff = "di2" bes,,,-.-> \change Staff = "ui2" aes'''( f) \change Staff = "di2" ees,-- ges--] \change Staff = "ui2" |
-g'[( a) \change Staff = "di2" b,( c) \change Staff = "ui2" d'( e) \change Staff = "di2" f,,,-.->] |
-gis'[-- \change Staff = "ui2" ais' \change Staff = "di2" cis,,,-.-> \change Staff = "ui2" dis'''( b fis) \change Staff = "di2" e,--] |
-\change Staff = "ui2" d'[( c  \change Staff = "di2" bes) a( g) f ees,-.->] |
-\stemUp cis'[-- gis-.-> fis'( a b) d,-- \change Staff = "ui2" e'] \stemNeutral |
-\change Staff = "di2" f,[-- \change Staff = "ui2" g'( aes) \change Staff = "di2" bes,-- c,,-.-> \change Staff = "ui2" des'''( ees)]\fermata |
-d[^\markup { \raise #3 "A tempo" } \change Staff = "di2" c,,,-.-> \change Staff = "ui2" bes''' \change Staff = "di2" aes,-- \change Staff = "ui2" g' \change Staff = "di2" f,-- \change Staff = "ui2" ees'] |
+  \consists "Merge_rests_engraver" }
+  <<
+    \set PianoStaff.connectArpeggios = ##t
+    \override PianoStaff.Arpeggio.arpeggio-direction = #UP
+    \new Staff = "ui2" {
+      \accidentalStyle piano
+    <<
+      \relative {
+        \override Score.MetronomeMark.padding = #2.2 \tempo Presto 4=168
+        \override DynamicLineSpanner.staff-padding = \phds
+        \time 7/8 d'8[\offset Y-offset 2^\markup { \smaller \italic "bruscamente" } e-- \change Staff = "di2" fis,-.-> \change Staff = "ui2" g'( a) \change Staff = "di2" b,-- \change Staff = "ui2" cis']( |
+        ees[ f) \change Staff = "di2" aes,,-- \change Staff = "ui2" bes''( c) \change Staff = "di2" g,,-- d-.->] |
+        cis'[-- \change Staff = "ui2" b'' \change Staff = "di2" a,,,-.-> \change Staff = "ui2" gis'''( fis e) dis,]-- |
+        c'[ \change Staff = "di2" bes,-- \change Staff = "ui2" f'' \change Staff = "di2" g,,,-.-> \change Staff = "ui2" a''' d,,-- e'] |
+        f,[( ges) aes'( bes) \change Staff = "di2" ces,,,-.-> \change Staff = "ui2" des'''( ees)] |
+        \change Staff = "di2" c,,[-- \change Staff = "ui2" b'' \change Staff = "di2" a,,-- \change Staff = "ui2" g''( fis) \change Staff = "di2" e,,,-.-> \change Staff = "ui2" d'''] |
+        des[( c) \change Staff = "di2" bes,,,-.-> \change Staff = "ui2" aes'''( f) \change Staff = "di2" ees,-- ges--] \change Staff = "ui2" |
+        g'[( a) \change Staff = "di2" b,( c) \change Staff = "ui2" d'( e) \change Staff = "di2" f,,,-.->] |
+        gis'[-- \change Staff = "ui2" ais' \change Staff = "di2" cis,,,-.-> \change Staff = "ui2" dis'''( b fis) \change Staff = "di2" e,--] |
+        \change Staff = "ui2" d'[( c  \change Staff = "di2" bes) a( g) f ees,-.->] |
+        \stemUp cis'[-- gis-.-> fis'( a b) d,-- \change Staff = "ui2" e'] \stemNeutral |
+        \change Staff = "di2" f,[-- \change Staff = "ui2" g'( aes) \change Staff = "di2" bes,-- c,,-.-> \change Staff = "ui2" des'''( ees)]\fermata |
+        d[^\markup { \raise #3 "A tempo" } \change Staff = "di2" c,,,-.-> \change Staff = "ui2" bes''' \change Staff = "di2" aes,-- \change Staff = "ui2" g' \change Staff = "di2" f,-- \change Staff = "ui2" ees'] |
 \change Staff = "di2" \stemUp cis,[-- b'( a fis e) g,-.-> d']-- \stemNeutral |
 ees,-.->[ f' ges-- aes bes-- \change Staff = "ui2" c( des] |
 e)[ \change Staff = "di2" a,( b) \change Staff = "ui2" g' \change Staff = "di2" f,,-.-> \change Staff = "ui2" d''( c] |
@@ -85,9 +87,8 @@ s8 s8 s8 s8 s8 s8 s8\pp
 >>
 %\midi { }
 \layout {
-\context {
-\Score
-\override BarNumber.break-visibility = ##(#f #f #f)
-\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
-}
+  \context {
+    \Score
+    \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
+  }
 }

diff --git a/manuscripts/3i.ly b/manuscripts/3i.ly
index 428ff86f91ff58a7956171db3f40f9062c28811d..8a9be0fb05614c4068c43f1befefd9afe069ebd5 100644 (file)
--- a/manuscripts/3i.ly
+++ b/manuscripts/3i.ly
@@ -69,7 +69,6 @@ ges( f ees aes, des) |
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 }
 }

diff --git a/manuscripts/4i.ly b/manuscripts/4i.ly
index c5729a28b0dbcddd37dddb591c6928256d03a6d6..31c9b3348597c4ffcce9af53ba41a60c9a87ff0e 100644 (file)
--- a/manuscripts/4i.ly
+++ b/manuscripts/4i.ly
@@ -63,7 +63,6 @@ bes2)\fermata |
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 \override TimeSignature.stencil = ##f
 }

diff --git a/manuscripts/5i.ly b/manuscripts/5i.ly
index 3b396b0d0acb34cf1772f55e097705be42b89f01..49ba46ca2812eeea384ffea90e36e168362b8eb4 100644 (file)
--- a/manuscripts/5i.ly
+++ b/manuscripts/5i.ly
@@ -123,7 +123,6 @@
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
 }
 }

diff --git a/manuscripts/6i.ly b/manuscripts/6i.ly
index 3e77bb1a58b33e341052db2a880b4960df14f68d..e9ae81f55d1bae1140ece21830dcffb6d359e484 100644 (file)
--- a/manuscripts/6i.ly
+++ b/manuscripts/6i.ly
@@ -152,7 +152,6 @@ s2 |
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
 }
 }

diff --git a/manuscripts/7i.ly b/manuscripts/7i.ly
index 79af30616b95731398be13881561e7d883d7eef3..038a206aa74be74b8d2c707e8357636c570a439f 100644 (file)
--- a/manuscripts/7i.ly
+++ b/manuscripts/7i.ly
@@ -63,7 +63,6 @@ aes2.\fermata
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
 }
 }

diff --git a/manuscripts/8i.ly b/manuscripts/8i.ly
index 56efb08f5fef5b3bd7d3919ff77ff2381f27f357..32c5f8994e81ed305f499a870be1fdbf382a3a3e 100644 (file)
--- a/manuscripts/8i.ly
+++ b/manuscripts/8i.ly
@@ -114,7 +114,6 @@ des,4( bes' ees,4.)
 \layout {
 \context {
 \Score
-\override BarNumber.break-visibility = ##(#f #f #f)
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 }
 }

diff --git a/manuscripts/9i.ly b/manuscripts/9i.ly
index a34421171c297b9e18f473f8c6115f07a3a9049c..08e73c1b2ef7f55cbd949411aa687c91c773bb68 100644 (file)
--- a/manuscripts/9i.ly
+++ b/manuscripts/9i.ly
@@ -43,7 +43,6 @@ bes8( ees,8 <c' f,>4) <d g,>4( <e a,>) <fis b,>( <gis cis,>)\fermata |
 \layout {
 \context {
 \Score
-\override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 \override TimeSignature.stencil = ##f
 }

diff --git a/variables/bio.ly b/variables/bio.ly
index f905d16014c6fc30edb86068bbac5cca1dc2a431..c5e0307008f4b365fd6edd74fdf633b83df84ee6 100644 (file)
--- a/variables/bio.ly
+++ b/variables/bio.ly
@@ -38,7 +38,7 @@ xbio = \markup {
       Penn State's Living Music, and the New Music Consortium. Additionally,
       Tucker serves as a sound engineer, technician, and teaching assistant
       with the Electroacoustic Music Studios at Eastman (EMuSE) and has
-      produced and performed dozens of electroacoustic works in this position
+      produced and performed hundreds of electroacoustic works in this position
       with artists such as Alan Pierson, Joao Pedro Oliviera, John Chowning,
       Jamie Jordan and more.
     }
@@ -58,10 +58,11 @@ xbio = \markup {
       He holds the MA and Catherine Filene Shouse Arts Leadership Certificate
       from the Eastman School of Music and the BM from Penn State University.
       He also studied at the University of South Florida. He has studied with
-      Robert Morris, Matthew Barber, David Liptak, Baljinder Sekhon, Sarah
-      Genevieve Burghart Rice, and Susanna Hancock. Tucker serves as instructor
-      of the Penn State Young Composers Institute, a virtual program for high
-      school students running in the fall and spring.
+      Robert Morris, Matthew Barber, Carlos Sánchez-Gutiérrez, David Liptak,
+      Baljinder Sekhon, Sarah Genevieve Burghart Rice, and Susanna Hancock.
+      Tucker serves as instructor of the Penn State Young Composers Institute,
+      a virtual program for high school students running in the fall and
+      spring.
     }
     \vspace #0.8
   }

diff --git a/variables/variables.ly b/variables/variables.ly
index 30ab0e5918dcf996c5773d8ab9bc760913ded57f..625686a3a473db0fe8eb5aad0f765cc56cc9700c 100644 (file)
--- a/variables/variables.ly
+++ b/variables/variables.ly
@@ -1,15 +1,16 @@
 %fifteen inventions project
 %texts
-xyear = \markup { 2022-23 }
+xyear = \markup { "2022–23" }
 xtitle = \markup { Circumnutation }
 xsub = \markup { fifteen inventions for keyboard instruments }
 xcomp = \markup { Tucker Johnson }
 xinst = \markup  { keyboard }
 xdur = \markup { "20\" - 12\'" }
 xcr = \markup \tiny { Copyright \char ##x00A9 MMXXIII Umbel Press. }
-oddfoot = \markup { \fill-line { \null \center-column { \teeny { \xcomp } \vspace #-0.2 \concat { " - " \fromproperty #'page:page-number-string " - " } } \null } }
-evfoot = \markup { \fill-line { \null \center-column { \teeny { \xtitle } \vspace #-0.2 \concat { " - " \fromproperty #'page:page-number-string " - " } } \null } }
-finfoot = \markup { \fill-line { \null \center-column { \concat { " - " \fromproperty #'page:page-number-string " - " } \small \typewriter { "February 1st, 2022 - Rochester, New York" } } \null } }
+oddhead = \markup { \fill-line { \null \center-column { \bold { \xcomp } "  " } \null } }
+evhead = \markup { \fill-line { \null \center-column { \bold { \xtitle } "  " } \null } }
+oddfoot = \markup { \fill-line { \null \center-column { " " \concat { " - " \fromproperty #'page:page-number-string " - " } } \null } }
+evfoot = \markup { \fill-line { \null \center-column { " " \concat { " - " \fromproperty #'page:page-number-string " - " } } \null } }
 
 %music
 tmarkione = \tempo "Vivace" 4 = 136