lilypond-0.1.45

diff --git a/init/performer.ly b/init/performer.ly
index 90b3688412fcdf13a5aaafd4b40c13946ad2ae9e..87ce9ca7d86ecfe97b4a75067d5e5600a41637a7 100644 (file)
--- a/init/performer.ly
+++ b/init/performer.ly
@@ -47,7 +47,7 @@ Staff_group = \translator
 
 Score = \translator {
        \type "Score_performer";
-       instrument = piano;
+%      instrument = piano;
        \accepts Staff;
        \accepts Grandstaff;
        \accepts Lyrics; 

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 2575f80979a571616cc41cd093308a06fde0af36..c302e05ac40922b1d60621a9c3a611129463c083 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -20,6 +20,7 @@ Tested Features: lyrics, interleaving lyrics and staffs
 melody = \melodic{
        \clef violin;
        \octave c';
+       \property Staff.instrument = "alto sax"
        
        c4 c | g g | a a | g g |
        f f | e e | d d8.( e16 | )c2 | % :|

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 199657677c0d4943ec061d15f0b618d4d5b2a23c..6dc14d11809e744896848aba5230ab3284c54252 100644 (file)
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -24,7 +24,7 @@ Audio_staff::output (Midi_stream& midi_stream_r, int track_i)
   Midi_track midi_track;
   midi_track.number_i_ =  track_i;
   for (Midi_walker i (this, &midi_track); i.ok(); i++)
-       i.process();
+    i.process();
   midi_stream_r << midi_track;
 }
 

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 99eed10c50585acf6d8ea94d7e80a4c7d1dfc399..6c813df4ae441ae424205b815eca5856f4a4118a 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -59,7 +59,14 @@ Staff_performer::do_removal_processing()
 String 
 Staff_performer::instrument_str() 
 { 
+  // mustn't ask Score for instrument: it will return piano!
   return get_property ("instrument");
+
+/* ugh, but can't
+  if (properties_dict_.elt_b ("instrument"))
+    return properties_dict_["instrument"];
+  return "";
+*/
 }
 
 void 

diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index 980990cf65fa9d2f3b831f7ba1361be732cb8816..06690a0334b272ca4374cba4745da024ab58b628 100644 (file)
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -68,7 +68,8 @@ Staff_side::get_position_f() const
   Real inter_f = paper()-> internote_f ();
 
   Interval v= support_height();
-  y = v[dir_]  + 2*dir_*inter_f;       // ugh
+//  y = v[dir_]  + 2*dir_*inter_f;     // ugh
+  y = v[dir_]; // ugh
 
   return y;
 }

diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly
index 1fd3aad026a958f980c65f8ec88ba9e33610bfbb..c627ea5c5dd6b75ccd36ac6b6cd0aa062cafee8d 100644 (file)
--- a/mutopia/J.S.Bach/preludes-1.ly
+++ b/mutopia/J.S.Bach/preludes-1.ly
@@ -1,11 +1,14 @@
 \header{
 filename =      "preludes-1.ly";
-title =         "1";
+title =         "DOUZE P\'ETITES PRELUDES";
+% tempo = "Moderato"
 composer =      "Johann Sebastian Bach (1685-1750)";
 enteredby =     "jcn";
 copyright =     "public domain";
 }
 
+\include "paper20.ly"
+
 rh = \melodic{
        \octave c'';
        \textstyle "italic";
@@ -66,8 +69,8 @@ lh = \melodic{
        c4-5 e-3 [g32-1 fis-2 g8.-1] 'g4 |
        d-5 f-3 [a32-1 gis a8.] 'a4 |
        % ugh grouping32: 4..4
-       e-5 e'-1 a-4 [e32-3 b c' b] [c' b a b] |
-       c'4 e-4 fis [a32-1 gis fis gis] [ ais gis fis gis] |
+       e-5 e'-1 a-4 [a32-3 b c' b] [c' b a b] |
+       c'4 e-4 fis [a32-1 gis fis gis] [a gis fis gis] |
        a4 c-4 d [d32 e f e] [f e d e] |
        % ugh tril sign
        % f4-1 e d-3\tr c |
@@ -106,6 +109,8 @@ global  = \melodic{
                >
        >
        \paper{
+               \paper_twenty
+               linewidth= 195.\mm;
        }
        \midi{
                \tempo 4 = 70;

diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly
index 98c4b5936ba8e5ee5e144defabdfb666ec07c6d6..e0e1f57595a7209406b47a002c98ee8648ca433f 100644 (file)
--- a/mutopia/J.S.Bach/preludes-2.ly
+++ b/mutopia/J.S.Bach/preludes-2.ly
@@ -6,6 +6,8 @@ enteredby =      "jcn";
 copyright =     "public domain";
 }
 
+\include "paper20.ly"
+
 rh = \melodic{
        \octave c'';
        \textstyle "italic";
@@ -53,7 +55,7 @@ rh = \melodic{
        g4-5\ff
        \multi 2 <
                { \stemup; c2-5 'b4-4 }
-               { \stemdown; 'g2 'd4 }
+               { \stemdown; 'g2-2 'd4-1 }
        >
        \stemboth;
        \multi 2 <
@@ -72,7 +74,7 @@ lh = \melodic{
                { \stemdown; 'c1 ~ 'c ~ 'c }
        >
        \stemboth; |
-       r8 [c-5( e-3 f-1] [e-3 c-5 c' e-4] |
+       r8 [c-5( e-3 g-1] [e-3 c-5 c' e-4] |
        [)fis-3 d-5( fis-3 a-1] [fis-3 d-5 d' fis-4] |
        )g2-3 r4 g-2( |
        [)a8 'a-5( c-4 e-2] [c-4 'a-5 g e-3] |
@@ -111,8 +113,10 @@ global  = \melodic{
                >
        >
        \paper{
+               \paper_twenty
+               linewidth= 195.\mm;
        }
        \midi{
-               \tempo 4 = 110;
+               \tempo 4 = 90;
        }
 }

diff --git a/mutopia/J.S.Bach/preludes-3.ly.m4 b/mutopia/J.S.Bach/preludes-3.ly.m4
index 3b99653102f63442c8ca990eba3c5e608ba64814..0a85331b0553a9ef801e8daeac1304ce54553361 100644 (file)
--- a/mutopia/J.S.Bach/preludes-3.ly.m4
+++ b/mutopia/J.S.Bach/preludes-3.ly.m4
@@ -6,6 +6,8 @@ enteredby =      "jcn";
 copyright =     "public domain";
 }
 
+\include "paper20.ly"
+
 define(comma, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |)
 define(s, `comma(translit($*,` ', `,'))')
 define(t, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |)
@@ -35,20 +37,25 @@ rh = \melodic{
        s('a c fis)
        s('a c fis)
        s('bes d g)
+
+
        s(c fis a -"poco\\_a\\_poco\\_cresc.")
        s(d g bes)
        s(d fis c')
+
        s(cis g bes)
        s(c es a !-"dim.")
        s('bes e g)
        s('a c g)
+
        s('a c fis)
        s('g 'bes e)
-       s('fis a es)
+       s('fis 'a es)
+
        s('g 'bes d -"dim.")
        s('g 'a c)
-       s('fis a c)
-       s('fis a c)
+       s('fis 'a c)
+       s('fis 'a c)
        r16\p ['g 'a c] ['b 'g 'b 'g] r 'g r 'g
        s('a c fis -"poco\\_cresc.")
        s(c fis a)
@@ -95,8 +102,9 @@ lh = \melodic{
        'd4 r [d8 'a] |
        'd4 r [d8 'bes] |
 
+
        'd4 r [es8 c] |
-       'd4 r [es8 d] |
+       'd4 r [g8 d] |
        'd4 r [a8 fis] |
 
        'd4 r [g8 es] |
@@ -108,7 +116,7 @@ lh = \melodic{
        'd4 r [cis8 'bes] |
        'd4 r [c!8 'a] |
 
-       'd4 r ['bes8 g] |
+       'd4 r ['bes8 'g] |
        'd4 r [es8 c] |
        'd4 r [d8 c] |
 
@@ -124,7 +132,7 @@ lh = \melodic{
        'g4 r [es8 c] |
        'g4 r [es8 c] |
        'g4 r r |
-       'g2.-\fermata 
+       'g2._\fermata 
        \bar "|.";
 }
 
@@ -146,6 +154,8 @@ global  = \melodic{
                >
        >
        \paper{
+               \paper_twenty
+               linewidth= 195.\mm;
        }
        \midi{
                \tempo 4 = 90;

diff --git a/mutopia/J.S.Bach/preludes.tex b/mutopia/J.S.Bach/preludes.tex
new file mode 100644 (file)
index 0000000..39d19a9
--- /dev/null
+++ b/mutopia/J.S.Bach/preludes.tex
@@ -0,0 +1,50 @@
+\documentclass{article}         %UGH
+\usepackage{a4}
+
+\advance\oddsidemargin-30mm
+\evensidemargin\oddsidemargin
+% ugh, centre
+\advance\textwidth60mm
+\hsize210mm
+\vsize269mm
+\advance\topmargin-25mm
+\advance\textheight45mm
+\pagestyle{empty}
+
+\input titledefs
+        
+\input lilyponddefs
+\def\interscoreline{\vskip2mm}
+%ugh
+\staffheight=20pt
+
+\font\numfont=feta-nummer10 scaled \magstep2
+\def\piece#1#2#3{%
+%  \hbox to0pt{\vbox to\staffheight{\vss}}
+%  \nopagebreak
+  \vbox to 0pt{\large\bf#3\vss}
+  \nopagebreak
+  \vbox to0pt{\vbox to4.5\staffheight{\vss\numfont#1}\vss}
+  \nopagebreak
+  \input#2%
+}
+
+\begin{document}
+
+\title{DOUZE PETITS PR\'ELUDES\\
+       TWAALF KLEINE PRELUDI\"EN}
+\composer{J.S.\ Bach (1685-1750)}
+
+\makelilytitle
+\kern-\staffheight
+
+\piece{1}{preludes-1}{Moderato}
+\vskip2\staffheight
+\piece{2}{preludes-2}{Moderato}
+\newpage
+\piece{3}{preludes-3}{Semplice e non troppo legato}
+\newpage
+\piece{4}{preludes-4}{Allegretto}
+
+\end{document}
+

diff --git a/mutopia/standchen-20.tex b/mutopia/standchen-20.tex
index d295d2f83473cd1b4999935c8f78df1416783213..ed2f7e9bc5c5c2ca7eef5068c7529397062b7cec 100644 (file)
--- a/mutopia/standchen-20.tex
+++ b/mutopia/standchen-20.tex
@@ -5,7 +5,8 @@
 % UGH UGH
 \advance\oddsidemargin-30mm
 \evensidemargin\oddsidemargin
-\advance\textwidth30mm
+% ugh, centre
+\advance\textwidth60mm
 \addtolength{\textheight}{20mm}
 \pagestyle{empty}
 \begin{document}

diff --git a/mutopia/standje.ly b/mutopia/standje.ly
index 4ac80c2032e75ed973b3841bc077a6132d774efe..ce1681d9cdb20869c9ad311ec2efe9e8d1749d16 100644 (file)
--- a/mutopia/standje.ly
+++ b/mutopia/standje.ly
@@ -47,7 +47,7 @@ $vocal_verse1 = \melodic{
        % [a3 2\grace b] )
        [2/3 a!8( ) gis] a \] c'4. a8 |
        g!2. |
-       [2/3 d'8\f cis'] d \] f'4. b8 |
+       [2/3 d'8\f cis'] d' \] f'4. b8 |
        c'!2. |
 }
 
@@ -112,6 +112,8 @@ $lyric_verse2 = \lyric{
        Sil-8. ber-16 t\"o-4. nen8
        \[2/3 Jed-4 es8 \] wei-4. che8 
        Herz.2.
+       \[2/3 Jed-4 es8 \] wei-4. che8 
+       Herz.2.
 }
 
 $lyric_through1 = \lyric{
@@ -175,7 +177,7 @@ $treble_eentje = \melodic{
        <e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
        <f4. g> <['b8-. g-.(> <d-. g-.> <f-. )g-.]> |
        <e2 g\pp> <e4 g> |
-       <f2\mf a(> <[as8.( c'> <)f16 )a]> |
+       <f2\mf a(> <[a8.( c'> <)f16 )a]> |
        <e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
        <f4. g> <['b8-. g-.(> <d-. g-.> <f-. )g-.]> |
        <e2. g> |
@@ -236,23 +238,23 @@ global= \melodic {\meter 3 /4; \key bes es as; }
                
 \score{
        \melodic<
-               \type Lyrics { 
-                       \meter 3 /4; 
-                       \skip 4 * 12; 
-                       \$lyric_verse1
-                       \skip 4 * 24; 
-                       \$lyric_verse2
-               }
                \type Staff { < 
                        \global 
                        { 
+                               \property Staff.instrument = "alto sax"
                                \skip 4 * 12; 
                                \$vocal_verse1 
                                \skip 4 * 24; 
                                \$vocal_verse1
                        }
                > }
-               
+               \type Lyrics { 
+                       \meter 3 /4; 
+                       \skip 4 * 12; 
+                       \$lyric_verse1
+                       \skip 4 * 24; 
+                       \$lyric_verse2
+               }
                \type Grandstaff < 
                        < 
                                \global