release: 0.0.46.jcn1

[lilypond.git] / input / scales.ly

diff --git a/input/scales.ly b/input/scales.ly
index 0c210cbf778bd8701ad6bc4656a71d46d98e6d5a..1fe1f398751da52d1bd87ed5f22f2c494467a6da 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -1,41 +1,42 @@
 
-blah = \staff{\melodic{    \meter {6/8}
-                \skip {36*8}
-               \meter {4/4}}
-       \melodic{       
-\duration { 8 }
-                       \octave{ }
-                        |[ a a a a a a a a a ]6/9 
-                       \octave{ 1 }
-                        |[ a a a a a a a a a ]6/9 
-                       \octave { ' } 
+blah = \staff{  "melodic" 
+       \melodic {
+               \duration { 8 }           \meter {6/8}  
+               
+               \octave{ c }
+                        |[ a cr a a a a a a a rc a ]6/9 
+                       \octave{ c }
+                        |[ a decr a a a a a a a rc a ]6/9 
+                       \octave { c' } 
                         [ 'c 'g d a e' b' f'' c''' g''' ]6/9
                         [ g''' c''' f'' b' e' a d 'g 'c ]6/9
-                       \octave{ 1 }
+                       \octave{ c'' }
                         [ 'c 'g d a e' b' f'' c''' g''' ]6/9
                         [ g''' c''' f'' b' e' a d 'g 'c ]6/9
-                       \octave { } 
+                       \octave { ''c}   
                         [ c g d' ]2/3 
                         [ d' g c ]2/3  
                         [ f c' g' ]2/3 
                         [ g' c' f ]2/3  
-                       \octave{ 1 }
+                       \octave{ c }
                         [ c g d' ]2/3 
                         [ d' g c ]2/3  
                         [ f c' g' ]2/3 
                         [ g' c' f ]2/3 
-
+ [ g' c' f ]2/3 
+  \meter {4/4}
+       
 c1
        \duration { 8}
        [c-> d-> e-> f->][g-> a-> b-> c'->] % 1
-\octave{'}     [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
-\octave{}      [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
+\octave{c'}    [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
+\octave{c}     [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
        [c-. d-. e-. f-.][g-. a-. b-. c'-.]
        [c'-- b-- a-- g][f-- e-- d c--] % 5
-       [c-\portato d-\portato e-\portato f-\portato]
-               [g-\portato a-\portato b-\portato c'-\portato]
-       [c'-\upbow b-\upbow a-\downbow g-\downbow]
-               [f-\downbow e-\downbow d-\upbow c-\upbow]
+       [c-portato d-portato e-portato f-portato]
+               [g-portato a-portato b-portato c'-portato]
+       [c'-upbow b-upbow a-downbow g-downbow]
+               [f-downbow e-downbow d-upbow c-upbow]
        [c-| d-| e-| f-|][g-| a-| b-| c'-|]
        [c' b a g][f e d c]
        [c d e f][g a b c'] % 10