patch::: 1.3.1.hwn1

[lilypond.git] / lily / bar.cc

diff --git a/lily/bar.cc b/lily/bar.cc
index 7ba3f2d77b953fea9b87b3709005d290857c3a56..f2d3d187ea617c22e4d017ac72ff2e997650221b 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -3,9 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "dimension-cache.hh"
 #include "bar.hh"
 #include "string.hh"
 #include "molecule.hh"
@@ -13,60 +14,76 @@
 #include "lookup.hh"
 #include "debug.hh"
 
-Bar::Bar()
+
+Bar::Bar ()
 {
-  breakable_b_ = true;
+  set_elt_property ("breakable", SCM_BOOL_T);
   type_str_ = "|";
-  spanned_i_ = 0;
 }
 
-
-
-IMPLEMENT_IS_TYPE_B1(Bar,Item);
-
 void
-Bar::do_print() const
+Bar::do_print () const
 {
-  DOUT << type_str_;
+#ifndef NPRINT
+  String s = type_str_;
+  DEBUG_OUT << "type = " << s;
+#endif
 }
 
+Real
+Bar::get_bar_size () const
+{
+  // Never called!
+  return 0;
+}
+
+
 Molecule*
-Bar::brew_molecule_p() const
+Bar::do_brew_molecule_p () const
 {    
-  Paper_def *p = paper();
-  Symbol s = p->lookup_l()->bar (type_str_, 
-                                  p->get_var ("bar_size"));
-  Molecule*output = new Molecule (Atom (s));
+  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}
 };
 
 void
-Bar::do_pre_processing()
+Bar::do_pre_processing ()
 {
   for (int i=0; bar_breaks[i][0]; i++) 
     {
-       if (bar_breaks[i][1] == type_str_)
-           type_str_ = bar_breaks[i][break_status_i()+1];
+      if (bar_breaks[i][1] == type_str_)
+       {
+         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_BOOL_T      // UGR.
+      && (break_status_dir () == RIGHT) && (type_str_ == ""))
+    {
+      type_str_ = "|";
+    }
+
+  if (type_str_ =="")
+    set_empty (true, X_AXIS);
 }
   
+