lilypond-0.1.47

diff --git a/BUGS b/BUGS
index 810766b46ed396d25b94e59c66651af9b86f0fe7..10c0b999d26629d4bb5068a11231c3532d012c28 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -8,6 +8,10 @@ and before. Glibc upto 2.0.5 also has problems with memmem (), but
 these should not affect LilyPond.
 
 
+[IRIX (5.3?)]
+
+coredump from strstream::strstream () upon the first read of a file
+
 [Linux Intel]
 
 LilyPond occasionally crashes while parsing the initialisation files.

diff --git a/bin/mudela-book.pl b/bin/mudela-book.pl
index bf65dd7806e80896244491bf2adfb05b309baebf..a5ed477aeaa819352910c619018d44a4a7328abe 100644 (file)
--- a/bin/mudela-book.pl
+++ b/bin/mudela-book.pl
@@ -83,7 +83,7 @@ sub open_mudela
        print BOOK "\\begin{verbatim}\n";
     }
     if ($fragment_b) {
-       print MUDELA "\\score { \\melodic {";
+       print MUDELA "\\score { \\melodic {\\octave c';";
     }
 
 }

diff --git a/init/feta11.ly b/init/feta11.ly
index 0ecd6c7adad63da38fdcc60b018e93305b17eae9..f874201e801ac312ec7d419370d7d7d73f64fedb 100644 (file)
--- a/init/feta11.ly
+++ b/init/feta11.ly
@@ -4,8 +4,8 @@
 % input from out/feta11.log
 % name=\symboltables {
     "rests"     = \table {
-        "0"    "\\wholerest"   -0.00\pt        4.13\pt -1.72\pt        0.00\pt 
-        "1"    "\\halfrest"    -0.00\pt        4.13\pt -0.00\pt        1.72\pt 
+        "0"    "\\wholerest"   -0.00\pt        4.12\pt -1.72\pt        0.00\pt 
+        "1"    "\\halfrest"    -0.00\pt        4.12\pt -0.00\pt        1.72\pt 
         "0o"   "\\outsidewholerest"    -1.72\pt        5.84\pt -1.72\pt        0.28\pt 
         "1o"   "\\outsidehalfrest"     -1.72\pt        5.84\pt -0.28\pt        1.72\pt 
         "2"    "\\quartrest"   -0.00\pt        2.97\pt 2.06\pt 9.90\pt 
@@ -16,8 +16,8 @@
         "7"    "\\hundredtwentyeighthrest"     -0.00\pt        5.75\pt -0.00\pt        16.06\pt        
         }
     "accidentals"       = \table {
-        "1"    "\\sharp"       -0.00\pt        3.03\pt -4.13\pt        4.13\pt 
-        "0"    "\\natural"     -0.00\pt        1.83\pt -4.13\pt        4.13\pt 
+        "1"    "\\sharp"       -0.00\pt        3.03\pt -4.12\pt        4.12\pt 
+        "0"    "\\natural"     -0.00\pt        1.83\pt -4.12\pt        4.12\pt 
         "-1"   "\\flat"        -0.33\pt        2.20\pt -1.38\pt        5.50\pt 
         "-2"   "\\flatflat"    -0.33\pt        3.99\pt -1.38\pt        5.50\pt 
         "2"    "\\sharpsharp"  -0.00\pt        2.75\pt -1.38\pt        1.38\pt 
@@ -54,8 +54,10 @@
         "downbow"      "\\downbow"     -2.06\pt        2.06\pt -0.00\pt        3.67\pt 
         "turn" "\\turn"        -3.01\pt        3.01\pt -1.46\pt        1.46\pt 
         "trill"        "\\trill"       -2.75\pt        2.75\pt -0.00\pt        6.19\pt 
-        "pedalheel"    "\\pedalheel"   -1.38\pt        1.38\pt -1.38\pt        1.83\pt 
-        "pedaltoe"     "\\pedaltoe"    -1.38\pt        1.38\pt -0.00\pt        4.13\pt 
+        "upedalheel"   "\\upedalheel"  -1.38\pt        1.38\pt -1.38\pt        1.83\pt 
+        "dpedalheel"   "\\dpedalheel"  -1.38\pt        1.38\pt -1.83\pt        1.38\pt 
+        "upedaltoe"    "\\upedaltoe"   -1.38\pt        1.38\pt -0.00\pt        4.12\pt 
+        "dpedaltoe"    "\\dpedaltoe"   -1.38\pt        1.38\pt -4.12\pt        0.00\pt 
         "flageolet"    "\\flageolet"   -1.47\pt        1.47\pt -1.47\pt        1.47\pt 
         }
     "flags"     = \table {

diff --git a/init/feta13.ly b/init/feta13.ly
index 2cec6814a74816f8abe63e5f1c442cacd40ec8bb..4be008a65751f87fd5934cfa95be99df4f46a6f7 100644 (file)
--- a/init/feta13.ly
+++ b/init/feta13.ly
@@ -18,19 +18,19 @@
     "accidentals"       = \table {
         "1"    "\\sharp"       -0.00\pt        3.58\pt -4.88\pt        4.88\pt 
         "0"    "\\natural"     -0.00\pt        2.17\pt -4.88\pt        4.88\pt 
-        "-1"   "\\flat"        -0.39\pt        2.60\pt -1.63\pt        6.50\pt 
-        "-2"   "\\flatflat"    -0.39\pt        4.71\pt -1.63\pt        6.50\pt 
-        "2"    "\\sharpsharp"  -0.00\pt        3.25\pt -1.63\pt        1.63\pt 
+        "-1"   "\\flat"        -0.39\pt        2.60\pt -1.62\pt        6.50\pt 
+        "-2"   "\\flatflat"    -0.39\pt        4.71\pt -1.62\pt        6.50\pt 
+        "2"    "\\sharpsharp"  -0.00\pt        3.25\pt -1.62\pt        1.62\pt 
         }
     "dots"      = \table {
         "dot"  "\\dot" -0.00\pt        1.46\pt -0.73\pt        0.73\pt 
-        "repeatcolon"  "\\repeatcolon" -0.00\pt        1.46\pt -1.63\pt        1.63\pt 
+        "repeatcolon"  "\\repeatcolon" -0.00\pt        1.46\pt -1.62\pt        1.62\pt 
         }
     "balls"     = \table {
         "-1"   "\\brevisball"  -0.00\pt        6.50\pt -1.79\pt        1.79\pt 
-        "-1l"  "\\brevisledger"        -1.63\pt        8.13\pt -0.33\pt        0.33\pt 
+        "-1l"  "\\brevisledger"        -1.62\pt        8.12\pt -0.33\pt        0.33\pt 
         "-2"   "\\longaball"   -0.00\pt        6.50\pt -1.79\pt        1.79\pt 
-        "-2l"  "\\longaledger" -1.63\pt        8.13\pt -0.33\pt        0.33\pt 
+        "-2l"  "\\longaledger" -1.62\pt        8.12\pt -0.33\pt        0.33\pt 
         "0"    "\\wholeball"   -0.00\pt        6.44\pt -1.79\pt        1.79\pt 
         "0l"   "\\wholeledger" -1.61\pt        8.04\pt -0.33\pt        0.33\pt 
         "1"    "\\halfball"    -0.00\pt        4.48\pt -1.79\pt        1.79\pt 
@@ -41,21 +41,23 @@
     "scripts"   = \table {
         "ufermata"     "\\ufermata"    -4.31\pt        4.31\pt -0.24\pt        4.71\pt 
         "dfermata"     "\\dfermata"    -4.31\pt        4.31\pt -4.71\pt        0.24\pt 
-        "sforzato"     "\\sforzatoaccent"      -2.92\pt        2.92\pt -1.63\pt        1.63\pt 
+        "sforzato"     "\\sforzatoaccent"      -2.92\pt        2.92\pt -1.62\pt        1.62\pt 
         "staccato"     "\\staccato"    -0.49\pt        0.49\pt -0.49\pt        0.49\pt 
         "ustaccatissimo"       "\\ustaccatissimo"      -0.65\pt        0.65\pt -0.20\pt        3.25\pt 
         "dstaccatissimo"       "\\dstaccatissimo"      -0.65\pt        0.65\pt -3.25\pt        0.20\pt 
         "tenuto"       "\\tenuto"      -2.92\pt        2.92\pt -0.20\pt        0.20\pt 
-        "umarcato"     "\\umarcato"    -1.63\pt        1.63\pt -0.00\pt        3.58\pt 
-        "dmarcato"     "\\dmarcato"    -1.63\pt        1.63\pt -3.58\pt        0.00\pt 
-        "open" "\\ouvert"      -1.30\pt        1.30\pt -1.63\pt        1.63\pt 
+        "umarcato"     "\\umarcato"    -1.62\pt        1.62\pt -0.00\pt        3.58\pt 
+        "dmarcato"     "\\dmarcato"    -1.62\pt        1.62\pt -3.58\pt        0.00\pt 
+        "open" "\\ouvert"      -1.30\pt        1.30\pt -1.62\pt        1.62\pt 
         "stopped"      "\\plusstop"    -1.79\pt        1.79\pt -1.79\pt        1.79\pt 
         "upbow"        "\\upbow"       -2.11\pt        2.11\pt -0.00\pt        6.76\pt 
         "downbow"      "\\downbow"     -2.44\pt        2.44\pt -0.00\pt        4.33\pt 
         "turn" "\\turn"        -3.55\pt        3.55\pt -1.72\pt        1.72\pt 
         "trill"        "\\trill"       -3.25\pt        3.25\pt -0.00\pt        7.31\pt 
-        "pedalheel"    "\\pedalheel"   -1.63\pt        1.63\pt -1.63\pt        2.17\pt 
-        "pedaltoe"     "\\pedaltoe"    -1.63\pt        1.63\pt -0.00\pt        4.88\pt 
+        "upedalheel"   "\\upedalheel"  -1.62\pt        1.62\pt -1.62\pt        2.17\pt 
+        "dpedalheel"   "\\dpedalheel"  -1.62\pt        1.62\pt -2.17\pt        1.62\pt 
+        "upedaltoe"    "\\upedaltoe"   -1.62\pt        1.62\pt -0.00\pt        4.88\pt 
+        "dpedaltoe"    "\\dpedaltoe"   -1.62\pt        1.62\pt -4.88\pt        0.00\pt 
         "flageolet"    "\\flageolet"   -1.73\pt        1.73\pt -1.73\pt        1.73\pt 
         }
     "flags"     = \table {
@@ -71,7 +73,7 @@
     "clefs"     = \table {
         "alto" "\\altoclef"    -3.25\pt        12.10\pt        -6.50\pt        6.50\pt 
         "alto_change"  "\\caltoclef"   -2.60\pt        9.68\pt -5.20\pt        5.20\pt 
-        "bass" "\\bassclef"    -1.63\pt        11.70\pt        -8.13\pt        3.25\pt 
+        "bass" "\\bassclef"    -1.62\pt        11.70\pt        -8.12\pt        3.25\pt 
         "bass_change"  "\\cbassclef"   -1.30\pt        9.36\pt -6.50\pt        2.60\pt 
         "violin"       "\\violinclef"  -2.83\pt        12.15\pt        -9.75\pt        16.25\pt        
         "violin_change"        "\\cviolinclef" -2.46\pt        9.52\pt -7.80\pt        13.00\pt        

diff --git a/init/feta19.ly b/init/feta19.ly
index 1b8d266f5cab62dbecc8cc6a8161613db861b53f..146a35974e3f11a936378b4eaa2866f7ea8b0c2e 100644 (file)
--- a/init/feta19.ly
+++ b/init/feta19.ly
@@ -4,8 +4,8 @@
 % input from out/feta19.log
 % name=\symboltables {
     "rests"     = \table {
-        "0"    "\\wholerest"   -0.00\pt        7.13\pt -2.97\pt        0.00\pt 
-        "1"    "\\halfrest"    -0.00\pt        7.13\pt -0.00\pt        2.97\pt 
+        "0"    "\\wholerest"   -0.00\pt        7.12\pt -2.97\pt        0.00\pt 
+        "1"    "\\halfrest"    -0.00\pt        7.12\pt -0.00\pt        2.97\pt 
         "0o"   "\\outsidewholerest"    -2.97\pt        10.09\pt        -2.97\pt        0.48\pt 
         "1o"   "\\outsidehalfrest"     -2.97\pt        10.09\pt        -0.48\pt        2.97\pt 
         "2"    "\\quartrest"   -0.00\pt        5.13\pt 3.56\pt 17.10\pt        
@@ -16,8 +16,8 @@
         "7"    "\\hundredtwentyeighthrest"     -0.00\pt        9.93\pt -0.00\pt        27.75\pt        
         }
     "accidentals"       = \table {
-        "1"    "\\sharp"       -0.00\pt        5.23\pt -7.13\pt        7.13\pt 
-        "0"    "\\natural"     -0.00\pt        3.17\pt -7.13\pt        7.13\pt 
+        "1"    "\\sharp"       -0.00\pt        5.23\pt -7.12\pt        7.12\pt 
+        "0"    "\\natural"     -0.00\pt        3.17\pt -7.12\pt        7.12\pt 
         "-1"   "\\flat"        -0.57\pt        3.80\pt -2.38\pt        9.50\pt 
         "-2"   "\\flatflat"    -0.57\pt        6.89\pt -2.38\pt        9.50\pt 
         "2"    "\\sharpsharp"  -0.00\pt        4.75\pt -2.38\pt        2.38\pt 
@@ -54,8 +54,10 @@
         "downbow"      "\\downbow"     -3.56\pt        3.56\pt -0.00\pt        6.33\pt 
         "turn" "\\turn"        -5.20\pt        5.20\pt -2.51\pt        2.51\pt 
         "trill"        "\\trill"       -4.75\pt        4.75\pt -0.00\pt        10.69\pt        
-        "pedalheel"    "\\pedalheel"   -2.38\pt        2.38\pt -2.38\pt        3.17\pt 
-        "pedaltoe"     "\\pedaltoe"    -2.38\pt        2.38\pt -0.00\pt        7.13\pt 
+        "upedalheel"   "\\upedalheel"  -2.38\pt        2.38\pt -2.38\pt        3.17\pt 
+        "dpedalheel"   "\\dpedalheel"  -2.38\pt        2.38\pt -3.17\pt        2.38\pt 
+        "upedaltoe"    "\\upedaltoe"   -2.38\pt        2.38\pt -0.00\pt        7.12\pt 
+        "dpedaltoe"    "\\dpedaltoe"   -2.38\pt        2.38\pt -7.12\pt        0.00\pt 
         "flageolet"    "\\flageolet"   -2.53\pt        2.53\pt -2.53\pt        2.53\pt 
         }
     "flags"     = \table {

diff --git a/init/feta20.ly b/init/feta20.ly
index b11fd20be05374713d88622e891dab775bc765f3..13488ac1cac5cf33498a7a6acb4af6b5530db87b 100644 (file)
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -4,10 +4,10 @@
 % input from out/feta20.log
 % name=\symboltables {
     "rests"     = \table {
-        "0"    "\\wholerest"   -0.00\pt        7.50\pt -3.13\pt        0.00\pt 
-        "1"    "\\halfrest"    -0.00\pt        7.50\pt -0.00\pt        3.13\pt 
-        "0o"   "\\outsidewholerest"    -3.13\pt        10.62\pt        -3.13\pt        0.50\pt 
-        "1o"   "\\outsidehalfrest"     -3.13\pt        10.62\pt        -0.50\pt        3.13\pt 
+        "0"    "\\wholerest"   -0.00\pt        7.50\pt -3.12\pt        0.00\pt 
+        "1"    "\\halfrest"    -0.00\pt        7.50\pt -0.00\pt        3.12\pt 
+        "0o"   "\\outsidewholerest"    -3.12\pt        10.62\pt        -3.12\pt        0.50\pt 
+        "1o"   "\\outsidehalfrest"     -3.12\pt        10.62\pt        -0.50\pt        3.12\pt 
         "2"    "\\quartrest"   -0.00\pt        5.40\pt 3.75\pt 18.00\pt        
         "3"    "\\eighthrest"  -0.00\pt        6.67\pt 5.00\pt 14.21\pt        
         "4"    "\\sixteenthrest"       -0.00\pt        7.76\pt -0.00\pt        14.21\pt        
@@ -23,7 +23,7 @@
         "2"    "\\sharpsharp"  -0.00\pt        5.00\pt -2.50\pt        2.50\pt 
         }
     "dots"      = \table {
-        "dot"  "\\dot" -0.00\pt        2.25\pt -1.13\pt        1.13\pt 
+        "dot"  "\\dot" -0.00\pt        2.25\pt -1.12\pt        1.12\pt 
         "repeatcolon"  "\\repeatcolon" -0.00\pt        2.25\pt -2.50\pt        2.50\pt 
         }
     "balls"     = \table {
@@ -54,8 +54,10 @@
         "downbow"      "\\downbow"     -3.75\pt        3.75\pt -0.00\pt        6.67\pt 
         "turn" "\\turn"        -5.47\pt        5.47\pt -2.65\pt        2.65\pt 
         "trill"        "\\trill"       -5.00\pt        5.00\pt -0.00\pt        11.25\pt        
-        "pedalheel"    "\\pedalheel"   -2.50\pt        2.50\pt -2.50\pt        3.33\pt 
-        "pedaltoe"     "\\pedaltoe"    -2.50\pt        2.50\pt -0.00\pt        7.50\pt 
+        "upedalheel"   "\\upedalheel"  -2.50\pt        2.50\pt -2.50\pt        3.33\pt 
+        "dpedalheel"   "\\dpedalheel"  -2.50\pt        2.50\pt -3.33\pt        2.50\pt 
+        "upedaltoe"    "\\upedaltoe"   -2.50\pt        2.50\pt -0.00\pt        7.50\pt 
+        "dpedaltoe"    "\\dpedaltoe"   -2.50\pt        2.50\pt -7.50\pt        0.00\pt 
         "flageolet"    "\\flageolet"   -2.67\pt        2.67\pt -2.67\pt        2.67\pt 
         }
     "flags"     = \table {

diff --git a/init/feta23.ly b/init/feta23.ly
index bdebc4e99670445a5d74a268f881bc8da4dce82e..e1ad925c23e863d994fa6e91c214cb19589d9b06 100644 (file)
--- a/init/feta23.ly
+++ b/init/feta23.ly
@@ -9,7 +9,7 @@
         "0o"   "\\outsidewholerest"    -3.52\pt        11.95\pt        -3.52\pt        0.56\pt 
         "1o"   "\\outsidehalfrest"     -3.52\pt        11.95\pt        -0.56\pt        3.52\pt 
         "2"    "\\quartrest"   -0.00\pt        6.08\pt 4.22\pt 20.25\pt        
-        "3"    "\\eighthrest"  -0.00\pt        7.50\pt 5.63\pt 15.98\pt        
+        "3"    "\\eighthrest"  -0.00\pt        7.50\pt 5.62\pt 15.98\pt        
         "4"    "\\sixteenthrest"       -0.00\pt        8.73\pt -0.00\pt        15.98\pt        
         "5"    "\\thirtysecondrest"    -0.00\pt        9.85\pt -0.00\pt        21.61\pt        
         "6"    "\\sixtyfourthrest"     -0.00\pt        10.56\pt        -0.00\pt        27.23\pt        
@@ -20,7 +20,7 @@
         "0"    "\\natural"     -0.00\pt        3.75\pt -8.44\pt        8.44\pt 
         "-1"   "\\flat"        -0.68\pt        4.50\pt -2.81\pt        11.25\pt        
         "-2"   "\\flatflat"    -0.68\pt        8.16\pt -2.81\pt        11.25\pt        
-        "2"    "\\sharpsharp"  -0.00\pt        5.63\pt -2.81\pt        2.81\pt 
+        "2"    "\\sharpsharp"  -0.00\pt        5.62\pt -2.81\pt        2.81\pt 
         }
     "dots"      = \table {
         "dot"  "\\dot" -0.00\pt        2.53\pt -1.27\pt        1.27\pt 
@@ -53,9 +53,11 @@
         "upbow"        "\\upbow"       -3.66\pt        3.66\pt -0.00\pt        11.70\pt        
         "downbow"      "\\downbow"     -4.22\pt        4.22\pt -0.00\pt        7.50\pt 
         "turn" "\\turn"        -6.15\pt        6.15\pt -2.98\pt        2.98\pt 
-        "trill"        "\\trill"       -5.63\pt        5.63\pt -0.00\pt        12.66\pt        
-        "pedalheel"    "\\pedalheel"   -2.81\pt        2.81\pt -2.81\pt        3.75\pt 
-        "pedaltoe"     "\\pedaltoe"    -2.81\pt        2.81\pt -0.00\pt        8.44\pt 
+        "trill"        "\\trill"       -5.62\pt        5.62\pt -0.00\pt        12.66\pt        
+        "upedalheel"   "\\upedalheel"  -2.81\pt        2.81\pt -2.81\pt        3.75\pt 
+        "dpedalheel"   "\\dpedalheel"  -2.81\pt        2.81\pt -3.75\pt        2.81\pt 
+        "upedaltoe"    "\\upedaltoe"   -2.81\pt        2.81\pt -0.00\pt        8.44\pt 
+        "dpedaltoe"    "\\dpedaltoe"   -2.81\pt        2.81\pt -8.44\pt        0.00\pt 
         "flageolet"    "\\flageolet"   -3.00\pt        3.00\pt -3.00\pt        3.00\pt 
         }
     "flags"     = \table {
@@ -69,9 +71,9 @@
         "d6"   "\\dsixtyfourthflag"    -0.28\pt        7.68\pt -0.28\pt        24.83\pt        
         }
     "clefs"     = \table {
-        "alto" "\\altoclef"    -5.63\pt        20.94\pt        -11.25\pt       11.25\pt        
+        "alto" "\\altoclef"    -5.62\pt        20.94\pt        -11.25\pt       11.25\pt        
         "alto_change"  "\\caltoclef"   -4.50\pt        16.75\pt        -9.00\pt        9.00\pt 
-        "bass" "\\bassclef"    -2.81\pt        20.25\pt        -14.06\pt       5.63\pt 
+        "bass" "\\bassclef"    -2.81\pt        20.25\pt        -14.06\pt       5.62\pt 
         "bass_change"  "\\cbassclef"   -2.25\pt        16.20\pt        -11.25\pt       4.50\pt 
         "violin"       "\\violinclef"  -4.90\pt        21.02\pt        -16.88\pt       28.12\pt        
         "violin_change"        "\\cviolinclef" -4.26\pt        16.48\pt        -13.50\pt       22.50\pt        

diff --git a/lily/parser.y b/lily/parser.y
index 159978d3dcd8fb0e5c6b3289e498110f9534e509..13cc69a973e6a366512bb923d1f7e85a19b54d5f 100644 (file)
--- a/lily/parser.y
+++ b/lily/parser.y
@@ -40,6 +40,16 @@
 #include "duration-convert.hh"
 #include "change-translator.hh"
 
+int const GUESS_PLET = 5;
+int guess_plet_a[GUESS_PLET] =
+{ 
+  1,
+  3,
+  2,
+  3,
+  4
+};
+
 #ifndef NDEBUG
 #define YYDEBUG 1
 #endif
@@ -91,6 +101,7 @@
     char c;
     const char *consstr;
     int i;
+    int pair[2];
     int ii[10];
 }
 %{
@@ -224,6 +235,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <real>   unit
 %type <request> abbrev_command_req
 %type <request>        post_request structured_post_request
+%type <pair>   plet_fraction
 %type <request> command_req verbose_command_req
 %type <request>        script_req  dynamic_req
 %type <score>  score_block score_body
@@ -846,13 +858,26 @@ dynamic_req:
        }
        ;
 
+plet_fraction:
+       unsigned '/' unsigned {
+               $$[0] = $1;
+               $$[1] = $3;
+       }
+       |
+       '/' unsigned {
+               int num = $2 >? 1;
+               $$[0] = guess_plet_a[(num <? GUESS_PLET) - 1];
+               $$[1] = num;
+       }
+       ;
+
 close_plet_parens:
-       ']' unsigned '/' unsigned {
+       ']' plet_fraction {
                $$ = MAEBTELP;
-               THIS->plet_.type_i_ = $4;
-               THIS->plet_.iso_i_ = $2;
-               THIS->default_duration_.plet_.type_i_ = $4;
-               THIS->default_duration_.plet_.iso_i_ = $2;
+               THIS->plet_.type_i_ = $2[1];
+               THIS->plet_.iso_i_ = $2[0];
+               THIS->default_duration_.plet_.type_i_ = $2[1];
+               THIS->default_duration_.plet_.iso_i_ = $2[0];
        }
        | TELP {
                $$ = TELP;
@@ -861,12 +886,12 @@ close_plet_parens:
                THIS->default_duration_.plet_.iso_i_ = 1;
                THIS->default_duration_.plet_.type_i_ = 1;
        }
-       | TELP unsigned '/' unsigned {
+       | TELP plet_fraction {
                $$ = TELP;
-               THIS->plet_.type_i_ = $4;
-               THIS->plet_.iso_i_ = $2;
-               THIS->default_duration_.plet_.type_i_ = $4;
-               THIS->default_duration_.plet_.iso_i_ = $2;
+               THIS->plet_.type_i_ = $2[1];
+               THIS->plet_.iso_i_ = $2[0];
+               THIS->default_duration_.plet_.type_i_ = $2[1];
+               THIS->default_duration_.plet_.iso_i_ = $2[0];
        }
        ;
 
@@ -903,19 +928,19 @@ open_abbrev_parens:
        ;
 
 open_plet_parens:
-       '[' unsigned '/' unsigned {
+       '[' plet_fraction {
                $$ = BEAMPLET;
-               THIS->plet_.type_i_ = $4;
-               THIS->plet_.iso_i_ = $2;
-               THIS->default_duration_.plet_.type_i_ = $4;
-               THIS->default_duration_.plet_.iso_i_ = $2;
+               THIS->plet_.type_i_ = $2[1];
+               THIS->plet_.iso_i_ = $2[0];
+               THIS->default_duration_.plet_.type_i_ = $2[1];
+               THIS->default_duration_.plet_.iso_i_ = $2[0];
        }
-       | PLET unsigned '/' unsigned {
+       | PLET plet_fraction {
                $$ = PLET;
-               THIS->plet_.type_i_ = $4;
-               THIS->plet_.iso_i_ = $2;
-               THIS->default_duration_.plet_.type_i_ = $4;
-               THIS->default_duration_.plet_.iso_i_ = $2;
+               THIS->plet_.type_i_ = $2[1];
+               THIS->plet_.iso_i_ = $2[0];
+               THIS->default_duration_.plet_.type_i_ = $2[1];
+               THIS->default_duration_.plet_.iso_i_ = $2[0];
        }
        ;
 

diff --git a/lily/tex-stream.cc b/lily/tex-stream.cc
index 02c33a8707a9bc5c860002e49fd6ba1f50e5cc4f..d861e6ecdee72dea2af673b50f155546dbc700bd 100644 (file)
--- a/lily/tex-stream.cc
+++ b/lily/tex-stream.cc
@@ -33,7 +33,7 @@ Tex_stream::header()
   *os << _("% Creator: ") << get_version_str() << "\n";
   *os << _("% Automatically generated, at ");
   time_t t (time (0));
-  *os << ctime (&t)<<"\n";
+  *os << ctime (&t) << "%\n";
 }
 Tex_stream::~Tex_stream()
 {

diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly
index c627ea5c5dd6b75ccd36ac6b6cd0aa062cafee8d..c46593a660815c8f3e6458b39b4c8c610281d813 100644 (file)
--- a/mutopia/J.S.Bach/preludes-1.ly
+++ b/mutopia/J.S.Bach/preludes-1.ly
@@ -13,7 +13,7 @@ rh = \melodic{
        \octave c'';
        \textstyle "italic";
        r16\p_"legato"\< ['g-1( c-3 )e-5] r ['g-1( c )e]
-       r [g( c )d] r ['b-1( d-2 \!)g-5] |
+       r ['g( c )d] r ['b-1( d-2 \!)g-5] |
        r\mf ['a( d-2 ) g-5] r ['a(\< d )f-4]
        r ['a( d )e-3] r [c-1( e-2 \!)a-5] |
        r\f ['b e a-5] r ['b e-3 g-5] 
@@ -76,9 +76,9 @@ lh = \melodic{
        % f4-1 e d-3\tr c |
        f4-1 e d-3 c |
        % g( )'g g\pr-"(#)"( )'g |
-       g( )'g g-"(\\textsharp)"( )'g |
-       % g\pr-"(\\textsharp)"( )'g g\pr-"(\\textsharp)"( )'g |
-       g-"(\\textsharp)"( )'g g-"(\\textsharp)"( )'g |
+       g ~ 'g g-"(\\textsharp)" ~ 'g |
+       % g\pr-"(\\textsharp)" ~ 'g g\pr-"(\\textsharp)" ~ 'g |
+       g-"(\\textsharp)" ~ 'g g-"(\\textsharp)" ~ 'g |
        % ugh, f should be at upper staff
        g r r16 ['g-5( 'b-4 d] )f-1 s s s |
        s [g-5( b-4 d'-2] )f'-1 s s s s \clef violin; [g'-4 b'-2 d''-1] 

diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly
index e0e1f57595a7209406b47a002c98ee8648ca433f..c82b6d784a50b028a3529e0c7c4221fd183b3ddb 100644 (file)
--- a/mutopia/J.S.Bach/preludes-2.ly
+++ b/mutopia/J.S.Bach/preludes-2.ly
@@ -39,6 +39,7 @@ rh = \melodic{
                { \stemup; c2 r4 < {c-5 ~ c8} {'a4 ~ 'a8} > }
                { \stemdown; c2 r4 'e4 ~ 'e8 }
        >
+       \stemboth;
        ['d-1\p( 'fis-2 'a-4] ['fis-2 'd-1 c-5 'a-3] |
        [)'b-4\< 'g-1( 'b-2 d-4] [ 'b-2 'g-1 f!-5 d-3] |
        [)e-4 'g-1( c-2 e-4] [c-2 'g g-5 e-3] |
@@ -82,10 +83,10 @@ lh = \melodic{
        % [g32-1( fis-2 g8.-1] ) 'g4 g( )'g\mr |
        
        % my edition has  mordents on every g here
-       [g32-1( fis-2 g8.-1] ) 'g4 g( )'g |
+       [g32-1( fis-2 g8.-1] ) 'g4 g ~ 'g |
        % 'g( )g\mr 'g( )g\mr |
-       g( )'g g( )'g |
-       g( )'g g( )'g |
+       g ~ 'g g ~ 'g |
+       g ~ 'g g ~ 'g |
        [g8 'g-5( 'b-4 d-2] ['b-4 'g-5 f!-1 d-3] |
        [)e-2 c-4 e-2 g-1] [e-3 c-5 c' e-4] |
        \textstyle "finger";

diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index cab0aaa82c6a3e0a4afd5bf501e9899faf435a8d..78933d0c4b26bfd7b213641ed860b6c26eb4cb40 100644 (file)
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -23,13 +23,12 @@
 % transplant a TeX dimension into the PS output.
 \def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\the\csname #1\endcsname) deftexdimen}}
 
-\def\turnOnPostScript{
+\def\turnOnPostScript{%
 \def\embeddedps##1{%
         % This sets CTM so that you get to the currentpoint
         % by executing a 0 0 moveto
         \special{ps: @beginspecial @setspecial ##1 @endspecial}       
 }
-
 %
 % width, slope, height 
 %
@@ -60,8 +59,7 @@ def
         def     
 } def
 }
-
-
+%
 \PSsetTeXdimen{staffrulethickness}
 \PSsetTeXdimen{staffheight}
 \special{! %
@@ -164,7 +162,7 @@ def
 
 
 
-\def\turnOnExperimentalFeatures{
+\def\turnOnExperimentalFeatures{%
 % draw a slur in embedded postscript
 \special{ps:
 }}

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 8a03396e189ab912022e661a179eeeefa159fc40..7a841241557419b1d30083f832a42621667ae395 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -2,10 +2,12 @@
 %% include file for LilyPond
 %%
 %% this file defines various macros to accomodate lilypond output
-
+%% 
+%% let's not make par before endinput
+%
 % TeXbook ex 7.7
 \def\ifundefined#1{\expandafter\ifx\csname#1\endcsname\relax}
-
+%
 % skip if included already
 \def\SkipLilydefs{\endinput}
 \ifundefined{EndLilyPondOutput}
@@ -13,7 +15,7 @@
         \def\SkipLilydefs{}
 \fi
 \SkipLilydefs
-
+%
 \ifundefined{mudelacopyright}
         \def\mudelacopyright{\copyright\ \number\year}
 \fi