From 01d6bad0f5ca11314af398f7d59d1622a7744d1d Mon Sep 17 00:00:00 2001 From: hanwen Date: Thu, 10 Apr 2003 23:07:10 +0000 Subject: [PATCH] (stop_translation_timestep): add staff support. --- ChangeLog | 5 +++++ Documentation/user/macros.itexi | 4 ++-- buildscripts/lys-to-tely.py | 2 +- input/regression/multi-measure-rest-text.ly | 4 +++- lily/multi-measure-rest-engraver.cc | 8 ++++---- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d1e7887c5..9fceab5e5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-11 Han-Wen Nienhuys + + * lily/multi-measure-rest-engraver.cc (stop_translation_timestep): + add staff support. + 2003-04-10 Juergen Reuter * mf/parmesan-scripts.mf, Documentation/user/refman.itely, diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 65abb563c6..b3dc51087d 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -92,7 +92,7 @@ $\\flat$% @end macro @macro inputfileref{DIR,NAME} -@uref{../../../\DIR\/out-www/collated-files.html#\NAME\} +@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}} @end macro @end ifhtml @@ -103,7 +103,7 @@ $\\flat$% @cindex \NAME\ @end macro -@macro inputfileref{DIR,NAME} +@macro inputfileref{DIR,NAME}i @file{\DIR\/\NAME\} @end macro diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py index 14a998009b..b05de07417 100644 --- a/buildscripts/lys-to-tely.py +++ b/buildscripts/lys-to-tely.py @@ -76,7 +76,7 @@ if files: s = r""" @ifhtml @html - + @end html @end ifhtml """ % n diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 3f7bbdd01d..398a6305ee 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -7,10 +7,12 @@ Texts may be added to the multi measure rests. } \score { \notes { - \time 3/4 + \time 3/4 + \property Score.skipBars = ##t R2._\markup { \center << \musicglyph #"scripts-dfermata" \roman "Ad lib" >> } R2.^\fermataMarkup R2.^"4" + R2.*3_\markup { \roman "a1b2c3" } R2.*10^"inner"^"top"_"inner"_"bot" c2. }} diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index a79dd46055..09b81be760 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -209,11 +209,11 @@ Multi_measure_rest_engraver::stop_translation_timestep () { typeset_grob (last_rest_); - /* - huh ? add-staff-support ? - */ for (int i = 0; i < last_numbers_.size ();i++) - typeset_grob (last_numbers_[i]); + { + typeset_grob (last_numbers_[i]); + Side_position_interface::add_staff_support (last_numbers_[i]); + } } last_rest_ = 0; last_numbers_.clear(); -- 2.11.4.GIT