release: 1.1.18

[lilypond.git] / lily / symtable.cc

diff --git a/lily/symtable.cc b/lily/symtable.cc
index cc3cecff23140339de16c96438dcf0fd18466a37..ccf1eb16102584041048253f83486af0a9154f39 100644 (file)
--- a/lily/symtable.cc
+++ b/lily/symtable.cc
@@ -21,8 +21,8 @@ Symtables::Symtables()
 Symtables::Symtables (Symtables const &s)
   : Dictionary<Symtable*> (s)
 {
-  font_ = s.font_;
-  font_path_ = s.font_path_;
+  font_name_ = s.font_name_;
+
   for (Dictionary_iter< Symtable*>  i (s); i.ok(); i++)
     {
       add (i.key(), new Symtable (*i.val ()));
@@ -31,7 +31,7 @@ Symtables::Symtables (Symtables const &s)
 
 Symtables::~Symtables()
 {
-  for (Dictionary_iter< Symtable*>  i (*this); i.ok(); i++)
+  for (Dictionary_iter<Symtable*>  i (*this); i.ok(); i++)
     {
       delete i.val();
     }
@@ -60,12 +60,12 @@ Symtables::operator()(String s)
     {
       error (_f ("Symtable `%s\' unknown", s));
       /* 
-        We can 't return, because we'll dump core anyway.
+        We can 't return, because we would dump core anyway.
        */
       return 0;
     }
   else
-    return Dictionary<Symtable*>::operator[](s);
+    return elem(s);
 }
 void
 Symtables::print() const