Issue 2530: Use fractions rather than Scheme pairs for \scaleDuration, timeSignatureF...

[lilypond.git] / Documentation / ly-examples / aucun-snippet.ly

diff --git a/Documentation/ly-examples/aucun-snippet.ly b/Documentation/ly-examples/aucun-snippet.ly
index 3dd1a642edbf2487afd5a8cf6973d9e5afa860b2..bcfc2f1dceaa5b6fc0a929fc7e1e748e185944a0 100644 (file)
--- a/Documentation/ly-examples/aucun-snippet.ly
+++ b/Documentation/ly-examples/aucun-snippet.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.39"
 \include "example-header.ily"
 
 \paper {
@@ -136,21 +136,21 @@ thick y-factor offset)
 pair?)
 #{
 \once \override Voice.Stem #'text = \markup {
-    \postscript #(let ((x-off (car $offset))
-                       (y-off (cdr $offset)))
+    \postscript #(let ((x-off (car offset))
+                       (y-off (cdr offset)))
     (string-append
-    (ly:number->string (car $offset)) " " (ly:number->string (cdr $offset)) "
+    (ly:number->string (car offset)) " " (ly:number->string (cdr offset)) "
 translate "
-    (ly:number->string $angle) " rotate "
+    (ly:number->string angle) " rotate "
     (ly:number->string (- x-off)) " "
     (ly:number->string (- y-off)) " translate 0 setlinewidth "
-    (ly:number->string (- x-off $len-left))  " " (ly:number->string (+ y-off
-$thick)) " moveto "
-    (ly:number->string (- x-off $len-left))  " " (ly:number->string y-off)
-                                             " " (ly:number->string $thick) "
+    (ly:number->string (- x-off len-left))  " " (ly:number->string (+ y-off
+thick)) " moveto "
+    (ly:number->string (- x-off len-left))  " " (ly:number->string y-off)
+                                             " " (ly:number->string thick) "
 90 270 arc "
-    (ly:number->string (+ x-off $len-right)) " " (ly:number->string y-off)
-                                             " " (ly:number->string $thick) "
+    (ly:number->string (+ x-off len-right)) " " (ly:number->string y-off)
+                                             " " (ly:number->string thick) "
 270 90 arc "
                                              " gsave fill grestore stroke")) }
 
@@ -162,8 +162,8 @@ $thick)) " moveto "
     (ly:stencil-add
         sten1
         (ly:stencil-translate sten2
-                              (cons 0 (+ (* $y-factor (cdr extent1))
-                                         (* (- 1 $y-factor) (car extent1))))))))
+                              (cons 0 (+ (* y-factor (cdr extent1))
+                                         (* (- 1 y-factor) (car extent1))))))))
 #})
 
 
@@ -187,9 +187,9 @@ triplumNotes = \relative c' {
   f8 f4 e8 d c f f f | % 1
        % the \scaleDurations command below makes 5 notes last the
        % duration of a dotted quarter
-       e8 c4 \scaleDurations #'(3 . 2) {       \times 4/5{e16[ d e d e]} } e8 f4 | % 2
+       e8 c4 \scaleDurations 3/2 {     \times 4/5{e16[ d e d e]} } e8 f4 | % 2
   g2. ~ g4. | % 3
-       f8 d4 f4. \scaleDurations #'(3 . 2) { \times 4/6{ g16[ f e f e f]}} % 4
+       f8 d4 f4. \scaleDurations 3/2 { \times 4/6{ g16[ f e f e f]}} % 4
        g8 g4 g4. e4. | % 5
        fis8 d4 e8\startGroup g4\stopGroup f8[ e d] | % 6
        c2. r4. | % 7
@@ -222,10 +222,10 @@ tenorNotes = \relative c {
                  %\set Staff.instrumentName = "Triplum"
                  \set Staff.instrumentName = \incipitTriplum
                        \set Staff.shortInstrumentName = "Tr."
-      \set Staff.timeSignatureFraction = #'(9 . 8)
-      \scaleDurations #'(2 . 3)
+      \set Staff.timeSignatureFraction = 9/8
+      \scaleDurations 2/3
                  \context Voice = "triplum" { \global \triplumNotes }
-%      \scaleDurations #'(2 . 3)
+%      \scaleDurations 2/3
 %                      \context Voice = "slashes" { \triplumSkips }
            \new Lyrics { \lyricsto "triplum" { \triplumWords }}
                >>
@@ -233,8 +233,8 @@ tenorNotes = \relative c {
                  %\set Staff.instrumentName = "Motetus"
                  \set Staff.instrumentName = \incipitMotetus
                        \set Staff.shortInstrumentName = "M."
-      \set Staff.timeSignatureFraction = #'(9 . 8)
-      \scaleDurations #'(2 . 3)
+      \set Staff.timeSignatureFraction = 9/8
+      \scaleDurations 2/3
                        \context Voice = "motetus" { \global \motetusNotes }
            \new Lyrics { \lyricsto "motetus" { \motetusWords }}
          >>