(stop_translation_timestep):

add staff support.

diff --git a/ChangeLog b/ChangeLog
index 5d1e7887c544889f1f492a99d18f491208dd681a..9fceab5e5eaa920199977ca5c31f03375fa1960c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-11  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/multi-measure-rest-engraver.cc (stop_translation_timestep):
+       add staff support.
+
 2003-04-10  Juergen Reuter  <reuter@ipd.uka.de>
 
        * mf/parmesan-scripts.mf, Documentation/user/refman.itely,

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 65abb563c6e989f55eaa1cae953f67b0067be855..b3dc51087d372cb2e16c5e7dba433f8e1467f245 100644 (file)
--- 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 14a998009bdd63a244fbc5ba9f1da650d719ebc9..b05de0741760589a7ab96bdf5bf25a89cd7a93fc 100644 (file)
--- a/buildscripts/lys-to-tely.py
+++ b/buildscripts/lys-to-tely.py
@@ -76,7 +76,7 @@ if files:
                s = r"""
 @ifhtml
 @html
-<NAME="%s">
+<A NAME="%s">
 @end html
 @end ifhtml
 """ % n

diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index 3f7bbdd01dc705844c119d9db3845bf9121408bf..398a6305ee5c113f6cb3d1c9b2582d7ee974c2cb 100644 (file)
--- 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 a79dd460554a1bdd0a5b46dfff69610ec64ece17..09b81be76006c8f15f8d17378254f9cba42b02c2 100644 (file)
--- 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();