anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Günter Milde 2015-10-19 18:30:27 +02:00
parent d0af891eb2
commit 7e716a26a5
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tex2lyx/test/test-insets-basic.lyx.lyx
View File

@ -6042,7 +6042,7 @@ h
\end_inset \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_inset script superscript
\begin_layout Plain Layout \begin_layout Plain Layout

2
src/tex2lyx/test/test-insets-basic.tex
View File

@ -531,7 +531,7 @@ e\textsuperscript{h}
\textsublhalfring{e} \textsublhalfring{e}
\textsubplus{e} \textsubplus{e}
\=*{e} \=*{e}
\b{e} (don't mix up with \b{e})
\"{e} \"{e}
\textovercross{e} \textovercross{e}
\s{e} \s{e}

2
src/tex2lyx/test/test-insets.lyx.lyx
View File

@ -6481,7 +6481,7 @@ h
\end_inset \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_inset script superscript
\begin_layout Plain Layout \begin_layout Plain Layout

2
src/tex2lyx/test/test-insets.tex
View File

@ -586,7 +586,7 @@ e\textsuperscript{h}
\textsublhalfring{e} \textsublhalfring{e}
\textsubplus{e} \textsubplus{e}
\=*{e} \=*{e}
\b{e} (don't mix up with \b{e})
\"{e} \"{e}
\textovercross{e} \textovercross{e}
\s{e} \s{e}

4
src/tex2lyx/text.cpp
View File

@ -314,7 +314,7 @@ char const * const known_tipa_marks[] = {"textsubwedge", "textsubumlaut",
"textovercross", "textsubarch", "textsuperimposetilde", "textraising", "textovercross", "textsubarch", "textsuperimposetilde", "textraising",
"textlowering", "textadvancing", "textretracting", "textdoublegrave", "textlowering", "textadvancing", "textretracting", "textdoublegrave",
"texthighrise", "textlowrise", "textrisefall", "textsyllabic", "texthighrise", "textlowrise", "textrisefall", "textsyllabic",
"textsubring", 0}; "textsubring", "textsubbar", 0};
/// TIPA tones that need special handling /// TIPA tones that need special handling
char const * const known_tones[] = {"15", "51", "45", "12", "454", 0}; 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 // fromLaTeXCommand() does not yet
// recognize tipa short cuts // recognize tipa short cuts
p.get_token(); p.get_token();
name = "\\b"; name = "\\textsubbar";
} else if (name == "\\textdoublevertline") { } else if (name == "\\textdoublevertline") {
// FIXME: This is not correct, // FIXME: This is not correct,
// \textvertline is higher than \textbardbl // \textvertline is higher than \textbardbl