From 835733c03b16c46b9f0954591308d92abf548df0 Mon Sep 17 00:00:00 2001
From: jleightcap <jack@leightcap.com>
Date: Fri, 4 Jun 2021 00:21:18 -0400
Subject: [PATCH] text formatting

---
 Vexations.ly | 66 ++++++++++++++++++++++++++++++++++++++--------------
 piano.ly     | 24 ++++++++++++-------
 2 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/Vexations.ly b/Vexations.ly
index 75f024e..e99c8d5 100644
--- a/Vexations.ly
+++ b/Vexations.ly
@@ -1,27 +1,59 @@
 \version "2.21.1"
 
-\header {
-  title = "VEXATIONS"
-  composer = "ERIK SATIE"
-  meter = "Très lent"
-}
-
 \include "piano.ly"
 
-\score {
-  <<
-    \new PianoStaff
+\book {
+  \header {
+    title = "VEXATIONS"
+    composer = "ERIK SATIE"
+    meter = "Très lent"
+    poet = \markup{
+      \italic
+      \pad-markup #4
+      \column {
+        \line { NOTE DE L'AUTEUR: }
+        \wordwrap \italic {
+          Pour se jouer 840 fois de suite ce motif, il sera bon de se préparer au préalable, et dans le plus grand silence, par des immobilités sérieuses
+        }
+      }
+
+    }
+  }
+
+  \score {
     <<
-      \set PianoStaff.instrumentName = #""
-      \new Staff = "rightHand" << \rightHand >>
-      \new Staff = "leftHand" << \leftHand >>
+      \new PianoStaff
+      <<
+        \set PianoStaff.instrumentName = #""
+        \new Staff = "rightHand" << \rightHand >>
+        \new Staff = "leftHand" << \leftHand >>
+      >>
     >>
-  >>
 
-  \layout {
-    \context {
-      \Score
-      \omit BarNumber
+    \layout {
+      \context {
+        \Score
+        \omit BarNumber
+      }
     }
   }
+
+  \score {
+    \header {
+      piece = \markup {
+        \italic
+        \wordwrap {
+          "A ce signe il sera d'usage de présenter le thème de la Basse"
+        }
+      }
+    }
+
+    <<
+      \new PianoStaff
+      <<
+        \set PianoStaff.instrumentName = \markup{\italic "THÈME "}
+        \new Staff = "theme" << \theme >>
+      >>
+    >>
+  }
 }
diff --git a/piano.ly b/piano.ly
index e18eee3..b3a3ec9 100644
--- a/piano.ly
+++ b/piano.ly
@@ -24,7 +24,8 @@ rightHand = \relative c'' {
   <cis g'!>8
   <cis g'!>~
   <cis g'!>8
-  r8 \bar "||"
+  r8 |
+  \bar "||"
 
   \break % variation 2
   <ees, a>4
@@ -46,12 +47,14 @@ rightHand = \relative c'' {
   <g! cis>8
   <g! cis>~
   <g! cis>8
-  r8 \bar "||"
+  r8 |
+  \bar "||"
 }
 
 leftHand = \relative c' {
   \clef "bass"
   \once \override Staff.TimeSignature #'stencil = ##f 
+  \time 13/4
 
   % variation 1
   \stemDown \change Staff = "rightHand" c4
@@ -73,7 +76,8 @@ leftHand = \relative c' {
   e!8
   e8~
   e8
-  s8 \bar "||"
+  s8 |
+  \bar "||"
 
   \break % variation 2
   \stemUp \change Staff = "leftHand" c4
@@ -95,11 +99,15 @@ leftHand = \relative c' {
   e!8
   e8~
   e8
-  s8 \bar "||"
+  s8 |
+  \bar "||"
+}
+
+theme = \relative c' {
+  \clef "bass"
+  \once \override Staff.TimeSignature #'stencil = ##f 
+  \time 13/4
 
-  \break % theme
-  \stemDown \change Staff = "leftHand"
-  c4^\markup{"THÈME"}
-  a8[ cis] bes4 dis g,8[ d'!] c![ dis] ges,4 cis f,!8[ b!] ges[ dis'] ces4 e!8 e8~ e8
+  c4 a8[ cis] bes4 dis g,8[ d'!] c![ dis] ges,4 cis f,!8[ b!] ges[ dis'] ces4 e!8 e8~ e8 r8 |
   \bar "||"
 }
-- 
2.38.5