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

[lilypond.git] / lily / instrument-name-engraver.cc

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 "
                ,