patch::: 1.3.115.hwn1: problems in 1.3.115/placement of dynamics

1.3.115.hwn1
============

* Bugfix: multi-measure rest ends, chords.

diff --git a/CHANGES b/CHANGES
index 743168d42661544ef835cf30d95285b8bda7c10a..b6874de7a5f83a147b2222870c8909799e64663b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+1.3.115.hwn1
+============
+
+* Bugfix: multi-measure rest ends, chords. 
 
 1.3.114.mb1
 ===========
@@ -16,6 +20,7 @@
 ============
 
 * abc2ly fixes
+
        * allow a g_8 clef to be specified by treble8
 
        * allow full mode names, as well as 3 character abbreviations

diff --git a/VERSION b/VERSION
index b94cd0f76c0ba9e25bff2be4e523826adde4381e..989a44927551134b3e4dd65f47dbd46f1aca3e52 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=115
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/chord.cc b/lily/chord.cc
index 2aa4b0532eba2cae3b9bd43a6061908d0e4236fe..a4e428e5d4ffc75c381fb130a4cac4e15c6ff1b0 100644 (file)
--- a/lily/chord.cc
+++ b/lily/chord.cc
@@ -415,7 +415,8 @@ Chord::get_chord (SCM tonic, SCM add, SCM sub, SCM inversion, SCM bass, SCM dur)
       scm_unprotect_object (n->self_scm ());
     }
 
-  Simultaneous_music*v = new Request_chord (list);
+  Simultaneous_music*v = new Request_chord (SCM_EOL);
+  v->set_mus_property ("elements", list);
 
   return v;
 }

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index e903781f7e113003a1d65573bb81144c6cb0df86..ad7051f04c9422051fa7b3e6686b1e7aa12109c3 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -47,23 +47,16 @@ Instrument_name_engraver::stop_translation_timestep ()
     }
 }
 
-/*
-  FIXME: use different mechanics, and use a markup-p function?
- */
 void
 Instrument_name_engraver::create_text (SCM txt)
 {
   if(!text_)
     {
       text_ = new Item (get_property ("InstrumentName"));
-      if (txt != SCM_EOL)
-        {
-          text_->set_grob_property ("text", txt);
-        }
-      else if (text_->get_grob_property ("text") == SCM_EOL)
-        {
-          return;
-        }
+      
+      if (text_->get_grob_property ("text") != txt)
+       text_->set_grob_property ("text", txt);
+     
       if (delim_)
         text_->set_parent (delim_, Y_AXIS);
       
@@ -81,10 +74,12 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
       if (now_mom () > Moment (0))
        s = get_property ("instr");
 
-      //      if (gh_string_p (s))
-      //       {
-         create_text (s);
-         //    }
+      /*
+       FIXME: use markup_p () to check type.
+      */
+      if (gh_string_p (s))
+       create_text (s);
+         
     }
 
   if (Align_interface::has_interface (i.elem_l_)

diff --git a/lily/parser.yy b/lily/parser.yy
index 5d6485132af54fa428aafb6f98db879f71bd7d8e..31894f773af4f229d97c2e84af3b89edb2a6633e 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1624,7 +1624,7 @@ FIXME: location is one off, since ptich & duration don't contain origin refs.
                Request_chord * rqc2 = new Request_chord (SCM_EOL);
                rqc2->set_mus_property ("elements", gh_list (sk->self_scm (), SCM_UNDEFINED));;
                Request_chord * rqc3 = new Request_chord(SCM_EOL);
-               rqc2->set_mus_property ("elements", gh_list (sp2->self_scm (), SCM_UNDEFINED));;
+               rqc3->set_mus_property ("elements", gh_list (sp2->self_scm (), SCM_UNDEFINED));;
 
                SCM ms = gh_list (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
 

diff --git a/scm/translator-properties.scm b/scm/translator-properties.scm
index 751081619adaf81ef5cc0e87099ea700e7a931c7..b3e706a2daa60adc791410e07bebd70b70352f80 100644 (file)
--- a/scm/translator-properties.scm
+++ b/scm/translator-properties.scm
@@ -60,7 +60,17 @@ The head of the list:
     )
 
 @end example")
-(translator-property-description 'automaticPhrasing boolean? "")
+(translator-property-description 'automaticPhrasing boolean? " If set,
+the @ref{Lyric_phrasing_engraver} will match note heads of context
+called Voice X to syllables from LyricsVoice called
+X-<something>. This feature is turned on by default. See the example
+file @file{lyrics-multi-stanza.ly}.
+
+")
+(translator-property-description 'automaticMelismata boolean? " If
+set, \addlyrics will assume that beams, slurs and ties signal
+melismata, and align lyrics accordingly.
+")
 (translator-property-description 'barAlways boolean? " If set to true a bar line is drawn after each note.
 ")
 (translator-property-description 'barCheckNoSynchronize boolean? "If set, don't reset measurePosition when finding a bbarcheck. This