[Emacs-diffs] master 0e5e816: Updated to match more recent versions of Praat.

[Lars Ingebrigtsen]

branch: master
commit 0e5e816a09cddb0577e5d7c6187b872876b2f759
Author: W. Garrett Mitchener <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Updated to match more recent versions of Praat.
    
    * lisp/leim/quail/ipa-praat.el ("ipa-praat"): Update to match
    more recent versions of Praat (bug#36198).
    
    - \rh was used for ram's horns (a vowel) and rhoticity hook (a
      diacritic).  Praat uses \hr for the hook, so I made that changed.
    
    - \e3v for the slightly rounded diacritic seems to have been a typo
      related to the use of e in the example.  Changed it to \3v to match
      Praat.
    
    - Added examples to the table of tone diacritics
    
    - Added \^h for superscript h
    
    - Added \^H for superscript h with hook
    
    - Added \^w for superscript w (labialization)
    
    - Added \^j for superscript j (palatalization)
    
    - Added \^g for superscript symbol (velarization)
    
    - Added \^9 for superscript symbol (pharyngealization)
---
 lisp/leim/quail/ipa-praat.el | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/lisp/leim/quail/ipa-praat.el b/lisp/leim/quail/ipa-praat.el
index 74a2dcc..169dbcf 100644
--- a/lisp/leim/quail/ipa-praat.el
+++ b/lisp/leim/quail/ipa-praat.el
@@ -148,7 +148,14 @@ input | example | description
 \\'1   | ˈ       | primary stress
 \\'2   | ˌ       | secondary stress
 \\cn   | t̚       | unreleased plosive
-\\rh   | ɜ˞      | rhotacized vowel
+\\hr   | ɜ˞      | rhotacized vowel
+\\^h   | ʰ       | aspiration
+\\^H   | ʱ       | voiced aspiration
+\\^w   | ʷ       | labialized, rounded
+\\^j   | ʲ       | palatalized
+\\^g   | ˠ       | velarized
+\\^9   | ˤ       | pharyngealized
+
 
 - Understrikes
 
@@ -168,7 +175,7 @@ input | example | description
 \\Uv   | d̺       | apical
 \\Dv   | d̻       | laminal
 \\nv   | u̯       | nonsyllabic
-\\e3v  | e̹       | slightly rounded
+\\3v   | e̹       | slightly rounded
 \\cv   | u̜       | slightly unrounded
 
 - Overstrikes
@@ -176,14 +183,14 @@ input | example | description
 input | example | description
 ------+---------+--------------------------------------------
 \\0^   | ɣ̊       | voiceless
-\\'^   |         | high tone
-\\`^   |         | low tone
-\\-^   |         | mid tone
-\\~^   |         | nasalized
-\\v^   |         | rising tone
-\\^^   |         | falling tone
-\\:^   |         | centralized
-\\N^   |         | short
+\\'^   | é       | high tone
+\\`^   | è       | low tone
+\\-^   | ē       | mid tone
+\\~^   | ẽ       | nasalized
+\\v^   | ě       | rising tone
+\\^^   | ê       | falling tone
+\\:^   | ë       | centralized
+\\N^   | ĕ       | short
 \\li   | k͡p      | simultaneous articulation or single segment
 "
  nil t nil nil nil nil nil nil nil nil t)
@@ -308,7 +315,13 @@ input | example | description
  ("\\'1" ?ˈ) ; primary stress
  ("\\'2" ?ˌ) ; secondary stress
  ("\\cn" #x031A) ; t̚ unreleased plosive
- ("\\rh" #x02DE) ; ɜ˞ rhotacized vowel
+ ("\\hr" #x02DE) ; ɜ˞ rhotacized vowel
+ ("\\^h" ?ʰ) ; ʰ aspiration (usually following a plosive)
+ ("\\^H" ?ʱ) ; ʱ voiced aspiration (usually following a plosive)
+ ("\\^w" ?ʷ) ; labialized
+ ("\\^j" ?ʲ) ; palatalized
+ ("\\^g" ?ˠ) ; velarized
+ ("\\^9" ?ˤ) ; pharyngealized
 
  ("\\|v" #x0329) ; n̩ syllabic consonant
  ("\\0v" #x0325) ; b̥ voiceless
@@ -324,7 +337,7 @@ input | example | description
  ("\\Uv" #x033A) ; d̺ apical
  ("\\Dv" #x033B) ; d̻ laminal
  ("\\nv" #x032F) ; u̯ nonsyllabic
- ("\\e3v" #x0339) ; e̹ slightly rounded
+ ("\\3v" #x0339) ; e̹ slightly rounded
  ("\\cv" #x031C) ; u̜ slightly unrounded
 
  ("\\0^" #x030A) ; ɣ̊ voiceless