lilypond-0.0.65

diff --git a/lily/molecule.cc b/lily/molecule.cc
index 94d94cfd138a52357498de72c0e9ba63e5f6d605..ff047f2c771f89a4bbce7469a21b76f3cfc2105a 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -28,7 +28,7 @@ Atom::Atom(Symbol s)
 
 
 String
-Atom::TeXstring() const
+Atom::TeX_string() const
 {
     /* infinity checks. */
     assert( abs(off.x) < 100 CM);
@@ -46,11 +46,11 @@ Atom::TeXstring() const
 /* *************** */
 
 String
-Molecule::TeXstring() const
+Molecule::TeX_string() const
 {
     String s;
     for(iter_top(ats,c); c.ok(); c++)
-       s+=c->TeXstring();
+       s+=c->TeX_string();
     return s;
 }
 

diff --git a/lily/tex-beam.cc b/lily/tex-beam.cc
index 194d97384a25cd187a73c49749eed04fdc2b4ac9..356565c4f7293a8e9a77e86960bcc621dbc4baad 100644 (file)
--- a/lily/tex-beam.cc
+++ b/lily/tex-beam.cc
@@ -96,7 +96,7 @@ Lookup::beam(Real &slope, Real width) const
     m.add(a);
     
     Symbol ret;
-    ret.tex = m.TeXstring();
+    ret.tex = m.TeX_string();
     ret.dim.y = Interval(0,width*slope);
     ret.dim.x = Interval(0,width);
     

diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc
index 2cbe6e7acd2f3e88872e1444d2b3804988cf7dde..d44b3469291fef02122f3be2992480a126ff50e9 100644 (file)
--- a/lily/tex-slur.cc
+++ b/lily/tex-slur.cc
@@ -56,7 +56,7 @@ Lookup::half_slur_middlepart(Real &dx, int dir) const
     s.tex = f;
     Atom a(s);
     a.translate(Offset(dx/2,0));
-    s.tex = a.TeXstring();
+    s.tex = a.TeX_string();
 
     return s;
 }
@@ -171,7 +171,7 @@ Lookup::slur (int dy , Real &dx, int dir) const
     Atom a(s);
     a.translate(Offset(dx/2,0));
     s.dim = a.extent();
-    s.tex = a.TeXstring();
+    s.tex = a.TeX_string();
     return s;    
 }
 
@@ -195,12 +195,12 @@ Lookup::big_slur(int dy , Real &dx, int dir) const
     Molecule mol;
     mol.add(l);
     Atom a(m);
-    a.translate(Offset(0,slur_extra * internote()));
+    a.translate(Offset(0,slur_extra * internote_f()));
     mol.add_right(m);
     mol.add_right(r);
-    mol.translate(Offset(0, l_dy * internote()));
+    mol.translate(Offset(0, l_dy * internote_f()));
     Symbol s;
-    s.tex = mol.TeXstring();
+    s.tex = mol.TeX_string();
     s.dim = mol.extent();
     return s;
 }