From 058eef3e24f64193a59177d0330c1a69313042be Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:06:21 +0000 Subject: [PATCH] lilypond-0.1.47 --- init/paper16.ly | 4 +++- lily/include/direction.hh | 6 ++++++ lily/include/minmax.tcc | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 lily/include/minmax.tcc diff --git a/init/paper16.ly b/init/paper16.ly index 69cac72395..8abf148a52 100644 --- 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 032effc64f..d02274f6c1 100644 --- 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 minmax (Direction d, T, T); + #endif // DIRECTION_HH diff --git a/lily/include/minmax.tcc b/lily/include/minmax.tcc new file mode 100644 index 0000000000..5f3fa895e7 --- /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 + + */ + +template +minmax (Direction d, T t1, T t2) +{ + if (d > 0) return t1 >? t2; + else return t1