From: tuckerjohnson <tuckerajohnsonmusic@gmail.com>
Date: Wed, 12 Apr 2023 22:24:39 +0000 (-0400)
Subject: work
X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=194d1117e727ce35012e33e1406d97ea2cbe4867;p=circumnutation.git

work
---

diff --git a/eng-files/paper.ly b/eng-files/paper.ly
index e459b06..4a24e74 100644
--- a/eng-files/paper.ly
+++ b/eng-files/paper.ly
@@ -4,25 +4,33 @@
   #(include-special-characters)
   first-page-number = -1
   print-page-number = ##f
-	oddHeaderMarkup = \markup { \tiny { "  " } }
-	evenHeaderMarkup = \markup { \tiny { "  " } }
-	oddFooterMarkup = \markup {
-      \concat { \if \on-page #3 \fill-line { \null \xcr \null } }
-      \concat { \if \on-page #5 \oddfoot }
-      \concat { \if \on-page #7 \oddfoot }
-      \concat { \if \on-page #9 \oddfoot }
-      \concat { \if \on-page #11 \oddfoot }
-      \concat { \if \on-page #13 \oddfoot }
-          }
+  oddHeaderMarkup = \markup { \tiny { "  " } }
+  evenHeaderMarkup = \markup { \tiny { "  " } }
+  oddFooterMarkup = \markup {
+    \concat { \if \on-page #3 \fill-line { \null \xcr \null } }
+    \concat { \if \on-page #5 \oddfoot }
+    \concat { \if \on-page #7 \oddfoot }
+    \concat { \if \on-page #9 \oddfoot }
+    \concat { \if \on-page #11 \oddfoot }
+    \concat { \if \on-page #13 \oddfoot }
+  }
   evenFooterMarkup = \markup {
-      \concat { \if \on-page #2 \evfoot }
-      \concat { \if \on-page #4 \evfoot }
-      \concat { \if \on-page #6 \evfoot }
-      \concat { \if \on-page #8 \evfoot }
-      \concat { \if \on-page #10 \evfoot }
-      \concat { \if \on-page #12 \evfoot }
-      \concat { \if \on-page #14 \evfoot }
-          }
+    \concat { \if \on-page #2 \evfoot }
+    \concat { \if \on-page #4 \evfoot }
+    \concat { \if \on-page #6 \evfoot }
+    \concat { \if \on-page #8 \evfoot }
+    \concat { \if \on-page #10 \evfoot }
+    \concat { \if \on-page #12 \evfoot }
+    \concat { \if \on-page #14 \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")
         print-all-headers = ##t
         top-margin = 0.8\cm
diff --git a/front-matter/front matter.ly b/front-matter/front matter.ly
index f6e58fc..6ef09af 100644
--- a/front-matter/front matter.ly	
+++ b/front-matter/front matter.ly	
@@ -6,30 +6,23 @@ front-matter = \markuplist {
      \line { \xinst " | " \xdur }
      \line { \xcomp }
      \vspace #25
-
    }
    \center-column {
-     \fill-line {
-       \column {\null}
-       \center-column {
-	  \vspace #7
-	  \line { \hbracket \bold "program notes" }
-	  \vspace #0.2
-	  \xpnote
-	  \vspace #0.5
-	  \line { ================================= }
-	  \vspace #0.5
-	  \line { \hbracket \bold "inventions" }
-	  \vspace #0.2
-	  \table-of-contents
-	  \null
-	  \line { ================================= }
-	  \vspace #1.5
-	}
+     \vspace #3
+     \table-of-contents
+     \vspace #0.5
+     \line { ================================= }
+     \vspace #0.5
+     \line { \hbracket \bold "program notes"}
+     \vspace #0.2
+     \xpnote
+     \vspace #0.5
+     \line { ================================= }
+     \vspace #0.5
+     \line { \hbracket \bold "performance notes"}
+     \vspace #0.2
 
-      \column {\null}
-       }
+  }
   }
    \right-column { \vspace #2 }
   }
-}