* lily/paper-column-engraver.cc (make_columns):

* scm/define-grobs.scm: Revert my previous change and set the default
in define-grobs.scm instead.

diff --git a/ChangeLog b/ChangeLog
index faead39c123184c60aeb851fb63a244470e80d51..32f5d951c93c2f4d2ff4b7f298b6c623ed626d91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-10  Joe Neeman  <joeneeman@gmail.com>
+
+       * lily/paper-column-engraver.cc (make_columns):
+       * scm/define-grobs.scm: Revert my previous change and set the default
+       in define-grobs.scm instead.
+
 2006-05-09  Graham Percival  <gpermus@gmail.com>
        
        * Documentation/user/changing-defaults.itely: general editing.

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 652ab1a1b757d9fb7a6df12c1605362957058cf1..7bc7c665ac1798d978ee09c17e248965c2bf4952 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -57,7 +57,6 @@ Paper_column_engraver::make_columns ()
   SCM m = now_mom ().smobbed_copy ();
   p1->set_property ("when", m);
   p2->set_property ("when", m);
-  p1->set_property ("line-break-permission", ly_symbol2scm ("allow"));
 
   set_columns (p1, p2);
 }
@@ -187,7 +186,7 @@ Paper_column_engraver::stop_translation_timestep ()
 
   if (to_boolean (get_property ("forbidBreak")))
     command_column_->set_property ("line-break-permission", SCM_EOL);
-  else
+  else if (Paper_column::is_breakable (command_column_))
     {
       breaks_++;
       last_breakable_column_ = command_column_;

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 6c5c5231232d7b328cf9ae66dd1ab6aac096d43a..128849f988de2ea9e2fa9ecff7841885f89eb69d 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1102,6 +1102,7 @@
        ;;                    (stencil . ,ly:paper-column::print)
        
        (non-musical . #t)
+       (line-break-permission . allow)
 
        ;; debugging stuff: print column number.
        ;;               (font-size . -6) (font-name . "sans")  (Y-extent . #f)