* scripts/convert-ly.py (FatalConversionError.conv): add #'() case

to 1.9.0 conversion.

* lily/mark-engraver.cc: doc string.

diff --git a/ChangeLog b/ChangeLog
index 9e7ab823ce11963edff23fee545e26923b91d0ba..cbb023fe7b084f5a661a3e0162b39e81e7cc10ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-03-26  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scripts/convert-ly.py (FatalConversionError.conv): add #'() case
+       to 1.9.0 conversion.
+       
+
+       * lily/mark-engraver.cc: doc string.
+
        * make/lilypond.redhat.spec.in (Group): add vim scriptlets.
 
        * Documentation/user/introduction.itely (Introduction): new node.

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 3aeda39292aa51167cf4059c8025fce1499c76d2..cea5a246e8016257ea917a6d293b8e4a41bb3897 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -116,7 +116,11 @@ Bar_number_engraver::create_items ()
 
 ENTER_DESCRIPTION (Bar_number_engraver,
 /* descr */       "A bar number is created whenever measurePosition is zero. It is\n"
-"put on top of all staves, and appears only at  left side of the staff.",
+                  "put on top of all staves, and appears only at  left side of the staff. "
+                  "The staves are taken from @code{stavesFound}, which is maintained by "
+                  "@code{@ref{Staff_collecting_engraver}}. "
+                  ,
+                  
 /* creats*/       "BarNumber",
 /* accepts */     "",
 /* acks  */      "break-aligned-interface",

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index ade82a0c23e3d84c8060e6b5539178f5ce70d3e6..aed555b91b169db89b40f8670c1142ebaca33d6e 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -25,8 +25,7 @@ class Mark_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Mark_engraver);
 protected:
-  Item* text_;
-  
+  Item *text_;
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
@@ -46,6 +45,7 @@ Mark_engraver::Mark_engraver ()
 {
   text_ =0;
   mark_ev_ = 0;
+  staff_ = 0;
 }
 
 void
@@ -68,7 +68,8 @@ Mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_property ("side-support-elements" , get_property ("stavesFound"));
+      SCM lst = get_property ("stavesFound");
+      text_->set_property ("side-support-elements" , lst);
       typeset_grob (text_);
       text_ =0;
     }
@@ -141,7 +142,13 @@ Mark_engraver::process_music ()
 }
 
 ENTER_DESCRIPTION (Mark_engraver,
-/* descr */       "",
+/* descr */       "This engraver will create RehearsalMark objects. "
+                  "It puts them on top of all staves (which is taken from "
+                  "the property @code{stavesFound}). If moving this engraver "
+                  "to a different context, "
+                  "@ref{Staff_collecting_engraver} must move along, otherwise all marks"
+                  "end up on the same Y-location"
+                  ,
 /* creats*/       "RehearsalMark",
 /* accepts */     "mark-event",
 /* acks  */       "bar-line-interface",

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 877121403b3cc30c16a56a36cb1f39cf283d8cc1..63c7b04aad7601e13884feb071cdb4b52c4373ce 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -108,7 +108,13 @@ Metronome_mark_engraver::process_music ()
 }
 
 ENTER_DESCRIPTION (Metronome_mark_engraver,
-/* descr */       "Engrave metro nome marking. This delegates the real work to the function in the metronomeMarkFormatter property",
+/* descr */       "Engrave metro nome marking. This delegates the formatting work "
+                  "to the function in the metronomeMarkFormatter property. "
+                  "The mark is put over all staves. "
+                  "The staves are taken from the @code{stavesFound} property, "
+                  "which is maintained by @code{@ref{Staff_collecting_engraver}}. "
+       
+                  ,
 /* creats*/       "MetronomeMark",
 /* accepts */     "metronome-change-event",
 /* acks  */       "time-signature-interface bar-line-interface",

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 649edd450c0db2a57870d6c580f2926c4addf827..5f31dc5b62ea58b847841bffb0af85fc77df7e30 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1424,10 +1424,12 @@ if 1:
                return str
        
        def conv (str):
+               str = re.sub (r"#'\(\)", "@SCM_EOL@", str)
                str =  conv_relative (str)
                str = sub_chords (str)
 
                str = articulation_substitute (str)
+               str = re.sub ("@SCM_EOL@", "#'()", str)
                
                return str