source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "bar.hh"
Bar::Bar ()
{
- breakable_b_ = true;
+ set_elt_property (breakable_scm_sym, SCM_BOOL_T);
type_str_ = "|";
}
Bar::do_print () const
{
#ifndef NPRINT
- DOUT << type_str_;
+ String s = type_str_;
+ DOUT << "type = " << s;
#endif
}
+Real
+Bar::get_bar_size () const
+{
+ return paper_l ()->get_var ("barsize");
+}
+
+
Molecule*
Bar::do_brew_molecule_p () const
{
- Paper_def *p = paper ();
- Molecule *output = new Molecule (lookup_l ()->bar (type_str_, p->get_var ("barsize")));
+ Molecule *output = new Molecule (lookup_l ()->bar (type_str_, get_bar_size (), paper_l ()));
return output;
}
/**
Prescriptions for splitting bars.
- TODO: parametrise this (input-settable)
+ TODO: put this in SCM.
*/
static char const *bar_breaks[][3] ={
{":|", ":|:", "|:"},
{"|", "|", ""},
{"", "|s", "|"},
- {"", "|:", "|:"},
+ {"|", "|:", "|:"},
{"|.", "|.", ""},
{":|", ":|", ""},
{"||", "||", ""},
{".|.", ".|.", ""},
+ {"", "scorebar", "scorepostbreak"},
+ {"", "brace", "brace"},
+ {"", "bracket", "bracket"},
{0,0,0}
};
for (int i=0; bar_breaks[i][0]; i++)
{
if (bar_breaks[i][1] == type_str_)
- type_str_ = bar_breaks[i][break_status_dir ()+1];
+ {
+ type_str_ = bar_breaks[i][break_status_dir ()+1];
+ break;
+ }
}
-
- /*
- span_score_bar needs dims, so don't do
-
- transparent_b_ = empty_b_ = (!type_str_);
-
- */
+ if (remove_elt_property (at_line_start_scm_sym)!= SCM_BOOL_F
+ && (break_status_dir () == RIGHT) && (type_str_ == ""))
+ {
+ type_str_ = "|";
+ }
+
+ if (type_str_ =="")
+ dim_cache_[X_AXIS]->set_empty (true);
}