lilypond-0.1.42

diff --git a/bin/convert-mudela.pl b/bin/convert-mudela.pl
index 7c26746870d0c2641ba6720b5df605cae491937c..e10af3b07777d4ee4aef28f0b155abc1d594b434 100644 (file)
--- a/bin/convert-mudela.pl
+++ b/bin/convert-mudela.pl
@@ -153,6 +153,12 @@ sub convert_0_1_6_to_0_1_7
     }
 }  
 
+sub convert_0_1_7_to_0_1_8
+{
+    s/\\plet *1 *\/ *1 *;/\\]/;    
+    s/\\plet *([1-9][0-9]*) *\/ *([2-9][0-9]*) *;/\\[$1\/$2/;    
+}  
+
 ###############################################################
 
 sub    last_conversion
@@ -200,6 +206,7 @@ my %minor_conversions = ("0.0.50" => \&no_conv,
                         "0.1.5" => \&convert_0_1_4_to_0_1_5,
                         "0.1.6" => \&convert_0_1_5_to_0_1_6
                         ,"0.1.7" => \&convert_0_1_6_to_0_1_7
+                        ,"0.1.8" => \&convert_0_1_7_to_0_1_8
                         );
 
  

diff --git a/init/engraver.ly b/init/engraver.ly
index e8869c0de93cd3740fd23cfb30ad638bf152668f..7553bd0cdefddf391db41386eb63cad4d2a0a701 100644 (file)
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -29,6 +29,7 @@ Voice = \translator {
        \consists "Script_engraver";
        \consists "Rhythmic_column_engraver";
        \consists "Slur_engraver";
+       \consists "Plet_engraver";
        \accepts "Thread";
 }
 
@@ -68,6 +69,7 @@ Lyric_voice =
        \consists "Lyric_engraver";
        \consists "Line_group_engraver";
        \consists "Beam_req_swallow_translator";
+       \consists "Plet_swallow_engraver";
 }
 
 Lyrics = \translator {

diff --git a/input/beams.ly b/input/beams.ly
index 64db731f8ee575d73c0a10fda9e7a97071396c07..e821fb164bed6d4ef45670f5ecf29fc97374e4e5 100644 (file)
--- a/input/beams.ly
+++ b/input/beams.ly
@@ -7,7 +7,7 @@ copyright =      "PD";
 
 TestedFeatures =        "beams and beamflags";
 }
-\version "0.1.7";
+\version "0.1.8";
 
 \score{
        \melodic { \multi 3 < 

diff --git a/input/cadenza.ly b/input/cadenza.ly
index 1b46d347408ad6ef1f657dde46b980d8d26955a5..a4e49199f6eb8ed1af2860556862848403d7b245 100644 (file)
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -13,7 +13,7 @@ Tested Features: cadenza mode
 Ugh.. Wish we had grace notes....  It adds another dimension to this
 piece of music.  %}
 
-\version "0.1.7";
+\version "0.1.8";
 
 
 cad = \melodic  {

diff --git a/input/collisions.ly b/input/collisions.ly
index cf6c5ad39db9eedf0a24700a54f57b339941fc62..ac8d5db146d2f44b95bcdf71d0f0c180d192c2f1 100644 (file)
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -5,7 +5,7 @@ enteredby =      "HWN,JCN";
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }
-\version "0.1.7";
+\version "0.1.8";
 
 
 

diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly
index 9585e1fb7d5fb3c46100bc671586fd7f2a2642db..317c4e9953206d2eda212af8558a1a9bccad9a0c 100644 (file)
--- a/input/coriolan-alto.ly
+++ b/input/coriolan-alto.ly
@@ -16,7 +16,7 @@ TestedFeatures:
 % (maybe even sooner :-)
 %
 
-\version "0.1.7";
+\version "0.1.8";
 
 alto1 = \melodic{
        \meter 4/4; 

diff --git a/input/font-body.ly b/input/font-body.ly
index cfb563d364236be8f74ed2fb9fa9e865c468d35a..a7dd41d9647e09a09cc729b4986ca50cbaf34a41 100644 (file)
--- a/input/font-body.ly
+++ b/input/font-body.ly
@@ -1,4 +1,4 @@
-\version "0.1.7";
+\version "0.1.8";
 FontBody=      \melodic{ 
                \octave c';
                \bar "|:";

diff --git a/input/font16.ly b/input/font16.ly
index 42b4cfe103541f5f95dc7e7ad72f519e2dac9bbf..d836e27edb6b6315677435c93068b25eeb031704 100644 (file)
--- a/input/font16.ly
+++ b/input/font16.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.7";
+\version "0.1.8";
 \include "font-body.ly"
 
 \score{

diff --git a/input/gallina.ly b/input/gallina.ly
index 4f47a5cf1c69f4091d86b93a9519c06b0d8f8ca9..a45ce1d52ff29412e5a13c949aab8aa9ef6f5639 100644 (file)
--- a/input/gallina.ly
+++ b/input/gallina.ly
@@ -38,7 +38,7 @@ part of the basso continuo --HWN
 
 %} 
 
-\version "0.1.7";
+\version "0.1.8";
 
 vi1=\melodic{
   \meter 4/4;

diff --git a/input/gourlay.ly b/input/gourlay.ly
index 70569448a880c69aefed81d56be68e1a048977e7..26542f3b700120a3a934c0ad96654780d1bfe093 100644 (file)
--- a/input/gourlay.ly
+++ b/input/gourlay.ly
@@ -1,50 +1,10 @@
-\header{
-enteredby      jcn
-copyright      PD
-TestedFeatures  This file tests some nasty Gourlay spacings
-}
-
-\version "0.1.6";
-
-\score{
-% huh?
-%      \multi 2 \melodic < \octave c'';
-       \melodic \multi 2 < \octave c'';
-               { \stemup; d2 d     | d d | d4 d2. | }
-               \octave c';
-               % huh, plet broken?
-%              { \stemdown; g4 g g g | \plet 2/3; g2 g2 g2 \plet 1/1; | g4. g8 g2 | }
-               { \stemdown; g4 g g g | g2*2/3 g2*2/3 g2*2/3 | g4. g8 g2 | }
-               >
-       \paper{
-           linewidth = 20.\cm;
-       }
-}
-
-\score{
-% huh?
-%      \multi 2 \melodic < \octave c'';
-       \melodic \multi 2 < \octave c'';
-               { \stemup; d2 d     | d d | d4 d2. | }
-               \octave c';
-               % huh, plet broken?
-%              { \stemdown; g4 g g g | \plet 2/3; g2 g2 g2 \plet 1/1; | g4. g8 g2 | }
-               { \stemdown; g4 g g g | g2*2/3 g2*2/3 g2*2/3 | g4. g8 g2 | }
-               >
-       \paper{
-           linewidth = 4.\cm;
-           \output "lelie1.tex";
-       }
-
-}
-
 \header{
 enteredby =     "jcn";
 copyright =     "PD";
 TestedFeatures =        "This file tests some nasty Gourlay spacings";
 }
 
-\version "0.1.7";
+\version "0.1.8";
 
 %{
 
@@ -56,9 +16,7 @@ This is taken from [Gourlay]'s paper on breaking lines
        \melodic \multi 2 < \octave c'';
                { \stemup; d2 d     | d d | d4 d2. | }
                \octave c';
-               % huh, plet broken?
-%              { \stemdown; g4 g g g | \plet 2/3; g2 g2 g2 \plet 1/1; | g4. g8 g2 | }
-               { \stemdown; g4 g g g | g2*2/3 g2*2/3 g2*2/3 | g4. g8 g2 | }
+              { \stemdown; g4 g g g | \[2/3 g2 g2 g2 \] | g4. g8 g2 | }
                >
        \paper{
            linewidth = 4.\cm;

diff --git a/input/keys.ly b/input/keys.ly
index 05ec062c27b545543883bab011c377a22fcc261e..67ee8f5a91b8aa10f8dc4e02dde2a879f09f9700 100644 (file)
--- a/input/keys.ly
+++ b/input/keys.ly
@@ -1,4 +1,4 @@
-\version "0.1.7";
+\version "0.1.8";
 
 
 blah = \melodic{

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index b3707432802e59ed96b5341847ef0a626ce0c96a..25ed78778436ac91303bc754af4acff3dd66a5a5 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -11,7 +11,7 @@ copyright =    "public domain";
 Tested Features: example file with comments
 
 %}
-\version "0.1.7";
+\version "0.1.8";
 
 
 % the % is a comment.

diff --git a/input/multi.ly b/input/multi.ly
index d63ddb0ab52c41b5f74fe8d6dbee3b1abe437349..0d8a890cca033fa5c20d0ba71b4bbd02e5fabc7e 100644 (file)
--- a/input/multi.ly
+++ b/input/multi.ly
@@ -10,7 +10,7 @@ Tested Features: \multi
 %}
 
 
-\version "0.1.7";
+\version "0.1.8";
 
 \score{
        \melodic 

diff --git a/input/pedal.ly b/input/pedal.ly
index 33c736c3e835d69249ee931d634b37953f9b3b6c..d2a9c01c2a20b8122fe9b9a869054235e80eb99d 100644 (file)
--- a/input/pedal.ly
+++ b/input/pedal.ly
@@ -24,7 +24,7 @@
 % \lbheel \lbheel \lfheel \lftoe
 % \rbheel \rbtoe \rfheel \rftoe
 
-\version "0.1.7";
+\version "0.1.8";
 
 \score{
                \melodic {

diff --git a/input/rhythm.ly b/input/rhythm.ly
index 8b6ecb031a5104e708c7d95890df04296d1de92e..11569bf0f140dccab510806b9d298ab969502718 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,7 +7,7 @@ TestedFeatures =         "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "0.1.7";
+\version "0.1.8";
 
 ritme = \melodic{ %\octave ;
        \partial 8;

diff --git a/input/scales.ly b/input/scales.ly
index a6b2b48367fdf7408b682684488e28de32c79703..3e715106f91fe67a3ff8e5693c02e999802d18bc 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -12,7 +12,7 @@ copyright =    "public domain";
 % scales with accents.
 %
 
-\version "0.1.7";
+\version "0.1.8";
 blah =         \melodic {
                \meter 6/8;     
                \octave  'c ;

diff --git a/input/scripts.ly b/input/scripts.ly
index ad6503efb70c53ef8bc9d8d6bc5ca676ddc9f727..7198bc1b83bba16e8f0dc02bcf88e806d0ced6bb 100644 (file)
--- a/input/scripts.ly
+++ b/input/scripts.ly
@@ -1,5 +1,5 @@
        
-\version "0.1.7";
+\version "0.1.8";
 
 
 blah =         \melodic {

diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index 363390eb8c4060d2698b7117f05ce3829b04f915..91c488de41f4e86fd09347bfaf88030aed56c8a8 100644 (file)
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  Tested Features:breaking algorithm, chords, multivoice, accents
 %}
 
-\version "0.1.7";
+\version "0.1.8";
 
 %% Stuff from MPP version
 % \lefttitle{Menuetto}

diff --git a/input/sleur.ly b/input/sleur.ly
index bcb6e45846f080e25b3db265ab5d156d379a3560..d6e30d3b2ff7a67d678ae74423018abfd99c6bd1 100644 (file)
--- a/input/sleur.ly
+++ b/input/sleur.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.7";
+\version "0.1.8";
 
 shortlong = \melodic{
        c4()c( c c  |

diff --git a/input/slurs.ly b/input/slurs.ly
index caf87a3f4c1b4271146fcd5218427a5baeb155b2..ef66c1e9e8fe22cc1181a6054bdf42ce1aaa6693 100644 (file)
--- a/input/slurs.ly
+++ b/input/slurs.ly
@@ -1,5 +1,5 @@
 
-\version "0.1.7";
+\version "0.1.8";
 
 \score{
        \melodic{\octave c';

diff --git a/input/spacing.ly b/input/spacing.ly
index 10bb206640a726013553b73f7a77dd8a251bd7b0..f92428fbcfaf42c7b7e06fd23c0645982d116178 100644 (file)
--- a/input/spacing.ly
+++ b/input/spacing.ly
@@ -6,7 +6,7 @@ copyright =      "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
-\version "0.1.7";
+\version "0.1.8";
 
 multipart = \melodic{ 
     \multi 3 < 

diff --git a/input/standchen-16.ly b/input/standchen-16.ly
index d8966dfbde1151f3b12ecf82cbcc1bf008d6b074..8c0bda8e20417c0835e116f2948d0186640b6e5f 100644 (file)
--- a/input/standchen-16.ly
+++ b/input/standchen-16.ly
@@ -9,6 +9,6 @@ description = "A schubert song in 16 pt";
 copyright =     "public domain";
 } 
 
-\version "0.1.7";
+\version "0.1.8";
 
 \include "standchen.ly"

diff --git a/input/standchen-20.ly b/input/standchen-20.ly
index ba4a3a043a6f1bbc0808e710764a0e75995f8c3a..0f9dbee368d2865d3416627477e22fe54c457689 100644 (file)
--- a/input/standchen-20.ly
+++ b/input/standchen-20.ly
@@ -8,7 +8,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 description = "A schubert song in 20 pt";
 } 
-\version "0.1.7";
+\version "0.1.8";
 
 % fool make-website
 % \include "standchen.ly";

diff --git a/input/standchen.ly b/input/standchen.ly
index 04cbe817cb02c470b56247ecb57fd284f1e1d1f7..73792caa2d4b0d3d1e99c58193c68981ff9b2ea5 100644 (file)
--- a/input/standchen.ly
+++ b/input/standchen.ly
@@ -14,7 +14,7 @@ multiple \paper{}s in one \score
 %}
 
 \include "paper20.ly"
-\version "0.1.7";
+\version "0.1.8";
 
 commands = \melodic{
        \skip 2.*4;
@@ -54,9 +54,8 @@ melodie = \melodic{
 %%8
        f2 r4 |
 %%9
-
        < { a'4.()  g' [2/3 g'( f' )e' ]1/1 }
-       { cis'4. e'_"dolce" \plet 2/3; e' \plet 1/1; } > |
+       { cis'4. e'_"dolce" \[2/3 e' \] } > |
 %%10
        < f'2. d'2. > |
 %%11
@@ -68,10 +67,7 @@ melodie = \melodic{
 %%14
        a2 r 
        < { d'()  c'4. g [2/3 bes a g ]1/1 }
-       { f \p ()  e4._"dolce" bes 
-               \plet 2/3; g
-               \plet 1/1; 
-       } > |
+       { f \p ()  e4._"dolce" bes \[2/3 g \] } > |
 %%16
        < a2. f2. > |
 %%17
@@ -351,16 +347,16 @@ tekstI = \lyric{
        _ _ _
        _ _ _
 % 5
-       [2/3 Lei- se8 ]1/1 fleh-4. en8 
-       [2/3 mei- ne8 ]1/1 Lie- der8 _8
-       Durch4. die8 [2/3 Nacht zu8 ]1/1 
+       \[2/3 Lei- se8 \] fleh-4. en8 
+       \[2/3 mei- ne8 \] Lie- der8 _8
+       Durch4. die8 \[2/3 Nacht zu8 \] 
        dir;2 _    
        _ _ _ 
        _ _ _
 % 11
-       [2/3 In den8 ]1/1 stil-4. len8 
-       [2/3 Hain her-8 ]1/1 nie-4. der,8
-       Lieb4. chen,8 [2/3 komm zu8 ]1/1 
+       \[2/3 In den8 \] stil-4. len8 
+       \[2/3 Hain her-8 \] nie-4. der,8
+       Lieb4. chen,8 \[2/3 komm zu8 \] 
        mir!2 _
        _ _ _ 
        _ _ _
@@ -368,7 +364,7 @@ tekstI = \lyric{
 % 17
        Fl\"us-8. ternd16 schlan-4. ke8 
        Wip-8. fel16 rau-4. schen8
-       [2/3 In des8 ]1/1 Mon-4. des8 
+       \[2/3 In des8 \] Mon-4. des8 
        Licht;2.
        _ _ _ 
        _ _ _
@@ -376,7 +372,7 @@ tekstI = \lyric{
 % 23
        Des8. Ver-16 r\"a-4. ters8 
        feind-8. lich16 Lau-4. schen8
-       [2/3 F\"urch- te,8 ]1/1 Hol-4. de,8 
+       \[2/3 F\"urch- te,8 \] Hol-4. de,8 
        nicht.2.
        _ _ _ 
        _ _ _
@@ -396,7 +392,7 @@ tekstI = \lyric{
        mich!2 _
        Be-8. bend16 harr' ich8 _8
        dir8. ent-16 ge- gen!8 _8
-       [2/3 Komm, be-8 ]1/1 gl\"u4. cke8 
+       \[2/3 Komm, be-8 \] gl\"u4. cke8 
        mich!2.
        _ _ _ _ _ _
 % 47
@@ -418,17 +414,17 @@ tekstII = \lyric{
        _ _ _
        _ _ _
 % 5
-       [2/3 H\"orst die8 ]1/1 Nach-4. ti-8 
-       [2/3 gal- len8 ]1/1 schla- gen?8 _8
-       Ach!4. sie8 [2/3 fleh- en8 ]1/1 
+       \[2/3 H\"orst die8 \] Nach-4. ti-8 
+       \[2/3 gal- len8 \] schla- gen?8 _8
+       Ach!4. sie8 \[2/3 fleh- en8 \] 
        dich,2 _
        _ _ _ 
        _ _ _
 
 % 11
-       [2/3 Mit der8 ]1/1 T\"o-4. ne8
-       [2/3 s\"u\ss- en8 ]1/1 Kla-4. gen8
-       Fleh-4. en8 [2/3 sie f\"ur8 ]1/1
+       \[2/3 Mit der8 \] T\"o-4. ne8
+       \[2/3 s\"u\ss- en8 \] Kla-4. gen8
+       Fleh-4. en8 \[2/3 sie f\"ur8 \]
        mich.2 _
        _ _ _ 
        _ _ _
@@ -436,7 +432,7 @@ tekstII = \lyric{
 % 17
        Sie-8. ver-16 stehn4. des8
        Bus-8. ens16 Seh-4. nen,8
-       [2/3 Ken- nen8 ]1/1 Lieb-4. es-8 
+       \[2/3 Ken- nen8 \] Lieb-4. es-8 
        schmerz,2.
        _ _ _ 
        _ _ _
@@ -444,7 +440,7 @@ tekstII = \lyric{
 % 23
        R\"uh-8. ren16 mit4. den8 
        Sil-8. ber-16 t\"o-4. nen8
-       [2/3 Jed- es8 ]1/1 wei-4. che8 
+       \[2/3 Jed- es8 \] wei-4. che8 
        Herz.2.
        _ _ _ 
        _ _ _

diff --git a/input/standje.ly b/input/standje.ly
index 5d3481ece6afd88c8db042b31ccdd170baa41d8a..e6d29fd9943d268af93e10e1e17a4e1433694943 100644 (file)
--- a/input/standje.ly
+++ b/input/standje.ly
@@ -1,5 +1,5 @@
 \header{
-filename =      "standchen.ly";
+filename =      "standje.ly";
 title =         "St\"andchen (Serenade) \"Leise flehen meine Lieder\"";
 opus =  "D. 957 No. 4";
 composer =      "Franz Schubert (1797-1828)"
@@ -9,49 +9,45 @@ copyright =    "public domain";
 } 
 
 %{
- Tested Features: multivoice, accents, lyrics, chords, piano music,
+ Tested Features@ multivoice, accents, lyrics, chords, piano music,
 multiple \paper{}s in one \score 
 %}
 
-\version "0.1.7";
+\version "0.1.8";
 
 $vocal_verse1 = \melodic{
        \octave c';
        % ugh: treble/bass
 %      \clef treble;
        \clef violin;
-       % ugh: '3' of plet should hang over middle note
-       % ugh: barcheck fails if i write 'g8' below:
-%      [2/3 g8( )as]1/1 \plet 2/3; g8 \plet 1/1; c'4. g8 |
-       % anyway, for typping this plet stuff sucks
-       [2/3 g8( )as]1/1 \plet 2/3; g \plet 1/1; c'4. g8 |
-       [2/3 f8( )g]1/1 \plet 2/3; f \plet 1/1; c'4 f8 r |
-       g4.-> f8 [2/3 f( )es]1/1 \plet 2/3; d \plet 1/1; |
+       [2/3 g8( )as] g \] c'4. g8 |
+       [2/3 f8( )g] f \] c'4 f8 r |
+       g4.-> f8 [2/3 f( )es] d \] |
        es2 r4 |
        % ugh: a whole should be a measure
        %r1 |
        r2. |
        r2. |
-       [2/3 g8( )as]1/1 \plet 2/3; g \plet 1/1; es'4. g8 |
-       [2/3 f8( )g]1/1 \plet 2/3; f \plet 1/1; d'4. c'8 |
-       bes4. as8 [2/3 as( )g]1/1 \plet 2/3; f \plet 1/1; |
+       [2/3 g8( )as] g \] es'4. g8 |
+       [2/3 f8( )g] f \] d'4. c'8 |
+       bes4. as8 [2/3 as( )g] f \] |
        g2 r4 |
        r2. |
        r2. |
        g8. b16 es'4. d'8 |
        c'8. g16 es4. c8 |
-       %  [as32\grace( bes32\grace] )
-       [2/3 as8( )g]1/1 \plet 2/3; as \plet 1/1; c'4. as8 |
+       % [as3 2\grace( bes3 2\grace] )
+       [2/3 as8( )g] as \] c'4. as8 |
        g2. |
-       %[f32\grace( g] )
-       [2/3 f8( )e]1/1 \plet 2/3; f \plet 1/1; as4. f8 |
+       %[f3 2\grace( g] )
+       [2/3 f8( )e] f \] as4. f8 |
        es!2. |
        g8. b16 es'4. d'8 |
        c'8. g16 e4. c8 |
-       % [a32\grace b] )
-       [2/3 a!8( ) gis]1/1 \plet 2/3; a \plet 1/1; c'4. a8 |
+       % [a3 2\grace b] )
+       [2/3 a!8( ) gis] a \] c'4. a8 |
        g!2. |
-       [2/3 d'8\f cis']1/1 \plet 2/3; d \plet 1/1; f'4. b8 |
+       [2/3 d'8\f cis'] d \] f'4. b8 |
        c'2. |
        r2. |
        r2. |
@@ -59,32 +55,32 @@ $vocal_verse1 = \melodic{
 
 $lyric_verse1 = \lyric{
 % 5
-       [2/3 Lei-4 se8 ]1/1 fleh-4. en8  |
-       [2/3 mei-4 ne8 ]1/1 Lie-4 der8 _8 |
-       Durch4. die8 [2/3 Nacht4 zu8 ]1/1  |
+       \[2/3 Lei-4 se8 \] fleh-4. en8 |
+       \[2/3 mei-4 ne8 \] Lie-4 der8 _8 |
+       Durch4. die8 \[2/3 Nacht4 zu8 \] |
        dir;2 _4 |
        _4 _ _ |
        _ _ _ |
 % 11
-       [2/3 In4 den8 ]1/1 stil-4. len8 |
-       [2/3 Hainr4 her-8 ]1/1 nie-4. der,8 |
-       Lieb4. chen,8 [2/3 komm4 zu8 ]1/1 |
+       \[2/3 In4 den8 \] stil-4. len8 |
+       \[2/3 Hainr4 her-8 \] nie-4. der,8 |
+       Lieb4. chen,8 \[2/3 komm4 zu8 \] |
        mir!2 _4 |
-       _4 _ _  |
+       _4 _ _ |
        _ _ _ |
 % 17
        Fl\"us-8. ternd16 schlan-4. ke8 |
        Wip-8. fel16 rau-4. schen8 |
-       [2/3 In4 des8 ]1/1 Mon-4. des8 |
+       \[2/3 In4 des8 \] Mon-4. des8 |
        Licht;2. |
-       _4 _ _  |
        _4 _ _ |
-% 23
+       _4 _ _ |
+% 23 
        Des8. Ver-16 r\"a-4. ters8 |
        feind-8. lich16 Lau-4. schen8 |
-       [2/3 F\"urch-4 te,8 ]1/1 Hol-4. de,8 |
+       \[2/3 F\"urch-4 te,8 \] Hol-4. de,8 |
        nicht,2. |
-       [2/3 f\"urch-4 te,8 ]1/1 Hol-4. de,8 |
+       \[2/3 f\"urch-4 te,8 \] Hol-4. de,8 |
        nicht.2. |
        _4 _ _ 
        _ _ _
@@ -94,8 +90,8 @@ $treble_intro = \melodic{
        \octave c';
        \clef violin;
        % ugh: i'd like to type this!
-        %r8 [<'g-. c-.> <c-. es-.> <'g-. c-.> <c-. es-.> <'g-. c-.>] |
-        r8 <['g-. c-.> <c-. es-.> <'g-. c-.> <c-. es-.> <'g-. c-.]> |
+       %r8 [<'g-. c-.> <c-. es-.> <'g-. c-.> <c-. es-.> <'g-. c-.>] |
+       r8 <['g-. c-.> <c-. es-.> <'g-. c-.> <c-. es-.> <'g-. c-.]> |
        r8 <['as-. c-.> <c-. es-.> <'as-. c-.> <c-. es-.> <'as-. c-.]> |
        r8 <['as-. c-.> <c-. d-.> <'as-. c-.> <c-. d-.> <'as-. c-.]> |
        r8 <['g-. 'b-.> <'b-. d-.> <'g-. 'b-.> <'b-. d-.> <'g-. 'b-.]> |
@@ -107,28 +103,33 @@ $treble_verse1 = \melodic{
        \clef violin;
        r8 <['g c> <c es> <'g c> <c es> <'g c]> |
        r8 <['f c> <c d> <'f c> <c d> <'f c]> |
-       r8 <['f 'g b> <'g b d> <'f 'g b> <'g b d> <'f 'g b]> |
+       r8 <['f 'g 'b> <'g 'b d> <'f 'g 'b> <'g 'b d> <'f 'g 'b]> |
        r8 <['es 'g c> <'g c es> <'es 'g c> <'g c es> <'es 'g c]> |
        <g'4.( b> <)f'8 d'> <[2/3 f' d'> <es' c'> <d' b]1/1> |
+       <c'2. e'> |
        r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
-       r8 <['g c> <c es> <'g c> <c es> <'g c]> |
+       r8 <['f c> <c d> <'f c> <c d> <'f c]> |
+       r8 <['f 'as 'bes> <'as 'bes d> <'f 'g 'bes> <'g 'bes d> <'f 'g 'bes]> |
+       r8 <['es 'g 'bes> <'g 'bes es> <'es 'g 'bes> <'g 'bes es]> 
+       <{ es'( | )bes4. as8}{ c'( | )d4.( )f8 } > 
+       < [2/3 f as> <es g> <d f]1/1> |
+       <es2. g> |
+       r8 <['f 'g> <'g 'b> <'f 'g> <'g 'b> <'f 'g]> |
+       r8 <['es 'g> <'g c> <'es 'g> <'g c> <'es 'g]> |
+       r8\pp <['es 'as c> <'as c es> <'es 'as c> <'as c es> <'es 'as c]> |
+       r8 <['es 'g 'bes> <'g 'bes 'es> <'es 'g 'bes> <'g 'bes 'es> <'es 'g 'bes]> |
+       % [as3 2\grace( bes )
+       [2/3 as8(( g )as]1/1 c'4.-> ) as8 |
+       g2. |
+       r8 <['f 'g> <'g 'b> <'f 'g> <'g 'b> <'f 'g]> |
+       r8 <['e 'g> <'g c> <'e 'g> <'g c> <'e 'g]> |
+       r8 <['f 'a c> <'a c f> <'f 'a c> <'a c f> <'f 'a c]> |
+       r8 <['e 'g c> <'g c e> <'e 'g c> <'g c e> <'e 'g c]> |
+       <{[2/3 f'8\f( e f']1/1 a'4. )f'8 } {\[2/3 f e f \] a4. f8 } > |
+       <e2 e'> r4 |
+%      <{as!2\mf( [c'8. )as16]} {f2 as8( )f}> |
+       as!2\mf( [c'8. )as16] |
+       <e4. g> <[e8-.( g-.> <e8-. g-.> <)e8-. g-.]> |
 }
 
 $bass_intro = \melodic{
@@ -144,10 +145,10 @@ $bass_verse1 = \melodic{
        \octave c;
        \clef bass;
        <'c2 c> r4 |
+       <'as2 as> r4 |
+       <'g2 g> r4 |
        <'c2 c> r4 |
-       <'c2 c> r4 |
-       <'c2 c> r4 |
-       <'c2 c> r4 |
+       <'g8 g> <[g' d''> <d'' f''> <g' d''> <d'' f''> <g' d'']> |
        <'c2 c> r4 |
        <'c2 c> r4 |
        <'c2 c> r4 |
@@ -170,23 +171,29 @@ $bass_verse1 = \melodic{
 }
                
                
-global= \melodic {\meter 3/4; \key bes es as; }
+global= \melodic {\meter 3 /4; \key bes es as; }
 
                
 \score{
        \melodic<
-               \type Lyrics { \skip 4 * 12; \$lyric_verse1 }
-               \type Staff 
-               { \skip 4 * 12; \$vocal_verse1 }
+               \type Lyrics { 
+                       \meter 3 /4; \skip 4 * 12; \$lyric_verse1
+               }
+               \type Staff { < 
+                       \global 
+                       { \skip 4 * 12; \$vocal_verse1 }
+               > }
                
                % i want a (grand) staff!!!
                
                \type Grandstaff < 
-                       < { \$treble_intro \$treble_verse1 }
-                         \global 
+                       < 
+                               \global
+                               { \$treble_intro \$treble_verse1 }
                        >
-                       < \global
-                         { \$bass_intro \$bass_verse1 }
+                       < 
+                               \global
+                               { \$bass_intro \$bass_verse1 }
                        >
                >
        >

diff --git a/input/stem.ly b/input/stem.ly
index 5442943342475a3d42a7592a5b77a1b0a7e6fc2e..ee58946ea120af104d61d52b86fd7983012f1fc2 100644 (file)
--- a/input/stem.ly
+++ b/input/stem.ly
@@ -8,7 +8,7 @@ of beams";
        
 }
 
-\version "0.1.7";
+\version "0.1.8";
 
 beamintervals = \melodic{
                \meter 7/4;

diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly
index 1bb3e31ba6408c28ab541f3e84555ed0ddf29323..124d0e385590b961741581166c936f9855adaac2 100644 (file)
--- a/input/toccata-fuga-E.ly
+++ b/input/toccata-fuga-E.ly
@@ -20,7 +20,7 @@ copyright =    "public domain";
 %}
 
 
-\version "0.1.7";
+\version "0.1.8";
 
 toccata_commands = \melodic{
        \meter 4/4;

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index fae537bf46d8ab7cc69c13a48468fb9396f4ce99..4d11d3a6e2e980f522586635e9425d3c9e700532 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -12,7 +12,7 @@ copyright =    "public domain";
 Tested Features                lyrics and chords
 %}
 
-\version "0.1.7";
+\version "0.1.8";
 
 melodie = \melodic {
         \clef"violin";

diff --git a/input/twinkle.ly b/input/twinkle.ly
index e6814ce34810b25f494e7cdd513c99d850705e70..050bfda51830a9ff9fcb24fecb64c5ba490e4df4 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 
-\version "0.1.7";
+\version "0.1.8";
 
 melody = \melodic{
        \clef violin;

diff --git a/input/wtk1-fugue1.ly b/input/wtk1-fugue1.ly
index 646c75ff3043c26ffe6ed5fcc701fc7cf6f5cffe..e48c55b1892d6e6dc65d208ac2eb4e9258e0b396 100644 (file)
--- a/input/wtk1-fugue1.ly
+++ b/input/wtk1-fugue1.ly
@@ -11,7 +11,7 @@ copyright =    "Public Domain";
 %{
        
 %}
-\version "0.1.7";
+\version "0.1.8";
 
 
 global = 

diff --git a/input/wtk1-fugue2.ly b/input/wtk1-fugue2.ly
index 50a2166a0028d5e0a5b96217d782cc0602f76f6c..2d90c2ad90df1e2867187a419bc6c483e1e69c43 100644 (file)
--- a/input/wtk1-fugue2.ly
+++ b/input/wtk1-fugue2.ly
@@ -12,7 +12,7 @@ copyright =    "Public Domain";
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
-\version "0.1.7";
+\version "0.1.8";
 
                                     % should add \need{dutch.ini} for
                                     % correct parsing of note names

diff --git a/input/wtk1-prelude1.ly b/input/wtk1-prelude1.ly
index 5ed120b09da92f05807a21fcc84a9e016533c909..dea0195fa0a512da2d7578a2439ad253f19b4aae 100644 (file)
--- a/input/wtk1-prelude1.ly
+++ b/input/wtk1-prelude1.ly
@@ -8,7 +8,7 @@ enteredby =      "Shay Rojansky";
 copyright =     "Public Domain";
 }
 
-\version "0.1.7";
+\version "0.1.8";
 
 global = 
     \melodic {

diff --git a/lily/include/plet-swallow-engraver.hh b/lily/include/plet-swallow-engraver.hh
new file mode 100644 (file)
index 0000000..be36120
--- /dev/null
+++ b/lily/include/plet-swallow-engraver.hh
@@ -0,0 +1,28 @@
+/*
+  plet-swallow-engraver.hh -- declare Swallow_engraver
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef PLET_SWALLOW_ENGRAVER_HH
+#define PLET_SWALLOW_ENGRAVER_HH
+
+#include "swallow-grav.hh"
+
+/**
+  This engraver swallows plets silently.
+ */
+class Plet_swallow_engraver : public Swallow_engraver 
+{
+public:
+  TRANSLATOR_CLONE(Plet_swallow_engraver);
+  DECLARE_MY_RUNTIME_TYPEINFO;
+
+protected:
+  virtual bool do_try_request (Request*);
+};
+
+#endif // PLET_SWALLOW_ENGRAVER_HH

diff --git a/lily/lexer.l b/lily/lexer.l
index f2d6c9214e3a699ab344ff417555878fc4c1f86a..851e21c2e1d4d881c790e6b4a79e9cc4c3b60791 100644 (file)
--- a/lily/lexer.l
+++ b/lily/lexer.l
@@ -82,6 +82,8 @@ RESTNAME      [rs]
 NOTECOMMAND    \\{A}+
 LYRICS         ({AA}|{TEX})[^0-9 \t\n\f]*
 ESCAPED                [nt\\'"]
+PLET           \\\[
+TELP           \\\]
 
 %%
 
@@ -285,6 +287,14 @@ ESCAPED            [nt\\'"]
        return c;
 }
 
+<lyrics,notes>{PLET}   {
+       return yylval.i = PLET;
+}
+
+<lyrics,notes>{TELP}   {
+       return yylval.i = TELP;
+}
+
 <INITIAL,notes>.       {
        return yylval.c = YYText ()[0];
 }

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 7bddf702d1d28da498fdb864bc3de9f599a0f0e5..2a8760ee525c1eee49843062d259a071ad760f18 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -48,7 +48,6 @@ static Keyword_ent the_key_tab[]={
   {"output", OUTPUT},
   {"partial", PARTIAL},
   {"paper", PAPER},
-  {"plet", PLET},
   {"property", PROPERTY},
   {"pt", PT_T},
   {"score", SCORE},

diff --git a/lily/parser.y b/lily/parser.y
index 051fb72c50cb5804fda24deb383f80616c2cc209..8dea7f982aa7d068316d02f25cb9186eb9823680 100644 (file)
--- a/lily/parser.y
+++ b/lily/parser.y
@@ -12,7 +12,7 @@
 #include <iostream.h>
 
 // mmm
-#define MUDELA_VERSION "0.1.7"
+#define MUDELA_VERSION "0.1.8"
 
 #include "scalar.hh"
 #include "translation-property.hh"
@@ -113,6 +113,8 @@ yylex (YYSTYPE *s,  void * v_l)
 
 %token ALIAS
 %token BAR
+%token BEAMPLET
+%token MAEBTELP
 %token CADENZA
 %token CLEAR
 %token CLEF
@@ -141,6 +143,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %token PAPER
 %token PARTIAL
 %token PLET
+%token TELP
 %token PT_T
 %token SCORE
 %token SCRIPT
@@ -189,9 +192,9 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <outputdef> output_def
 %type <header>         mudela_header mudela_header_body
 %type <box>    box
-%type <c>      open_request_parens close_request_parens
+%type <i>      open_request_parens close_request_parens
 %type <c>      open_abbrev_parens
-%type <c>      open_plet_parens close_plet_parens
+%type <i>      open_plet_parens close_plet_parens
 %type <music>  simple_element music_elt full_element lyrics_elt command_elt
 %type <i>      abbrev_type
 %type <i>      int
@@ -217,7 +220,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <real>   dim real
 %type <real>   unit
 %type <request> abbrev_command_req
-%type <request>        post_request pre_request command_req verbose_command_req
+%type <request>        post_request command_req verbose_command_req
 %type <request>        script_req  dynamic_req
 %type <score>  score_block score_body
 %type <script> script_definition script_body mudela_script gen_script_def
@@ -737,6 +740,13 @@ post_requests:
                $2->set_spot (THIS->here_input ());
                THIS->post_reqs.push ($2);
        }
+       | post_requests close_request_parens    {
+               Array<Request*>& r = *THIS->get_parens_request ($2);
+               for (int i = 0; i < r.size (); i++ )
+                       r[i]->set_spot (THIS->here_input ());
+               THIS->post_reqs.concat (r);
+               delete &r;
+       }
        ;
 
 
@@ -744,9 +754,6 @@ post_request:
        POST_REQUEST_IDENTIFIER {
                $$ = (Request*)$1->request ();
        }
-       |close_request_parens   {
-               $$ = THIS->get_parens_request ($1);
-       }
        | script_req
        | dynamic_req
        | abbrev_type   {
@@ -820,7 +827,17 @@ dynamic_req:
 
 close_plet_parens:
        ']' INT '/' INT {
-               $$ = ']';
+               $$ = MAEBTELP;
+               THIS->plet_.type_i_ = $4;
+               THIS->plet_.iso_i_ = $2;
+       }
+       | TELP {
+               $$ = TELP;
+               THIS->plet_.type_i_ = 1;
+               THIS->plet_.iso_i_ = 1;
+       }
+       | TELP INT '/' INT {
+               $$ = TELP;
                THIS->plet_.type_i_ = $4;
                THIS->plet_.iso_i_ = $2;
        }
@@ -836,15 +853,14 @@ close_request_parens:
        | ']'   {
                $$ = ']';
        }
-       | close_plet_parens {
-               $$ = ']';
-       }
        | E_SMALLER {
                $$ = '<';
        }
        | E_BIGGER {
                $$ = '>';
        }
+       | close_plet_parens {
+       }
        ;
 
 open_abbrev_parens:
@@ -861,7 +877,12 @@ open_abbrev_parens:
 
 open_plet_parens:
        '[' INT '/' INT {
-               $$ = '[';
+               $$ = BEAMPLET;
+               THIS->plet_.type_i_ = $4;
+               THIS->plet_.iso_i_ = $2;
+       }
+       | PLET INT '/' INT {
+               $$ = PLET;
                THIS->plet_.type_i_ = $4;
                THIS->plet_.iso_i_ = $2;
        }
@@ -956,24 +977,19 @@ script_dir:
        ;
 
 pre_requests:
-       | pre_requests pre_request {
-               THIS->pre_reqs.push ($2);
-               $2->set_spot (THIS->here_input ());
+       {
        }
-       ;
-
-pre_request:
-       open_request_parens     {
-               $$ = THIS->get_parens_request ($1);
+       | pre_requests open_request_parens {
+               Array<Request*>& r = *THIS->get_parens_request ($2);
+               for (int i = 0; i < r.size (); i++ )
+                       r[i]->set_spot (THIS->here_input ());
+               THIS->pre_reqs.concat (r);
+               delete &r;
        }
        ;
 
 voice_command:
-       PLET     INT '/' INT {
-               THIS->plet_.type_i_ = $4;
-               THIS->plet_.iso_i_ = $2;
-       }
-       | DURATION STRING {
+       DURATION STRING {
                THIS->set_duration_mode (*$2);
                delete $2;
        }

diff --git a/lily/plet-swallow-engraver.cc b/lily/plet-swallow-engraver.cc
new file mode 100644 (file)
index 0000000..1f837ad
--- /dev/null
+++ b/lily/plet-swallow-engraver.cc
@@ -0,0 +1,21 @@
+/*
+  plet-swallow-engraver.cc -- implement Plet_swallow_engraver
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#include "musical-request.hh"
+#include "plet-swallow-engraver.hh"
+
+IMPLEMENT_IS_TYPE_B1(Plet_swallow_engraver,Swallow_engraver);
+ADD_THIS_TRANSLATOR(Plet_swallow_engraver);
+
+bool
+Plet_swallow_engraver::do_try_request (Request* req_l)
+{
+  if (req_l && req_l->musical () && req_l->musical ()->plet ())
+    return true;
+  return false;
+}

diff --git a/mf/Makefile b/mf/Makefile
index 00b46f2f99312eb24aae464f6dd1c3ec1a469fa3..b4d3a3e71171946a784af19a729fa9f6f82aa5e3 100644 (file)
--- a/mf/Makefile
+++ b/mf/Makefile
@@ -41,8 +41,8 @@ $(outdir)/%.log: %.mf
        mv $(@F) $@
        rm $(basename $< ).*gf
 
-$(lyout)/%.ly $(texout)/%.tex: $(outdir)/%.log
-       $(PYTHON) $(depth)/bin/mf-to-table.py --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
+$(lyout)/%.ly $(texout)/%.tex: $(outdir)/%.mf
+       $(PYTHON) $(depth)/bin/mf-to-table.py --ly $(lyout)/$(<F:.mf=.ly) --tex $(texout)/$(<F:.mf=.tex) $<
 
 localinstall:
        $(INSTALL) -d $(MFDIR)/public/lilypond

diff --git a/mi2mu/mudela-item.cc b/mi2mu/mudela-item.cc
index d70200e3c5bd00ad682bd00c16acad43cec0b616..a7feee56dd2dd8b70c62b4dca7801722ec635ea0 100644 (file)
--- a/mi2mu/mudela-item.cc
+++ b/mi2mu/mudela-item.cc
@@ -197,11 +197,10 @@ Mudela_note::str ()
   //ugh
   String str;
   if (dur.plet_b ())
-       str += String ("\\plet ")
+       str += String ("\\[")
            + String_convert::i2dec_str (dur.plet_.iso_i_, 0, 0)
            + "/"
-           + String_convert::i2dec_str (dur.plet_.type_i_, 0, 0)
-           + "; ";
+           + String_convert::i2dec_str (dur.plet_.type_i_, 0, 0);
 
   str += name_str;
 
@@ -210,7 +209,7 @@ Mudela_note::str ()
   str += Duration_convert::dur2_str (tmp);
 
   if (dur.plet_b ())
-       str += String (" \\plet 1/1;");
+       str += String (" \\]");
 
   /* 
     note of zero duration is nonsense, 

diff --git a/mi2mu/mudela-stream.cc b/mi2mu/mudela-stream.cc
index ed1350645bc490a407263fa3c66cd7fba5bd63bd..02e4858a44fd04f82e746d8f1431f7c29a3b3c78 100644 (file)
--- a/mi2mu/mudela-stream.cc
+++ b/mi2mu/mudela-stream.cc
@@ -81,7 +81,7 @@ Mudela_stream::header()
   *os_p_ << filename_str_g;
   *os_p_ << "\n\n";
   // ugh
-  *os_p_ << "\\version \"0.1.7\";\n";
+  *os_p_ << "\\version \"0.1.8\";\n";
 }
 
 void