From: fred <fred>
Date: Sun, 24 Mar 2002 19:26:46 +0000 (+0000)
Subject: lilypond-0.0.18
X-Git-Tag: release/1.5.59~5674
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bae13038eeb76c84a341dbf88ea762f86c84efed;p=lilypond.git

lilypond-0.0.18
---

diff --git a/hdr/beam.hh b/hdr/beam.hh
index be2cb8f94c..60b5dedd71 100644
--- a/hdr/beam.hh
+++ b/hdr/beam.hh
@@ -22,7 +22,7 @@ struct Beam: public Spanner {
     
     virtual Interval width()const;    
 
-    Spanner *broken_at(const PCol *, const PCol *) const;
+    Spanner *broken_at(PCol *,  PCol *) const;
     Beam();
     void add(Stem*);
     void process();
diff --git a/hdr/scoreline.hh b/hdr/scoreline.hh
index e3997b5a36..5734a7b4b4 100644
--- a/hdr/scoreline.hh
+++ b/hdr/scoreline.hh
@@ -13,7 +13,7 @@
 /// the columns of a score that form one line.
 struct
 Line_of_score {
-    PointerList<const PCol *> cols;
+    PointerList<PCol *> cols;
 
     // need to store height of each staff.
     IPointerList<Line_of_staff*> staffs;
@@ -21,7 +21,7 @@ Line_of_score {
 
     /****************/
     void process() ;
-    Line_of_score(svec<const PCol *> sv,  PScore *);
+    Line_of_score(svec<PCol *> sv,  PScore *);
 
     String TeXstring() const;
 
diff --git a/hdr/slur.hh b/hdr/slur.hh
index 43359399e8..10b5884571 100644
--- a/hdr/slur.hh
+++ b/hdr/slur.hh
@@ -25,7 +25,7 @@ struct Slur : Spanner {
     void add(Notehead*);
     void set_default_dir();
     Interval height() const;
-    Spanner* broken_at(const PCol*, const PCol*) const;
+    Spanner* broken_at( PCol*, PCol*) const;
     void process();
 private:
     void brew_molecule();
diff --git a/hdr/spanner.hh b/hdr/spanner.hh
index 3940cebf60..8a22985819 100644
--- a/hdr/spanner.hh
+++ b/hdr/spanner.hh
@@ -31,7 +31,7 @@ struct Spanner {
 
 
     /// clone a piece of  this spanner.
-    virtual Spanner *broken_at(const PCol *c1, const PCol *c2) const=0; 
+    virtual Spanner *broken_at( PCol *c1,  PCol *c2) const=0; 
     /**
  
     PRE
diff --git a/src/beam.cc b/src/beam.cc
index 3d43b4ed1d..a2d58254af 100644
--- a/src/beam.cc
+++ b/src/beam.cc
@@ -1,3 +1,4 @@
+#include "dimen.hh"
 #include "beam.hh"
 #include "misc.hh"
 #include "debug.hh"
@@ -141,7 +142,7 @@ Beam::process()
 
 // todo.
 Spanner *
-Beam::broken_at(const PCol *, const PCol *) const
+Beam::broken_at( PCol *, PCol *) const
 {
     return new Beam(*this);
 }
@@ -166,6 +167,7 @@ Beam::width() const
     return Interval( (*me->stems.top()) ->hpos(),
 		     (*me->stems.bottom()) ->hpos() );
 }
+
 /*
   beams to go with one stem.
   */
@@ -177,6 +179,8 @@ Beam::stem_beams(Stem *here, Stem *next, Stem *prev)
     Real dy=paper()->internote()*2;
     Real stemdx = paper()->rule_thickness();
     Real sl = slope*paper()->internote();
+    paper()->lookup_->beam(sl, convert_dimen(20,"pt"));
+    slope = sl /paper()->internote();
     Molecule leftbeams;
     Molecule rightbeams;
 
@@ -227,10 +231,7 @@ Beam::brew_molecule()
 {
     assert(left->line == right->line);
     Real inter=paper()->internote();
-    Real sl = slope*inter;
-
     output = new Molecule;
-    slope = sl / inter;
     Real x0 = stems.top()->hpos();
     
     for (PCursor<Stem*> i(stems); i.ok(); i++) {
diff --git a/src/scoreline.cc b/src/scoreline.cc
index bd21c32bba..788efd5dab 100644
--- a/src/scoreline.cc
+++ b/src/scoreline.cc
@@ -22,7 +22,7 @@ Line_of_score::TeXstring() const
 }
 
 
-Line_of_score::Line_of_score(svec<const PCol *> sv,
+Line_of_score::Line_of_score(svec<PCol *> sv,
 			     PScore *ps)
 {
     pscore_ = ps;
diff --git a/src/slur.cc b/src/slur.cc
index 5d9eb0de44..f795dc8284 100644
--- a/src/slur.cc
+++ b/src/slur.cc
@@ -52,7 +52,7 @@ Slur::preprocess()
 }
 
 Spanner*
-Slur::broken_at(const PCol*l, const PCol*r) const
+Slur::broken_at(PCol*l, PCol*r) const
 {
     assert(l->line == r->line);
     Slur*ret = new Slur(*this);
diff --git a/src/staffline.cc b/src/staffline.cc
index a51c669e1f..9fd5b1d5bf 100644
--- a/src/staffline.cc
+++ b/src/staffline.cc
@@ -64,13 +64,13 @@ Line_of_staff::Line_of_staff(Line_of_score * sc, PStaff*st)
     pstaff_=st;
 
     
-    const PCol *linestart = sc->cols.top();
-    const PCol *linestop = sc->cols.bottom();
+    PCol *linestart = sc->cols.top();
+    PCol *linestop = sc->cols.bottom();
 
     
     for (PCursor<const Spanner*> sp(pstaff_->spans); sp.ok(); sp++) {
-	const PCol *brokenstart = &MAX(*linestart, *sp->left);
-	const 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));