release: 1.1.43

[lilypond.git] / mutopia / los-toros-oboe.ly

diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index 48fed8cf124f8df6cb48dc3647f84517ef0b264a..f889f73d66a44b0abd63ebc293f04c99d62ea17b 100644 (file)
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -8,26 +8,13 @@ enteredby =    "jcn";
 copyright =     "public domain";
 latexheaders=    "headers";
 } 
-\version "1.0.0";
+\version "1.0.19";
 
-%{
-Silly latex file dropped; use ly2dvi
 
-Converted to relative octave from los-toros-oboe.ly:
-    :s/[^\\]'/'x/g
-    :s/'x//g
-    (511 substitutions on 155 lines)
-
-    lilypond -f los-toros-oboe 2> bla
-    wc -l bla
-    138
-    138 / 3 =  46 octave quotes of 511 remain!
-
-%}
 
 \include "paper16.ly"
 
-hoboonestart = \melodic
+hoboonestart = \notes
   \relative c'{
 % ugh: cant copy: allegro/primo tempo
        \property Voice . textstyle =  "large"
@@ -35,7 +22,7 @@ hoboonestart = \melodic
        \property Voice . textstyle =  "italic"
 }
 
-hobooneintro = \melodic  \relative c'{
+hobooneintro = \notes  \relative c'{
 
 %      \property Voice . textstyle =  "roman"
 %      [es''16-.-"Allegro" es-. es-. es-.] [es8-. d-.] |
@@ -60,7 +47,7 @@ hobooneintro = \melodic  \relative c'{
        [)g8  r d'] r |
 }
 
-hoboonemid = \melodic  \relative c'{
+hoboonemid = \notes    \relative c'{
 
        [g'16-. g-. g-. g-.] [g8-. f-.] |
        as2-> |
@@ -125,11 +112,11 @@ hoboonemid = \melodic     \relative c'{
        [fis16( e a, )c] e4 ~ |
        [e16 d( e, c'] [)b8-. a-.] |
        g2 ~ |
-       [g8 \[/3 d16( e fis ]1/1 [)g8 d'-.] |
+       [g8 \times 2/3 {  d16( e fis ] } [)g8 d'-.] |
        b2-> ~ |
-       [b8 \[/3 d,16( e fis ]1/1 [)g8-"cresc. poco" e'-.] |
+       [b8 \times 2/3 {  d,16( e fis ] } [)g8-"cresc. poco" e'-.] |
        e2-> ~ |
-       [e8 \[/3 d,,16( e fis ]1/1 [)g8\f d'-.] |
+       [e8 \times 2/3 {  d,,16( e fis ] } [)g8\f d'-.] |
        [d8.-> b'16-.] [g16-. d-. b-. c-.] |
        [d-. e-. fis-. a-.] [g8-. e-.] |
        fis2-> ~ |
@@ -141,17 +128,17 @@ hoboonemid = \melodic     \relative c'{
        [fis8.->( g16] )g4 ~ |
 
        % (only notes! of) five measures copied from 14 measures above
-       [g8 \[/3 d16( e fis ]1/1 [)g8 d'-.] |
+       [g8 \times 2/3 {  d16( e fis ] } [)g8 d'-.] |
        b2->-"cresc." ~ |
-       [b8 \[/3 d,16( e fis ]1/1 [)g8 e'-.] |
+       [b8 \times 2/3 {  d,16( e fis ] } [)g8 e'-.] |
        e2-> ~ |
-       [e8 \[/3 d,,16(_"h\\^atez" e fis ]1/1 [)g8\f d'-.] |
+       [e8 \times 2/3 {  d,,16(_"h\\^atez" e fis ] } [)g8\f d'-.] |
        [d8.-> b16-.] [g16-.-"cresc." d'-. b-. c-.] |
        [d16\f\< e-. fis-. g-.] [a-. b,-. c-. \!d-.] 
 }
 
 
-hoboonesecondstart = \melodic   \relative c'{
+hoboonesecondstart = \notes   \relative c'{
 
 % ugh: cant copy: allegro/primo tempo
        \property Voice . textstyle =  "large"
@@ -160,7 +147,7 @@ hoboonesecondstart = \melodic   \relative c'{
        
 }
        
-hoboonelast = \melodic   \relative c'{
+hoboonelast = \notes   \relative c'{
        % could transpose/copy from measure 19...
        [d''16-.\p  d-. d-. d-.] [d8-. c-.] |
        es2-> |
@@ -272,7 +259,7 @@ hoboonelast = \melodic   \relative c'{
        g8-. r r4 |
 }
 
-hoboone = \melodic {
+hoboone = \notes {
        \hoboonestart
        \hobooneintro
        \hoboonemid
@@ -281,7 +268,7 @@ hoboone = \melodic {
        \hoboonelast
 }
 
-global = \melodic{
+global = \notes{
        \key es;
        \time 2/4;
        \skip 4*110;
@@ -295,22 +282,22 @@ global = \melodic{
 }
 
 
-$staff_hoboone = \type Staff = hoboonestaff <
+$staff_hoboone = \context Staff = hoboonestaff <
        \global
        \property Staff.instrument = "oboe"
        % don't expand multi-bar rest
-       \property Score.SkipBars = 1
+       \property Score.skipBars = 1
        \hoboone
 >
 
 a4 = \paper{
-       \include "bar-numbering.ly"
+       \translator{ \BarNumberingStaffContext }
 }
 
 a4sixteen = \paper{
        \paper_sixteen
        linewidth= 193.\mm;
-       \include "bar-numbering.ly"
+       \translator { \BarNumberingStaffContext }
 }
 
 \score{