release: 1.1.53

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

diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index 29bc8a371efb6298acfee0a911fb2516fc9d2ce3..6152042eadb9a3fb0ae4a1b9bdf0be53ffea7a78 100644 (file)
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -8,38 +8,25 @@ enteredby =    "jcn";
 copyright =     "public domain";
 latexheaders=    "headers";
 } 
-\version "1.0.3";
+\version "1.1.52";
 
-%{
-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 = \notes
   \relative c'{
 % ugh: cant copy: allegro/primo tempo
-       \property Voice . textstyle =  "large"
+       \property Voice . textStyle =  "large"
        [es''16-.^"Allegro" es-. es-. es-.] [es8-. d-.] |
-       \property Voice . textstyle =  "italic"
+       \property Voice . textStyle =  "italic"
 }
 
 hobooneintro = \notes  \relative c'{
 
-%      \property Voice . textstyle =  "roman"
+%      \property Voice . textStyle =  "roman"
 %      [es''16-.-"Allegro" es-. es-. es-.] [es8-. d-.] |
-%      \property Voice . textstyle =  "italic"
+%      \property Voice . textStyle =  "italic"
        [f''8.-> es16(] [)d8 c-.] |
        [bes16( c d es] [)d8 c-.] |
        [bes-. as->~] [as16( g f g] |
@@ -107,29 +94,29 @@ hoboonemid = \notes        \relative c'{
        [d16-. d-. d-. d-.] [d8.-. es16->] |
        [d16 d d d] [d8 es16-.] r16-\fermata^"court"^"tr\\`es" |
        % Un peu plus lent.
-       \property Voice . textstyle =  "bold"
+       \property Voice . textStyle =  "bold"
 
 % ugh
-%      d4(\<^"Un peu plus lent" \property Voice . textstyle =  "italic _"tr\\`es \\'el\\'egant"
+%      d4(\<^"Un peu plus lent" \property Voice . textStyle =  "italic _"tr\\`es \\'el\\'egant"
 %      d4(\^"Un peu plus lent et \\'el\\'egant"<
-       \property Voice . textstyle =  "italic" 
+       \property Voice . textStyle =  "italic" 
        d4(\<
        [e8 \!fis8] |
 %      [)b-. a-.] [g16( fis e )d] |
-       \property Voice . textstyle =  "bold"
+       \property Voice . textStyle =  "bold"
        [)b-.^"Un peu plus lent et \\'el\\'egant" a-.] [g,,16( fis' e )d] |
-       \property Voice . textstyle =  "italic" 
+       \property Voice . textStyle =  "italic" 
        [d( c b\< c] [)\!fis'8-. e-.] |
        d,,4-> ~ [d16 e( fis g] |
        [a b\< d fis] [)\!a8-. g-.] |
        [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,11 +128,11 @@ hoboonemid = \notes       \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-.] 
 }
@@ -154,9 +141,9 @@ hoboonemid = \notes \relative c'{
 hoboonesecondstart = \notes   \relative c'{
 
 % ugh: cant copy: allegro/primo tempo
-       \property Voice . textstyle =  "large"
+       \property Voice . textStyle =  "large"
        [es''16-.\ff^"Tempo 1$^o$" es-. es-. es-.] [es8-. d-.] |
-       \property Voice . textstyle =  "italic"
+       \property Voice . textStyle =  "italic"
        
 }
        
@@ -195,7 +182,7 @@ hoboonelast = \notes   \relative c'{
        [bes'16-.\ff bes-. bes-. bes-.] [bes8-. ces16->] r16^"court"-\fermata |
        % ugh: eight measures rest (ugh: r1 -> four beats...)
        % eiht measures rest..
-       \property Voice . textstyle =  "bold"
+       \property Voice . textStyle =  "bold"
 %      r2^"Un peu plus lent et \\'el\\'egant"
        R2*8
 %      r4 r8\p bes |
@@ -203,7 +190,7 @@ hoboonelast = \notes   \relative c'{
        r8\p bes,, |
 %      g2->^"Un peu plus lent et \\'el\\'egant" ~ |
        g2-> ~ |
-       \property Voice . textstyle =  "italic"
+       \property Voice . textStyle =  "italic"
        g8 r r c |
        c2-> ~ |
        c8 r r bes'\f |
@@ -233,9 +220,9 @@ hoboonelast = \notes   \relative c'{
        g8-. r f4-> ~ |
        [f8 es-. ces8.-. as16-.] |
        % `a deux
-       \property Voice . textstyle =  "large"
+       \property Voice . textStyle =  "large"
        [ces8.->^"Plus vite" bes16-.(] [a bes es d] |
-       \property Voice . textstyle =  "italic"
+       \property Voice . textStyle =  "italic"
        [)c!8.-> bes16] [a( bes es )d] |
        [c->( bes es )d] [c->( bes es )d] |
        % same measure
@@ -244,9 +231,9 @@ hoboonelast = \notes   \relative c'{
        [g )f d( es] [f g as a] |
        [c )bes bes,( c] [d es f g] |
        [as g f g] [as bes c d] |
-       \property Voice . textstyle =  "large"
+       \property Voice . textStyle =  "large"
        [)es-.^"Tempo 1$^o$" g,-. g-. g-.] [g8-. g-.] |
-       \property Voice . textstyle =  "italic"
+       \property Voice . textStyle =  "italic"
        bes4.-> g8-. |
        gis2->( |
        )as! |
@@ -261,9 +248,9 @@ hoboonelast = \notes   \relative c'{
        g4.-> g8-. |
        es4.-> es8-. |
        bes4.-> bes8-. |
-       \property Voice . textstyle =  "large"
+       \property Voice . textStyle =  "large"
        g'4.->^"Presto" g8-. |
-       \property Voice . textstyle =  "italic"
+       \property Voice . textStyle =  "italic"
        es4.-> es8-. |
        [bes-. bes-. es-. g-.] |
        [bes-. bes,-. es-. g-.] |
@@ -295,22 +282,22 @@ global = \notes{
 }
 
 
-$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{