From: fred <fred>
Date: Sun, 24 Mar 2002 19:40:45 +0000 (+0000)
Subject: lilypond-0.0.65
X-Git-Tag: release/1.5.59~4871
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1c5be261a262ce39030d8b2e391881a2b1570335;p=lilypond.git

lilypond-0.0.65
---

diff --git a/lily/molecule.cc b/lily/molecule.cc
index 94d94cfd13..ff047f2c77 100644
--- 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 194d97384a..356565c4f7 100644
--- 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 2cbe6e7acd..d44b346929 100644
--- 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;
 }