Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / Documentation / snippets / expressive-headword.ly

diff --git a/Documentation/snippets/expressive-headword.ly b/Documentation/snippets/expressive-headword.ly
index eb6b31b11ffdec8ea68a0cddea8d083452b12475..f9f5e9b908c8cc2da81077d29d8a30aefbeeb9e0 100644 (file)
--- a/Documentation/snippets/expressive-headword.ly
+++ b/Documentation/snippets/expressive-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.2"
+\version "2.17.11"
 
 \header {
   lsrtags = "headword"
@@ -17,11 +17,6 @@ Expressive headword
 } % begin verbatim
 
 \include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
 
 % NR 1.3 Expressive marks
 
@@ -32,8 +27,8 @@ Expressive headword
 %\layout {
 %   \context {
 %      \Score
-%      \override SpacingSpanner #'base-shortest-duration =
-%         #(ly:make-moment 1 20)
+%      \override SpacingSpanner.base-shortest-duration =
+%         #(ly:make-moment 1/20)
 %   }
 %}
 
@@ -45,7 +40,7 @@ Expressive headword
       \key g \major
       \time 6/8
       \partial 2
-      \once \override TextScript #'staff-padding = #2
+      \once \override TextScript.staff-padding = #2
       d'8 \staccato
       ^ \markup { \column {
          RONDO