From 0312d30f9cc850a67425d51888339c116d821d33 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 19 Mar 2017 16:15:03 +0100 Subject: [PATCH] Consider text-mode accents of the form {\v a} in BiblioInfo Fixes #9340. --- src/BiblioInfo.cpp | 13 ++++++++++++- status.22x | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index 21c3b274cd..de27e612fb 100644 --- a/src/BiblioInfo.cpp +++ b/src/BiblioInfo.cpp @@ -153,7 +153,18 @@ docstring convertLaTeXCommands(docstring const & str) continue; } - // we just ignore braces + // Change text mode accents in the form + // {\v a} to \v{a} (see #9340). + // FIXME: This is a sort of mini-tex2lyx. + // Use the real tex2lyx instead! + static lyx::regex const tma_reg("^\\{\\\\[bcCdfGhHkrtuUv]\\s\\w\\}"); + if (lyx::regex_search(to_utf8(val), tma_reg)) { + val = val.substr(1); + val.replace(2, 1, from_ascii("{")); + continue; + } + + // Apart from the above, we just ignore braces if (ch == '{' || ch == '}') { val = val.substr(1); continue; diff --git a/status.22x b/status.22x index 91125870c6..2506d219b7 100644 --- a/status.22x +++ b/status.22x @@ -220,6 +220,8 @@ What's new - Correct width of the navigating window in the document settings and preferences dialogs in non-English localizations. +- Fix display of some text-mode accents in the citation preview (bug 9340). + * INTERNALS -- 2.39.5