lilypond-0.1.47

diff --git a/init/paper16.ly b/init/paper16.ly
index 69cac7239525fea9c25dbff5d465cdb98384f0b6..8abf148a52e1841300e35b6ba8b89f12eacce469 100644 (file)
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -32,7 +32,9 @@ paper_sixteen = \paper {
        % ( beam_thickness = 0.48 interline for now...)
        % interbeam = interline - (beam_thickness + staffline_thickness) / 2
        % interbeam = 2.84;
-       % ugh: interline *in fact* is rule_thickness + "interline"?
+       % ugh: interline *in fact* is rule_thickness + "interline"? --jcn
+
+       % No --hwn
        interbeam = 3.14;
 
        gourlay_energybound = 100000.;

diff --git a/lily/include/direction.hh b/lily/include/direction.hh
index 032effc64f1da59ce37b1e4514dd7452efa61ec4..d02274f6c1e762923ae9786dc989620aae39b5a4 100644 (file)
--- a/lily/include/direction.hh
+++ b/lily/include/direction.hh
@@ -22,5 +22,11 @@ enum Direction
 
 };
 
+/**
+   if d > 0: the max operator
+   if d < 0: the min operator
+ */
+template<class T> minmax (Direction d, T, T);
+
 
 #endif // DIRECTION_HH

diff --git a/lily/include/minmax.tcc b/lily/include/minmax.tcc
new file mode 100644 (file)
index 0000000..5f3fa89
--- /dev/null
+++ b/lily/include/minmax.tcc
@@ -0,0 +1,17 @@
+
+/*   
+  minmax.cc --  implement minmax()
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  
+ */
+
+template<class T>
+minmax (Direction d, T t1, T t2)
+{
+  if (d > 0) return t1 >? t2;
+  else return t1 <? t2;
+}
+