Headword tweaks.

diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly
index 88519380baf46539bf29c1a81c19af9da2f5f1df..f0576bff220289280c091191765e1e46bc0e55c5 100644 (file)
--- a/input/manual/expressive-headword.ly
+++ b/input/manual/expressive-headword.ly
@@ -1,17 +1,9 @@
 \version "2.11.51"
 \include "english.ly"
 #(set-global-staff-size 15)
-\paper{
-  ragged-right=##t
-  line-width=17\cm
-  indent=0\cm
-}
- 
-\layout {
-  \context { \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
-  }
+\paper {
+  line-width = 16\cm
+  indent = 0\cm
 }
 
 % NR 1.3 Expressive marks
@@ -39,8 +31,8 @@
       \once \override TextScript #'staff-padding = #2
       d'8 \staccato
       ^ \markup { \column {
-         "RONDO"
-         \italic "Allegro" } }
+         RONDO
+         \italic Allegro } }
       d'8 \staccato
       g'8 \staccato
       a'8 \staccato

diff --git a/input/manual/keyboard-headword.ly b/input/manual/keyboard-headword.ly
index 1813e1ffbd49cc8a1134c7828dd07ada4419ec6c..6e453ffcb44f13aaabc2961730210325b433a2be 100644 (file)
--- a/input/manual/keyboard-headword.ly
+++ b/input/manual/keyboard-headword.ly
@@ -2,227 +2,244 @@
 \include "english.ly"
 
 #(set-global-staff-size 15)
-\paper{
-  ragged-right=##t
-  line-width=17\cm
-  indent=0\cm
+\paper {
+  line-width = 16\cm
+  indent = 0\cm
 }
 
+% NR 2.2 Keyboard instruments
+
+% M. Ravel, Sonatine (1905)
+% First movement
+
 \layout {
-  \context { \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
+  \context {
+    \Score
+    \remove "Bar_number_engraver"
+  }
+  \context {
+    \Staff
+    \remove "Time_signature_engraver"
+  }
+}
+
+fermataLong = \markup {
+  \override #'(direction . 1)
+  \override #'(baseline-skip . 2) {
+    \dir-column {
+      \musicglyph #"scripts.ufermata"
+      \text \italic \hcenter long
+    }
   }
 }
 
 \new PianoStaff <<
   \set PianoStaff.connectArpeggios = ##t
   \new Staff {
-     \time 2/4
-     \key fs \major
-     <<
-        \new Voice {
-           \voiceOne
-           fs''8 (
-           ^ \markup \column {
-              \line \bold { Un peu retenu  }
-              \line \italic { très expressif } }
-           es''16
-           cs''16
-           as'4 )
-           |
-           fs''8 (
-           es''16
-           cs''16
-           as'4 )
-           |
-           fs''8 (
-           es''16
-           cs''16
-           as'8
-           cs''8 )
-           |
-        }
-        \new Voice {
-           \voiceTwo
-           r8 \ppp
-           fs'4 (
-           es'8 )
-           |
-           r8
-           fs'4 (
-           es'8 )
-           |
-           r8
-           fs'4 (
-           es'8 )
-           |
-        }
-    >>
-     \clef bass
-     <ds b! es'>4 (
-     ^ \markup \bold { Rall. }
-     \once \override Script #'padding = #2
-     <ds' as'>8 ) \fermata
-     \noBeam
-     \clef treble
-     \slurUp
-     <as fs'>8 ( \pp
-     |
-     <gs b cs'>4. )
-     ^ \markup \bold { a tempo }
-     \slurUp
-     <as fs'>8 (
-     |
-     <gs b cs'>4. )
-     <<
-        \new Voice {
-           \voiceOne
-           <as fs'>8 (
-           ^ \markup \bold { Rallentando }
-           |
-           cs'8
-           b16
-           cs'16
-           d'8
-           e'16
-           fs'16
-           |
-           <as! cs' gs'>4. )
-           s8
-           |
-           r8
-           <cs'' as'' cs'''>4 \arpeggio
-           e''16 (
-           ^ \markup \bold { Lent }
-           fs''16
-           |
-           \stemDown
-           <as'! cs'' gs''>2 )
-           |
-        }
+    \time 2/4
+    \key fs \major
+    <<
       \new Voice {
-           \voiceTwo
-           s8
-           |
-           <gs b>4 \<
-           <fs bs>4 \>
-           |
-           s4. \!
-           \slurUp
-           \once \override Script #'direction = #up
-           <a bs e'>8 ( \accent
-           |
-           <as! cs' gs'>4. )
-           <a' bs'>8 \ppp \>
-           |
-           s8 \!
-           \stemDown
-           \once \override Script #'direction = #up
-           #(set-octavation 1)
-           % \once \override Arpeggio #'extra-offset = #'(-0.25 .
-           % 0)
-           <cs''' as''' cs''''>4. \arpeggio \fermata
-           #(set-octavation 0)
-           \bar "|."
-        }
-     >>
-  }
-  \new Staff <<
-     \set Staff.pedalSustainStyle = #'bracket
-     \key fs \major
-     \clef bass
-     \new Voice {
         \voiceOne
-        ds'4 \tenuto
-        cs'4 \tenuto
+        fs''8 ( ^\markup {
+          \override #'(baseline-skip . 2.4) \column {
+            \line \bold { Un peu retenu }
+            \line \italic { très expressif }
+          }
+        }
+        es''16
+        cs''16
+        as'4 )
+        |
+        fs''8 (
+        es''16
+        cs''16
+        as'4 )
+        |
+        fs''8 (
+        es''16
+        cs''16
+        as'8
+        cs''8 )
+        |
+      }
+      \new Voice {
+        \voiceTwo
+        gs'8\rest \ppp
+        fs'4 (
+        es'8 )
         |
-        ds'4 \tenuto
-        cs'4 \tenuto
+        gs'8\rest
+        fs'4 (
+        es'8 )
         |
-        ds'4 \tenuto
-        cs'4 \tenuto
+        gs'8\rest
+        fs'4 (
+        es'8 )
         |
-        s8
-        \clef treble
-        <b' cs''>8 [
-        \clef bass
-        <es b cs'>8 \fermata ]
-        s8
+      }
+    >>
+    \clef bass
+    <ds b! es'>4 ( ^ \markup \bold { Rall. }
+    \override Script #'stencil = #(lambda (grob)
+      ly:script::print (grob-interpret-markup grob fermataLong))
+    <ds' as'>8 ) \fermata
+    \noBeam
+    \clef treble
+    \slurUp
+    \once \override Hairpin #'to-barline = ##f
+    <as fs'>8 ( \pp \>
+    |
+    <gs b cs'>4. \! ) ^\markup \bold { a Tempo }
+    \slurUp
+    <as fs'>8 ^\( \>
+    |
+    <gs b cs'>4. \! \)
+    <<
+      \new Voice {
+        \voiceOne
+        <as fs'>8 (
         |
-        r8
-        \clef treble
-        <b' cs''>4 \tenuto
-        s8
+        cs'8 ^\markup \bold { Rallentando }
+        b16
+        cs'16
+        d'8
+        e'16
+        fs'16
         |
-        r8
-        \clef treble
-        <b' cs''>4 \tenuto
+        <as! cs' gs'>4. )
         s8
         |
-        s2
-        |
         r8
-        \clef treble
-        <as' cs''>4
-        \clef bass
-        s8
+        <cs'' as'' cs'''>4 \arpeggio
+        e''16 ( ^\markup \bold { Lent }
+        fs''16
         |
-        s8
-        \clef treble
-        <as'>4 \arpeggio
-        \clef bass
-        s8
-        |
-        s8
-        \clef treble
-        <as''>4. \arpeggio \fermata
-        |
-     }
-     \new Voice {
         \voiceTwo
-        ds'8 [ (
-        < ds bs >8
-        cs'8
-        < ds as >8 ] )
-        |
-        ds'8 [ (
-        < ds bs >8
-        cs'8
-        < ds as >8 ] )
-        |
-        ds'8 [ (
-        < ds bs >8
-        cs'8
-        < ds as >8 ] )
+        <as'! cs'' gs''>2 )
         |
-        \once \override Script #'outside-staff-priority = #100
-        \once \override TextScript #'outside-staff-priority = #500
-        <cs, gs,>4. \fermata
-        _ \markup \italic { ped. }
-        <fs, cs>8 (
-        |
-        <e, b,>4. ) \sustainOn
-        \clef bass
-        <fs, cs>8 ( \sustainOff
-        |
-        <e, b,>4. ) \sustainOn
-        \clef bass
-        <fs, cs>8 ( \sustainOff
-        |
-        <e, b,>4
-        <d, a,>4
+      }
+      \new Voice {
+        \voiceTwo
+        s8
         |
-        <fs,, cs,>4. ) \sustainOn
-        <a, e>8 ( \sustainOff
+        <gs b>4 \<
+        <fs bs>4 \>
         |
-        <fs, cs>4. ) \sustainOn
+        s4. \!
         \slurUp
-        <a e'>8 ( \sustainOff \sustainOn
+        \once \override Script #'direction = #UP
+        <a bs e'>8 ( \accent
         |
-        <fs cs'>2 ) \sustainOff \sustainOn
+        <as! cs' gs'>4. )
+        \once \override Hairpin #'to-barline = ##f
+        <a' bs'>8 \ppp \>
         |
-     }
+        s8 \!
+        \stemDown
+        \once \override Script #'direction = #UP
+        #(set-octavation 1)
+        \voiceOne
+        \once \override PianoStaff.Arpeggio #'padding = #0.8
+        <cs''' as''' cs''''>4. \arpeggio \fermata
+        #(set-octavation 0)
+        \bar "|."
+      }
+    >>
+  }
+  \new Staff <<
+    \set Staff.pedalSustainStyle = #'bracket
+    \key fs \major
+    \clef bass
+    \new Voice {
+      \voiceOne
+      ds'4 \tenuto
+      cs'4 \tenuto
+      |
+      ds'4 \tenuto
+      cs'4 \tenuto
+      |
+      ds'4 \tenuto
+      cs'4 \tenuto
+      |
+      s8
+      \clef treble
+      <b' cs''>8 [
+      \clef bass
+      <es b cs'>8 \fermata ]
+      s8
+      |
+      fs8\rest
+      \clef treble
+      <b' cs''>4 \tenuto
+      s8
+      |
+      fs8\rest
+      \clef treble
+      <b' cs''>4 \tenuto
+      s8
+      |
+      s2
+      |
+      ds8\rest
+      \clef treble
+      <as' cs''>4
+      \clef bass
+      s8
+      |
+      s8
+      \clef treble
+      <as'>4 \arpeggio
+      \clef bass
+      s8
+      |
+      s8
+      \clef treble
+      <as''>4. \arpeggio \fermata
+      |
+    }
+    \new Voice {
+      \voiceTwo
+      ds'8 [ (
+      < ds bs >8
+      cs'8
+      < ds as >8 ] )
+      |
+      ds'8 [ (
+      < ds bs >8
+      cs'8
+      < ds as >8 ] )
+      |
+      ds'8 [ (
+      < ds bs >8
+      cs'8
+      < ds as >8 ] )
+      |
+      \once \override Script #'outside-staff-priority = #100
+      \once \override TextScript #'outside-staff-priority = #500
+      <cs, gs,>4. \fermata _\markup \italic { ped. }
+      <fs, cs>8 (
+      |
+      <e, b,>4. ) \sustainOn
+      \clef bass
+      <fs, cs>8 \( \sustainOff
+      |
+      <e, b,>4. \) \sustainOn
+      \clef bass
+      <fs, cs>8 ( \sustainOff
+      |
+      <e, b,>4
+      <d, a,>4
+      |
+      <fs,, cs,>4. ) \sustainOn
+      <a, e>8 ( \sustainOff
+      |
+      <fs, cs>4. ) \sustainOn
+      \slurUp
+      <a e'>8 ( \sustainOff \sustainOn
+      |
+      <fs cs'>2 ) \sustainOff \sustainOn
+      |
+    }
   >>
 >>
-

diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly
index c9cc86e8db79254aed8fb2a11331cfba110b920e..cc5820c27c85fbb79a4aa4a27e18c83a3c895b2e 100644 (file)
--- a/input/manual/repeats-headword.ly
+++ b/input/manual/repeats-headword.ly
@@ -1,17 +1,9 @@
 \version "2.11.51"
 \include "english.ly"
 #(set-global-staff-size 15)
-\paper{
-  ragged-right=##t
-  line-width=17\cm
-  indent=0\cm
-}
- 
-\layout {
-  \context { \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
-  }
+\paper {
+  line-width = 16\cm
+  indent = 0\cm
 }
 
 % NR 1.7 Repeats
@@ -21,7 +13,12 @@
 % Movt II, Andante con moto
 % Measures 9 - 16
 
-\layout { }
+\layout {
+  \context {
+    \Staff
+    \remove "Time_signature_engraver"
+  }
+}
 
 \new PianoStaff <<
 
@@ -32,7 +29,7 @@
       \set Score.currentBarNumber = #9
       \bar "|:"
       <af ef c>4 (
-      <af g c>8..
+      <af gf c>8..
       <af ef c>32
       |
       <af f df>8. )

diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly
index eb0434eb7c3dbb785568a87bb43042cfdd72d506..f0f4b11454d249df1cc999a48f286e3413612cf4 100644 (file)
--- a/input/manual/rhythms-headword.ly
+++ b/input/manual/rhythms-headword.ly
@@ -1,17 +1,9 @@
 \version "2.11.51"
 \include "english.ly"
 #(set-global-staff-size 15)
-\paper{
-  ragged-right=##t
-  line-width=17\cm
-  indent=0\cm
-}
- 
-\layout {
-  \context { \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
-  }
+\paper {
+  line-width = 16\cm
+  indent = 0\cm
 }
 
 % NR 1.2 Rhythms
@@ -22,12 +14,16 @@
 % Measures 31 - 34
 
 \layout {
-   \context {
-      \Score
-      \override SpacingSpanner #'base-shortest-duration = 
-         #(ly:make-moment 1 40) 
+  \context {
+    \Score
+    \override SpacingSpanner #'base-shortest-duration =
+      #(ly:make-moment 1 40)
       %\override SpacingSpanner #'strict-grace-spacing = ##t
-   }
+  }
+  \context {
+    \Staff
+    \remove "Time_signature_engraver"
+  }
 }
 
 \new PianoStaff <<
@@ -39,7 +35,12 @@
       \time 2/4
       \set Score.currentBarNumber = #31
 
-      <c'' c'>8 (
+      <c''' c''>8 ( -\markup {
+        \override #'(baseline-skip . 2) \italic \column {
+          \line { a tempo }
+          cantabile
+        }
+      }
       <g'' g'>8 )
       ~
       <g'' g'>8 (
@@ -49,7 +50,7 @@
       |
 
       \afterGrace
-         <f'' f'>8 (
+         <f'' f'>8 [ (
          {
             e''16 [
             f''16
@@ -57,8 +58,9 @@
             d''16 ]
          }
       <e''! e'>16
-      <f'' f'>16 )
-      <g'' g'>16 ( \staccato
+      <f'' f'>16 ] )
+      \once \override TextScript #'padding = #3.8
+      <g'' g'>16 ( \staccato -\markup { \italic cresc. }
       <a'' a'>16 ) \staccato
       <bf'' bf'>32  (
       <b'' b'>32 )
@@ -66,11 +68,12 @@
       <c''' c''>32 )
 
       |
-
-      b''32 (
+      
+      \once \override DynamicLineSpanner #'padding = #2
+      b''32 ( \p \>
       c'''32
       d'''32
-      c'''32 )
+      c'''32 ) \!
       g''8 (
       ~
       g''32 [
@@ -97,7 +100,7 @@
       |
 
       \afterGrace
-         <f'' f'>8 (
+         <f'' f'>8 [ (
          {
             e''16 [
             f''16
@@ -105,8 +108,8 @@
             d''16 ]
          }
       <e''! e'>16
-      <f'' f'>16 )
-      <g'' g'>16 ( \staccato
+      <f'' f'>16 ] )
+      <g'' g'>16 ( \staccato -\markup { \italic cresc. }
       <af''! af'!>16 ) \staccato
       <bf'' bf'>32  (
       <b'' b'>32 )

diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly
index 58f06b60edc3221906f3ff0a63d24f40450ebb40..c3ccf5f482fb320b51ec8787e9d30e9a8593ba9b 100644 (file)
--- a/input/manual/text-headword.ly
+++ b/input/manual/text-headword.ly
@@ -2,9 +2,8 @@
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper{
-  ragged-right=##t
-  line-width=17\cm
-  indent=0\cm
+  line-width = 16\cm
+  indent = 0\cm
 }
  
 \layout {
@@ -49,7 +48,7 @@
 
       <df'' g'>4
       <bf' g'>2
-      _ \markup { \italic { "ten." } }
+      _ \markup { \italic { ten. } }
 
       |
 
@@ -66,10 +65,10 @@
 
             \once \override TextScript #'staff-padding = #4
             ef''8. (
-            _ \markup { \italic { "tranqu." } }
+            _ \markup { \italic { tranqu. } }
             d''16 )
             df''8 \trill \fermata
-            _ \markup { \italic { "ten." } }
+            _ \markup { \italic { ten. } }
          }
 
          \new Voice {
@@ -90,7 +89,7 @@
       \oneVoice
       \once \override TextScript #'staff-padding = #4
       df''32 
-      _ \markup { \italic "dolce" }
+      _ \markup { \italic dolce }
       c''32 
       df''32
       ef''32
@@ -156,7 +155,7 @@
             |
 
             bf4
-            bf8 ^ \markup { \italic "ten." }
+            bf8 ^ \markup { \italic ten. }
          }
 
          \new Voice {