(stop_translation_timestep): set

line-break-permission if forbidBreak is not set.

diff --git a/ChangeLog b/ChangeLog
index 5e3a079623924f8ef3b092f527a367c59c37050a..f278b8df07d164664c4078542e96d66415bcef18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/paper-column-engraver.cc (stop_translation_timestep): set
+       line-break-permission if forbidBreak is not set.
+       
 2006-05-09  Joe Neeman  <joeneeman@gmail.com>
 
        * scm/define-context-properties.scm:
@@ -181,10 +186,10 @@
 2006-05-03  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * stepmake/aclocal.m4: run python-config for crosscompiling
-       flags. Backportme.
+       flags. 
 
        * scripts/lilypond-book.py (Lilypond_file_snippet.my_system): add
-       -f png for HTML, TEXINFO formats. Backportme.
+       -f png for HTML, TEXINFO formats. 
 
        * input/tutorial/lbook-html-test.html: new file.
 
@@ -195,13 +200,13 @@
        * flower/include/tuple.hh (struct Tuple2): new file.
 
        * mf/GNUmakefile (FC_FIND): new function. Find ncsb using
-       $(FCMATCH), only if $(NCSB_DIR) not set. Backportme.
+       $(FCMATCH), only if $(NCSB_DIR) not set. 
 
        * configure.in (LINK_GXX_STATICALLY): only warn if $NCSB_DIR set.
 
-       * config.make.in (DOCUMENTATION): set FCMATCH. Backportme. 
+       * config.make.in (DOCUMENTATION): set FCMATCH.  
 
-       * autogen.sh (srcdir): don't set --with-ncsb-dir. Backportme.
+       * autogen.sh (srcdir): don't set --with-ncsb-dir. 
 
 2006-05-03  Graham Percival  <gpermus@gmail.com>
 

diff --git a/configure.in b/configure.in
index 1a52aced05c45edc7c6e8ad24b6008a1337cf3b3..9d831c8d035dfbf9c421911e0b308c4fa6e61ec4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,7 @@ AC_ARG_ENABLE(gui,
 AC_ARG_WITH(ncsb-dir,
     [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
     [NCSB_DIR=$withval],
-    )
+    [NCSB_DIR=""])
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 603a5b19671147c3aff4361d4d9ef1c9699d5607..38efaaaf2d644c9d0f2a725fc0a45e6cf5c73bf1 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -186,8 +186,11 @@ Paper_column_engraver::stop_translation_timestep ()
 
   if (to_boolean (get_property ("forbidBreak")))
     command_column_->set_property ("line-break-permission", SCM_EOL);
-  else if (Paper_column::is_breakable (command_column_))
+  else
     {
+      if (!Paper_column::is_breakable (command_column_))
+       command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
+      
       breaks_++;
       last_breakable_column_ = command_column_;
       last_breakable_moment_ = now_mom ();
@@ -207,8 +210,8 @@ Paper_column_engraver::stop_translation_timestep ()
        }
     }
 
-  context ()->get_score_context ()->unset_property ( ly_symbol2scm ("forbidBreak"));
-  context ()->get_score_context ()->unset_property ( ly_symbol2scm ("allowPageTurn"));
+  context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak"));
+  context ()->get_score_context ()->unset_property (ly_symbol2scm ("allowPageTurn"));
 
   first_ = false;
   break_events_.clear ();

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index e1671a57de6097a9151eabe396d700d62334f2d6..dab7129e5ef4deb957434a14f8462097e50a7aa8 100644 (file)
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -273,4 +273,5 @@ ADD_TRANSLATOR (Percent_repeat_engraver,
                "countPercentRepeats",
 
                /* write */
-    "forbidBreak");
+               "forbidBreak "
+               );