From: fred <fred>
Date: Tue, 26 Mar 2002 23:38:07 +0000 (+0000)
Subject: lilypond-1.3.42
X-Git-Tag: release/1.5.59~1381
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=929dad33bcc58974e0606e4ca294394bf5a3d104;p=lilypond.git
lilypond-1.3.42
---
diff --git a/lily/base-span-bar-engraver.cc b/lily/base-span-bar-engraver.cc
deleted file mode 100644
index 3993776b42..0000000000
--- a/lily/base-span-bar-engraver.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- span-bar-grav.cc -- implement Base_span_bar_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#include "dimension-cache.hh"
-#include "lily-guile.hh"
-#include "span-bar.hh"
-#include "base-span-bar-engraver.hh"
-
-Base_span_bar_engraver::Base_span_bar_engraver()
-{
- spanbar_p_ =0;
- use_priority_b_ = true;
-}
-
-Span_bar*
-Base_span_bar_engraver::get_span_bar_p() const
-{
- return new Span_bar;
-}
-
-
-void
-Base_span_bar_engraver::acknowledge_element (Score_element_info i)
-{
- int depth = i.origin_trans_l_arr (this).size();
- if (depth > 1
- && dynamic_cast<Bar *> (i.elem_l_))
- {
- bar_l_arr_.push (dynamic_cast<Bar *> (i.elem_l_));
-
- if (bar_l_arr_.size() >= 2 && !spanbar_p_)
- /*
- hmm, i do want a bracket with one staff some times, but not always
- if (bar_l_arr_.size() >= 1 && !spanbar_p_)
-
- --jcn
- */
-
- /*
-
- use a property? get_property ("singleStaffBracket"); ?
-
- --hwn
- */
- {
- spanbar_p_ = get_span_bar_p();
- spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
-
- /*
- UGH. UGH UUHGK GUHG G
- */
- String visnam = String(name()) + "-visibility";
-
- spanbar_p_->set_elt_property ("visibility-lambda",
- scm_eval (ly_symbol2scm (visnam.ch_C())));
-
- if (use_priority_b_)
- {
- spanbar_p_->set_elt_property ("break-aligned", SCM_BOOL_T);
- }
- else
- {
- spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
- }
-
- announce_element (Score_element_info (spanbar_p_,0));
- if (!gh_string_p (spanbar_p_->get_elt_property ("glyph")))
- spanbar_p_-> set_elt_property ("glyph",
- bar_l_arr_[0]->get_elt_property ("glyph"));
- }
- }
-}
-
-void
-Base_span_bar_engraver::do_pre_move_processing()
-{
- if (spanbar_p_)
- {
- for (int i=0; i < bar_l_arr_.size() ; i++)
- spanbar_p_->add_bar (bar_l_arr_[i]);
- typeset_element (spanbar_p_);
- spanbar_p_ =0;
- }
- bar_l_arr_.set_size (0);
-}
-
-
-
-ADD_THIS_TRANSLATOR(Base_span_bar_engraver);
-
diff --git a/lily/include/base-span-bar-engraver.hh b/lily/include/base-span-bar-engraver.hh
deleted file mode 100644
index d3a360db3b..0000000000
--- a/lily/include/base-span-bar-engraver.hh
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- base-span-bar-engraver.hh -- declare Span_bar_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef SPAN_BAR_GRAV_HH
-#define SPAN_BAR_GRAV_HH
-
-#include "engraver.hh"
-class Axis_align_spanner;
-/**
-
- Make bars that span multiple "staffs". Catch bars, and span a
- Span_bar over them if we find more than 2 bars. Vertical alignment
- of staffs changes the appearance of spanbars. It is up to the
- aligner (Vertical_align_engraver, in this case, to add extra
- dependencies to the spanbars.
-
- */
-class Base_span_bar_engraver : public Engraver
-{
- Span_bar * spanbar_p_;
- Array<Bar*> bar_l_arr_;
-
-public:
- VIRTUAL_COPY_CONS(Translator);
-
-
- Base_span_bar_engraver();
-protected:
- /**
- Do we use break priorities? If true, use break_priority_i_ as
- horizontal alignment priority, otherwise, hang the spanbar on the
- acknowledged bar. */
- bool use_priority_b_;
-
- virtual void acknowledge_element (Score_element_info);
- virtual void do_pre_move_processing();
- virtual Span_bar* get_span_bar_p() const;
-};
-
-#endif // SPAN_BAR_GRAV_HH