From: Joe Neeman <joeneeman@gmail.com>
Date: Wed, 10 May 2006 10:37:12 +0000 (+0000)
Subject: * lily/paper-column-engraver.cc (make_columns):
X-Git-Tag: release/2.9.5~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7279e5754ac3b0f3c99018ae28ac7eb83a93fc79;p=lilypond.git

* 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 faead39c12..32f5d951c9 100644
--- 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 652ab1a1b7..7bc7c665ac 100644
--- 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 6c5c523123..128849f988 100644
--- 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)