release: 1.1.53

[lilypond.git] / lily / bar.cc

diff --git a/lily/bar.cc b/lily/bar.cc
index 7e49b7088fe0a2e72b80ce1bfe96571d818bdbb4..913c2c72ed1c0622c0107c4ef11829ec30fef4af 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -14,10 +14,9 @@
 #include "debug.hh"
 
 
-
 Bar::Bar ()
 {
-  breakable_b_ = true;
+  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
   type_str_ = "|";
 }
 
@@ -25,33 +24,43 @@ void
 Bar::do_print () const
 {
 #ifndef NPRINT
-  DOUT << type_str_;
+  String s = type_str_;
+  DOUT << "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 ();
-  Atom s = lookup_l ()->bar (type_str_, p->get_var ("barsize"));
+  Molecule *output = new Molecule (lookup_l ()->bar (type_str_, get_bar_size (), paper_l ()));
   
-  Molecule*output = new Molecule (Atom (s));
   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}
 };
 
@@ -61,14 +70,18 @@ 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_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);
 }