# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1506291156 -3600
# Node ID 083d8fd4a7c32a5dd5cf0f81f5fb54dda1d7d717
# Parent  972d3dab11428ca26f4ffea6839d0eccdd1c58d6# Parent  5945a68b33a73c9a180fabab1005ff1cec2e2f54
Merge with upstream.

diff -r 5945a68b33a7 -r 083d8fd4a7c3 Session/InconnuDeLimoise.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Session/InconnuDeLimoise.abc	Sun Sep 24 23:12:36 2017 +0100
@@ -0,0 +1,11 @@
+X: 1
+T: Inconnu de Limoise, L'
+C: Maxou Heintzen
+M: 3/4
+L: 1/8
+Q: 1/4=104
+K: G
+D GA | B2 BB (3cBA | B3 B cd | c2 cB AG | A2 D2 GA |
+       B2 BB (3cBA | B3 B cd |c2 cB AG | A3 :|
+B cd | e2 gf ef | d2 dc BA | GF GA BG | D4 GF |
+       E2 EF GA | G2F2 E2 | [1 F2 FG AB | A3 :| [2 FE FG AB | G3 |]
diff -r 5945a68b33a7 -r 083d8fd4a7c3 abcfield.py
--- a/abcfield.py	Tue Sep 19 10:06:24 2017 +0100
+++ b/abcfield.py	Sun Sep 24 23:12:36 2017 +0100
@@ -137,7 +137,9 @@
     if p[1] == "":
         return t
     else:
-        return p[2].strip() + " " + p[0].strip()
+        first = p[2].strip()
+        second = p[0].strip()
+        return (first + " " if first.isalnum() else first) + second
 
 # Convert Key field from ABC to display, so G#dor->G# Dorian.
 def convertKeyToDisplay(t):