CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/30 23:43:03
Modified files:
. : ChangeLog
flower : getopt-long.cc string-convert.cc string.cc
flower/include : compare.hh interval.hh interval.tcc real.hh
string-data.icc
lily : afm.cc align-interface.cc auto-beam-engraver.cc
beam-concave.cc beam-engraver.cc
beam-quanting.cc beam.cc beaming-info.cc
binary-source-file.cc break-algorithm.cc
break-align-interface.cc
chord-tremolo-engraver.cc cluster-engraver.cc
completion-note-heads-engraver.cc
gourlay-breaking.cc grid-point-engraver.cc
ledger-line-spanner.cc line-interface.cc
lookup.cc lyric-extender.cc lyric-hyphen.cc
multi-measure-rest.cc music-sequence.cc
note-head.cc note-spacing.cc ottava-bracket.cc
part-combine-iterator.cc quote-iterator.cc
simultaneous-music-iterator.cc
spacing-engraver.cc spacing-spanner.cc
lily/include : break-algorithm.hh
Log message:
* flower/*.cc: remove <? and >?
* lily/*.cc: remove <? and >?
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3520&tr2=1.3521&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/getopt-long.cc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/string-convert.cc.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/string.cc.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/compare.hh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/interval.hh.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/interval.tcc.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/real.hh.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/string-data.icc.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/afm.cc.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/align-interface.cc.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/auto-beam-engraver.cc.diff?tr1=1.141&tr2=1.142&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam-concave.cc.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam-engraver.cc.diff?tr1=1.117&tr2=1.118&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam-quanting.cc.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam.cc.diff?tr1=1.299&tr2=1.300&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beaming-info.cc.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/binary-source-file.cc.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/break-algorithm.cc.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/break-align-interface.cc.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/chord-tremolo-engraver.cc.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/cluster-engraver.cc.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/completion-note-heads-engraver.cc.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/gourlay-breaking.cc.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grid-point-engraver.cc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ledger-line-spanner.cc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/line-interface.cc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lookup.cc.diff?tr1=1.183&tr2=1.184&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lyric-extender.cc.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lyric-hyphen.cc.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/multi-measure-rest.cc.diff?tr1=1.123&tr2=1.124&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-sequence.cc.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-head.cc.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-spacing.cc.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ottava-bracket.cc.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/part-combine-iterator.cc.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/quote-iterator.cc.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/simultaneous-music-iterator.cc.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/spacing-engraver.cc.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/spacing-spanner.cc.diff?tr1=1.138&tr2=1.139&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/break-algorithm.hh.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3520 lilypond/ChangeLog:1.3521
--- lilypond/ChangeLog:1.3520 Sat Apr 30 22:42:54 2005
+++ lilypond/ChangeLog Sat Apr 30 23:43:03 2005
@@ -1,5 +1,9 @@
2005-05-01 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * flower/*.cc: remove <? and >?
+
+ * lily/*.cc: remove <? and >?
+
* lily/tweak-registration.cc (insert_tweak_from_file): dubious
bugfix. Make sure that 0x0 isn't passed into scm_cons(). Fixes
crash with tweak editor.
Index: lilypond/flower/getopt-long.cc
diff -u lilypond/flower/getopt-long.cc:1.23 lilypond/flower/getopt-long.cc:1.24
--- lilypond/flower/getopt-long.cc:1.23 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/getopt-long.cc Sat Apr 30 23:43:03 2005
@@ -312,7 +312,7 @@
int wid = 0;
for (int i = 0; l[i].shortname_char_ || l[i].longname_str0_; i++)
{
- wid = wid >? l[i].str_for_help ().length ();
+ wid = max (wid, l[i].str_for_help ().length ());
}
for (int i = 0; l[i].shortname_char_ || l[i].longname_str0_; i++)
Index: lilypond/flower/include/compare.hh
diff -u lilypond/flower/include/compare.hh:1.8
lilypond/flower/include/compare.hh:1.9
--- lilypond/flower/include/compare.hh:1.8 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/compare.hh Sat Apr 30 23:43:03 2005
@@ -13,21 +13,6 @@
return function (t1, t2) op 0; \
}
-#define GPP_MINMAX_OPERATOR(type, op, opp) \
- inline type \
- operator op (type t1, type t2) \
- { \
- return (t1 opp t2) ? t1 : t2; \
- }
-
-#if defined (__GNUG__) && ! defined (__STRICT_ANSI__)
-#define GPP_MINMAX(type, prefix) \
- prefix GPP_MINMAX_OPERATOR (type, <?, <) \
- prefix GPP_MINMAX_OPERATOR (type, >?, >)
-#else
-#define GPP_MINMAX (type, prefix)
-#endif
-
/** handy notations for a signed comparison.
make the operators{<,<=,==,>=,>} and the MAX and MIN of two.
Please fill a & in the type argument if necessary.
@@ -39,7 +24,6 @@
prefix ONE_OPERATOR (type, function, !=) \
prefix ONE_OPERATOR (type, function, <) \
prefix ONE_OPERATOR (type, function, <=) \
- GPP_MINMAX (type, prefix) \
prefix inline type max (type t1, type t2) { return (t1 > t2) ? t1 : t2; } \
prefix inline type min (type t1, type t2) { return (t1 < t2) ? t1 : t2; } \
\
Index: lilypond/flower/include/interval.hh
diff -u lilypond/flower/include/interval.hh:1.46
lilypond/flower/include/interval.hh:1.47
--- lilypond/flower/include/interval.hh:1.46 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/interval.hh Sat Apr 30 23:43:03 2005
@@ -50,8 +50,8 @@
void intersect (Interval_t<T> h);
void add_point (T p)
{
- elem_ref (LEFT) = elem (LEFT) <? p;
- elem_ref (RIGHT) = elem (RIGHT) >? p;
+ elem_ref (LEFT) = min (elem (LEFT), p);
+ elem_ref (RIGHT) = max (elem (RIGHT), p);
}
T length () const;
T delta () const;
Index: lilypond/flower/include/interval.tcc
diff -u lilypond/flower/include/interval.tcc:1.37
lilypond/flower/include/interval.tcc:1.38
--- lilypond/flower/include/interval.tcc:1.37 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/interval.tcc Sat Apr 30 23:43:03 2005
@@ -89,32 +89,19 @@
void
Interval_t<T>::unite (Interval_t<T> h)
{
- elem_ref (LEFT) = h.elem (LEFT) <? elem (LEFT);
- elem_ref (RIGHT) = h.elem (RIGHT) >? elem (RIGHT);
+ elem_ref (LEFT) = min (h.elem (LEFT), elem (LEFT));
+ elem_ref (RIGHT) = max (h.elem (RIGHT), elem (RIGHT));
}
template<class T>
void
Interval_t<T>::intersect (Interval_t<T> h)
{
-#if defined (__GNUG__) && !defined (__STRICT_ANSI__)
- elem_ref (LEFT) = h.elem (LEFT) >? elem (LEFT);
- elem_ref (RIGHT) = h.elem (RIGHT) <? elem (RIGHT);
-#else
elem_ref (LEFT) = max (h.elem (LEFT), elem (LEFT));
elem_ref (RIGHT) = min (h.elem (RIGHT), elem (RIGHT));
-#endif
}
-#if 0 //this is called intersection
-template<class T>
-Interval_t<T>
-intersect (Interval_t<T> x, Interval_t<T> const &y)
-{
- x.intersect (y);
- return x;
-}
-#endif
+
template<class T>
String
Index: lilypond/flower/include/real.hh
diff -u lilypond/flower/include/real.hh:1.18
lilypond/flower/include/real.hh:1.19
--- lilypond/flower/include/real.hh:1.18 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/real.hh Sat Apr 30 23:43:03 2005
@@ -13,6 +13,7 @@
typedef double Real;
extern const Real infinity_f;
+using namespace std;
template<class T> inline T abs (T x)
{
@@ -26,20 +27,12 @@
return 0;
}
-template<class T> inline T max (T x, T y)
-{
- return x >? y;
-}
template<class T> inline T sqr (T x)
{
return x * x;
}
-template<class T> inline T min (T x, T y)
-{
- return x <? y;
-}
inline Real
distance (Real x, Real y)
Index: lilypond/flower/include/string-data.icc
diff -u lilypond/flower/include/string-data.icc:1.20
lilypond/flower/include/string-data.icc:1.21
--- lilypond/flower/include/string-data.icc:1.20 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/string-data.icc Sat Apr 30 23:43:03 2005
@@ -9,12 +9,15 @@
#ifndef STRINGDATA_INL
#define STRINGDATA_INL
+#include "string-data.hh"
+
+#include <algorithm>
#include <cassert>
#include <cstring>
-
#include <memory.h>
-#include "string-data.hh"
+using namespace std;
+
const int INITIALMAX = 8;
#include <sys/types.h>
@@ -90,7 +93,7 @@
if (j > maxlen)
{
Byte *p = new Byte[j + 1];
- memcpy (p, data_byte_, (maxlen <? length_) + 1);
+ memcpy (p, data_byte_, min (maxlen, length_) + 1);
maxlen = j;
delete[] data_byte_;
data_byte_ = p;
Index: lilypond/flower/string-convert.cc
diff -u lilypond/flower/string-convert.cc:1.30
lilypond/flower/string-convert.cc:1.31
--- lilypond/flower/string-convert.cc:1.30 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/string-convert.cc Sat Apr 30 23:43:03 2005
@@ -343,5 +343,5 @@
String
String_convert::pad_to (String s, int n)
{
- return s + to_string (' ' , (n - s.length ()) >? 0);
+ return s + to_string (' ' , max (n - s.length (), 0));
}
Index: lilypond/flower/string.cc
diff -u lilypond/flower/string.cc:1.47 lilypond/flower/string.cc:1.48
--- lilypond/flower/string.cc:1.47 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/string.cc Sat Apr 30 23:43:03 2005
@@ -168,7 +168,7 @@
/*
don't forget the terminating '\0'
*/
- int f = (s1.length () <? s2.length ());
+ int f = min (s1.length (), s2.length ());
int cmp_length = 1+ f;
int i = memcmp (p1, p2, cmp_length);
return i;
Index: lilypond/lily/afm.cc
diff -u lilypond/lily/afm.cc:1.64 lilypond/lily/afm.cc:1.65
--- lilypond/lily/afm.cc:1.64 Tue Apr 12 22:49:29 2005
+++ lilypond/lily/afm.cc Sat Apr 30 23:43:03 2005
@@ -20,7 +20,7 @@
font_info_ = fi;
design_size_ = 1.0;
- for (int i = 256 >? fi->numOfChars; i--;)
+ for (int i = max (256, fi->numOfChars); i--;)
ascii_to_metric_idx_.push (-1);
for (int i = 0; i < fi->numOfChars; i++)
Index: lilypond/lily/align-interface.cc
diff -u lilypond/lily/align-interface.cc:1.73
lilypond/lily/align-interface.cc:1.74
--- lilypond/lily/align-interface.cc:1.73 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/align-interface.cc Sat Apr 30 23:43:03 2005
@@ -178,8 +178,8 @@
dy *= stacking_dir;
if (j)
{
- dy = (dy >? threshold[SMALLER])
- <? threshold[BIGGER];
+ dy = min (max (dy, threshold[SMALLER]),
+ threshold[BIGGER]);
}
where_f += stacking_dir * dy;
Index: lilypond/lily/auto-beam-engraver.cc
diff -u lilypond/lily/auto-beam-engraver.cc:1.141
lilypond/lily/auto-beam-engraver.cc:1.142
--- lilypond/lily/auto-beam-engraver.cc:1.141 Thu Apr 21 18:45:04 2005
+++ lilypond/lily/auto-beam-engraver.cc Sat Apr 30 23:43:03 2005
@@ -379,7 +379,7 @@
durlog - 2);
stems_->push (stem);
last_add_mom_ = now;
- extend_mom_ = (extend_mom_ >? now) + m->get_length ();
+ extend_mom_ = max (extend_mom_, now) + m->get_length ();
}
}
Index: lilypond/lily/beam-concave.cc
diff -u lilypond/lily/beam-concave.cc:1.10 lilypond/lily/beam-concave.cc:1.11
--- lilypond/lily/beam-concave.cc:1.10 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/beam-concave.cc Sat Apr 30 23:43:03 2005
@@ -36,7 +36,7 @@
note is reached in the opposite direction as the last-first dy
*/
int dy = positions.top () - positions[0];
- int closest = (beam_dir * positions.top ()) >? (beam_dir * positions[0]);
+ int closest = max (beam_dir * positions.top (), beam_dir * positions[0]);
for (int i = 2; !concave && i < positions.size () - 1; i++)
{
int inner_dy = positions[i] - positions[i - 1];
@@ -67,7 +67,7 @@
{
Real line_y = slope * i + positions[0];
- concaveness += (beam_dir * (positions[i] - line_y)) >? 0.0;
+ concaveness += max (beam_dir * (positions[i] - line_y), 0.0);
}
concaveness /= positions.size ();
Index: lilypond/lily/beam-engraver.cc
diff -u lilypond/lily/beam-engraver.cc:1.117
lilypond/lily/beam-engraver.cc:1.118
--- lilypond/lily/beam-engraver.cc:1.117 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/beam-engraver.cc Sat Apr 30 23:43:03 2005
@@ -261,7 +261,7 @@
scm_int2num (durlog));
Moment stem_location = now - beam_start_mom_ + beam_start_location_;
beam_info_->add_stem (stem_location,
- (durlog- 2) >? 0);
+ max (durlog- 2, 0));
Beam::add_stem (beam_, stem);
}
}
Index: lilypond/lily/beam-quanting.cc
diff -u lilypond/lily/beam-quanting.cc:1.69 lilypond/lily/beam-quanting.cc:1.70
--- lilypond/lily/beam-quanting.cc:1.69 Tue Apr 12 22:49:29 2005
+++ lilypond/lily/beam-quanting.cc Sat Apr 30 23:43:03 2005
@@ -7,11 +7,13 @@
Jan Nieuwenhuizen <[EMAIL PROTECTED]>
*/
+#include "beam.hh"
+
+#include <algorithm>
#include <math.h>
#include "warn.hh"
#include "staff-symbol-referencer.hh"
-#include "beam.hh"
#include "stem.hh"
#include "output-def.hh"
#include "group-interface.hh"
@@ -333,7 +335,7 @@
Stem_info info = stem_infos[i];
Direction d = info.dir_;
- score[d] += limit_penalty * (0 >? (d * (info.shortest_y_ - current_y)));
+ score[d] += limit_penalty * max (0.0, (d * (info.shortest_y_ -
current_y)));
Real ideal_diff = d * (current_y - info.ideal_y_);
Real ideal_score = shrink_extra_weight (ideal_diff, 1.5);
@@ -352,7 +354,7 @@
Direction d = DOWN;
do
{
- score[d] /= (count[d] >? 1);
+ score[d] /= max (count[d], 1);
}
while (flip (&d) != DOWN);
@@ -381,7 +383,7 @@
dem += DAMPING_DIRECTION_PENALTY;
}
- dem += MUSICAL_DIRECTION_FACTOR *(0 >? (fabs (dy) - fabs (dy_mus)));
+ dem += MUSICAL_DIRECTION_FACTOR * max (0.0, (fabs (dy) - fabs (dy_mus)));
Real slope_penalty = IDEAL_SLOPE_FACTOR;
@@ -420,7 +422,7 @@
Drul_array<Real> y (yl, yr);
Drul_array<Direction> dirs (ldir, rdir);
- Real extra_demerit = SECONDARY_BEAM_DEMERIT / (beam_counts[LEFT] >?
beam_counts[RIGHT]);
+ Real extra_demerit = SECONDARY_BEAM_DEMERIT / (max (beam_counts[LEFT],
beam_counts[RIGHT]));
Direction d = LEFT;
Real dem = 0.0;
@@ -448,7 +450,7 @@
k <= radius + BEAM_EPS; k += 1.0)
if (gap.contains (k))
{
- Real dist = fabs (gap[UP] - k) <? fabs (gap[DOWN] - k);
+ Real dist = min (fabs (gap[UP] - k), fabs (gap[DOWN] - k));
/*
this parameter is tuned to grace-stem-length.ly
@@ -463,7 +465,7 @@
}
while ((flip (&d)) != LEFT);
- if ((beam_counts[LEFT] >? beam_counts[RIGHT]) >= 2)
+ if (max (beam_counts[LEFT], beam_counts[RIGHT]) >= 2)
{
Real straddle = 0.0;
Real sit = (thickness - slt) / 2;
Index: lilypond/lily/beam.cc
diff -u lilypond/lily/beam.cc:1.299 lilypond/lily/beam.cc:1.300
--- lilypond/lily/beam.cc:1.299 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/beam.cc Sat Apr 30 23:43:03 2005
@@ -91,7 +91,7 @@
for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
{
Grob *stem = unsmob_grob (scm_car (s));
- m = m >? (Stem::beam_multiplicity (stem).length () + 1);
+ m = max (m, (Stem::beam_multiplicity (stem).length () + 1));
}
return m;
}
@@ -451,7 +451,7 @@
Real lw = nw_f;
Real rw = nw_f;
if (i > 0)
- rw = nw_f <? ((xposn - last_xposn) / 2);
+ rw = min (nw_f, ((xposn - last_xposn) / 2));
else
/*
TODO: 0.5 is a guess.
@@ -460,7 +460,7 @@
- 0.5;
if (st)
- lw = nw_f <? ((xposn - last_xposn) / 2);
+ lw = min (nw_f, ((xposn - last_xposn) / 2));
else
lw = me->get_bound (RIGHT)->relative_coordinate (xcommon, X_AXIS)
- last_xposn;
@@ -534,7 +534,7 @@
Grob *s = stems[i];
Direction sd = get_grob_direction (s);
- int center_distance = int (- d * Stem::head_positions (s) [-d]) >? 0;
+ int center_distance = max (int (- d * Stem::head_positions (s) [-d]),
0);
int current = sd ? (1 + d * sd) / 2 : center_distance;
if (current)
@@ -783,9 +783,8 @@
Real inter = 0.5;
Real hang = 1.0 - (thickness - slt) / 2;
- *dy = sign (*dy) * (fabs (*dy)
- >?
- (sit <? inter <? hang));
+ *dy = sign (*dy) * max (fabs (*dy),
+ min (min (sit, inter), hang));
}
}
@@ -1200,7 +1199,7 @@
if (i > 0
&& i < stems.size () -1
&& Stem::is_invisible (st))
- b = b <? beaming->infos_.elem (i).beams_i_drul_[-d];
+ b = min (b, beaming->infos_.elem (i).beams_i_drul_[-d]);
Stem::set_beaming (st, b, d);
}
@@ -1342,7 +1341,7 @@
= + staff_space * (robust_scm2double (stem->get_property
("stemlet-length"), 0.0)
+ robust_scm2double (rest->get_property
("minimum-distance"), 0.0));
- Real shift = d * (((beam_y - d * minimum_distance) - rest_dim) * d <? 0.0);
+ Real shift = d * min (((beam_y - d * minimum_distance) - rest_dim) * d, 0.0);
shift /= staff_space;
Real rad = Staff_symbol_referencer::line_count (rest) * staff_space / 2;
@@ -1398,7 +1397,7 @@
Should we take invisible stems into account?
*/
if (Stem::get_direction (stems[i]) == d)
- bc = bc >? (Stem::beam_multiplicity (stems[i]).length () + 1);
+ bc = max (bc, (Stem::beam_multiplicity (stems[i]).length () + 1));
}
return bc;
Index: lilypond/lily/beaming-info.cc
diff -u lilypond/lily/beaming-info.cc:1.19 lilypond/lily/beaming-info.cc:1.20
--- lilypond/lily/beaming-info.cc:1.19 Wed Apr 27 09:12:33 2005
+++ lilypond/lily/beaming-info.cc Sat Apr 30 23:43:03 2005
@@ -56,7 +56,7 @@
Beaming_info thisbeam = infos_.boundary (d, 0);
Beaming_info next = infos_.boundary (d, 1);
- return thisbeam.beams_i_drul_[-d] <? next.beams_i_drul_[d];
+ return min (thisbeam.beams_i_drul_[-d], next.beams_i_drul_[d]);
}
void
@@ -80,8 +80,8 @@
while (flip (&d) != LEFT);
int middle_beams = (split ? 1
- : splits[RIGHT].beam_extend_count (LEFT) <?
- splits[LEFT].beam_extend_count (RIGHT));
+ : min (splits[RIGHT].beam_extend_count (LEFT),
+ splits[LEFT].beam_extend_count (RIGHT)));
do
{
Index: lilypond/lily/binary-source-file.cc
diff -u lilypond/lily/binary-source-file.cc:1.11
lilypond/lily/binary-source-file.cc:1.12
--- lilypond/lily/binary-source-file.cc:1.11 Tue Apr 12 22:49:29 2005
+++ lilypond/lily/binary-source-file.cc Sat Apr 30 23:43:03 2005
@@ -27,8 +27,8 @@
if (!contains (pos_str0))
return "";
- char const *begin_str0 = pos_str0 - 8 >? to_str0 ();
- char const *end_str0 = pos_str0 + 7 <? to_str0 () + length ();
+ char const *begin_str0 = max (pos_str0 - 8, to_str0 ());
+ char const *end_str0 = min (pos_str0 + 7, to_str0 () + length ());
String pre_string ((Byte const *)begin_str0, pos_str0 - begin_str0);
pre_string = String_convert::bin2hex (pre_string);
Index: lilypond/lily/break-algorithm.cc
diff -u lilypond/lily/break-algorithm.cc:1.43
lilypond/lily/break-algorithm.cc:1.44
--- lilypond/lily/break-algorithm.cc:1.43 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/break-algorithm.cc Sat Apr 30 23:43:03 2005
@@ -99,3 +99,7 @@
return h;
}
+
+Break_algorithm::~Break_algorithm ()
+{
+}
Index: lilypond/lily/break-align-interface.cc
diff -u lilypond/lily/break-align-interface.cc:1.49
lilypond/lily/break-align-interface.cc:1.50
--- lilypond/lily/break-align-interface.cc:1.49 Tue Apr 19 12:48:41 2005
+++ lilypond/lily/break-align-interface.cc Sat Apr 30 23:43:03 2005
@@ -225,7 +225,7 @@
- extents[next_idx][LEFT];
/* should probably junk minimum-space */
else if (type == ly_symbol2scm ("minimum-space"))
- offsets[next_idx] = extents[idx][RIGHT] >? distance;
+ offsets[next_idx] = max (extents[idx][RIGHT], distance);
}
else
{
Index: lilypond/lily/chord-tremolo-engraver.cc
diff -u lilypond/lily/chord-tremolo-engraver.cc:1.78
lilypond/lily/chord-tremolo-engraver.cc:1.79
--- lilypond/lily/chord-tremolo-engraver.cc:1.78 Tue Apr 12 22:49:29 2005
+++ lilypond/lily/chord-tremolo-engraver.cc Sat Apr 30 23:43:03 2005
@@ -100,7 +100,7 @@
Rational total_dur = l.main_part_;
Rational note_dur = total_dur / Rational (elt_count *
Repeated_music::repeat_count (repeat_));
- total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2);
+ total_duration_flags_ = max (0, (intlog2 (total_dur.den ()) - 2));
flags_ = intlog2 (note_dur.den ()) -2;
Index: lilypond/lily/cluster-engraver.cc
diff -u lilypond/lily/cluster-engraver.cc:1.28
lilypond/lily/cluster-engraver.cc:1.29
--- lilypond/lily/cluster-engraver.cc:1.28 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/cluster-engraver.cc Sat Apr 30 23:43:03 2005
@@ -85,8 +85,8 @@
int p = (pit ? pit->steps () : 0) + c0;
- pmax = pmax >? p;
- pmin = pmin <? p;
+ pmax = max (pmax, p);
+ pmin = min (pmin, p);
}
beacon_ = make_item ("ClusterSpannerBeacon", cluster_notes_[0]->self_scm
());
Index: lilypond/lily/completion-note-heads-engraver.cc
diff -u lilypond/lily/completion-note-heads-engraver.cc:1.48
lilypond/lily/completion-note-heads-engraver.cc:1.49
--- lilypond/lily/completion-note-heads-engraver.cc:1.48 Tue Apr 12
22:49:29 2005
+++ lilypond/lily/completion-note-heads-engraver.cc Sat Apr 30 23:43:03 2005
@@ -89,7 +89,7 @@
musiclen.grace_part_ = musiclen.main_part_;
musiclen.main_part_ = Rational (0, 1);
}
- note_end_mom_ = note_end_mom_ >? (now + musiclen);
+ note_end_mom_ = max (note_end_mom_, (now + musiclen));
do_nothing_until_ = Rational (0, 0);
return true;
Index: lilypond/lily/gourlay-breaking.cc
diff -u lilypond/lily/gourlay-breaking.cc:1.82
lilypond/lily/gourlay-breaking.cc:1.83
--- lilypond/lily/gourlay-breaking.cc:1.82 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/gourlay-breaking.cc Sat Apr 30 23:43:03 2005
@@ -263,7 +263,7 @@
add 20000 to the demerits, so that a break penalty
of -10000 won't change the result */
- demerit = (demerit + 20000) >? 2000;
+ demerit = max ((demerit + 20000), 2000.0);
demerit *= 10;
}
Index: lilypond/lily/grid-point-engraver.cc
diff -u lilypond/lily/grid-point-engraver.cc:1.1
lilypond/lily/grid-point-engraver.cc:1.2
--- lilypond/lily/grid-point-engraver.cc:1.1 Thu Apr 21 15:20:45 2005
+++ lilypond/lily/grid-point-engraver.cc Sat Apr 30 23:43:03 2005
@@ -28,7 +28,7 @@
if (!now.main_part_.mod_rat (mom->main_part_))
{
- Item * it = make_item ("GridPoint", SCM_EOL);
+ make_item ("GridPoint", SCM_EOL);
}
}
}
Index: lilypond/lily/include/break-algorithm.hh
diff -u lilypond/lily/include/break-algorithm.hh:1.24
lilypond/lily/include/break-algorithm.hh:1.25
--- lilypond/lily/include/break-algorithm.hh:1.24 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/break-algorithm.hh Sat Apr 30 23:43:03 2005
@@ -31,8 +31,8 @@
Simple_spacer_wrapper *generate_spacing_problem (Link_array<Grob> const &,
Interval) const;
virtual Array<Column_x_positions> do_solve () const = 0;
-
public:
+ virtual ~Break_algorithm ();
Simple_spacer *(*get_line_spacer) ();
Break_algorithm ();
void set_pscore (Paper_score *);
Index: lilypond/lily/ledger-line-spanner.cc
diff -u lilypond/lily/ledger-line-spanner.cc:1.23
lilypond/lily/ledger-line-spanner.cc:1.24
--- lilypond/lily/ledger-line-spanner.cc:1.23 Fri Apr 22 04:17:36 2005
+++ lilypond/lily/ledger-line-spanner.cc Sat Apr 30 23:43:03 2005
@@ -246,7 +246,7 @@
reqs[rank][vdir].ledger_extent_.unite (ledger_extent);
reqs[rank][vdir].head_extent_.unite (head_extent);
reqs[rank][vdir].position_
- = vdir * ((vdir * reqs[rank][vdir].position_) >? (vdir * pos));
+ = vdir * max (vdir * reqs[rank][vdir].position_, vdir * pos);
}
}
@@ -283,7 +283,7 @@
Real limit = (center + (both ? which * gap / 2 : 0));
lr.ledger_extent_.elem_ref (-which)
- = which * (which * lr.ledger_extent_[-which] >? which *
limit);
+ = which * max (which * lr.ledger_extent_[-which], which *
limit);
}
while (flip (&which) != LEFT);
}
@@ -318,7 +318,7 @@
head_size[LEFT]),
0.0);
- left_shorten = (-ledger_size[LEFT] + d) >? 0;
+ left_shorten = max (-ledger_size[LEFT] + d, 0.0);
/*
TODO: shorten 2 ledger lines for the case natural +
Index: lilypond/lily/line-interface.cc
diff -u lilypond/lily/line-interface.cc:1.23
lilypond/lily/line-interface.cc:1.24
--- lilypond/lily/line-interface.cc:1.23 Mon Apr 18 13:35:13 2005
+++ lilypond/lily/line-interface.cc Sat Apr 30 23:43:03 2005
@@ -34,7 +34,7 @@
Line_interface::make_dashed_line (Real thick, Offset from, Offset to,
Real dash_period, Real dash_fraction)
{
- dash_fraction = (dash_fraction >? 0) <? 1.0;
+ dash_fraction = min (max (dash_fraction, 0.0), 1.0);
Real on = dash_fraction * dash_period + thick;
Real off = dash_period - on;
@@ -124,7 +124,7 @@
? 0.0
: robust_scm2double (dash_fraction, 0.4);
- fraction = (fraction >? 0) <? 1.0;
+ fraction = min (max (fraction, 0.0), 1.0);
Real period = Staff_symbol_referencer::staff_space (me)
* robust_scm2double (me->get_property ("dash-period"), 1.0);
Index: lilypond/lily/lookup.cc
diff -u lilypond/lily/lookup.cc:1.183 lilypond/lily/lookup.cc:1.184
--- lilypond/lily/lookup.cc:1.183 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/lookup.cc Sat Apr 30 23:43:03 2005
@@ -58,8 +58,8 @@
Lookup::beam (Real slope, Real width, Real thick, Real blot)
{
Real height = slope * width;
- Real min_y = (0 <? height) - thick / 2;
- Real max_y = (0 >? height) + thick / 2;
+ Real min_y = min (0., height) - thick / 2;
+ Real max_y = max (0., height) + thick / 2;
Box b (Interval (0, width),
Interval (min_y, max_y));
@@ -681,7 +681,7 @@
{
Box b;
b[X_AXIS] = Interval (0, iv.length ());
- b[Y_AXIS] = Interval (0 <? protude, 0 >? protude);
+ b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude));
Offset z1 (iv[LEFT], 0);
Offset z2 (iv[RIGHT], 0);
Index: lilypond/lily/lyric-extender.cc
diff -u lilypond/lily/lyric-extender.cc:1.57
lilypond/lily/lyric-extender.cc:1.58
--- lilypond/lily/lyric-extender.cc:1.57 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/lyric-extender.cc Sat Apr 30 23:43:03 2005
@@ -57,17 +57,17 @@
= left_point + (robust_scm2double (minlen, 0));
if (heads.size ())
- right_point = right_point >? heads.top ()->extent (common, X_AXIS)[RIGHT];
+ right_point = max (right_point, heads.top ()->extent (common,
X_AXIS)[RIGHT]);
Real h = sl * robust_scm2double (me->get_property ("thickness"), 0);
Real pad = 2* h;
if (right_text)
- right_point = right_point <? (robust_relative_extent (right_text, common,
X_AXIS)[LEFT] - pad);
+ right_point = min (right_point, (robust_relative_extent (right_text,
common, X_AXIS)[LEFT] - pad));
/* run to end of line. */
if (me->get_bound (RIGHT)->break_status_dir ())
- right_point = right_point >? (robust_relative_extent (me->get_bound
(RIGHT), common, X_AXIS)[LEFT] - pad);
+ right_point = max (right_point, (robust_relative_extent (me->get_bound
(RIGHT), common, X_AXIS)[LEFT] - pad));
left_point += pad;
Real w = right_point - left_point;
Index: lilypond/lily/lyric-hyphen.cc
diff -u lilypond/lily/lyric-hyphen.cc:1.19 lilypond/lily/lyric-hyphen.cc:1.20
--- lilypond/lily/lyric-hyphen.cc:1.19 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/lyric-hyphen.cc Sat Apr 30 23:43:03 2005
@@ -65,7 +65,7 @@
&& !bounds[RIGHT]->break_status_dir ())
{
Real minimum_length = robust_scm2double (me->get_property
("minimum-length"), .3);
- dash_length = (l - 2 * padding) >? minimum_length;
+ dash_length = max ((l - 2 * padding), minimum_length);
}
Real space_left = l - dash_length - (n - 1) * dash_period;
@@ -78,7 +78,7 @@
&& !bounds[RIGHT]->break_status_dir ())
return SCM_EOL;
- space_left = space_left >? 0.0;
+ space_left = max (space_left, 0.0);
Box b (Interval (0, dash_length), Interval (h, h + th));
Stencil dash_mol (Lookup::round_filled_box (b, 0.8 * lt));
Index: lilypond/lily/multi-measure-rest.cc
diff -u lilypond/lily/multi-measure-rest.cc:1.123
lilypond/lily/multi-measure-rest.cc:1.124
--- lilypond/lily/multi-measure-rest.cc:1.123 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/multi-measure-rest.cc Sat Apr 30 23:43:03 2005
@@ -50,7 +50,7 @@
we gotta stay clear of sp_iv, so move a bit to the right if
needed.
*/
- x_off += (sp_iv[LEFT] - rx) >? 0;
+ x_off += max (sp_iv[LEFT] - rx, 0.0);
/*
center between stuff.
@@ -92,7 +92,7 @@
we gotta stay clear of sp_iv, so move a bit to the right if
needed.
*/
- Real x_off = (sp_iv[LEFT] - rx) >? 0;
+ Real x_off = max (sp_iv[LEFT] - rx, 0.0);
Stencil mol;
mol.add_stencil (symbol_stencil (me, space));
@@ -180,9 +180,9 @@
Real slt = me->get_layout ()->get_dimension (ly_symbol2scm
("linethickness"));
Real y = slt * thick_thick / 2 * ss;
Real ythick = hair_thick * slt * ss;
- Box b (Interval (0, 0 >? (width - 2 * ythick)), Interval (-y, y));
+ Box b (Interval (0.0, max (0.0, (width - 2 * ythick))), Interval (-y, y));
- Real blot = width ? (.8 * (y <? ythick)) : 0.0;
+ Real blot = width ? (.8 * min (y, ythick)) : 0.0;
Stencil m = Lookup::round_filled_box (b, blot);
Stencil yb = Lookup::round_filled_box (Box (Interval (-0.5, 0.5) * ythick,
Interval (-ss, ss)), blot);
Index: lilypond/lily/music-sequence.cc
diff -u lilypond/lily/music-sequence.cc:1.58
lilypond/lily/music-sequence.cc:1.59
--- lilypond/lily/music-sequence.cc:1.58 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/music-sequence.cc Sat Apr 30 23:43:03 2005
@@ -50,7 +50,7 @@
{
Music *m = unsmob_music (scm_car (s));
Moment l = m->get_length ();
- dur = dur >? l;
+ dur = max (dur, l);
}
return dur;
@@ -122,7 +122,7 @@
for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
{
- m = m <? unsmob_music (scm_car (s))->start_mom ();
+ m = min (m, unsmob_music (scm_car (s))->start_mom ());
}
return m;
}
Index: lilypond/lily/note-head.cc
diff -u lilypond/lily/note-head.cc:1.135 lilypond/lily/note-head.cc:1.136
--- lilypond/lily/note-head.cc:1.135 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/note-head.cc Sat Apr 30 23:43:03 2005
@@ -162,7 +162,7 @@
Note_head::get_balltype (Grob *me)
{
SCM s = me->get_property ("duration-log");
- return scm_is_number (s) ? scm_to_int (s) <? 2 : 0;
+ return scm_is_number (s) ? min (scm_to_int (s), 2) : 0;
}
ADD_INTERFACE (Note_head, "note-head-interface",
Index: lilypond/lily/note-spacing.cc
diff -u lilypond/lily/note-spacing.cc:1.56 lilypond/lily/note-spacing.cc:1.57
--- lilypond/lily/note-spacing.cc:1.56 Wed Apr 6 11:49:26 2005
+++ lilypond/lily/note-spacing.cc Sat Apr 30 23:43:03 2005
@@ -317,7 +317,7 @@
Real chord_start = hp[sd];
Real stem_end = Stem::stem_end_position (stem);
- stem_posns[d] = Interval (chord_start <? stem_end, chord_start>?
stem_end);
+ stem_posns[d] = Interval (min (chord_start, stem_end), max
(chord_start, stem_end));
head_posns[d].unite (hp);
}
}
@@ -383,7 +383,7 @@
/*
Ugh. 7 is hardcoded.
*/
- correction = (correction / 7) <? 1.0;
+ correction = min (correction / 7, 1.0);
correction *= stem_dirs[LEFT];
correction
*= robust_scm2double (me->get_property
("stem-spacing-correction"), 0);
Index: lilypond/lily/ottava-bracket.cc
diff -u lilypond/lily/ottava-bracket.cc:1.32
lilypond/lily/ottava-bracket.cc:1.33
--- lilypond/lily/ottava-bracket.cc:1.32 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/ottava-bracket.cc Sat Apr 30 23:43:03 2005
@@ -120,9 +120,10 @@
Real text_size = text.extent (X_AXIS).is_empty ()
? 0.0 : text.extent (X_AXIS)[RIGHT] + 0.3;
- span_points[LEFT] = span_points[LEFT]
- <? (span_points[RIGHT] - text_size
- - robust_scm2double (me->get_property ("minimum-length"), -1.0));
+ span_points[LEFT] =
+ min (span_points[LEFT],
+ (span_points[RIGHT] - text_size
+ - robust_scm2double (me->get_property ("minimum-length"), -1.0)));
Interval bracket_span_points = span_points;
bracket_span_points[LEFT] += text_size;
Index: lilypond/lily/part-combine-iterator.cc
diff -u lilypond/lily/part-combine-iterator.cc:1.22
lilypond/lily/part-combine-iterator.cc:1.23
--- lilypond/lily/part-combine-iterator.cc:1.22 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/part-combine-iterator.cc Sat Apr 30 23:43:03 2005
@@ -132,10 +132,10 @@
Moment p;
p.set_infinite (1);
if (first_iter_->ok ())
- p = p <? first_iter_->pending_moment ();
+ p = min (p, first_iter_->pending_moment ());
if (second_iter_->ok ())
- p = p <? second_iter_->pending_moment ();
+ p = min (p, second_iter_->pending_moment ());
return p;
}
Index: lilypond/lily/quote-iterator.cc
diff -u lilypond/lily/quote-iterator.cc:1.36
lilypond/lily/quote-iterator.cc:1.37
--- lilypond/lily/quote-iterator.cc:1.36 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/quote-iterator.cc Sat Apr 30 23:43:03 2005
@@ -159,14 +159,14 @@
Moment m (infty);
if (Music_wrapper_iterator::ok ())
- m = m <? Music_wrapper_iterator::pending_moment ();
+ m = min (m, Music_wrapper_iterator::pending_moment ());
/*
In case event_idx_ < 0, we're not initted yet, and the wrapped
music expression determines the starting moment.
*/
if (quote_ok ())
- m = m <? vector_moment (event_idx_) - start_moment_;
+ m = min (m, vector_moment (event_idx_) - start_moment_);
return m;
}
Index: lilypond/lily/simultaneous-music-iterator.cc
diff -u lilypond/lily/simultaneous-music-iterator.cc:1.63
lilypond/lily/simultaneous-music-iterator.cc:1.64
--- lilypond/lily/simultaneous-music-iterator.cc:1.63 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/simultaneous-music-iterator.cc Sat Apr 30 23:43:03 2005
@@ -104,7 +104,7 @@
for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
{
Music_iterator *it = unsmob_iterator (scm_car (s));
- next = next <? it->pending_moment ();
+ next = min (next, it->pending_moment ());
}
return next;
Index: lilypond/lily/spacing-engraver.cc
diff -u lilypond/lily/spacing-engraver.cc:1.64
lilypond/lily/spacing-engraver.cc:1.65
--- lilypond/lily/spacing-engraver.cc:1.64 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/spacing-engraver.cc Sat Apr 30 23:43:03 2005
@@ -131,7 +131,7 @@
if (mus)
{
Moment m = mus->get_length ();
- shortest_playing = shortest_playing <? m;
+ shortest_playing = min (shortest_playing, m);
}
}
Moment starter;
@@ -142,13 +142,13 @@
Moment m = now_durations_[i].info_.music_cause ()->get_length ();
if (m.to_bool ())
{
- starter = starter <? m;
+ starter = min (starter, m);
playing_durations_.insert (now_durations_[i]);
}
}
now_durations_.clear ();
- shortest_playing = shortest_playing <? starter;
+ shortest_playing = min (shortest_playing, starter);
Paper_column *sc
= dynamic_cast<Paper_column *> (unsmob_grob (get_property
("currentMusicalColumn")));
Index: lilypond/lily/spacing-spanner.cc
diff -u lilypond/lily/spacing-spanner.cc:1.138
lilypond/lily/spacing-spanner.cc:1.139
--- lilypond/lily/spacing-spanner.cc:1.138 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/spacing-spanner.cc Sat Apr 30 23:43:03 2005
@@ -220,7 +220,7 @@
space -= increment;
- dists[d] = dists[d] >? space;
+ dists[d] = max (dists[d], space);
}
else
{
@@ -228,7 +228,7 @@
Staff_spacing::get_spacing_params (sp,
&space, &fixed_space);
- dists[d] = dists[d] >? fixed_space;
+ dists[d] = max (dists[d], fixed_space);
}
}
}
@@ -430,7 +430,7 @@
SCM st = cols[i]->get_property ("shortest-starter-duration");
Moment this_shortest = *unsmob_moment (st);
assert (this_shortest.to_bool ());
- shortest_in_measure = shortest_in_measure <? this_shortest.main_part_;
+ shortest_in_measure = min (shortest_in_measure,
this_shortest.main_part_);
}
else if (!shortest_in_measure.is_infinity ()
&& Item::is_breakable (cols[i]))
@@ -480,7 +480,7 @@
d = m->main_part_;
if (max_idx >= 0)
- d = d <? durations[max_idx];
+ d = min (d, durations[max_idx]);
return d;
}
@@ -608,7 +608,7 @@
TODO: this criterion is discontinuous in the derivative.
Maybe it should be continuous?
*/
- compound_fixed_note_space = compound_fixed_note_space <? compound_note_space;
+ compound_fixed_note_space = min (compound_fixed_note_space,
compound_note_space);
bool packed = to_boolean (me->get_layout ()->c_variable ("packed"));
Real strength, distance;
@@ -762,7 +762,7 @@
}
assert (!isinf (compound_space));
- compound_space = compound_space >? compound_fixed;
+ compound_space = max (compound_space, compound_fixed);
/*
Hmm. we do 1/0 in the next thing. Perhaps we should check if this
@@ -859,13 +859,13 @@
Moment *dt = unsmob_moment (rc->get_property ("measure-length"));
if (dt)
{
- delta_t = delta_t <? * dt;
+ delta_t = min (delta_t, *dt);
/*
The following is an extra safety measure, such that
the length of a mmrest event doesn't cause havoc.
*/
- shortest_playing_len = shortest_playing_len <? * dt;
+ shortest_playing_len = min (shortest_playing_len, *dt);
}
}
Real dist = 0.0;
@@ -877,7 +877,7 @@
around to get chord tremolos to behave properly.
*/
- shortest_playing_len = shortest_playing_len >? delta_t;
+ shortest_playing_len = max (shortest_playing_len, delta_t);
if (delta_t.main_part_ && !lwhen.grace_part_)
{
dist = get_duration_space (me, shortest_playing_len,
shortest.main_part_, expand_only);
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
