Do not use 'unsafe' tipa shortcuts

Turns out they are, well, unsafe (i.e. conflict with existing 'core' macros).

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 24a11fa69642dc9115d2ec0335f624e6e3d9e0c2..cb765623558cbe0e9855fc221ede39095c8cd7f8 100644 (file)
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -489,11 +489,11 @@
 0x0250 "\\textturna"              "tipa" "force,tipashortcut=5" # LATIN SMALL LETTER TURNED A
 0x0251 "\\textscripta"            "tipa" "force,tipashortcut=A" # LATIN SMALL LETTER ALPHA
 0x0252 "\\textturnscripta"        "tipa" "force,tipashortcut=6" # LATIN SMALL LETTER TURNED ALPHA
-0x0253 "\\texthtb"                "tipa" "force,tipashortcut=\\!b" # LATIN SMALL LETTER B WITH HOOK
+0x0253 "\\texthtb"                "tipa" "force" # LATIN SMALL LETTER B WITH HOOK
 0x0254 "\\textopeno"              "tipa" "force,tipashortcut=O" # LATIN SMALL LETTER OPEN O
 0x0255 "\\textctc"                "tipa" "force,tipashortcut=C" # LATIN SMALL LETTER C WITH CURL
-0x0256 "\\textrtaild"             "tipa" "force,tipashortcut=\\:d" # LATIN SMALL LETTER D WITH TAIL
-0x0257 "\\texthtd"                "tipa" "force,tipashortcut=\\!d" # LATIN SMALL LETTER D WITH HOOK
+0x0256 "\\textrtaild"             "tipa" "force" # LATIN SMALL LETTER D WITH TAIL
+0x0257 "\\texthtd"                "tipa" "force" # LATIN SMALL LETTER D WITH HOOK
 0x0258 "\\textreve"               "tipa" "force,tipashortcut=9" # LATIN SMALL LETTER REVERSED E
 0x0259 "\\textschwa"              "tipa" "force,tipashortcut=@" # LATIN SMALL LETTER SCHWA
 0x025a "\\textrhookschwa"         "tipa" "force" # LATIN SMALL LETTER SCHWA WITH HOOK
@@ -502,9 +502,9 @@
 0x025d "\\textrhookrevepsilon"    "tipa" "force" # LATIN SMALL LETTER REVERSED OPEN E WITH HOOK
 0x025e "\\textcloserevepsilon"    "tipa" "force" # LATIN SMALL LETTER CLOSED REVERSED OPEN E
 0x025f "\\textbardotlessj"        "tipa" "force" # LATIN SMALL LETTER DOTLESS J WITH STROKE
-0x0260 "\\texthtg"                "tipa" "force,tipashortcut=\\!g" # LATIN SMALL LETTER G WITH HOOK
+0x0260 "\\texthtg"                "tipa" "force" # LATIN SMALL LETTER G WITH HOOK
 0x0261 "\\textscriptg"            "tipa" "force" # LATIN SMALL LETTER SCRIPT G
-0x0262 "\\textscg"                "tipa" "force,tipashortcut=\\;G" # LATIN LETTER SMALL CAPITAL G
+0x0262 "\\textscg"                "tipa" "force" # LATIN LETTER SMALL CAPITAL G
 0x0263 "\\textgamma"              "tipa" "force,tipashortcut=G" # LATIN SMALL LETTER GAMMA
 0x0264 "\\textramshorns"          "tipa" "force,tipashortcut=7" # LATIN SMALL LETTER RAMS HORN
 0x0265 "\\textturnh"              "tipa" "force,tipashortcut=4" # LATIN SMALL LETTER TURNED H
@@ -515,42 +515,42 @@
 0x026a "\\textsci"                "tipa" "force,tipashortcut=I" # LATIN LETTER SMALL CAPITAL I
 0x026b "\\textltilde"             "tipa" "force" # LATIN SMALL LETTER L WITH MIDDLE TILDE
 0x026c "\\textbeltl"              "tipa" "force" # LATIN SMALL LETTER L WITH BELT
-0x026d "\\textrtaill"             "tipa" "force,tipashortcut=\\:l" # LATIN SMALL LETTER L WITH RETROFLEX HOOK
+0x026d "\\textrtaill"             "tipa" "force" # LATIN SMALL LETTER L WITH RETROFLEX HOOK
 0x026e "\\textlyoghlig"           "tipa" "force" # LATIN SMALL LETTER LEZH
 0x026f "\\textturnm"              "tipa" "force,tipashortcut=W" # LATIN SMALL LETTER TURNED M
 0x0270 "\\textturnmrleg"          "tipa" "force" # LATIN SMALL LETTER TURNED M WITH LONG LEG
 0x0271 "\\textltailm"             "tipa" "force,tipashortcut=M" # LATIN SMALL LETTER M WITH HOOK
 0x0272 "\\textltailn"             "tipa" "force" # LATIN SMALL LETTER N WITH LEFT HOOK
-0x0273 "\\textrtailn"             "tipa" "force,tipashortcut=\\:n" # LATIN SMALL LETTER N WITH RETROFLEX HOOK
-0x0274 "\\textscn"                "tipa" "force,tipashortcut=\\;N" # LATIN LETTER SMALL CAPITAL N
+0x0273 "\\textrtailn"             "tipa" "force" # LATIN SMALL LETTER N WITH RETROFLEX HOOK
+0x0274 "\\textscn"                "tipa" "force" # LATIN LETTER SMALL CAPITAL N
 0x0275 "\\textbaro"               "tipa" "force,tipashortcut=8" # LATIN SMALL LETTER BARRED O
 0x0276 "\\textscoelig"            "tipa" "force" # LATIN LETTER SMALL CAPITAL OE
 0x0277 "\\textcloseomega"         "tipa" "force" # LATIN SMALL LETTER CLOSED OMEGA
 0x0278 "\\textphi"                "tipa" "force,tipashortcut=F" # LATIN SMALL LETTER PHI
-0x0279 "\\textturnr"              "tipa" "force,tipashortcut=\\*r" # LATIN SMALL LETTER TURNED R
+0x0279 "\\textturnr"              "tipa" "force" # LATIN SMALL LETTER TURNED R
 0x027a "\\textturnlonglegr"       "tipa" "force" # LATIN SMALL LETTER TURNED R WITH LONG LEG
-0x027b "\\textturnrrtail"         "tipa" "force,tipashortcut=\\:R" # LATIN SMALL LETTER TURNED R WITH HOOK
+0x027b "\\textturnrrtail"         "tipa" "force" # LATIN SMALL LETTER TURNED R WITH HOOK
 0x027c "\\textlonglegr"           "tipa" "force" # LATIN SMALL LETTER R WITH LONG LEG
-0x027d "\\textrtailr"             "tipa" "force,tipashortcut=\\:r" # LATIN SMALL LETTER R WITH TAIL
+0x027d "\\textrtailr"             "tipa" "force" # LATIN SMALL LETTER R WITH TAIL
 0x027e "\\textfishhookr"          "tipa" "force,tipashortcut=R" # LATIN SMALL LETTER R WITH FISHHOOK
 0x027f "\\textlhti"               "tipx" "force" # LATIN SMALL LETTER REVERSED R WITH FISHHOOK
-0x0280 "\\textscr"                "tipa" "force,tipashortcut=\\;R" # LATIN LETTER SMALL CAPITAL R
+0x0280 "\\textscr"                "tipa" "force" # LATIN LETTER SMALL CAPITAL R
 0x0281 "\\textinvscr"             "tipa" "force,tipashortcut=K" # LATIN LETTER SMALL CAPITAL INVERTED R
-0x0282 "\\textrtails"             "tipa" "force,tipashortcut=\\:s" # LATIN SMALL LETTER S WITH HOOK
+0x0282 "\\textrtails"             "tipa" "force" # LATIN SMALL LETTER S WITH HOOK
 0x0283 "\\textesh"                "tipa" "force,tipashortcut=S" # LATIN SMALL LETTER ESH
-0x0284 "\\texthtbardotlessj"      "tipa" "force,tipashortcut=\\!j" # LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK
+0x0284 "\\texthtbardotlessj"      "tipa" "force" # LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK
 0x0285 "\\textlooptoprevesh"      "tipx" "force" # LATIN SMALL LETTER SQUAT REVERSED ESH
 0x0286 "\\textctesh"              "tipa" "force" # LATIN SMALL LETTER ESH WITH CURL
-0x0287 "\\textturnt"              "tipa" "force,tipashortcut=\\*t" # LATIN SMALL LETTER TURNED T
-0x0288 "\\textrtailt"             "tipa" "force,tipashortcut=\\:t" # LATIN SMALL LETTER T WITH RETROFLEX HOOK
+0x0287 "\\textturnt"              "tipa" "force" # LATIN SMALL LETTER TURNED T
+0x0288 "\\textrtailt"             "tipa" "force" # LATIN SMALL LETTER T WITH RETROFLEX HOOK
 0x0289 "\\textbaru"               "tipa" "force" # LATIN SMALL LETTER U BAR
 0x028a "\\textupsilon"            "tipa" "force,tipashortcut=U" # LATIN SMALL LETTER UPSILON
 0x028b "\\textscriptv"            "tipa" "force,tipashortcut=V" # LATIN SMALL LETTER V WITH HOOK
 0x028c "\\textturnv"              "tipa" "force,tipashortcut=2" # LATIN SMALL LETTER TURNED V
-0x028d "\\textturnw"              "tipa" "force,tipashortcut=\\*w" # LATIN SMALL LETTER TURNED W
+0x028d "\\textturnw"              "tipa" "force" # LATIN SMALL LETTER TURNED W
 0x028e "\\textturny"              "tipa" "force,tipashortcut=L" # LATIN SMALL LETTER TURNED Y
 0x028f "\\textscy"                "tipa" "force,tipashortcut=Y" # LATIN LETTER SMALL CAPITAL Y
-0x0290 "\\textrtailz"             "tipa" "force,tipashortcut=\\:z" # LATIN SMALL LETTER Z WITH RETROFLEX HOOK
+0x0290 "\\textrtailz"             "tipa" "force" # LATIN SMALL LETTER Z WITH RETROFLEX HOOK
 0x0291 "\\textctz"                "tipa" "force" # LATIN SMALL LETTER Z WITH CURL
 0x0292 "\\textyogh"               "tipa" "force,tipashortcut=Z" # LATIN SMALL LETTER EZH
 0x0293 "\\textctyogh"             "tipa" "force" # LATIN SMALL LETTER EZH WITH CURL
@@ -558,14 +558,14 @@
 0x0295 "\\textrevglotstop"        "tipa" "force,tipashortcut=Q" # LATIN LETTER PHARYNGEAL VOICED FRICATIVE
 0x0296 "\\textinvglotstop"        "tipa" "force" # LATIN LETTER INVERTED GLOTTAL STOP
 0x0297 "\\textstretchc"           "tipa" "force" # LATIN LETTER STRETCHED C
-0x0298 "\\textbullseye"           "tipa" "force,tipashortcut=\\!o" # LATIN LETTER BILABIAL CLICK
-0x0299 "\\textscb"                "tipa" "force,tipashortcut=\\;B" # LATIN LETTER SMALL CAPITAL B
+0x0298 "\\textbullseye"           "tipa" "force" # LATIN LETTER BILABIAL CLICK
+0x0299 "\\textscb"                "tipa" "force" # LATIN LETTER SMALL CAPITAL B
 0x029a "\\textcloseepsilon"       "tipa" "force" # LATIN SMALL LETTER CLOSED OPEN E
-0x029b "\\texthtscg"              "tipa" "force,tipashortcut=\\!G" # LATIN LETTER SMALL CAPITAL G WITH HOOK
-0x029c "\\textsch"                "tipa" "force,tipashortcut=\\;H" # LATIN LETTER SMALL CAPITAL H
+0x029b "\\texthtscg"              "tipa" "force" # LATIN LETTER SMALL CAPITAL G WITH HOOK
+0x029c "\\textsch"                "tipa" "force" # LATIN LETTER SMALL CAPITAL H
 0x029d "\\textctj"                "tipa" "force,tipashortcut=J" # LATIN SMALL LETTER J WITH CROSSED-TAIL
-0x029e "\\textturnk"              "tipa" "force,tipashortcut=\\*k" # LATIN SMALL LETTER TURNED K
-0x029f "\\textscl"                "tipa" "force,tipashortcut=\\;L" # LATIN LETTER SMALL CAPITAL L
+0x029e "\\textturnk"              "tipa" "force" # LATIN SMALL LETTER TURNED K
+0x029f "\\textscl"                "tipa" "force" # LATIN LETTER SMALL CAPITAL L
 0x02a0 "\\texthtq"                "tipa" "force" # LATIN SMALL LETTER Q WITH HOOK
 0x02a1 "\\textbarglotstop"        "tipa" "force" # LATIN LETTER GLOTTAL STOP WITH STROKE
 0x02a2 "\\textbarrevglotstop"     "tipa" "force" # LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE
@@ -709,7 +709,7 @@
 #0x0326 ""                         "" "combining,force" # COMBINING COMMA BELOW
 0x0327 "\\c"                      "" "combining,force" # COMBINING CEDILLA
 0x0328 "\\k"                      "" "combining,force" # COMBINING OGONEK
-0x0329 "\\textsyllabic"           "tipa" "combining,force,tipashortcut=\\s" # COMBINING VERTICAL LINE BELOW
+0x0329 "\\textsyllabic"           "tipa" "combining,force" # COMBINING VERTICAL LINE BELOW
 0x032a "\\textsubbridge"          "tipa" "combining,force" # COMBINING BRIDGE BELOW
 0x032b "\\textsubw"               "tipa" "combining,force" # COMBINING INVERTED DOUBLE ARCH BELOW
 0x032c "\\textsubwedge"           "tipa" "combining,force" # COMBINING CARON BELOW
@@ -975,17 +975,17 @@
 #
 # Phonetic Extensions
 #
-0x1d00 "\\textsca"                "tipa" "force,tipashortcut=\\;A" # LATIN LETTER SMALL CAPITAL A
+0x1d00 "\\textsca"                "tipa" "force" # LATIN LETTER SMALL CAPITAL A
 #0x1d01 ""                        "" "" # LATIN LETTER SMALL CAPITAL AE
 #0x1d02 ""                        "" "" # LATIN SMALL LETTER TURNED AE
 #0x1d03 ""                         "" "" # LATIN LETTER SMALL CAPITAL BARRED B
 #0x1d04 ""                         "" "" # LATIN LETTER SMALL CAPITAL C
 #0x1d05 ""                         "" "" # LATIN LETTER SMALL CAPITAL D
 #0x1d06 ""                         "" "" # LATIN LETTER SMALL CAPITAL ETH
-0x1d07 "\\textsce"                "tipa" "force,tipashortcut=\\;E" # LATIN LETTER SMALL CAPITAL E
+0x1d07 "\\textsce"                "tipa" "force" # LATIN LETTER SMALL CAPITAL E
 0x1d08 "\\textrevepsilon"         "tipa" "force" # LATIN SMALL LETTER TURNED OPEN E
 #0x1d09 ""                         "" "" # LATIN SMALL LETTER TURNED I
-0x1d0a "\\textscj"                "tipa" "force,tipashortcut=\\;J" # LATIN LETTER SMALL CAPITAL J
+0x1d0a "\\textscj"                "tipa" "force" # LATIN LETTER SMALL CAPITAL J
 0x1d0b "\\textsck"                "tipx" "force" # LATIN LETTER SMALL CAPITAL K
 #0x1d0c ""                         "" "" # LATIN LETTER SMALL CAPITAL L WITH STROKE
 0x1d0d "\\textscm"                "tipx" "force" # LATIN LETTER SMALL CAPITAL M
@@ -1003,7 +1003,7 @@
 0x1d19 "\\textrevscr"             "tipx" "force" # LATIN LETTER SMALL CAPITAL REVERSED R
 #0x1d1a ""                         "" "" # LATIN LETTER SMALL CAPITAL TURNED R
 #0x1d1b ""                         "" "" # LATIN LETTER SMALL CAPITAL T
-0x1d1c "\\textscu"                "tipa" "force,tipashortcut=\\;U" # LATIN LETTER SMALL CAPITAL U
+0x1d1c "\\textscu"                "tipa" "force" # LATIN LETTER SMALL CAPITAL U
 #0x1d1d ""                         "" "" # LATIN SMALL LETTER SIDEWAYS U
 #0x1d1e ""                         "" "" # LATIN SMALL LETTER SIDEWAYS DIAERESIZED U
 #0x1d1f ""                         "" "" # LATIN SMALL LETTER SIDEWAYS TURNED M