From 8d862d30dcac13b678bfa101a440c40ed3971da6 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:26:56 +0000
Subject: [PATCH] lilypond-0.0.20

---
 hdr/linespace.hh | 4 ++--
 hdr/proto.hh     | 4 ++--
 src/boxes.cc     | 8 --------
 src/molecule.cc  | 8 ++++----
 src/pscore.cc    | 2 +-
 src/staffline.cc | 6 +++---
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/hdr/linespace.hh b/hdr/linespace.hh
index 54704508e6..8a8742142c 100644
--- a/hdr/linespace.hh
+++ b/hdr/linespace.hh
@@ -14,8 +14,8 @@ struct Colinfo {
     Real fixpos;
     Colinfo();
     void print() const;
-    Real minright() const { return pcol_->width().max; }
-    Real minleft() const { return -pcol_->width().min; }
+    Real minright() const { return pcol_->width().right; }
+    Real minleft() const { return -pcol_->width().left; }
 };
 
 
diff --git a/hdr/proto.hh b/hdr/proto.hh
index 217b2f7f58..c20d981f15 100644
--- a/hdr/proto.hh
+++ b/hdr/proto.hh
@@ -30,7 +30,6 @@ struct Dynamic;
 struct Idealspacing;
 struct Identifier;
 struct Input_commands;
-struct Interval;
 struct Item;
 struct Key;
 struct Keyitem;
@@ -95,5 +94,6 @@ struct Keyword_table;
 struct Rhythmic_grouping;
 struct Staff_commands_at ;
 struct Commands_at ;
-struct Moment;
+struct Time_description;
+
 #endif // PROTO_HH
diff --git a/src/boxes.cc b/src/boxes.cc
index b280e45f92..d6564663a1 100644
--- a/src/boxes.cc
+++ b/src/boxes.cc
@@ -2,14 +2,6 @@
 #include "const.hh"
 #include "vray.hh"
 
-Box::Box(svec<Real> &s)
-{
-    assert(s.sz() == 4);
-    x.min = s[0];
-    x.max = s[1];
-    y.min = s[2];
-    y.max = s[3];
-}
 
 Box::Box()
 {        
diff --git a/src/molecule.cc b/src/molecule.cc
index fb72eb6bf0..68b8791c18 100644
--- a/src/molecule.cc
+++ b/src/molecule.cc
@@ -82,7 +82,7 @@ Molecule::add_right(const Molecule &m)
 	add(m);
 	return;
     }
-   Real xof=extent().x.max - m.extent().x.min;
+   Real xof=extent().x.right - m.extent().x.left;
     Molecule toadd(m);
     toadd.translate(Offset(xof, 0.0));
     add(toadd);
@@ -95,7 +95,7 @@ Molecule::add_left(const Molecule &m)
 	add(m);
 	return;
     }
-    Real xof=extent().x.min - m.extent().x.max;
+    Real xof=extent().x.left - m.extent().x.right;
     Molecule toadd(m);
     toadd.translate(Offset(xof, 0.0));
     add(toadd);
@@ -109,7 +109,7 @@ Molecule::add_top(const Molecule &m)
 	add(m);
 	return;
     }
-  Real yof=extent().y.max - m.extent().y.min;
+  Real yof=extent().y.right - m.extent().y.left;
     Molecule toadd(m);
     toadd.translate(Offset(0,yof));
     add(toadd);
@@ -122,7 +122,7 @@ Molecule::add_bottom(const Molecule &m)
 	add(m);
 	return;
     }
-    Real yof=extent().y.min- m.extent().y.max;
+    Real yof=extent().y.left- m.extent().y.right;
     Molecule toadd(m);
     toadd.translate(Offset(0,yof));
     add(toadd);
diff --git a/src/pscore.cc b/src/pscore.cc
index a34d86b0ba..c808ecc3fe 100644
--- a/src/pscore.cc
+++ b/src/pscore.cc
@@ -59,7 +59,7 @@ PScore::typeset_item(Item *i, PCol *c, PStaff *s, int breakstat)
 	    svec<Item*> col_its (select_items(s, c));
 	    for (int j =0; j < col_its.sz(); j++)
 		col_its[j]->translate(Offset(-iv.length(),0));
-	    i->translate (Offset(-iv.max, 0));
+	    i->translate (Offset(-iv.right, 0));
 	}
     }
     
diff --git a/src/staffline.cc b/src/staffline.cc
index afb8085b1a..c3e33fff06 100644
--- a/src/staffline.cc
+++ b/src/staffline.cc
@@ -13,7 +13,7 @@ make_vbox(Interval i)
 {    
     String s("\\vbox to ");
     s += print_dimen(i.length());
-    s += "{\\vskip "+print_dimen(i.max)+" ";
+    s += "{\\vskip "+print_dimen(i.right)+" ";
     return s;
 }
 
@@ -68,8 +68,8 @@ Line_of_staff::Line_of_staff(Line_of_score * sc, PStaff*st)
     
     for (PCursor<const Spanner*> sp(pstaff_->spans); sp.ok(); sp++) {
 
-	PCol *brokenstart = &MAX(*linestart, *sp->left);
-	PCol *brokenstop = &MIN(*linestop, *sp->right);
+	PCol *brokenstart = &max(*linestart, *sp->left);
+	PCol *brokenstop = &min(*linestop, *sp->right);
 	if ( *brokenstart < *brokenstop) {
 	    line_of_score_->pscore_-> // higghl
 		add_broken(sp->broken_at(brokenstart,brokenstop));
-- 
2.39.5