Replace staccatissimo shorthand -| with -!

The bar line character is used too prominently, and ! seems more appropriate.

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index c2ada64c4b55e6a55162c73c0071c5cf02d6bd63..f32e9fece89106b6015aed22e73dad52bb362b8f 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -61,6 +61,10 @@ which scares away people.
 
 @end ignore
 
+@item
+The articulation shorthand for @code{\staccatissimo} has been
+renamed from @code{-|} to@tie{}@code{-!}.
+
 @item
 Tempo change ranges are now written as @code{\tempo 4 = 60 - 68}
 rather than @code{\tempo 4 = 60 ~ 68}.

diff --git a/lily/parser.yy b/lily/parser.yy
index 3a64654197fd7ac4ba0fb86463a33dedcec5443c..ed9c90f907ee16f325d49d8d158a7af67e525198 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2800,8 +2800,8 @@ script_abbreviation:
        | '-'           {
                $$ = scm_from_locale_string ("Dash");
        }
-       | '|'           {
-               $$ = scm_from_locale_string ("Bar");
+       | '!'           {
+               $$ = scm_from_locale_string ("Bang");
        }
        | ANGLE_CLOSE   {
                $$ = scm_from_locale_string ("Larger");

diff --git a/python/convertrules.py b/python/convertrules.py
index 6f0a0f1a04771beeca1c7fcc60b3ba6cb7ad0ebe..e2acf4e26617f5a3cfdda0cdf07c518c43424b96 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3591,7 +3591,8 @@ def conv(str):
                   r"\1", str)
     return str
 
-@rule((2, 17, 25), r'''\tempo 4. = 50~60 -> \tempo 4. = 50-60''')
+@rule((2, 17, 25), r'''\tempo 4. = 50~60 -> \tempo 4. = 50-60
+-| -> -!''')
 def conv(str):
 #  This goes for \tempo commands ending with a range, like
 #  = 50 ~ 60
@@ -3599,6 +3600,14 @@ def conv(str):
 #  complete syntax has a large number of variants, and this is quite
 #  unlikely to occur in other contexts
     str = re.sub (r"(=\s*[0-9]+\s*)~(\s*[0-9]+\s)", r"\1-\2", str)
+# Match strings, and articulation shorthands that end in -^_
+# so that we leave alone -| in quoted strings and c4--|
+    def subnonstring(m):
+        if m.group (1):
+            return m.group (1)+"!"
+        return m.group (0)
+    str = re.sub (r"([-^_])\||" + matchstring + r"|[-^_][-^_]", subnonstring, str)
+    str = re.sub (r"\bdashBar\b", "dashBang", str)
     return str
 
 # Guidelines to write rules (please keep this at the end of this file)

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index ccbeee6ad6275223aa13b6b9a52a604dfa59f103..bafa57200d313e11a084b59ee053daff4bd50932 100644 (file)
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -179,7 +179,7 @@ expression."
             ((marcato) "^")
             ((stopped) "+")
             ((tenuto)    "-")
-            ((staccatissimo) "|")
+            ((staccatissimo) "!")
             ((accent) ">")
             ((staccato) ".")
             ((portato) "_")

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 8738b2a073bc591281882f3a82cbe861636be311..ec827b5d3992ebabe4648ea973aff6d1ac8e1fac 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -1167,7 +1167,7 @@ articulations_dict = {
     #"shake": "?",
     "snap-pizzicato": "snappizzicato",
     #"spiccato": "?",
-    "staccatissimo": (musicexp.ShortArticulationEvent, "|"), # or "staccatissimo"
+    "staccatissimo": (musicexp.ShortArticulationEvent, "!"), # or "staccatissimo"
     "staccato": (musicexp.ShortArticulationEvent, "."), # or "staccato"
     "stopped": (musicexp.ShortArticulationEvent, "+"), # or "stopped"
     #"stress": "?",