Solve PDF output file name with '-1' appended

ksnortum · Jun 28, 2023 · d8587cf · d8587cf
1 parent 68d0673
commit d8587cf
Show file tree

Hide file tree

Showing 17 changed files with 361 additions and 199 deletions.
diff --git a/includes/global-variables.ily b/includes/global-variables.ily
@@ -11,6 +11,3 @@ fermataUnderBarline = {
   \tweak direction #DOWN
   \textEndMark \markup { \musicglyph "scripts.dfermata" }
 }
-
-% staffDown = \change Staff = "lower"
-% staffUp   = \change Staff = "upper"
diff --git a/includes/invention-no1-C-maj-parts.ily b/includes/invention-no1-C-maj-parts.ily
@@ -3,6 +3,8 @@
 \version "2.24.0"
 \language "english"
 
+\include "midi-title.ily"
+
 global = {
   \time 4/4
   \key c \major
@@ -73,7 +75,8 @@ leftHand = \relative c {
   <c, c'>1\arpeggio\fermata
 }
 
-inventionOneMusic = \score { 
+inventionOneMusic = 
+\score { 
   \header {
     opus = "BWV 772"
   }
@@ -88,17 +91,18 @@ inventionOneMusic = \score {
 
 \include "articulate.ly"
 
-inventionOneMidi = \book {
-  \bookOutputName "invention-no1-C-maj"
-  \score { 
-    \articulate <<
-      <<
-        \new Staff = "upper" \rightHand
-        \new Staff = "lower" \leftHand
-      >>
+inventionOneMidi = 
+\score { 
+  \header {
+    midiOutputFile = "invention-no1-C-maj" % see midi-title.ily
+  }
+  \articulate <<
+    <<
+      \new Staff = "upper" \rightHand
+      \new Staff = "lower" \leftHand
     >>
-    \midi {
-      \tempo 4 = 92
-    }
+  >>
+  \midi {
+    \tempo 4 = 92
   }
-}
+}
diff --git a/includes/invention-no10-G-maj-parts.ily b/includes/invention-no10-G-maj-parts.ily
@@ -4,6 +4,7 @@
 \language "english"
 
 \include "global-variables.ily"
+\include "midi-title.ily"
 
 global = {
   \time 9/8
@@ -111,7 +112,8 @@ leftHand = \relative d {
   g4.~ g8 b d  g4. \fermataUnderBarline |
 }
 
-inventionTenMusic = \score { 
+inventionTenMusic = 
+\score { 
   \header {
     opus = "BWV 781"
   }
@@ -127,18 +129,19 @@ inventionTenMusic = \score {
 
 \include "articulate.ly"
 
-inventionTenMidi = \book {
-  \bookOutputName "invention-no10-G-maj"
-  \score { 
-    \articulate <<
-      \keepWithTag midi
-      <<
-        \new Staff = "upper" \rightHand
-        \new Staff = "lower" \leftHand
-      >>
+inventionTenMidi = 
+\score { 
+  \header {
+    midiOutputFile = "invention-no10-G-maj" % see midi-title.ily
+  }
+  \articulate <<
+    \keepWithTag midi
+    <<
+      \new Staff = "upper" \rightHand
+      \new Staff = "lower" \leftHand
     >>
-    \midi {
-      \tempo 4. = 116
-    }
+  >>
+  \midi {
+    \tempo 4. = 116
   }
 }
diff --git a/includes/invention-no11-G-min-parts.ily b/includes/invention-no11-G-min-parts.ily
@@ -3,6 +3,8 @@
 \version "2.24.0"
 \language "english"
 
+\include "midi-title.ily"
+
 global = {
   \time 4/4
   \key g \minor
@@ -78,7 +80,8 @@ leftHand = \relative g, {
   bf8 a16 g  d'8\mordent d,  g2\fermata |
 }
 
-inventionElevenMusic = \score { 
+inventionElevenMusic = 
+\score { 
   \header {
     opus = "BWV 782"
   }
@@ -94,18 +97,19 @@ inventionElevenMusic = \score {
 
 \include "articulate.ly"
 
-inventionElevenMidi = \book {
-  \bookOutputName "invention-no11-G-min"
-  \score { 
-    \articulate {
-      \keepWithTag midi
-      <<
-        \new Staff = "upper" \rightHand
-        \new Staff = "lower" \leftHand
-      >>
-    }
-    \midi {
-      \tempo 4 = 76
-    }
+inventionElevenMidi = 
+\score { 
+  \header {
+    midiOutputFile = "invention-no11-G-min" % see midi-title.ily
+  }
+  \articulate {
+    \keepWithTag midi
+    <<
+      \new Staff = "upper" \rightHand
+      \new Staff = "lower" \leftHand
+    >>
+  }
+  \midi {
+    \tempo 4 = 76
   }
 }
diff --git a/includes/invention-no12-A-maj-parts.ily b/includes/invention-no12-A-maj-parts.ily
@@ -3,6 +3,8 @@
 \version "2.24.0"
 \language "english"
 
+\include "midi-title.ily"
+
 global = {
   \time 12/8
   \key a \major
@@ -83,7 +85,8 @@ leftHand = \relative a {
   cs16 d cs b a gs  fs fs' e d cs b  cs d e8 e,  a4.\fermata |
 }
 
-inventionTwelveMusic = \score { 
+inventionTwelveMusic = 
+\score { 
   \header {
     opus = "BWV 783"
   }
@@ -99,18 +102,19 @@ inventionTwelveMusic = \score {
 
 \include "articulate.ly"
 
-inventionTwelveMidi = \book {
-  \bookOutputName "invention-no12-A-maj"
-  \score { 
-    \articulate {
-      \keepWithTag midi
-      <<
-        \new Staff = "upper" \rightHand
-        \new Staff = "lower" \leftHand
-      >>
-    }
-    \midi {
-      \tempo 4. = 72
-    }
+inventionTwelveMidi = 
+\score { 
+  \header {
+    midiOutputFile = "invention-no12-A-maj" % see midi-title.ily
+  }
+  \articulate {
+    \keepWithTag midi
+    <<
+      \new Staff = "upper" \rightHand
+      \new Staff = "lower" \leftHand
+    >>
   }
-}
+  \midi {
+    \tempo 4. = 72
+  }
+}
diff --git a/includes/invention-no13-A-min-parts.ily b/includes/invention-no13-A-min-parts.ily
@@ -3,6 +3,8 @@
 \version "2.24.0"
 \language "english"
 
+\include "midi-title.ily"
+
 global = {
   \time 4/4
   \key a \minor
@@ -83,7 +85,8 @@ leftHand = \relative a, {
   f8 ds e e'  a,2\fermata |
 }
 
-inventionThirteenMusic = \score { 
+inventionThirteenMusic = 
+\score { 
   \header {
     opus = "BWV 784"
   }
@@ -96,15 +99,16 @@ inventionThirteenMusic = \score {
   \layout {}
 }
 
-inventionThirteenMidi = \book {
-  \bookOutputName "invention-no13-A-min"
-  \score { 
-    <<
-      \new Staff = "upper" \rightHand
-      \new Staff = "lower" \leftHand
-    >>
-    \midi {
-      \tempo 4 = 108
-    }
+inventionThirteenMidi = 
+\score { 
+  \header {
+    midiOutputFile = "invention-no13-A-min" % see midi-title.ily
   }
-}
+  <<
+    \new Staff = "upper" \rightHand
+    \new Staff = "lower" \leftHand
+  >>
+  \midi {
+    \tempo 4 = 108
+  }
+}
diff --git a/includes/invention-no14-Bb-maj-parts.ily b/includes/invention-no14-Bb-maj-parts.ily
@@ -3,6 +3,8 @@
 \version "2.24.0"
 \language "english"
 
+\include "midi-title.ily"
+
 global = {
   \time 4/4
   \key bf \major
@@ -70,7 +72,8 @@ leftHand = \relative bf {
   bf1\fermata |
 }
 
-inventionFourteenMusic = \score { 
+inventionFourteenMusic = 
+\score { 
   \header {
     opus = "BWV 785"
   }
@@ -83,15 +86,16 @@ inventionFourteenMusic = \score {
   \layout {}
 }
 
-inventionFourteenMidi = \book {
-  \bookOutputName "invention-no14-Bb-maj"
-  \score { 
-    <<
-      \new Staff = "upper" \rightHand
-      \new Staff = "lower" \leftHand
-    >>
-    \midi {
-      \tempo 4 = 69
-    }
+inventionFourteenMidi = 
+\score { 
+  \header {
+    midiOutputFile = "invention-no14-Bb-maj" % see midi-title.ily
   }
-}
+  <<
+    \new Staff = "upper" \rightHand
+    \new Staff = "lower" \leftHand
+  >>
+  \midi {
+    \tempo 4 = 69
+  }
+}
diff --git a/includes/invention-no15-B-min-parts.ily b/includes/invention-no15-B-min-parts.ily
@@ -3,6 +3,8 @@
 \version "2.24.0"
 \language "english"
 
+\include "midi-title.ily"
+
 global = {
   \time 4/4
   \key b \minor
@@ -78,7 +80,8 @@ leftHand = \relative b, {
   b1\fermata |
 }
 
-inventionFifteenMusic = \score { 
+inventionFifteenMusic = 
+\score { 
   \header {
     opus = "BWV 786"
   }
@@ -93,17 +96,18 @@ inventionFifteenMusic = \score {
 
 \include "articulate.ly"
 
-inventionFifteenMidi = \book {
-  \bookOutputName "invention-no15-B-min"
-  \score { 
-    \articulate {
-      <<
-        \new Staff = "upper" \rightHand
-        \new Staff = "lower" \leftHand
-      >>
-    }
-    \midi {
-      \tempo 4 = 92
-    }
+inventionFifteenMidi = 
+\score { 
+  \header {
+    midiOutputFile = "invention-no15-B-min" % see midi-title.ily
+  }
+  \articulate {
+    <<
+      \new Staff = "upper" \rightHand
+      \new Staff = "lower" \leftHand
+    >>
+  }
+  \midi {
+    \tempo 4 = 92
   }
 }