From 5376c4bf6fc40c51853d4a58777bddcf85b175cd Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Fri, 18 Jan 2008 21:19:12 -0800
Subject: [PATCH] Update headwords from Trevor Baca.

---
 input/manual/editorial-headword.ly    |  9 ---------
 input/manual/expressive-headword.ly   | 11 -----------
 input/manual/pitches-headword.ly      | 10 +---------
 input/manual/repeats-headword.ly      | 11 -----------
 input/manual/rhythms-headword.ly      | 17 +++++++----------
 input/manual/simultaneous-headword.ly | 11 -----------
 input/manual/staff-headword.ly        | 11 -----------
 input/manual/text-headword.ly         | 13 +------------
 8 files changed, 9 insertions(+), 84 deletions(-)

diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly
index 12d7fa86ba..3279c7ee3a 100644
--- a/input/manual/editorial-headword.ly
+++ b/input/manual/editorial-headword.ly
@@ -7,15 +7,6 @@
 % Piano sonata 18, Movt II, Scherzo
 % Measures 9 - 14
 
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
-}
-
 \layout { }
 
 \new PianoStaff <<
diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly
index 625816d552..cc65ce18b3 100644
--- a/input/manual/expressive-headword.ly
+++ b/input/manual/expressive-headword.ly
@@ -7,17 +7,6 @@
 % Piano sonata 19 - "Leichte Sonate"
 % measures 1 - 12
 
-#(set-global-staff-size 16)
-
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
-}
-
 %\layout {
 %   \context {
 %      \Score
diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly
index 7937eb844a..4b4f0b84f1 100644
--- a/input/manual/pitches-headword.ly
+++ b/input/manual/pitches-headword.ly
@@ -7,14 +7,6 @@
 % Piano sonata 21 - Dem Grafen von Waldstein Gewidmet
 % chorale at measures 34 - 40+
 
-\layout {
-   \context {
-      \Score
-      \override SpacingSpanner #'base-shortest-duration = 
-         #(ly:make-moment 1 20) 
-   }
-}
-
 \new PianoStaff <<
 
    % RH Staff
@@ -74,8 +66,8 @@
          |
          b'2. ( \sf \>
          a'4 ) 
-         |
          \clef bass
+         | \break
          s1 \p
          |
          s1
diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly
index 3e933c8714..8169906271 100644
--- a/input/manual/repeats-headword.ly
+++ b/input/manual/repeats-headword.ly
@@ -8,19 +8,8 @@
 % Movt II, Andante con moto
 % Measures 9 - 16
 
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
-}
-
 \layout { }
 
-#(set-global-staff-size 18)
-
 \new PianoStaff <<
 
    \new Staff = RH {
diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly
index 4c9ff368b8..2d7dbbf92c 100644
--- a/input/manual/rhythms-headword.ly
+++ b/input/manual/rhythms-headword.ly
@@ -8,18 +8,15 @@
 % Movt II - Abwesenheit
 % Measures 31 - 34
 
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
+\layout {
+   \context {
+      \Score
+      \override SpacingSpanner #'base-shortest-duration = 
+         #(ly:make-moment 1 40) 
+      %\override SpacingSpanner #'strict-grace-spacing = ##t
+   }
 }
 
-\layout { }
-
-#(set-global-staff-size 16)
 \new PianoStaff <<
 
    % RH Staff
diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly
index e1826feb1e..f675e9f0ad 100644
--- a/input/manual/simultaneous-headword.ly
+++ b/input/manual/simultaneous-headword.ly
@@ -8,17 +8,6 @@
 % Movt II - Arietta - Adagio molto semplice e cantabile
 % measures 108 - 118
 
-#(set-global-staff-size 16)
-
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
-}
-
 \layout {
    \context {
       \Score
diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly
index 362962445b..3942374a45 100644
--- a/input/manual/staff-headword.ly
+++ b/input/manual/staff-headword.ly
@@ -7,17 +7,6 @@
 % Piano sonata 29 - Für das Hammer-Klavier
 % Movt IV
 
-#(set-global-staff-size 14)
-
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  %ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
-}
-
 \layout {
    \context {
       \Score
diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly
index baad1dc964..c7d8f01e27 100644
--- a/input/manual/text-headword.ly
+++ b/input/manual/text-headword.ly
@@ -5,18 +5,7 @@
 
 % L. v. Beethoven, Op. 110
 % Piano sonata 31
-% measures 1 - 
-
-#(set-global-staff-size 14)
-
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  %ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
-}
+% measures 1 - 7
 
 \layout {
    \context {
-- 
2.39.5