Merge branch 'master' into lilypond/translation

[lilypond.git] / input / manual / unfretted-headword.ly

diff --git a/input/manual/unfretted-headword.ly b/input/manual/unfretted-headword.ly
index e4715160c04c28b426ed8e2e1c896cd506ff4db1..e859e1357be463126e2d69771ab9b82f2a4c7631 100644 (file)
--- a/input/manual/unfretted-headword.ly
+++ b/input/manual/unfretted-headword.ly
@@ -16,13 +16,13 @@
 
 %% Here by, I, the composer, agree that this extract of my composition
 %% be in the public domain and can be part of, used and presented in
-%% the Lilypond Documention Project.
+%% the LilyPond Documention Project.
 
 %% Statement Date: Octber the 9th, 2008
 
 
-\version "2.11.61"
-
+\version "2.12.0"
+#(set-global-staff-size 15)
 
 %%%
 %%% Abreviations
@@ -38,8 +38,8 @@ udbetc     = \markup { \line { \musicglyph #"scripts.upbow" " " \musicglyph #"sc
 
 fermaTa    = \markup \musicglyph #"scripts.ufermata"
 
-accel   = \markup \tiny \italic \bold "accel. ..."
-ritar   = \markup \tiny \italic \bold "ritar. ..."
+accel   = \markup \tiny \italic \bold "accel..."
+ritar   = \markup \tiny \italic \bold "ritar..."
 
 ignore     = \override NoteColumn #'ignore-collision = ##t
 
@@ -102,27 +102,6 @@ noflag         = \once \override Stem #'flag-style = #'no-flag
       (reverse args))))))
 
 
-%%%
-%%% Paper
-%%%
-
-#(set-global-staff-size 20)
-%#(set-default-paper-size "a4" 'landscape)
-
-\paper {
-  between-system-padding = 9
-}
-
-
-%%%
-%%% Header
-%%%
-
-\header {
-  meter       = "lentement"
-}
-
-
 %%%
 %%% Instruments
 %%%
@@ -138,9 +117,9 @@ ViolinSolo = \relative c' {
 
 
   %% Measure 1
-  \time 11/4
+  \time 25/8
   \mark \default
-  r2 ^\markup \colmark { \italic "fatigué" } r4
+  r2 ^\markup \colmark { \italic "fatigué" " " \bold "lentement"} r4 r r8
   <<
     { \shift d2 \glissando ^\markup \colmark { \quatre \dubetc \svib } \shifta e1 } \\
     { d2 \open \mf \< ~ \aniente d1  \! \> r4 r ^\markup \colmark { " " \fermaTa } \! }
@@ -149,7 +128,7 @@ ViolinSolo = \relative c' {
 
   %% Measure 2
   \time 7/4
-  \set Score.repeatCommands = #'((volta "¹) n.      ²) s.p."))
+  \set Score.repeatCommands = #'((volta "1) n.      2) s.p."))
   <<
     { \shift d2 \glissando ^\markup \colmark { \quatre \udbetc } \shifta e1 } \\
     { d2 \open \mf \< ~ d1 \! \> ~ d4 ^\markup \colmark { " " \fermaTa } \! }
@@ -163,7 +142,7 @@ ViolinSolo = \relative c' {
     { \shift d2 \glissando ^\markup \colmark { \quatre \dubetc \pvib \norm } \shifta e1 \glissando d2 } \\
     { d2 \open \mf \< ~ d1 ~ d2 \ff  ~ d1 \> ~ d2 ^\markup \colmark { " " " " \svib } ~ d4 \pp}
   >>
-
+  \break
 
   %% Measure 4
   \time 4/4
@@ -171,15 +150,15 @@ ViolinSolo = \relative c' {
   \tupletDown
   \times 2/3 { d4 ^\markup \colmark { \quatre \db \accel } d d }
   \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d }
-  \break
+
 
 
   %% Measure 5
   \time 5/4
-  \tupletbp \times 2/3 { d8 \mf \< ^\markup \colmark { \quatre \db " " \norm } d _\open d }
-  \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db " "\sulp } d _\open d }
-  \tupletbp \times 2/3 { d16 ^\markup \colmark { " " \db " " \norm } d _\open d d d _\open d }
-  d2 \ff ^\markup \colmark { " " " " \pvib } \>
+  \tupletbp \times 2/3 { d8 \mf \< ^\markup \colmark { \quatre \db \norm } d _\open d }
+  \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db \sulp } d _\open d }
+  \tupletbp \times 2/3 { d16 ^\markup \colmark { " " \db \norm } d _\open d d d _\open d }
+  d2 \ff ^\markup \colmark { " " \pvib } \>
 
 
   %% Measure 6
@@ -188,6 +167,7 @@ ViolinSolo = \relative c' {
   { d16 \staccato
     [ d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato]
   }
+  \break
 
 
   %% Measure 7
@@ -206,7 +186,6 @@ ViolinSolo = \relative c' {
 
   %% Measure 9
   <<
-    %% \override Glissando #'style = #'trill
     { \shift d2 \glissando ^\markup \colmark { \quatre } \shifta e1 } \\
     { d2 \open ~ d1  ^\markup \colmark { " " " " \mvib } }
   >>
@@ -222,23 +201,23 @@ ViolinSolo = \relative c' {
 \score {
 
   <<
-    \relative c' <<
-      \new Staff {
-        \set Staff.midiInstrument = "violin"
-        \ViolinSolo
-      }
+    \relative <<
+      \new Staff \ViolinSolo
     >>
+
     \override Score.Rest #'transparent = ##t
     \set Score.defaultBarType          = "empty"
   >>
 
   \layout  {
-    indent = 0.0
+    indent       = 0.0
     \context {
       \Staff
       \remove "Time_signature_engraver"
+    }
+    \context {
+      \Score
       \remove "Bar_number_engraver"
     }
   }
-  \midi { }
 }