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 34c2ddc76086d35bc3d578a68b84ef4191e2b2ff..663833b027f7413ab046c3ca3bfe807e01d99436 100644 (file)
--- 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 32f6ad45441575ac00e7cca6704d9f71631ad919..605733efd331692ca7e3bc494ece900e0bac911a 100644 (file)
--- 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 92da376cfbfd86317a0d5ca821733b87b480103a..c59c5bec8d570294dbd430a23041ac5ef7898375 100644 (file)
--- 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 f5bb00b3737d6fe4faff04222377c700da1591c5..0f35c5654032affde033df2f873dcbe106e93066 100644 (file)
--- 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 d16c52ed2af6b580bc332aa398ce222a54fcee06..d7e18fa4402d4b2eee44a9eecda99bd0ed8ada6b 100644 (file)
--- 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