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.
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)
/* read */
"currentCommandColumn "
- "instr "
- "instrument "
- "vocNam "
+ "shortInstrumentName "
+ "instrumentName "
+ "shortVocalName "
"vocalName "
,
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"""))
+
(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? "
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
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