work

diff --git a/eng-files/paper.ly b/eng-files/paper.ly
index e459b0683a4c0d3e5a7c53489f3da36c3081dd0f..4a24e741f6f9b50663dd463a8ad4bb6e0e337528 100644 (file)
--- 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 f6e58fc874133e0acd43dc79c40d88d9d3ed13a2..6ef09afa767c5a150f84404ebcc1a632dcb38f55 100644 (file)
--- 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 }
   }
-}