From 62a9de445822085c216c3de8d1057d661ea2452b Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 6 Dec 2000 12:08:31 +0100
Subject: [PATCH] patch::: 1.3.115.hwn1: problems in 1.3.115/placement of
 dynamics

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

* Bugfix: multi-measure rest ends, chords.
---
 CHANGES                          |  5 +++++
 VERSION                          |  2 +-
 lily/chord.cc                    |  3 ++-
 lily/instrument-name-engraver.cc | 25 ++++++++++---------------
 lily/parser.yy                   |  2 +-
 scm/translator-properties.scm    | 12 +++++++++++-
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/CHANGES b/CHANGES
index 743168d426..b6874de7a5 100644
--- 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 b94cd0f76c..989a449275 100644
--- 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 2aa4b0532e..a4e428e5d4 100644
--- 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 e903781f7e..ad7051f04c 100644
--- 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 5d6485132a..31894f773a 100644
--- 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 751081619a..b3e706a2da 100644
--- 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
-- 
2.39.5