From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 26 Jul 2006 11:57:22 +0000 (+0000)
Subject: * python/convertrules.py (conv): add rule.
X-Git-Tag: release/2.10.0-2~428
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cd41eab8352e5dbca217802ed965bf5c02561b42;p=lilypond.git

* python/convertrules.py (conv): add rule.

* lily/instrument-name-engraver.cc: shortVocalName iso. vocNam,
shortInstrumentName iso. instr.
---

diff --git a/ChangeLog b/ChangeLog
index 91450f9371..8f49cc7343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-26  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* python/convertrules.py (conv): add rule.
+
+	* lily/instrument-name-engraver.cc: shortVocalName iso. vocNam,
+	shortInstrumentName iso. instr.
+
 	* scm/output-ps.scm (dashed-line): add phase argument to
 	dashed-line.
 
diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 5a19610479..0375e40074 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -41,13 +41,13 @@ Instrument_name_engraver::process_music ()
   if (!text_spanner_)
     {
       SCM long_text = get_property ("instrument");
-      SCM short_text = get_property ("instr");
+      SCM short_text = get_property ("shortInstrumentName");
 
       if (!(Text_interface::is_markup (long_text)
 	    || Text_interface::is_markup (short_text)))
 	{
 	  long_text = get_property ("vocalName");
-	  short_text = get_property ("vocNam");
+	  short_text = get_property ("shortVocalName");
 	}
   
       if (Text_interface::is_markup (long_text)
@@ -115,9 +115,9 @@ ADD_TRANSLATOR (Instrument_name_engraver,
 		
 		/* read */
 		"currentCommandColumn "
-		"instr "
-		"instrument "
-		"vocNam "
+		"shortInstrumentName "
+		"instrumentName "
+		"shortVocalName "
 		"vocalName "
 		,
 
diff --git a/python/convertrules.py b/python/convertrules.py
index 1d128d38a7..af56792a70 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2824,3 +2824,10 @@ def conv (str):
 conversions.append (((2, 9, 11), conv, """\\set tupletNumberFormatFunction -> \\override #'text = """))
 
 
+def conv (str):
+    str = re.sub ('vocNam', 'shortVocalName', str)
+    str = re.sub (r'([^a-z])instr\s*=', r'\1shortInstrumentName =', str)
+    return str
+
+conversions.append (((2, 9, 13), conv, """instr -> shortInstrumentName, vocNam -> shortVocalName"""))
+
diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 9576f697fb..b97a71dbf4 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -252,9 +252,8 @@ selector for tab notation.")
      (implicitBassFigures ,list? "List of bass figures that are not
 printed as numbers, but only as extender lines.")
      
-     (instr ,markup? "See @code{instrument}")
 
-     (instrument ,markup? "The name to print left of a staff.  The
+     (instrumentName ,markup? "The name to print left of a staff.  The
 @code{instrument} property labels the staff in the first system, and
 the @code{instr} property labels following lines.")
      (instrumentEqualizer ,procedure? "
@@ -341,6 +340,8 @@ whether they are processed in this context.")
 than this, a number is printed. ")
      (shapeNoteStyles ,vector? "Vector of symbols, listing style for each note
 head relative to the tonic (qv.) of the scale.")
+     (shortInstrumentName ,markup? "See @code{instrument}")
+     (shortVocalName ,markup? "Name of a vocal line, short version.")
      (skipBars ,boolean? "If set to true, then
 skip the empty bars that are produced by multimeasure notes and rests.
 These bars will not appear on the printed output.  If not set (the
@@ -446,7 +447,6 @@ context names whose vertical axis groups should be taken into account for
 vertical spacing of systems.")
      
      (vocalName ,markup? "Name of a vocal line.")
-     (vocNam ,markup? "Name of a vocal line, short version.")
 
      (voltaOnThisStaff ,boolean?
 		       "Normally, volta brackets are put only on the