lilypond-1.1.37

diff --git a/lily/bar.cc b/lily/bar.cc
index 7fb6d30530978244132d3eefa75bce3261c042e3..1d572e235e8ec5baca5fa4c906c22b1d18e8ccf5 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -18,7 +18,6 @@ Bar::Bar ()
 {
   set_elt_property (breakable_scm_sym, SCM_BOOL_T);
   type_str_ = "|";
-  at_line_start_b_ = false;
 }
 
 void
@@ -57,7 +56,7 @@ static char const *bar_breaks[][3] ={
   {":|", ":|", ""},
   {"||", "||", ""},
   {".|.", ".|.", ""},
-  {"", "scorebar", "|"},
+  {"", "scorebar", "scorepostbreak"},
   {"", "{", "{"},
   {"", "[", "["},  
   {0,0,0}
@@ -71,7 +70,8 @@ Bar::do_pre_processing ()
       if (bar_breaks[i][1] == type_str_)
        {
          type_str_ = bar_breaks[i][break_status_dir ()+1];
-         if (at_line_start_b_ && (break_status_dir () == RIGHT) && (type_str_ == ""))
+         if (remove_elt_property (at_line_start_scm_sym)!= SCM_BOOL_F
+             && (break_status_dir () == RIGHT) && (type_str_ == ""))
            {
              type_str_ = "|";
            }

diff --git a/ly/params.ly b/ly/params.ly
index 165a781726dddfefa22bd8b9a006a7d8439246e2..5dc91bbb19fbe113e941d0cb8f722f5005e92a19 100644 (file)
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -115,6 +115,7 @@ Ross. page 151
 bar_kern = 0.5 * \interline;
 bar_thinkern = 0.75 * \interline;
 barthick_thick = 0.5* \interline;
+barthick_score = 0.13333* \interline;
 barthick_thin = 0.1*\interline;
 Can't be, these are ugly!  Changed to old (TeX) values.