lilypond-1.3.0

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 7ea4e0aaf21ff78cf105c284552c3a3906f8154e..b1187ec6924770f10b2c813609f42394782fa521 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -10,15 +10,11 @@
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
-#if PARANOIA
-#ifndef Rational
-#define Rational MyRational
-#endif
-#endif
 
 #include "compare.hh"
 #include "arithmetic-operator.hh"
 #include "fproto.hh"
+#include "string.hh"
 
 /**
    Rational numbers.  Included is support for + and - infinity.

diff --git a/lily/include/header.hh b/lily/include/header.hh
index 32907cdbe7281c348a3fe946823cc1613d570be0..2a31d99266fa87b4d7fe56abbe4003a1286222d7 100644 (file)
--- a/lily/include/header.hh
+++ b/lily/include/header.hh
@@ -15,9 +15,5 @@
 #include "scope.hh"
 
 
-/** Store bibliographical information.  The information in the \header
-   block is read into this struct.  Lily does not process this
-   information.  */
-typedef Scope Header;
 
 #endif // HEADER_HH

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index dc99d4d87be06a52308cd41ca47705ed5776d434..c5a9146f811d1240a9c1d6ed563334f7a499804d 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -209,7 +209,7 @@ Paper_def::reset_default_count()
 }
 
 Paper_outputter*
-Paper_def::paper_outputter_p (Paper_stream* os_p, Header* header_l, String origin_str) const
+Paper_def::paper_outputter_p (Paper_stream* os_p, Scope* header_l, String origin_str) const
 {
   Paper_outputter* p = new Paper_outputter (os_p);
 

diff --git a/lily/score.cc b/lily/score.cc
index 5f9a2b65c506b3dae3a80c301a3d59ebab36881e..b51795072149875b7df07676593781c81584a951 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -36,7 +36,7 @@ Score::Score (Score const &s)
   for (int i=0; i < s.def_p_arr_.size (); i++)
     def_p_arr_.push(s.def_p_arr_[i]->clone());
   errorlevel_i_ = s.errorlevel_i_;
-  header_p_ =  (s.header_p_) ? new Header (*s.header_p_): 0;
+  header_p_ =  (s.header_p_) ? new Scope (*s.header_p_): 0;
 }
 
 Score::~Score()
@@ -60,8 +60,7 @@ Score::run_translator (Music_output_def *odef_l)
   trans_p->last_mom_ = music_p_->length_mom ();
 
 
-  bool playing  =  odef_l->scope_p_->elem_b ("unfold_all");
-  Music_iterator * iter = Music_iterator::static_get_iterator_p (music_p_, playing);
+  Music_iterator * iter = Music_iterator::static_get_iterator_p (music_p_);
   iter->init_translator(music_p_, trans_p);
 
   iter->construct_children();

diff --git a/lily/scores.cc b/lily/scores.cc
index 65e9c087af148a2e3d1d9366afeabd0a25c09d5a..b3899c2d2e3f6a0e3ad0fe56c564ba911dde04b5 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -23,7 +23,7 @@ Sources* source_global_l = 0;
 Array<String> inclusion_global_array;
 Array<String> target_str_global_array;
 Link_array<Score> score_global_array;
-Header * header_global_p;
+Scope * header_global_p;
 
 
 void write_dependency_file (String fn, Array<String> targets,
@@ -69,7 +69,7 @@ void
 do_scores()
 {
   if (!header_global_p)
-    header_global_p = new Header;
+    header_global_p = new Scope;
   for (int i=0; i < score_global_array.size(); i++)
     {
       Score* is_p = score_global_array[i];