lilypond-0.0.22

diff --git a/src/bar.cc b/src/bar.cc
index 01807f123e24fda107160bd764ad0ad2f397224b..edfd6a8e3c40d609ec294a6deea5efa916848224 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -12,7 +12,7 @@ Bar::Bar( String t)
 Molecule*
 Bar::brew_molecule()const
 {    
-    Symbol s = paper()->lookup_->bar(type);
+    Symbol s = paper()->lookup_p_->bar(type);
 Molecule*    output = new Molecule(Atom(s));
 return output;
     

diff --git a/src/clefitem.cc b/src/clefitem.cc
index 4289c643749d412839cf9026816b173c03b37098..c6b8f09d0bb98c61664407549205079c2fffcc65 100644 (file)
--- a/src/clefitem.cc
+++ b/src/clefitem.cc
@@ -31,7 +31,7 @@ Clef_item::brew_molecule()const
     String t = type;
     if  (change)
        t += "_change";
-    Symbol s = paper()->lookup_->clef(t);
+    Symbol s = paper()->lookup_p_->clef(t);
     Molecule*output = new Molecule(Atom(s));
     output->translate(Offset(0, paper()->interline()/2 * y_off));
     return output;

diff --git a/src/linestaff.cc b/src/linestaff.cc
index 6d3985cb8b1621a944722c9df978f69edd53b550..f9430e9b7338f4aecc2fea8f51fc62d880cc1dd7 100644 (file)
--- a/src/linestaff.cc
+++ b/src/linestaff.cc
@@ -15,8 +15,8 @@ Linestaff::Linestaff(int l, PScore *s)
 void
 Linestaff::brew_molecule(Real width)
 {
-    Atom a  = pscore_->paper_->lookup_->linestaff(nolines,width);
-    stafsym = new Molecule(a);    
+    Atom a  = pscore_l_->paper_l_->lookup_p_->linestaff(nolines,width);
+    stafsym_p_ = new Molecule(a);
 }
 
 

diff --git a/src/notehead.cc b/src/notehead.cc
index 5db73866004130ab3851effd31c21d177c6ecbf0..f6521a58fed326c2032ff5d17cdfd8b0b7b8cf52 100644 (file)
--- a/src/notehead.cc
+++ b/src/notehead.cc
@@ -14,6 +14,7 @@ Notehead::Notehead(int ss)
     position = 0;
     balltype = 0;
     dots = 0;
+    extremal = 0;
 }
 
 void
@@ -39,11 +40,11 @@ Notehead::brew_molecule() const return out;
     Paperdef *p = paper();
 
     Real dy = p->internote();
-    Symbol s = p->lookup_->ball(balltype);
+    Symbol s = p->lookup_p_->ball(balltype);
     
     out = new Molecule(Atom(s));
     if (dots) {
-       Symbol d = p->lookup_->dots(dots);
+       Symbol d = p->lookup_p_->dots(dots);
        Molecule dm;
        dm.add(Atom(d));
        if (!(position %2))
@@ -55,7 +56,7 @@ Notehead::brew_molecule() const return out;
     if (streepjes) {
        int dir = sign(position);
        int s =(position<-1) ? -((-position)/2): (position-staff_size)/2;
-       Symbol str = p->lookup_->streepjes(s);
+       Symbol str = p->lookup_p_->streepjes(s);
        Molecule sm;
        sm.add(Atom(str));
        if (position % 2)

diff --git a/src/pstaff.cc b/src/pstaff.cc
index ba7789c91bf505ca721ed658dcfa749fedbb1d50..3c7d82deae661a64019b1747739fe247444d418a 100644 (file)
--- a/src/pstaff.cc
+++ b/src/pstaff.cc
@@ -1,19 +1,20 @@
 #include "pstaff.hh"
 #include "molecule.hh"
+
 PStaff::~PStaff()
 {
-    delete stafsym;
+    delete stafsym_p_;
 }
 
 PStaff::PStaff(PScore*ps)
 {
-    pscore_=ps;
-    stafsym = 0;
+    pscore_l_=ps;
+    stafsym_p_ = 0;
 }
 
 void
 PStaff::add(Item *i )
 {
     its.bottom().add(i);
-    i->pstaff_ = this;
+    i->pstaff_l_ = this;
 }

diff --git a/src/staffline.cc b/src/staffline.cc
index 7bd534fb976eaa471fd1d1c460de8e208c95393c..1eacf8cb6527b2d57fcf5ebba5c2a72af4ced6c6 100644 (file)
--- a/src/staffline.cc
+++ b/src/staffline.cc
@@ -26,11 +26,11 @@ Line_of_staff::TeXstring() const
     // the staff itself: eg lines, accolades
     s += "\\hbox{";
     {                          
-       ((PStaff*)pstaff_)->
-           brew_molecule(line_of_score_->pscore_->paper_->linewidth);
+       ((PStaff*)pstaff_l_)->
+           brew_molecule(line_of_score_l_->pscore_l_->paper_l_->linewidth);
 
-       s+=pstaff_->stafsym->TeXstring();
-       iter_top(line_of_score_->cols,cc);
+       s+=pstaff_l_->stafsym_p_->TeXstring();
+       iter_top(line_of_score_l_->cols,cc);
        Real lastpos=cc->hpos;
 
        // all items in the current line & staff.
@@ -45,12 +45,12 @@ Line_of_staff::TeXstring() const
            // now output the items.
 
            for (iter_top(cc->its,i); i.ok(); i++) {
-               if (i->pstaff_ == pstaff_)
+               if (i->pstaff_l_ == pstaff_l_)
                    s += i->TeXstring();
            }
            // spanners.
            for (iter_top(cc->starters,i); i.ok(); i++)
-               if (i->pstaff_ == pstaff_)
+               if (i->pstaff_l_ == pstaff_l_)
                    s += i->TeXstring();
        }
     }
@@ -60,19 +60,19 @@ Line_of_staff::TeXstring() const
 
 Line_of_staff::Line_of_staff(Line_of_score * sc, PStaff*st)
 {
-    line_of_score_=sc;
-    pstaff_=st;
+    line_of_score_l_=sc;
+    pstaff_l_=st;
 
     PCol *linestart = sc->cols.top();
     PCol *linestop = sc->cols.bottom();
     
-    for (iter_top(pstaff_->spans,i); i.ok(); i++) {
+    for (iter_top(pstaff_l_->spans,i); i.ok(); i++) {
 
        PCol *brokenstart = &max(*linestart, *i->left);
        PCol *brokenstop = &min(*linestop, *i->right);
        if ( *brokenstart < *brokenstop) {
            Spanner*span_p =i->broken_at(brokenstart,brokenstop);
-           line_of_score_->pscore_-> // higghl
+           line_of_score_l_->pscore_l_-> // higghl
                add_broken(span_p);
        }
     }
@@ -82,19 +82,19 @@ Line_of_staff::Line_of_staff(Line_of_score * sc, PStaff*st)
 Interval
 Line_of_staff::height() const
 {
-    Interval y = pstaff_->stafsym->extent().y;
-    iter_top(line_of_score_->cols,cc);
+    Interval y = pstaff_l_->stafsym_p_->extent().y;
+    iter_top(line_of_score_l_->cols,cc);
     
     // all items in the current line & staff.
     for (; cc.ok(); cc++) {
        for (iter_top(cc->its,i); i.ok(); i++) {
-           if (i->pstaff_ == pstaff_) 
+           if (i->pstaff_l_ == pstaff_l_) 
                y.unite(i->height());
            
        }
        // spanners.
        for (iter_top(cc->starters,i); i.ok(); i++)
-           if (i->pstaff_ == pstaff_) {
+           if (i->pstaff_l_ == pstaff_l_) {
                y.unite(i->height());
            }
     }
@@ -105,7 +105,7 @@ Line_of_staff::height() const
 void
 Line_of_staff::process()
 {
-    if (!pstaff_->stafsym)
-       pstaff_->brew_molecule(line_of_score_->pscore_->
-                              paper_->linewidth);
+    if (!pstaff_l_->stafsym_p_)
+       pstaff_l_->brew_molecule(line_of_score_l_->pscore_l_->
+                              paper_l_->linewidth);
 }

diff --git a/src/textdef.cc b/src/textdef.cc
index 58c666150c0bb2d9e0ebf12cdcd9b57872e9f443..26dee59a712d9b161617082f32c9b5fba208688e 100644 (file)
--- a/src/textdef.cc
+++ b/src/textdef.cc
@@ -13,7 +13,7 @@ Text_def::Text_def()
 Atom
 Text_def::create(Paperdef*p) const
 {
-    return p->lookup_->text(style, text, -align);
+    return p->lookup_p_->text(style, text, -align);
 }
 
 void