From: fred <fred>
Date: Sun, 24 Mar 2002 20:11:22 +0000 (+0000)
Subject: lilypond-0.1.61
X-Git-Tag: release/1.5.59~3118
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0ffafc08c4f0d4f1386f5e5ddb2860798854a7dc;p=lilypond.git

lilypond-0.1.61
---

diff --git a/Documentation/vocabulary-data b/Documentation/vocabulary-data
index 43847bb985..fdc193aef2 100644
--- 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 5256cfd8a8..5f824472e8 100644
--- 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 56793f1e27..e42d608713 100644
--- 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 3be80d97da..e4979d35d6 100644
--- 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 c1d2bb5cce..73ab40b1f5 100644
--- 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 1e16c2146b..14c8d745a8 100644
--- 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 1fb4992c05..22b5bffa6d 100644
--- 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 90b3688412..7d7cd9f113 100644
--- 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 2706aa128d..1c1d75b157 100644
--- 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 317c4e9953..656491bab3 100644
--- 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 f011d7bf27..e3cac3ecf2 100644
--- 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 5bfcd1038b..27542ccc8b 100644
--- 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 d82a03e710..41affb55f2 100644
--- 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 2b05688939..0b4525b396 100644
--- 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 a0f28fb15b..2ceedaa4f9 100644
--- 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 793e220585..3e3ad7de7f 100644
--- 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
index 0000000000..74367dc474
--- /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 953bd7c02a..ff1f127511 100644
--- 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 23333057a2..17a90a08b2 100644
--- 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 475f2e238b..ba1be97c6c 100644
--- 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 b4aa56da13..f870302100 100644
--- 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 19e7078057..b2b222c341 100644
--- 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 0e92c3145d..6ae34c8633 100644
--- 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 9ba966fdf2..1507d2c66e 100644
--- 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 4e55085818..f57627fde5 100644
--- 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 116aa60db0..3026613cae 100644
--- 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 3d45dea955..6663ffdffa 100644
--- 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 0c8729b41c..710df30c48 100644
--- 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 7bf1a4f42f..8cd604af5f 100644
--- 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
index 0000000000..2018b00868
--- /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 6f2639d8b3..6e9c55bf2f 100644
--- 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 0984052f53..fb57977c30 100644
--- 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 850230b6c7..e93332e8b1 100644
--- 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 98b5765212..6c99e7ed70 100644
--- 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 f1b600009b..bff0f4f8a0 100644
--- 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 635b57a802..e7cccf9b0c 100644
--- 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 aa1fd84857..0ad1fa5f6f 100644
--- 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 f941bb55ac..e38cbc120a 100644
--- 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 f3ccd57cbb..83334d2b1e 100644
--- 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 ae4c5e0e05..eb12f83988 100644
--- 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 e8867a1709..38764214c0 100644
--- 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 0869da4d2d..3b05a15208 100644
--- 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 5eb5c4895b..73f7340206 100644
--- 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 ad23c5c12d..8e51cf6373 100644
--- 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 68a1ca0081..116ba75c62 100644
--- 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 6718dd4c8b..f238406f28 100644
--- 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 2889c688a8..1a1f0bbeda 100644
--- 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 13e4510f34..aa6e8d5820 100644
--- 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 dc49d11fb5..c1a2bf0aef 100644
--- 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 5475ffe1ee..58ed585f9e 100644
--- 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 aeddce6a8f..7a3f7707aa 100644
--- 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 966f1f1aa4..c01d986137 100644
--- 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 ab3290fb16..a9b7601c5a 100644
--- 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 75e5e5dfab..1090871206 100644
--- 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 eef9019b7e..99a94e7c98 100644
--- 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 cce1305de8..702c5a5d5e 100644
--- 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 3c3bd64aa9..8936643c76 100644
--- 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 a9f5fd0506..802a494d0d 100644
--- 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 2d70dd71a9..bb1e48f026 100644
--- 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 a377271834..6b3bef51ab 100644
--- 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 1288eabaef..f123b9a32c 100644
--- 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 1fd005e649..c4a34c8982 100644
--- 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 b5290fea73..02d10f5512 100644
--- 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 28e91a5052..2726b10874 100644
--- 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 38aecb4055..dcf183f66b 100644
--- 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 db687e59f2..e75e39eb83 100644
--- 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 eb4a1fcc8d..7ccc808db8 100644
--- 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 7515b635df..0643095b97 100644
--- 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 eb7dc7b213..64008af3e4 100644
--- 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 34dd4d41c4..35efe1587c 100644
--- 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 7a8a718b1c..e76cbcd1af 100644
--- 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 68e2e76afa..a8b41cc70c 100644
--- 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 5469e62b5c..fd42f9c460 100644
--- 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 68a1117b0b..7cb045ba17 100644
--- 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 b842f1931b..345b6c341b 100644
--- 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 78586dc6a3..e467d440a1 100644
--- 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 82d94001bd..e0c3ea2e0e 100644
--- 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 a724709a38..f3e8784590 100644
--- 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 bf860c4126..2a407932f0 100644
--- 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 c89b735296..9193c65f05 100644
--- 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 35c344686c..dc077b4f29 100644
--- 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
index 0000000000..47b52434b3
--- /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;
+}
+