From: Graham Percival <graham@percival-music.ca>
Date: Mon, 3 Mar 2008 20:18:21 +0000 (-0800)
Subject: Improve formatting of headwords.
X-Git-Tag: release/2.11.42-1~7^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b54170e3ea7794f415fe108a7babd83ee04579d7;p=lilypond.git

Improve formatting of headwords.
---

diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly
index 340971876f..2e3b8ff19c 100644
--- a/input/manual/editorial-headword.ly
+++ b/input/manual/editorial-headword.ly
@@ -1,6 +1,12 @@
 \version "2.11.38"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
 % NR 1.7 Editorial annotations
 
 % Beethoven, Op. 31, No. 3
diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly
index 56f873644c..e08844cbc4 100644
--- a/input/manual/expressive-headword.ly
+++ b/input/manual/expressive-headword.ly
@@ -1,6 +1,12 @@
 \version "2.11.38"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
 % NR 1.3 Expressive marks
 
 % L. v. Beethoven, Op. 49 no. 1 
@@ -146,6 +152,7 @@
       |
 
       <d'' c'' a'>4 \fermata
+      r8 r4 r8
    }
 
    % LH Staff
@@ -251,6 +258,7 @@
       |
 
       <d' fs>4 \fermata
+      r8 r4 r8
    }
 
 >>
diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly
index 67e74f8a2b..5bab51ba42 100644
--- a/input/manual/pitches-headword.ly
+++ b/input/manual/pitches-headword.ly
@@ -1,6 +1,12 @@
 \version "2.11.38"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+  
 % NR 1.1 Pitches
 
 % L. v. Beethoven 
@@ -46,6 +52,7 @@
          |
          \clef treble
          <e' gs>4 %)
+         r4 r2
       }
 
       % RH Voice 2
@@ -76,6 +83,7 @@
          <a fs>2. )
          |
          s4
+         r4 r2
       }
 
    >>
@@ -122,6 +130,7 @@
       <b,! b,,!>1 ( \sustainUp
       |
       <e e,>4 )
+      r4 r2
    }
 
 >>
diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly
index 16ce69716c..8ec89eb753 100644
--- a/input/manual/repeats-headword.ly
+++ b/input/manual/repeats-headword.ly
@@ -1,6 +1,12 @@
 \version "2.11.38"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
 % NR 1.7 Repeats
 
 % Beethoven, Op. 57
diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly
index ff2a300f35..81b3176137 100644
--- a/input/manual/rhythms-headword.ly
+++ b/input/manual/rhythms-headword.ly
@@ -1,6 +1,12 @@
 \version "2.11.38"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
 % NR 1.2 Rhythms
 
 % Beethoven, Op. 81a
diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly
index ff363992be..766754e067 100644
--- a/input/manual/simultaneous-headword.ly
+++ b/input/manual/simultaneous-headword.ly
@@ -1,6 +1,12 @@
 \version "2.11.38"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
 % NR 1.5 Simultaneous notes
 
 % L. v. Beethoven, Op. 111
@@ -98,6 +104,7 @@
          \key ef \major
          c'''8. [
          cs'''8. \f ] \stopTrillSpan 
+         r8.
          
       }
 
@@ -281,6 +288,7 @@
       \key ef \major
       r8.
       r8.
+      r8.
          
    }
    
diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly
index d981a20bbe..90ff24f115 100644
--- a/input/manual/staff-headword.ly
+++ b/input/manual/staff-headword.ly
@@ -1,6 +1,12 @@
 \version "2.11.38"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
 % NR 1.6 Staff notation
 
 % L. v. Beethoven, Op. 106
@@ -157,7 +163,7 @@
       R1 * 3/4
 
       \bar "||"
-      \key d \major
+      %\key d \major
    }
 
    % LH
@@ -230,7 +236,7 @@
       R1 * 3/4
 
       \bar "||"
-      \key d \major
+      %\key d \major
    }
 
 >>
diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly
index c29327137d..7cbc123f3c 100644
--- a/input/manual/text-headword.ly
+++ b/input/manual/text-headword.ly
@@ -1,6 +1,12 @@
 \version "2.11.38"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
 % NR 1.8 Text
 
 % L. v. Beethoven, Op. 110