From: Günter Milde <milde@lyx.org>
Date: Mon, 19 Oct 2015 16:30:27 +0000 (+0200)
Subject: Fix #9764, combining diacritical characters for line below (part 2).
X-Git-Tag: 2.2.0alpha1~203
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7e716a26a5e9870da3f0659e6dd77f388451ae76;p=features.git

Fix #9764, combining diacritical characters for line below (part 2).

The correct mappings break the tex2lyx roundtrip tests because both,
the tests and tex2lyx use the wrong mapping (\b for "combining minus below").

Fix tex2lyx and the test files so that round-trip tests pass again.
---

diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 34c2ddc760..663833b027 100644
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx
@@ -6042,7 +6042,7 @@ h
 
 \end_inset
 
- e̹ e̜ e̟ e̠ e̠ ë e̽ e̩ e̩ e̯ e˞e
+ e̹ e̜ e̟ e̠ (don't mix up with e̱) ë e̽ e̩ e̩ e̯ e˞e
 \begin_inset script superscript
 
 \begin_layout Plain Layout
diff --git a/src/tex2lyx/test/test-insets-basic.tex b/src/tex2lyx/test/test-insets-basic.tex
index 32f6ad4544..605733efd3 100644
--- a/src/tex2lyx/test/test-insets-basic.tex
+++ b/src/tex2lyx/test/test-insets-basic.tex
@@ -531,7 +531,7 @@ e\textsuperscript{h}
 \textsublhalfring{e}
 \textsubplus{e}
 \=*{e}
-\b{e}
+(don't mix up with \b{e})
 \"{e}
 \textovercross{e}
 \s{e}
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 92da376cfb..c59c5bec8d 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -6481,7 +6481,7 @@ h
 
 \end_inset
 
- e̹ e̜ e̟ e̠ e̠ ë e̽ e̩ e̩ e̯ e˞e
+ e̹ e̜ e̟ e̠ (don't mix up with e̱) ë e̽ e̩ e̩ e̯ e˞e
 \begin_inset script superscript
 
 \begin_layout Plain Layout
diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index f5bb00b373..0f35c56540 100644
--- a/src/tex2lyx/test/test-insets.tex
+++ b/src/tex2lyx/test/test-insets.tex
@@ -586,7 +586,7 @@ e\textsuperscript{h}
 \textsublhalfring{e}
 \textsubplus{e}
 \=*{e}
-\b{e}
+(don't mix up with \b{e})
 \"{e}
 \textovercross{e}
 \s{e}
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index d16c52ed2a..d7e18fa440 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -314,7 +314,7 @@ char const * const known_tipa_marks[] = {"textsubwedge", "textsubumlaut",
 "textovercross", "textsubarch", "textsuperimposetilde", "textraising",
 "textlowering", "textadvancing", "textretracting", "textdoublegrave",
 "texthighrise", "textlowrise", "textrisefall", "textsyllabic",
-"textsubring", 0};
+"textsubring", "textsubbar", 0};
 
 /// TIPA tones that need special handling
 char const * const known_tones[] = {"15", "51", "45", "12", "454", 0};
@@ -4786,7 +4786,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 					// fromLaTeXCommand() does not yet
 					// recognize tipa short cuts
 					p.get_token();
-					name = "\\b";
+					name = "\\textsubbar";
 				} else if (name == "\\textdoublevertline") {
 					// FIXME: This is not correct,
 					// \textvertline is higher than \textbardbl