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

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

diff --git a/ChangeLog b/ChangeLog
index 91450f9371130a76052715eb4fd91a9939b97a8f..8f49cc7343504fce79413af51ec408bf1c12abee 100644 (file)
--- 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 5a196104794c80f419e32133c10fcd1862c65f5d..0375e400741c5f9db0572d845cf0934de3075c92 100644 (file)
--- 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 1d128d38a77188047e89bc72f1080d7aa856e9c4..af56792a702daa0c07d03679e7c30b2674367452 100644 (file)
--- 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 9576f697fbeba153390307b470f7eb2bdf7f5227..b97a71dbf4041ef70d464b397091a58ecc9790ce 100644 (file)
--- 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