typecheck barnumber.

* Documentation/topdocs/NEWS.tely (Top): doc new clipping feature

* input/regression/clip-systems.ly (Notes): new file.

* lily/paper-column-engraver.cc (stop_translation_timestep): set
rhythmic-location for paper column grobs.

diff --git a/ChangeLog b/ChangeLog
index df6663c9541a2c916722435bceafc6b14de65cbe..5ce6fa85550c7e379e61a8c7ff844811ac683abe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-12  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/paper-column-engraver.cc (stop_translation_timestep): also
+       typecheck barnumber.
+
        * scm/framework-ps.scm (dump-stencil-as-EPS): fix thinkos.
 
        * scm/lily.scm (type-p-name-alist): add rhythmic-location? type name.

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index dcb0f2e74ef99668a557584aa817969ed65c11c1..276d7363366755706393341ee41d2257b879e580 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -69,10 +69,10 @@ which scares away people.
 @item By defining a clip region, a cutout EPS file of a number of measures
 may be generated from the complete score.  Hence, it is no longer
 necessary to create separate files to create extracts of (long)
-scores.
+scores.  An example is shown in
+@file{input/regression/clip-systems.ly}.
 
-An example is shown in @file{input/regression/clip-systems.ly}. This
-feature was sponsored by Rick Hansen.
+This feature was sponsored by Rick Hansen.
 
 
 @item Lyric texts may include tie symbols by using the @code{~}

diff --git a/input/regression/clip-systems.ly b/input/regression/clip-systems.ly
index 1893821eeed89452301d90edbbeb527d3ce815aa..b86f9ac118cb712039affbe23606ba607545ee85 100644 (file)
--- a/input/regression/clip-systems.ly
+++ b/input/regression/clip-systems.ly
@@ -13,7 +13,8 @@ This file needs to be run separately with @code{-dclip-systems}; the
 collated-files.html of the regression test does not adequately show
 the results.
 
-The result will be files named @file{@var{base}-system-@var{systemnumber}-@var{start}-@var{end}.eps}.
+The result will be files named
+@file{@var{base}-system-@var{systemnumber}-@var{start}-@var{end}.eps}.
 
 "
 

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 1bc0c6b0e506f3a22f891029576f75fa9dc71c40..cdf2e500e57d89b3f7ca5e47e10de89d0a5f06df 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -205,9 +205,11 @@ Paper_column_engraver::stop_translation_timestep ()
 
 
   SCM mpos = get_property ("measurePosition");
-  if (unsmob_moment (mpos))
+  SCM barnum = get_property ("internalBarNumber"),
+  if (unsmob_moment (mpos)
+      && scm_is_integer (barnum))
     {
-      SCM where = scm_cons (get_property ("internalBarNumber"),
+      SCM where = scm_cons (barnum,
                            mpos);
 
       command_column_->set_property ("rhythmic-location", where);