From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 19 Mar 2017 15:15:03 +0000 (+0100)
Subject: Consider text-mode accents of the form {\v a} in BiblioInfo
X-Git-Tag: 2.3.0alpha1~194
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1a8fd56333f2070c997046b9aa3dde7567623779;p=features.git

Consider text-mode accents of the form {\v a} in BiblioInfo

Fixes #9340.
---

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 9083247ea8..1e2a1be769 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -378,7 +378,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;