From 8c4d5403757900750defe35b5e6592c8ad682886 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:30:00 +0000
Subject: [PATCH] lilypond-0.0.26

---
 hdr/beam.hh     | 3 ++-
 hdr/rest.hh     | 8 ++++----
 src/bar.cc      | 7 ++++---
 src/clefitem.cc | 3 +++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/hdr/beam.hh b/hdr/beam.hh
index 548641aecb..68a9f49cff 100644
--- a/hdr/beam.hh
+++ b/hdr/beam.hh
@@ -18,6 +18,7 @@ struct Beam:  public Directional_spanner {
     /// dir: -1 below heads, +1 above heads.
 
     /****************/
+    const char * name() const;
     
     virtual Interval width()const;    
     Offset center() const;
@@ -30,7 +31,7 @@ struct Beam:  public Directional_spanner {
     void do_pre_processing();
     void do_post_processing();
 
-    void print() const;
+    void do_print() const;
     void set_grouping(Rhythmic_grouping def, Rhythmic_grouping current);
     void set_stemlens();
     ~Beam();
diff --git a/hdr/rest.hh b/hdr/rest.hh
index d3f944f57e..02c6e0bff6 100644
--- a/hdr/rest.hh
+++ b/hdr/rest.hh
@@ -9,8 +9,8 @@
 #include "item.hh"
 
 /// ball at the end of the stem
-struct Rest : public Item
-{
+struct Rest : Item {
+
     int dots;
     int balltype;
 
@@ -18,8 +18,8 @@ struct Rest : public Item
 
 
     Rest(int dur,int dots);
-    void print()const;
-
+    void do_print()const;
+    const char * name() const;
     Molecule* brew_molecule_p()const;
 };
 /**
diff --git a/src/bar.cc b/src/bar.cc
index b18c500e62..4b3a0716eb 100644
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -4,17 +4,18 @@
 #include "paper.hh"
 #include "lookup.hh"
 
+NAME_METHOD(Bar);
 
 Bar::Bar( String t)
 {
     type = t;
 }
+
 Molecule*
 Bar::brew_molecule_p()const
 {    
     Symbol s = paper()->lookup_p_->bar(type);
-Molecule*    output = new Molecule(Atom(s));
-return output;
-    
+    Molecule*    output = new Molecule(Atom(s));
+    return output;
 }
     
diff --git a/src/clefitem.cc b/src/clefitem.cc
index 8b10b60107..2b451a804d 100644
--- a/src/clefitem.cc
+++ b/src/clefitem.cc
@@ -5,11 +5,14 @@
 #include "lookup.hh"
 #include "clef.hh"
 
+NAME_METHOD(Clef_item);
+
 Clef_item::Clef_item()
 {
     change = true;
     read("violin");
 }
+
 void
 Clef_item::read(String t)
 {
-- 
2.39.5