From 8475f73366dbae8b9e8d7cc9b1a172ba48995bcb Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 27 Aug 2012 08:50:40 +0200
Subject: [PATCH] IPA fixes

---
 lib/chkconfig.ltx     |  2 ++
 lib/unicodesymbols    | 23 ++++++++++++++++++-----
 src/LaTeXFeatures.cpp |  1 +
 status.20x            |  4 ++++
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index dbd1bd50db..bda246defa 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -358,6 +358,8 @@
 \TestPackage{lmodern}
 \TestPackage{luximono}
 \TestPackage{tipa}
+\TestPackage{tipx}
+\TestPackage{tone}
 % necessary to get correct size for InstantPreview images created by dvipng
 \TestPackage[c70fs.fd]{zhmetrics}
 % symbol packakges supported by LyX for items and the special character dialog
diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 014fd5fe7b..fe4d4e930d 100644
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -601,11 +601,11 @@
 0x02e2 "\\textsuperscript{s}"     "" "" # MODIFIER LETTER SMALL S
 0x02e3 "\\textsuperscript{x}"     "" "" # MODIFIER LETTER SMALL X
 0x02e4 "\\textsuperscript{\\textrevglotstop}" "tipa" "force" # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
-0x02e5 "\\tone{55}"               "tipa" "force" # MODIFIER LETTER EXTRA-HIGH TONE BAR
-0x02e6 "\\tone{44}"               "tipa" "force" # MODIFIER LETTER HIGH TONE BAR
-0x02e7 "\\tone{33}"               "tipa" "force" # MODIFIER LETTER MID TONE BAR
-0x02e8 "\\tone{22}"               "tipa" "force" # MODIFIER LETTER LOW TONE BAR
-0x02e9 "\\tone{11}"               "tipa" "force" # MODIFIER LETTER EXTRA-LOW TONE BAR
+0x02e5 "\\tone{55}"               "tone" "force" # MODIFIER LETTER EXTRA-HIGH TONE BAR
+0x02e6 "\\tone{44}"               "tone" "force" # MODIFIER LETTER HIGH TONE BAR
+0x02e7 "\\tone{33}"               "tone" "force" # MODIFIER LETTER MID TONE BAR
+0x02e8 "\\tone{22}"               "tone" "force" # MODIFIER LETTER LOW TONE BAR
+0x02e9 "\\tone{11}"               "tone" "force" # MODIFIER LETTER EXTRA-LOW TONE BAR
 #0x02ea ""                         "" "" # MODIFIER LETTER YIN DEPARTING TONE MARK
 #0x02eb ""                         "" "" # MODIFIER LETTER YANG DEPARTING TONE MARK
 0x02ec "\\textsubwedge{ }"        "tipa" "force" # MODIFIER LETTER VOICING
@@ -1042,6 +1042,12 @@
 0x1d7e "\\textbaru"               "tipa" "force" # LATIN SMALL CAPITAL LETTER U WITH STROKE
 #0x1d7f ""                         "" "" # LATIN SMALL LETTER UPSILON WITH STROKE
 #
+# Combining Diacritical Marks Supplement
+#
+0x1dc4 "\\texthighrise"            "tipa" "combining,force" # COMBINING MACRON-ACUTE
+0x1dc5 "\\textlowrise"             "tipa" "combining,force" # COMBINING GRAVE-MACRON
+0x1dc8 "\\textrisefall"            "tipa" "combining,force" # COMBINING GRAVE-ACUTE-GRAVE
+#
 # Latin Extended Additional
 #
 0x1e00 "\\textsubring{A}"         "tipa" "force,mathalpha" "\\subring{A}" "accents,subring" # LATIN CAPITAL LETTER A WITH RING BELOW
@@ -1584,6 +1590,7 @@
 0x203d "\\textinterrobang"        "textcomp" "" # INTERROBANG
 # use the following macro for the character OVERLINE
 0x203e "\\LyXoverline" "\\newcommand*\\LyXoverline{\\raisebox{2.6ex}{\\_}}" ""
+0x203f "\\textbottomtiebar{ }"    "tipa" "" # UNDERTIE
 0x2044 "\\textfractionsolidus"    "textcomp" "" # FRACTION SLASH
 0x2045 "\\textlquill"             "textcomp" "" # LEFT SQUARE BRACKET WITH QUILL
 0x2046 "\\textrquill"             "textcomp" "" # RIGHT SQUARE BRACKET WITH QUILL
@@ -1778,6 +1785,7 @@
 0x2193 "\\textdownarrow"          "textcomp" "" "\\downarrow" # DOWNWARDS ARROW
 0x2194 ""                         "" "" "\\leftrightarrow" # LEFT RIGHT ARROW
 0x2195 ""                         "" "" "\\updownarrow" # UP DOWN ARROW
+0x2197 "\\textglobrise"           "tipa" "" "" "" # NORTH EAST ARROW
 0x21a8 "{\\ascii\\ETB}"           "ascii" "" # UP DOWN ARROW WITH BASE
 0x21b5 "{\\Pisymbol{psy}{191}}"   "pifont" "" # RETURN KEY
 #
@@ -2122,6 +2130,11 @@
 #0x2a1b ""                         "" "" "" "" # INTEGRAL WITH OVERBAR
 #0x2a1c ""                         "" "" "" "" # INTEGRAL WITH UNDERBAR
 #
+# Modifier tone letters
+#
+0xa71b "\\textupstep"              "tipa" "" "" "" # MODIFIER LETTER RAISED UP ARROW
+0xa71c "\\textdownstep"            "tipa" "" "" "" # MODIFIER LETTER RAISED DOWN ARROW
+#
 # ligatures
 #
 0xfb00 "ff"                       "" "force" # LATIN SMALL LIGATURE FF
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index d425977710..909a5d3f59 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -552,6 +552,7 @@ char const * simplefeatures[] = {
 	"units",
 	"tipa",
 	"tipx",
+	"tone",
 	"framed",
 	"soul",
 	"textcomp",
diff --git a/status.20x b/status.20x
index a60ee00eb5..029bfcc739 100644
--- a/status.20x
+++ b/status.20x
@@ -30,6 +30,8 @@ What's new
 
 - Add explicit dvilualatex output format.
 
+- Add support for some IPA diacritics.
+
 
 * TEX2LYX IMPROVEMENTS
 
@@ -106,6 +108,8 @@ What's new
   please change the forward search command in Preferences > Output to
   okular --unique "$$o#src:$$n $$f" (as provided now in the dropdown list).
 
+- Fix LaTeX output of IPA tone symbols.
+
 
 * USER INTERFACE
 
-- 
2.39.5