From: fred <fred>
Date: Tue, 26 Mar 2002 23:04:27 +0000 (+0000)
Subject: lilypond-1.3.5
X-Git-Tag: release/1.5.59~1743
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc10d6497e24573bcfe003caebcf95fa1cf02ae3;p=lilypond.git

lilypond-1.3.5
---

diff --git a/lily/include/time-description.hh b/lily/include/time-description.hh
deleted file mode 100644
index 29c9ddcbd5..0000000000
--- a/lily/include/time-description.hh
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-  moment.hh -- part of GNU LilyPond
-
-  (c) 1996--1999 Han-Wen Nienhuys
-*/
-
-#ifndef tdes_HH
-#define tdes_HH
-
-#include "moment.hh"
-#include "lily-proto.hh"
-#include "array.hh"
-
-/// full info on where we are
-struct Time_description {
-  Moment when_;
-
-  /// if true, no bars needed, no reduction of whole_in_measure
-  bool cadenza_b_;
-    
-  /// current measure info
-  Moment whole_per_measure_;
-
-  /*
-    ugh: naming! junk whole_ prefixes.
-   */
-  /// where am i 
-  Moment whole_in_measure_;
-
-  /// how long is one beat?
-  Moment one_beat_;
-
-  /// idem
-  int bars_i_;
-
-  void set_cadenza (bool);
-  Moment when_mom () const { return when_; }
-  void OK() const;
-  Time_description();
-  void add (Moment dt);
-  bool allow_time_signature_change_b();
-  String str() const;
-  void print() const;
-  void setpartial (Moment p);
-  String try_set_partial_str (Moment) const;
-  Moment barleft() const;
-  Moment next_bar_moment() const;
-  void set_time_signature (int,int);
-  static int compare (const Time_description&, const Time_description&);
-};
-
-#include "compare.hh"
-
-
-INSTANTIATE_COMPARE(Time_description&,Time_description::compare);
-
-
-void
-process_timing_reqs (Time_description &time_, 
-		     Rhythmic_grouping *default_grouping,
-		     Array<Timing_req*> const& timing_req_l_arr);
-#endif // Time_description_HH
-
diff --git a/lily/score-priority-engraver.cc b/lily/score-priority-engraver.cc
deleted file mode 100644
index a182c7a7d5..0000000000
--- a/lily/score-priority-engraver.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-  score-align-reg.cc -- implement Score_priority_engraver
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#include "dimension-cache.hh"
-#include "axis-group-item.hh"
-#include "score-priority-engraver.hh"
-#include "item.hh"
-#include "dictionary-iter.hh"
-#include "break-align-item.hh"
-
-
-Score_priority_engraver::Score_priority_engraver()
-{
-  halign_p_ = 0;
-}
-
-void
-Score_priority_engraver::do_pre_move_processing()
-{
-  for (int i=0; i < column_p_arr_.size ();i++)
-    typeset_element (column_p_arr_[i]);
-  column_p_arr_.clear ();
-
-  if (halign_p_)
-    {
-      typeset_element (halign_p_);
-      halign_p_ =0;
-    }
-}
-
-/*
-  TODO: move this logic into Break_align_item
- */
-void
-Score_priority_engraver::acknowledge_element (Score_element_info inf)
-{
-  if (Item * item_l = dynamic_cast <Item *> (inf.elem_l_))
-    {
-      if (item_l->empty_b (X_AXIS) || item_l->parent_l (X_AXIS))
-	return;
-
-      SCM bp=item_l->remove_elt_property ("breakable");
-      bool breakable = (bp != SCM_UNDEFINED);
-      if (!breakable)
-	return ;
-
-
-      if (!halign_p_)
-	{
-	  halign_p_ = new Break_align_item;
-	  halign_p_->set_elt_property ("breakable", SCM_BOOL_T);
-	  announce_element (Score_element_info (halign_p_,0));
-	}
-
-      halign_p_->add_breakable_item (item_l);
-    }
-}
-
-ADD_THIS_TRANSLATOR(Score_priority_engraver);
-