lilypond-0.1.61

diff --git a/Documentation/vocabulary-data b/Documentation/vocabulary-data
index 43847bb9855b3c4e8c2759ebbfed1dac2a0c730d..fdc193aef242a1aa8dc7eef1e4ea8eed5454dbc1 100644 (file)
--- a/Documentation/vocabulary-data
+++ b/Documentation/vocabulary-data
@@ -1,5 +1,6 @@
 :engraving:notenstechen::steken::
 Francais:US English:Deutsch:UK English:Nederlands:Italiaans:
+:Grand staff:::Piano systeem::A combination of two staffs with a brace.  Usually used for piano music.
 :system:::systeem::
 accentuation:accentuation:::accent::
 accolade:brace:::::

diff --git a/VERSION b/VERSION
index 5256cfd8a81dd945eaa7cc5768e635e0f72bba1b..5f824472e8dc52b046e5a312edd2e21666fc3249 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=60
+PATCH_LEVEL=61
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:

diff --git a/bin/conflily.sh b/bin/conflily.sh
index 56793f1e278f931a9a13234bcea9bb8eb6ba433b..e42d608713373f8e2a8f8b3228fe86c533c4c912 100644 (file)
--- a/bin/conflily.sh
+++ b/bin/conflily.sh
@@ -32,4 +32,4 @@ fi
 ln -sf $lelie/current/lily/out/lilypond bin/lilypond
 ln -sf $lelie/current/mi2mu/out/mi2mu bin/mi2mu
 
-configure --prefix=/usr --enable-debugging --enable-printing --enable-checking
+configure --prefix=/usr --enable-debugging --enable-printing --enable-checking --disable-optimise

diff --git a/bin/convert-mudela.pl b/bin/convert-mudela.pl
index 3be80d97daba3aa3c70f0fe79b327c0131cca6b0..e4979d35d6e65aec4f18bfbb7a9f092db61a4096 100644 (file)
--- a/bin/convert-mudela.pl
+++ b/bin/convert-mudela.pl
@@ -165,6 +165,11 @@ sub convert_0_1_8_to_0_1_9
 #  print "introduced plet and finger shorthands...\n";
 }
 
+sub convert_0_1_9_to_0_1_10
+{
+    s/Grandstaff/Grand_staff/;    
+}
+
 ###############################################################
 
 sub    last_conversion
@@ -214,6 +219,7 @@ my %minor_conversions = ("0.0.50" => \&no_conv,
                         ,"0.1.7" => \&convert_0_1_6_to_0_1_7
                         ,"0.1.8" => \&convert_0_1_7_to_0_1_8
                         ,"0.1.9" => \&convert_0_1_8_to_0_1_9
+                        ,"0.1.10" => \&convert_0_1_9_to_0_1_10
                         );
 
  

diff --git a/configure.in b/configure.in
index c1d2bb5cce614730f69a6307d51a9ef74e040ad6..73ab40b1f5d2ec2f943f942bd5772ffbd3b5339b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,7 +51,7 @@ ac_cv_prog_lex_root=lex.yy
 OPTIMIZE="-O"
 printing_b=no
 checking_b=yes
-optimise_b=no
+optimise_b=tja
 profile_b=no
 CONFIGSUFFIX=
 debug_b=yes
@@ -123,6 +123,10 @@ if test "$optimise_b" = yes; then
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
+if test "$optimise_b" = no; then
+    OPTIMIZE=""
+fi
+
 if test $profile_b = yes; then
     EXTRA_LIBES="-pg"
     DEFINES="$DEFINES -pg"

diff --git a/init/engraver.ly b/init/engraver.ly
index 1e16c2146b8a609d65df95b65503c48571a03396..14c8d745a848c5ee9a8ce8046a3336e4727c42c2 100644 (file)
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -71,7 +71,7 @@ Thread = \translator {
        \consists "Tie_engraver";
 }
 
-Grandstaff = \translator {
+Grand_staff = \translator {
        \type "Engraver_group_engraver";
 
        \consists "Span_bar_engraver";
@@ -91,7 +91,7 @@ Staff_group = \translator {
        \consists "Line_group_engraver";
        \accepts "Staff";
        \accepts "Rhythmic_staff";
-       \accepts "Grandstaff";
+       \accepts "Grand_staff";
        \accepts "Lyrics";
 }
 
@@ -132,7 +132,7 @@ Score = \translator {
        \accepts "Staff";
        \accepts "Rhythmic_staff";      
        \accepts "Lyrics";
-       \accepts "Grandstaff";
+       \accepts "Grand_staff";
 }
 
 Stupid_score = \translator {

diff --git a/init/lily-init.ly b/init/lily-init.ly
index 1fb4992c05c4fa66181d22626b77635d19fadc6f..22b5bffa6d393e65d3559b24c0a08a37c369e6d5 100644 (file)
--- a/init/lily-init.ly
+++ b/init/lily-init.ly
@@ -1,34 +1,8 @@
 % Toplevel initialisation file. 
        
-\version "0.1.9";
-  
-breve = \duration { -1 0 }
-longa = \duration { -2 0 }
+\version "0.1.10";
 
-\include "dynamic.ly"
-\include "nederlands.ly"               % dutch
-\include "script.ly"
 
+\include "declarations.ly"
 
-Gourlay = 1.0
-Wordwrap = 0.0
-
-\include "paper16.ly"
-
-default_paper = \paper{
-       \paper_sixteen
-}
-
-% ugh
-\include "midi.ly"
-
-% declarations for standard directions
-left = -1
-right = 1
-up = 1
-down = -1
-% zillie spellink?
-center=0
-
-\include "property.ly"
-
+\maininput

diff --git a/init/performer.ly b/init/performer.ly
index 90b3688412fcdf13a5aaafd4b40c13946ad2ae9e..7d7cd9f11342546053818236a2f81610526d12ae 100644 (file)
--- a/init/performer.ly
+++ b/init/performer.ly
@@ -21,7 +21,7 @@ Voice = \translator
        \accepts Thread;
 }
 
-Grandstaff = \translator
+Grand_staff = \translator
 {
        \type "Performer_group_performer";
        \accepts Staff;
@@ -49,7 +49,7 @@ Score = \translator {
        \type "Score_performer";
        instrument = piano;
        \accepts Staff;
-       \accepts Grandstaff;
+       \accepts Grand_staff;
        \accepts Lyrics; 
        \accepts Staff_group;
        \consists "Swallow_performer";

diff --git a/input/bugs/a.ly b/input/bugs/a.ly
index 2706aa128d38d4af0b12d1079145ebcdff036b43..1c1d75b1571820a326f756b600be42df84fa6843 100644 (file)
--- a/input/bugs/a.ly
+++ b/input/bugs/a.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.9";
+\version "0.1.10";
 
 shortlong = \melodic{
        \octave c';

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

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index f011d7bf27b6575fb513516661f965021935c689..e3cac3ecf205eb7195ca7c0897708ae51032a2e7 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.9";
+\version "0.1.10";
 
 
 % the % is a comment.
@@ -59,7 +59,7 @@ begeleiding = \melodic{
 }
 
 \score{
-       \melodic \type Grandstaff <
+       \melodic \type Grand_staff <
                \melodie
                \begeleiding 
        >

diff --git a/input/multi.ly b/input/multi.ly
index 5bfcd1038bac128a1785d37ea5d35b7eaebc2897..27542ccc8b02e02b29b362581497926d18cb951d 100644 (file)
--- a/input/multi.ly
+++ b/input/multi.ly
@@ -11,7 +11,7 @@ Tested Features: \multi
 WARNING: the \multi construct is not very intuitive.  You better try
 the
 
-       \type Grandstaff <
+       \type Grand_staff <
                \type Staff = treble {.. }
                \type Staff = bass {.. }
        >               
@@ -21,7 +21,7 @@ construct to get multiple staffs, it's cleaner
 %}
 
 
-\version "0.1.9";
+\version "0.1.10";
 
 \score{
        \melodic 

diff --git a/input/pedal.ly b/input/pedal.ly
index d82a03e7102d027e36a5ce2b22ff0b6214fe2882..41affb55f2e103659cd7fdb77c54db50f531d097 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.9";
+\version "0.1.10";
 
 \score{
                \melodic {

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 2b05688939cbdf532f3f2ca111ad2e5532b5ff5f..0b4525b396f4412961e3e6e2f4bb62a8dd56f469 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -19,7 +19,7 @@
    * organ staff...
 %}
 
-\version "0.1.9";
+\version "0.1.10";
 
 noShift = { \property Voice.hshift = 0 }
 Shift = { \property Voice.hshift = 1 }
@@ -167,7 +167,7 @@ breakmusic = \melodic {
 % these should be two separate scores...
 \score{
   \type Score <
-    \type Grandstaff <
+    \type Grand_staff <
       \type Staff = treble {
         \praeludium_right \breakmusic \fuga2_right }
       \type Staff = bass { 

diff --git a/input/rhythm.ly b/input/rhythm.ly
index a0f28fb15bf362f60161aafc15e4fce83ce87227..2ceedaa4f9350d63d303ed0b57fa54254731e156 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.9";
+\version "0.1.10";
 
 ritme = \melodic{ %\octave ;
        \partial 8;
@@ -74,7 +74,7 @@ yanother =
        \accepts "Staff_group";
        \accepts "Staff";
        \accepts "Lyrics";
-       \accepts "Grandstaff";
+       \accepts "Grand_staff";
 }
 
 Rhythmic_staff = \translator

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

diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly
new file mode 100644 (file)
index 0000000..74367dc
--- /dev/null
+++ b/input/test/beam-pos.ly
@@ -0,0 +1,13 @@
+\score{
+       \melodic{
+               \property Score.beamquantisation = 3 % TEST
+               \octave c';
+               [c8 c] [c c] [c c] [c c]
+               [a'8 a'] [a' a'] [a' a'] [a' a']
+       }
+       \paper{
+               castingalgorithm = \Wordwrap;
+               linewidth = 60.0\mm;
+       }
+}
+

diff --git a/input/test/beams.ly b/input/test/beams.ly
index 953bd7c02ab8914d2a4a2e923a9a562f1ff47b6f..ff1f127511bb347edf45a89383db73b1c1bb75a6 100644 (file)
--- a/input/test/beams.ly
+++ b/input/test/beams.ly
@@ -1,4 +1,3 @@
-
 \header{
 filename =      "beams.ly";
 composer =      "heu";
@@ -7,90 +6,68 @@ copyright =    "PD";
 
 TestedFeatures =        "beams and beamflags";
 }
-\version "0.1.9";
+\version "0.1.10";
 
 \score{
-       \melodic { \multi 3 < 
-               { \octave c'; 
+       <
+%              \property Score.beamquantisation = \none
+               \type Grand_staff < 
+               \melodic { 
+                       \octave c'; 
                        \meter 8/4;
-                       \duration8;
-                       \stemup [c c'' a' f']
-                       \duration16;
-                       \stemup [c c'' a' f']
-                       \duration32;
-                       \stemup [c c'' a' f']
-                       \duration64;
-                       \stemup [c c'' a' f']
-                       \duration128;
-                       \stemup [c c'' a' f']
+                       \stemup [c8 c'' a' f']
+                       \stemup [c16 c'' a' f']
+                       \stemup [c32 c'' a' f']
+                       \stemup [c64 c'' a' f']
+                       \stemup [c128 c'' a' f']
                        r32
 
-                       \duration 8;
-                       \stemup ['g 'g 'g 'g]
-                       \duration 16;
-                       \stemup ['g 'g 'g 'g]
-                       \duration 32;
-                       \stemup ['g 'g 'g 'g]
-                       \duration 64;
-                       \stemup ['g 'g 'g 'g]
-                       \duration 128;
-                       \stemup ['g 'g 'g 'g]
+                       \stemup [g8 g g g]
+                       \stemup [g16 g g g]
+                       \stemup [g32 g g g]
+                       \stemup [g64 g g g]
+                       \stemup [g128 g g g]
                        r32
+
+                       \octave c;
+                       \stemboth;
+                       [c'8 c'] [b b] [a a] [g g] [f f] [e e]
+                       [c'16 c'] [b b] [a a] [g g]  [f f] [e e]
+                       [c'32 c'] [b b] [a a] [g g] [f f] [e e]
+                       [c'64 c'] [e e]
                }
-       
-       { \octave c';  
+       >
+       <       
+               \melodic { 
+                       \octave c';  
                        \meter 8/4;
-                       \duration8;
-                       \stemdown [a' 'a c e]
-                       \duration16;
-                       \stemdown [a' 'a c e]
-                       \duration32;
-                       \stemdown [a' 'a c e]
-                       \duration64;
-                       \stemdown [a' 'a c e]
-                       \duration128;
-                       \stemdown [a' 'a c e]
+                       \stemdown [a'8 'a c e]
+                       \stemdown [a'16 'a c e]
+                       \stemdown [a'32 'a c e]
+                       \stemdown [a'64 'a c e]
+                       \stemdown [a'128 'a c e]
                        r32
 
                        \octave c;
-                       \duration 8;
-                       \stemdown [d'' d'' d'' d'']
-                       \duration 16;
-                       \stemdown [d'' d'' d'' d'']
-                       \duration 32;
-                       \stemdown [d'' d'' d'' d'']
-                       \duration 64;
-                       \stemdown [d'' d'' d'' d'']
-                       \duration 128;
-                       \stemdown [d'' d'' d'' d'']
+                       \stemdown [d''8 d'' d'' d'']
+                       \stemdown [d''16 d'' d'' d'']
+                       \stemdown [d''32 d'' d'' d'']
+                       \stemdown [d''64 d'' d'' d'']
+                       \stemdown [d''128 d'' d'' d'']
                        r32
 
-               } >
-               
-               {\duration "last";
-                       % ugh, "duration mode"
-                       
-                       [g8 g] [a a] [b b] [c' c']
-                       
-                       [g16 g ] [a a] [b b] [c' c']
-                       [g32 g] [a a] [b b] [c' c']
-                       
-                       [g64 g ] [c' c' ]
-               }
-               {
-                       \transpose d {
-                       \octave c''';
-                       | [g8 g] [a a] [b b] [c' c']
-                       [g16 g ] [a a] [b b] [c' c']
-                       [g32 g] [a a] [b b] [c' c']
-                       [g64 g]
-                       [c' c']
-                       }
+                       \octave c'';
+                       \stemboth;
+                       [a8 a] [b b] [c' c'] [d' d'] [e' e'] [f' f']
+                       [a16 a] [b b] [c' c'] [d' d']  [e' e'] [f' f']
+                       [a32 a] [b b] [c' c'] [d' d']  [e' e'] [f' f']
+                       [a64 a] [f' f'] 
                }
-       }
+       >
+       >
+
        \paper{
-               gourlay_maxmeasures = 1.;
+               castingalgorithm = \Wordwrap;
        }
 }
 
-

diff --git a/input/test/broken.ly b/input/test/broken.ly
index 23333057a24b93e1dbfb9907fc7ba175f1ddb7df..17a90a08b279b6591f0ec4844ffbed703b81a68f 100644 (file)
--- a/input/test/broken.ly
+++ b/input/test/broken.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.9";
+\version "0.1.10";
 
 shortlong = \melodic{
        c4()c( c c  |

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

diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly
index b4aa56da1396332df8ae57e20c476fe20143b82a..f870302100282f86793f6d92bcce6d3724580d89 100644 (file)
--- a/input/test/denneboom.ly
+++ b/input/test/denneboom.ly
@@ -7,7 +7,7 @@ TestedFeatures = "This file tests silly line shapes";
 
 \include "paper20.ly"
 
-\version "0.1.9";
+\version "0.1.10";
 
 oden = \lyric{ 
        O8 |

diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index 19e7078057d0ee17cdcae6c881c916e7910f9c5f..b2b222c3415b4085ed21f513414fc1d4fec24fa8 100644 (file)
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -1,4 +1,4 @@
-\version "0.1.9";
+\version "0.1.10";
 FontBody=      \melodic{ 
                \octave c';
                \bar "|:";

diff --git a/input/test/font.ly b/input/test/font.ly
index 0e92c3145d471483e8d24ea66caf6154c4b805ca..6ae34c8633449c49f8279693c76c18311537e965 100644 (file)
--- a/input/test/font.ly
+++ b/input/test/font.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.9";
+\version "0.1.10";
 
 \include "font-body.ly"
 \score{

diff --git a/input/test/font16.ly b/input/test/font16.ly
index 9ba966fdf2b476cd4c16497a9de0a4864c89a600..1507d2c66e540e6ff919c75fb807eb0b8dbb3f49 100644 (file)
--- a/input/test/font16.ly
+++ b/input/test/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.9";
+\version "0.1.10";
 \include "font-body.ly"
 
 \score{

diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index 4e55085818d77f891ee2163a9e713cb5bea35b3a..f57627fde544a7a9fba2e3d3e5e0613f46224be7 100644 (file)
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -4,7 +4,7 @@ copyright =      "PD";
 TestedFeatures =        "This file tests some nasty Gourlay spacings";
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 %{
 

diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index 116aa60db0b0a53100d6f59388b3e6395cb4cd79..3026613cae0e5b11119a9ded343b86dbe655dce4 100644 (file)
--- a/input/test/sleur.ly
+++ b/input/test/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.9";
+\version "0.1.10";
 
 shortlong = \melodic{
        c4()c( c c  |

diff --git a/input/test/slurs.ly b/input/test/slurs.ly
index 3d45dea955525af4d161e5f77b68b8bcea8d3085..6663ffdffab3aab43644d081a180a4f23e6957a4 100644 (file)
--- a/input/test/slurs.ly
+++ b/input/test/slurs.ly
@@ -1,5 +1,5 @@
 
-\version "0.1.9";
+\version "0.1.10";
 
 \score{
        \melodic{\octave c';

diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index 0c8729b41c2ccfec7db60d1e61a7761522b7ad9b..710df30c48583e3e9a504b4ec726f05f6a1e51eb 100644 (file)
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,7 +6,7 @@ copyright =      "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 multipart = \melodic{ 
     \multi 3 < 

diff --git a/input/test/stem.ly b/input/test/stem.ly
index 7bf1a4f42fdf8962303474ee2cd381289bfa8205..8cd604af5f90380bf4f4bff247fed997c8d805ca 100644 (file)
--- a/input/test/stem.ly
+++ b/input/test/stem.ly
@@ -8,7 +8,7 @@ of beams";
        
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 beamintervals = \melodic{
                \meter 7/4;

diff --git a/input/test/tie.ly b/input/test/tie.ly
new file mode 100644 (file)
index 0000000..2018b00
--- /dev/null
+++ b/input/test/tie.ly
@@ -0,0 +1,18 @@
+tie = \melodic{
+       \octave c'';
+       e4 ~ e e e ~ |
+       e ~ a a a ~ |
+       a d d d ~ |
+       e e e e |
+       ''g ''g ''g ''g ~ |
+       ''g ''g ''g ''g |
+}
+
+\score{
+       \tie
+       \paper{ 
+             indent = 0.0\pt;
+               linewidth= 30.\mm;
+               castingalgorithm = \Wordwrap;
+       }
+}

diff --git a/input/tril.ly b/input/tril.ly
index 6f2639d8b32020d2fe25a0968792fcba60971827..6e9c55bf2f722d4710f70092deef1d89a61b86a4 100644 (file)
--- a/input/tril.ly
+++ b/input/tril.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests trills"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \score{
        \melodic{ 

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 0984052f5308ac5b654a00ee4df41827cd3fded1..fb57977c30ca7add15e976ab9fe7ae1795483996 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.9";
+\version "0.1.10";
 
 melodie = \melodic {
         \clef"violin";

diff --git a/mf/TODO b/mf/TODO
index 850230b6c7157300f9c14f9cd63bba8d7ee9ae6f..e93332e8b188d43d4182d675f9a2cdb5bc72ba3f 100644 (file)
--- a/mf/TODO
+++ b/mf/TODO
@@ -2,6 +2,7 @@
        - design decent macro for bulbed endings
        - printer dependencies.
        - y-refpoint for rests should be the 4th staffline (gclef: b')
+       - clean-up eight+ rests
        - versioning    
        - lo-res fixes.
        - work out sizes of character fonts.

diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
index 98b576521200e2d953a8c9bc6a164d768e4d7b4e..6c99e7ed703be2ef8512202d2c727d1333d1a713 100644 (file)
--- a/mutopia/Coriolan/clarinetti-part.ly
+++ b/mutopia/Coriolan/clarinetti-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "global.ly"
 \include "clarinetti.ly"

diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly
index f1b600009b9a86d8ab32018a1202dfab5c7a3af9..bff0f4f8a0e8af75ac4664ce12a09c766e77add5 100644 (file)
--- a/mutopia/Coriolan/clarinetti.ly
+++ b/mutopia/Coriolan/clarinetti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"

diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
index 635b57a802fb20f5dc9bb734201dd6dfc952158b..e7cccf9b0c73899577397887dc66ee138f80c85f 100644 (file)
--- a/mutopia/Coriolan/clarinetto-1.ly
+++ b/mutopia/Coriolan/clarinetto-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 clarinetto1 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
index aa1fd8485741c19b223cde2c83df9e4b8720eb18..0ad1fa5f6faf529a947395ae5d159c4d8b1f3d6c 100644 (file)
--- a/mutopia/Coriolan/clarinetto-2.ly
+++ b/mutopia/Coriolan/clarinetto-2.ly
@@ -9,13 +9,16 @@ copyright =    "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 clarinetto2 = \melodic{
        \octave c';     
 % koor: clarinetto-part.ly
 % lilypond: ../../current/lily/dynamic-grav.cc:58: void Dynamic_engraver::do_process_requests(): Assertion `!dynamic_p_' failed.
 % Aborted (core dumped)
+
+% huh?
+
 %      r1 | r1 | as4-.\ff r r2 | r1 |
        r1*2 | as4-. r r2 | r1*3 |
        b4-. r r2 | r1*3 |

diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index f941bb55ac6219230881246a57c8b3e2456d940a..e38cbc120a9a2688528c430de86ea3982a98af57 100644 (file)
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 contrabasso = \melodic{
        \octave c;

diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index f3ccd57cbb71fda0d7a48c3a0443f307fdc06793..83334d2b1e81173e11f0fe54cb50b086b85572b5 100644 (file)
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "global.ly"
 
@@ -42,12 +42,12 @@ $timpani_g = \type Staff_group = timpani_group <
        \$timpani_staff
 >
 
-$violini = \type Grandstaff = violini_group <
+$violini = \type Grand_staff = violini_group <
        \$violino1_staff
        \$violino2_staff
 >
 
-$bassi = \type Grandstaff = violine_group <
+$bassi = \type Grand_staff = violine_group <
        \$violoncello_staff
        \$contrabasso_staff
 >

diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
index ae4c5e0e05ad0422e2a922638bfb8b843056dbe2..eb12f83988d6b04b32e094011ef12d189a9ad824 100644 (file)
--- a/mutopia/Coriolan/corni-part.ly
+++ b/mutopia/Coriolan/corni-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "global.ly"
 \include "corni.ly"

diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly
index e8867a1709ae45f7e8d0caa4736bd3c1c46bbffe..38764214c0ce202d4575af0b94bcf709626326f0 100644 (file)
--- a/mutopia/Coriolan/corni.ly
+++ b/mutopia/Coriolan/corni.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "corno-1.ly"
 \include "corno-2.ly"

diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index 0869da4d2d578d5f6683bc5c861ceda173fae08f..3b05a152085f3af0a6d327b62f8fbba8e2c598db 100644 (file)
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 corno1 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
index 5eb5c4895b57d77bcb6d7f6d4ca6d9a9b1d7ef2c..73f7340206ea08a93bfdaa550e83f8b68a35e821 100644 (file)
--- a/mutopia/Coriolan/corno-2.ly
+++ b/mutopia/Coriolan/corno-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 corno2 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly
index ad23c5c12dcec04f960edca7305c8334c4247941..8e51cf63734cdb398fb5a248e75939b44493a9c8 100644 (file)
--- a/mutopia/Coriolan/fagotti-part.ly
+++ b/mutopia/Coriolan/fagotti-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "global.ly"
 \include "fagotti.ly"

diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly
index 68a1ca0081d61df9ff8f6464478b28893e254900..116ba75c62119d6ae887b03cf5750f626cc73fd7 100644 (file)
--- a/mutopia/Coriolan/fagotti.ly
+++ b/mutopia/Coriolan/fagotti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"

diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
index 6718dd4c8b959908870aa0a2320cff6735c6412f..f238406f2899bf16e3f6e2eb704c0b57c8286a5a 100644 (file)
--- a/mutopia/Coriolan/fagotto-1.ly
+++ b/mutopia/Coriolan/fagotto-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 fagotto1 = \melodic{
        \octave c;      

diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index 2889c688a870ea8a3b914cee569a7044d10981a0..1a1f0bbeda678bc5656bf0739f2fbb2fe2775373 100644 (file)
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 fagotto2 = \melodic{
        \octave c;      

diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
index 13e4510f34c3b5624c6a7d0393250d3b8b37a8da..aa6e8d582010dd143e7ebac095ad19955f2b484d 100644 (file)
--- a/mutopia/Coriolan/flauti-part.ly
+++ b/mutopia/Coriolan/flauti-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "global.ly"
 \include "flauti.ly"

diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index dc49d11fb55e87eb1674555e77eeb754f1b777b4..c1a2bf0aef776412ac52730290616ad87317bcea 100644 (file)
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "flauto-1.ly"
 \include "flauto-2.ly"

diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
index 5475ffe1ee6aeb8071df5a57586238f8e8c1616f..58ed585f9ee94dd9f3c3f5313f9830a0a04c1261 100644 (file)
--- a/mutopia/Coriolan/flauto-1.ly
+++ b/mutopia/Coriolan/flauto-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 flauto1 = \melodic{
        \octave c'';    

diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
index aeddce6a8ffa2c6bbbccebb616ed1253fc1f0294..7a3f7707aabadd1067601a01a7537325c7e5a5f2 100644 (file)
--- a/mutopia/Coriolan/flauto-2.ly
+++ b/mutopia/Coriolan/flauto-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 flauto2 = \melodic{
        \octave c'';    

diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly
index 966f1f1aa45b84672db74d012519a80aa7526d44..c01d9861374100f4fb8eb45ba490a71997817e03 100644 (file)
--- a/mutopia/Coriolan/global.ly
+++ b/mutopia/Coriolan/global.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 global = \melodic{
        \meter 4/4;

diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
index ab3290fb16d2069bb34a2375b22b14a746ab89ba..a9b7601c5af9902ffd357ef1cebf08f6e0fa804c 100644 (file)
--- a/mutopia/Coriolan/oboe-1.ly
+++ b/mutopia/Coriolan/oboe-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 oboe1 = \melodic{
        \octave c'';    

diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
index 75e5e5dfabe93be742193ee0d69088294b81ca98..1090871206b297625779b3d5b288ea80ee1d1b42 100644 (file)
--- a/mutopia/Coriolan/oboe-2.ly
+++ b/mutopia/Coriolan/oboe-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 oboe2 = \melodic{
        \octave c'';    

diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly
index eef9019b7e0f7e0f5df9ef4eb80a7c573f63ce43..99a94e7c988835a5972c9f4c23aef4199af32f59 100644 (file)
--- a/mutopia/Coriolan/oboi-part.ly
+++ b/mutopia/Coriolan/oboi-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "global.ly"
 \include "oboi.ly"

diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly
index cce1305de8d98a23d0bd6dd1f3cd80e26a1ef9b9..702c5a5d5e587709347464f0b2a1ed627ef408cd 100644 (file)
--- a/mutopia/Coriolan/oboi.ly
+++ b/mutopia/Coriolan/oboi.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "oboe-1.ly"
 \include "oboe-2.ly"

diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index 3c3bd64aa9b66a33f2df400518b74d12f8371163..8936643c76d54243744b85689ab103207f40cdb7 100644 (file)
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 timpani = \melodic{
        \octave c;      

diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly
index a9f5fd050659f7adbadc2aff3979c5b03ba3585a..802a494d0dfac6f2ea54c9b1b4370c82b425851d 100644 (file)
--- a/mutopia/Coriolan/trombe-part.ly
+++ b/mutopia/Coriolan/trombe-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "global.ly"
 \include "trombe.ly"

diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly
index 2d70dd71a91035d73a2e2f2c0ed5f24947c0925a..bb1e48f0265f5951aa2e0c3cbf69c60eb7e0ad86 100644 (file)
--- a/mutopia/Coriolan/trombe.ly
+++ b/mutopia/Coriolan/trombe.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "trombo-1.ly"
 \include "trombo-2.ly"

diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
index a37727183475155eb9f91ba692a7dbb16f1657c6..6b3bef51ab6aafb823122e597ee31a7e830843ef 100644 (file)
--- a/mutopia/Coriolan/trombo-1.ly
+++ b/mutopia/Coriolan/trombo-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 trombo1 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
index 1288eabaef3b3d391133883cf5924b0bca94865c..f123b9a32c9447475ec28c8c1d569eb5a8cb2b6f 100644 (file)
--- a/mutopia/Coriolan/trombo-2.ly
+++ b/mutopia/Coriolan/trombo-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 trombo2 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/viola.ly b/mutopia/Coriolan/viola.ly
index 1fd005e6499cd2e65ebd1c8bb9d506be5ecb9750..c4a34c898272d1fbad1bce2649d50a5d02fb318d 100644 (file)
--- a/mutopia/Coriolan/viola.ly
+++ b/mutopia/Coriolan/viola.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 viola = \melodic{
        \octave c;

diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index b5290fea73f1c76a959822a0f8dc28765745fdcd..02d10f5512e64d8ab558212f01f288425150a331 100644 (file)
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 violino1 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index 28e91a505241c152c92b5087f1093a6a9e0be9d5..2726b10874a114f6a8bedb249c91f0f841c8dad9 100644 (file)
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 violino2 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index 38aecb4055eac3661663106a2990d53af5f8b53b..dcf183f66bb8bb5eba493433c044d7efe805b0fc 100644 (file)
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 violoncello = \melodic{
        \octave c;

diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly
index db687e59f23ec35562cf294bdb5b97aa67ec8434..e75e39eb832bdab3e801713dfdd722522c97041c 100644 (file)
--- a/mutopia/J.S.Bach/preludes-1.ly
+++ b/mutopia/J.S.Bach/preludes-1.ly
@@ -108,7 +108,7 @@ bass_staff = \type Staff = bass <
        \two
 >
 
-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly
index eb4a1fcc8d232dc5b81350022a250abd1390baf8..7ccc808db829389c47910d43c56c180391ab9a3d 100644 (file)
--- a/mutopia/J.S.Bach/preludes-2.ly
+++ b/mutopia/J.S.Bach/preludes-2.ly
@@ -114,7 +114,7 @@ bass_staff = \type Staff = bass <
        \two
 >
 
-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-3.ly.m4 b/mutopia/J.S.Bach/preludes-3.ly.m4
index 7515b635df979eca7cc04b365b06470baf826023..0643095b979d51b19af1dbaace61eabf2d8715c8 100644 (file)
--- a/mutopia/J.S.Bach/preludes-3.ly.m4
+++ b/mutopia/J.S.Bach/preludes-3.ly.m4
@@ -161,7 +161,7 @@ bass_staff = \type Staff = bass <
        \two
 >
 
-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-4.ly b/mutopia/J.S.Bach/preludes-4.ly
index eb7dc7b21346e6de34376da0278faf5942495ffd..64008af3e4deb79541fa9a5ca2bf79bb741155c7 100644 (file)
--- a/mutopia/J.S.Bach/preludes-4.ly
+++ b/mutopia/J.S.Bach/preludes-4.ly
@@ -188,7 +188,7 @@ bass_staff = \type Staff = bass <
        { \voicetwo \three }
 >
 
-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-5.ly b/mutopia/J.S.Bach/preludes-5.ly
index 34dd4d41c47e6af66d0de1159232070e343593ed..35efe1587cec93a8126a181e13ee1edc20cce12c 100644 (file)
--- a/mutopia/J.S.Bach/preludes-5.ly
+++ b/mutopia/J.S.Bach/preludes-5.ly
@@ -192,7 +192,7 @@ bass_staff = \type Staff = bass <
        \two
 >
 
-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-6.ly b/mutopia/J.S.Bach/preludes-6.ly
index 7a8a718b1c4cdf8b95510ee1e952e0825400c543..e76cbcd1aff2cabbce31a67a06740a0de0ee13bd 100644 (file)
--- a/mutopia/J.S.Bach/preludes-6.ly
+++ b/mutopia/J.S.Bach/preludes-6.ly
@@ -109,7 +109,7 @@ bass_staff = \type Staff = bass <
        \four
 >
 
-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/scsii-menuetto.ly b/mutopia/J.S.Bach/scsii-menuetto.ly
index 68e2e76afada890d095aee56bd4f7ef0339c548c..a8b41cc70c541f87dbe14e93e4a5eab1615c9deb 100644 (file)
--- a/mutopia/J.S.Bach/scsii-menuetto.ly
+++ b/mutopia/J.S.Bach/scsii-menuetto.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  Tested Features:breaking algorithm, chords, multivoice, accents
 %}
 
-\version "0.1.9";
+\version "0.1.10";
 
 %% Stuff from MPP version
 % \lefttitle{Menuetto}

diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly
index 5469e62b5ccac7f111222c01ddc61c7d1257749a..fd42f9c4600bb9b4e172bc832f68a7b42fc55756 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue1.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue1.ly
@@ -11,7 +11,7 @@ copyright =    "Public Domain";
 %{
        
 %}
-\version "0.1.9";
+\version "0.1.10";
 
 
 global = 
@@ -182,7 +182,7 @@ bass =
 
         
 \score {
-    \melodic \type Grandstaff < 
+    \melodic \type Grand_staff < 
                 \multi 2 <
                        \global 
                        \soprane

diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly
index 68a1117b0b63a87f74074e208e8bc8f95224d1b7..7cb045ba17be65271256b956ee5bc023ab4a26da 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -13,7 +13,7 @@
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "nederlands.ly"                 % for correct parsing of note names
 
@@ -166,7 +166,7 @@ bassdux = \melodic {
         
 \score {
   \melodic {
-    \type Grandstaff < 
+    \type Grand_staff < 
       \type Staff = treble < 
         \global 
         \dux

diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly
index b842f1931b2c2523eb665f96f768445d8ded3ecb..345b6c341b8fc2fb73393a368ed4d54a2b42eb1a 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-prelude1.ly
+++ b/mutopia/J.S.Bach/wtk1-prelude1.ly
@@ -8,7 +8,7 @@ enteredby =      "Shay Rojansky";
 copyright =     "Public Domain";
 }
 
-\version "0.1.9";
+\version "0.1.10";
 
 global = 
     \melodic {
@@ -162,7 +162,7 @@ bass =
 
         
 \score {
-    \melodic \type Grandstaff < 
+    \melodic \type Grand_staff < 
                   <
                        \global 
                        \soprane

diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index 78586dc6a32240a768822a2e10f385848242cfd5..e467d440a15843ee8b44625fd1c20f5b2b499b15 100644 (file)
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -43,7 +43,7 @@ Voice engraver by uncommenting the lines in the paper
 definition below. --MB
 %} 
 
-\version "0.1.9";
+\version "0.1.10";
 
 vi1=\melodic{
   \meter 4/4;

diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly
index 82d94001bdef16028d8626367c4cbec1cf3215c4..e0c3ea2e0ed9b7e792f014f07352c97c891f6624 100644 (file)
--- a/mutopia/standchen-16.ly
+++ b/mutopia/standchen-16.ly
@@ -9,6 +9,6 @@ description = "A schubert song in 16 pt";
 copyright =     "public domain";
 } 
 
-\version "0.1.9";
+\version "0.1.10";
 
 \include "standchen.ly"

diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly
index a724709a38a3aaf40172a3787174523b8d7a62a9..f3e87845907d562315273c417b8541ca52bdeacc 100644 (file)
--- a/mutopia/standchen-20.ly
+++ b/mutopia/standchen-20.ly
@@ -8,7 +8,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 description = "A schubert song in 20 pt";
 } 
-\version "0.1.9";
+\version "0.1.10";
 
 % fool make-website
 % \include "standchen.ly";

diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
index bf860c41261c1f65eb9a06b75ed1d6e475eb445c..2a407932f02cba94b66815d0308d6620520eb7ae 100644 (file)
--- a/mutopia/standchen.ly
+++ b/mutopia/standchen.ly
@@ -13,7 +13,7 @@ multiple \paper{}s in one \score
 %}
 
 \include "paper20.ly"
-\version "0.1.9";
+\version "0.1.10";
 
 commands = \melodic{
        \skip 2.*4;
@@ -478,7 +478,7 @@ $bass_staff = \type Staff = bass<
        \begeleiding
 >
  
-$grand_staff = \type Grandstaff<
+$grand_staff = \type Grand_staff<
        \$treble_staff
        \$bass_staff
 >

diff --git a/mutopia/standje.ly b/mutopia/standje.ly
index c89b7352966b6d592aa9c44bb1617973af08284f..9193c65f050b3a4eaa3807550f7a40340df92491 100644 (file)
--- a/mutopia/standje.ly
+++ b/mutopia/standje.ly
@@ -13,7 +13,7 @@ copyright =    "public domain";
 multiple \paper{}s in one \score 
 %}
 
-\version "0.1.9";
+\version "0.1.10";
 
 $vocal_verse1 = \melodic{
        \octave c';
@@ -413,7 +413,7 @@ $bass_staff = \type Staff = bass<
        \bass
 >
 
-$grand_staff = \type Grandstaff<
+$grand_staff = \type Grand_staff<
        \$treble_staff
        \$bass_staff
 >

diff --git a/test/bow.cc b/test/bow.cc
index 35c344686c4b779a79509fd1c44ed0be1cf6e131..dc077b4f29966276e9085c4897f18f51aaeaf8ca 100644 (file)
--- a/test/bow.cc
+++ b/test/bow.cc
@@ -17,9 +17,14 @@ typedef void *Paper_def;
 bool experimental_features_global_b = true;
 
 #include "bezier.hh"
-#include "bezier.cc"
+
+#if 0
 #include "offset.cc"
+#include "interval.cc"
+#endif
 
+#include "misc.cc"
+#include "bezier.cc"
 
 struct Point
 {
@@ -84,7 +89,7 @@ main ()
 {
   //cout.unsetf(ios::scientific);
   cout.setf(ios::fixed);
-#if 0
+#if 1
   bow ((Point[6]){ 0,0, 20,0, 40,0, 60,0, 80,0, 100,1 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,0, 40,30, 60,30, 80,0, 100,1 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,0, 40,0, 60,0, 80,10, 100,1 }, 6, 1);
@@ -123,20 +128,24 @@ main ()
   bow ((Point[6]){ 0,10, 20,20, 40,0, 60,40, 80,20, 100,50 }, 6, -1);
 #endif
 
+#if 1
   //clipping
-#if 0
+
   bow ((Point[6]){ 0,0, 20,60, 40,0, 60,0, 80,0, 100,1 }, 6, 1);
 
   bow ((Point[6]){ 0,1, 20,0, 40,0, 60,0, 80,60, 100,0 }, 6, 1);
-//  bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1);
+  bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,20, 100,100 }, 6, -1);
   bow ((Point[6]){ 0,0, 20,-20, 40,-40, 60,-60, 80,-20, 100,-100 }, 6, 1);
-//  bow ((Point[6]){ 0,0, 20,-20, 40,-40, 60,-60, 80,-140, 100,-100 }, 6, -1);
+  bow ((Point[6]){ 0,0, 20,-20, 40,-40, 60,-60, 80,-140, 100,-100 }, 6, -1);
+  bow ((Point[7]){ 0,0, 20,40, 100,0, 150,0, 200,0, 280,40, 300,0 }, 7, 1);
   bow ((Point[7]){ 0,0, 20,40, 100,0, 150,0, 200,0, 280,40, 300,0 }, 7, 1);
+  bow ((Point[7]){ 0,20, 20,40, 100,0, 150,0, 200,0, 280,40, 300,20 }, 7, 1);
+  bow ((Point[3]){ 0,0, 10,10, 20,-20 }, 3, 1);
 #endif
 
-#if 0
-   // bugs
+#if 1
+  // infeasible
 
   bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,-40, 40,0, 60,20, 80,20, 100,40 }, 6, -1);
@@ -145,11 +154,6 @@ main ()
   bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1);
 #endif
 
-//  bow ((Point[6]){ 0,0, 20,20, 40,0, 60,0, 80,20, 100,1 }, 6, 1);
-//  bow ((Point[6]){ 0,20, 20,40, 40,0, 60,0, 80,40, 100,20 }, 6, 1);
-
-  bow ((Point[7]){ 0,0, 20,40, 100,0, 150,0, 200,0, 280,40, 300,0 }, 7, 1);
-  bow ((Point[7]){ 0,20, 20,40, 100,0, 150,0, 200,0, 280,40, 300,20 }, 7, 1);
 
   cout << "\\end" << endl;
 

diff --git a/test/int.cc b/test/int.cc
new file mode 100644 (file)
index 0000000..47b5243
--- /dev/null
+++ b/test/int.cc
@@ -0,0 +1,51 @@
+// vim:sw=2 makeprg=g++\ -g\ bow.cc\ -o\ bow
+#include <iostream.h>
+#define PT
+// #define STAFFHEIGHT 16.0
+#define STAFFHEIGHT 20.0
+
+#define UP 1
+#define DOWN (-1)
+
+// mmm
+#define STANDALONE
+
+#include <math.h>
+
+typedef void *Paper_def;
+
+bool experimental_features_global_b = true;
+
+#include "misc.cc"
+
+int
+main ()
+{
+  //cout.unsetf(ios::scientific);
+  cout.setf(ios::fixed);
+
+  Array<Real> a;
+  a.push (3.4);
+  a.push (3.9);
+  Interval iv;
+
+  iv = quantise_iv (a, 4, 3.5);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  iv = quantise_iv (a, 4, -1.5);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  iv = quantise_iv (a, 4, -7.5);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  iv = quantise_iv (a, 4, 3.4);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  iv = quantise_iv (a, 4, 3.9);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  cout << "\\end" << endl;
+
+  return 0;
+}
+