anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix macro termination in IPA inset if next character uses a TIPA shortcut

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-05-26 16:36:24 +02:00
parent 1b1f9d05d9
commit 6ddcfb87e4
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Paragraph.cpp
View File

@ -1275,8 +1275,15 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
string script; string script;
pair<docstring, bool> latex = encoding.latexChar(c); pair<docstring, bool> latex = encoding.latexChar(c);
docstring nextlatex; docstring nextlatex;
if (next != '\0' && next != META_INSET) bool nexttipas = false;
string nexttipashortcut;
if (next != '\0' && next != META_INSET) {
nextlatex = encoding.latexChar(next).first; nextlatex = encoding.latexChar(next).first;
if (runparams.inIPA) {
nexttipashortcut = Encodings::TIPAShortcut(next);
nexttipas = !nexttipashortcut.empty();
}
}
bool tipas = false; bool tipas = false;
if (runparams.inIPA) { if (runparams.inIPA) {
string const tipashortcut = Encodings::TIPAShortcut(c); string const tipashortcut = Encodings::TIPAShortcut(c);
@ -1291,9 +1298,11 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
column += writeScriptChars(os, latex.first, column += writeScriptChars(os, latex.first,
running_change, encoding, i) - 1; running_change, encoding, i) - 1;
else if (latex.second else if (latex.second
&& !prefixIs(nextlatex, '\\') && ((!prefixIs(nextlatex, '\\')
&& !prefixIs(nextlatex, '{') && !prefixIs(nextlatex, '{')
&& !prefixIs(nextlatex, '}') && !prefixIs(nextlatex, '}'))
|| (nexttipas
&& !prefixIs(from_ascii(nexttipashortcut), '\\')))
&& !tipas) { && !tipas) {
// Prevent eating of a following // Prevent eating of a following
// space or command corruption by // space or command corruption by