From: David Kastrup Date: Wed, 28 Jul 2010 13:49:48 +0000 (+0200) Subject: feta-accordion.mf, convertrules.py, musicxml2ly.py, accordion-discant-symbols.ly... X-Git-Tag: release/2.13.29-1~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=80845aa7b708c38add3209c1c0f36089e679b1ab;p=lilypond.git feta-accordion.mf, convertrules.py, musicxml2ly.py, accordion-discant-symbols.ly: sanitize accordion symbol names Symbol names like "accordion.accStdbase" are turned into "accordion.stdbass" in order to get more consistent and obvious names. Conversion rule is provided as well, and the single snippet is adapted. --- diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly index 887d00f9fc..44ca416712 100644 --- a/Documentation/snippets/accordion-discant-symbols.ly +++ b/Documentation/snippets/accordion-discant-symbols.ly @@ -35,10 +35,10 @@ vertical placement of the symbols can be tweaked by changing the } % begin verbatim discant = \markup { - \musicglyph #"accordion.accDiscant" + \musicglyph #"accordion.discant" } dot = \markup { - \musicglyph #"accordion.accDot" + \musicglyph #"accordion.dot" } \layout { ragged-right = ##t } diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf index 1a9e3625d9..3920e36c4d 100644 --- a/mf/feta-accordion.mf +++ b/mf/feta-accordion.mf @@ -30,7 +30,7 @@ accreg_lh# := 1.0 staff_space#; define_pixels (accreg_dot_size, accreg_linethickness, accreg_lh); -fet_beginchar ("accDiscant", "accDiscant") +fet_beginchar ("accordion register discant", "discant") save r, pat, lh, lt; path pat; @@ -101,7 +101,7 @@ fet_beginchar ("accDiscant", "accDiscant") fet_endchar; -fet_beginchar ("accDot", "accDot") +fet_beginchar ("accordion register dot", "dot") set_char_box (accreg_dot_size# / 2, accreg_dot_size# / 2, accreg_dot_size# / 2, accreg_dot_size# / 2); @@ -114,7 +114,7 @@ fet_beginchar ("accDot", "accDot") fet_endchar; -fet_beginchar ("accFreebase", "accFreebase") +fet_beginchar ("accordion register freebass", "freebass") save r, lh, lt; r# = accreg_lh#; @@ -171,7 +171,7 @@ fet_beginchar ("accFreebase", "accFreebase") fet_endchar; -fet_beginchar ("accStdbase", "accStdbase") +fet_beginchar ("accordion register stdbass", "stdbass") save r, p, lh, lt; path pat; @@ -244,7 +244,7 @@ fet_beginchar ("accStdbase", "accStdbase") fet_endchar; -fet_beginchar ("accBayanbase", "accBayanbase") +fet_beginchar ("accordion register bayanbass", "bayanbass") save lh, lt; lh = vround accreg_lh; @@ -372,7 +372,7 @@ def def_some_vars = enddef; -fet_beginchar ("accOldEE", "accOldEE") +fet_beginchar ("accordion oldEE", "oldEE") save r, pp, ir, lh, lt, stroke_width; r# = staff_space#; @@ -452,7 +452,7 @@ fet_beginchar ("accOldEE", "accOldEE") fi; fet_endchar; -fet_beginchar ("Accordion push", "push"); +fet_beginchar ("accordion push", "push"); save width, height; height# := 2.0 staff_space# + 3.0 stafflinethickness#; @@ -489,7 +489,7 @@ fet_beginchar ("Accordion push", "push"); fet_endchar; -fet_beginchar ("Accordion pull", "pull"); +fet_beginchar ("accordion pull", "pull"); save width, height; height# := 2.0 staff_space# + 3.0 stafflinethickness#; diff --git a/python/convertrules.py b/python/convertrules.py index 673d04d478..05bdbd8137 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -3006,8 +3006,22 @@ def conv (str): return str @rule ((2, 13, 29), - _ ("Eliminate beamSettings, beatLength, \setBeatGrouping, \overrideBeamSettings and \revertBeamSettings")) + _ ("Eliminate beamSettings, beatLength, \setBeatGrouping, \overrideBeamSettings and \revertBeamSettings\n\ +\"accordion.accEtcbase\" -> \"accordion.etcbass\"")) def conv(str): + def sub_acc (m): + d = { + 'Dot': 'dot', + 'Discant': 'discant', + 'Bayanbase': 'bayanbass', + 'Stdbase': 'stdbass', + 'Freebase': 'freebass', + 'OldEE': 'oldEE' + } + return '"accordion.%s"' % d[m.group (1)] + + str = re.sub (r'"accordion\.acc([a-zA-Z]+)"', + sub_acc, str) if re.search(r'overrideBeamSettings', str): stderr_write("\n") stderr_write(NOT_SMART % _("\overrideBeamSettings. Use \set beamExceptions or \overrideTimeSignatureSettings.\n")) diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index 7e8dbbae02..2f4b807080 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -1409,7 +1409,7 @@ def musicxml_accordion_to_markup (mxl_event): if high: commandname += "H" command += """\\combine - \\raise #2.5 \\musicglyph #\"accordion.accDot\" + \\raise #2.5 \\musicglyph #\"accordion.dot\" """ middle = mxl_event.get_maybe_exist_named_child ('accordion-middle') if middle: @@ -1423,32 +1423,32 @@ def musicxml_accordion_to_markup (mxl_event): if txt == 3: commandname += "MMM" command += """\\combine - \\raise #1.5 \\musicglyph #\"accordion.accDot\" + \\raise #1.5 \\musicglyph #\"accordion.dot\" \\combine - \\raise #1.5 \\translate #(cons 1 0) \\musicglyph #\"accordion.accDot\" + \\raise #1.5 \\translate #(cons 1 0) \\musicglyph #\"accordion.dot\" \\combine - \\raise #1.5 \\translate #(cons -1 0) \\musicglyph #\"accordion.accDot\" + \\raise #1.5 \\translate #(cons -1 0) \\musicglyph #\"accordion.dot\" """ elif txt == 2: commandname += "MM" command += """\\combine - \\raise #1.5 \\translate #(cons 0.5 0) \\musicglyph #\"accordion.accDot\" + \\raise #1.5 \\translate #(cons 0.5 0) \\musicglyph #\"accordion.dot\" \\combine - \\raise #1.5 \\translate #(cons -0.5 0) \\musicglyph #\"accordion.accDot\" + \\raise #1.5 \\translate #(cons -0.5 0) \\musicglyph #\"accordion.dot\" """ elif not txt <= 0: commandname += "M" command += """\\combine - \\raise #1.5 \\musicglyph #\"accordion.accDot\" + \\raise #1.5 \\musicglyph #\"accordion.dot\" """ low = mxl_event.get_maybe_exist_named_child ('accordion-low') if low: commandname += "L" command += """\\combine - \\raise #0.5 \musicglyph #\"accordion.accDot\" + \\raise #0.5 \musicglyph #\"accordion.dot\" """ - command += "\musicglyph #\"accordion.accDiscant\"" + command += "\musicglyph #\"accordion.discant\"" command = "\\markup { \\normalsize %s }" % command # Define the newly built command \accReg[H][MMM][L] additional_definitions[commandname] = "%s = %s" % (commandname, command)