From: Tommaso Cucinotta <tommaso@lyx.org>
Date: Sun, 16 Apr 2017 22:38:31 +0000 (+0200)
Subject: findadv: match \textbackslash and \textasciicircum also without trailing {} (fixes... 
X-Git-Tag: 2.3.0alpha1~42
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6d05a96546c4704e325066e205631326951cb05a;p=features.git

findadv: match \textbackslash and \textasciicircum also without trailing {} (fixes autotest findadv-re-02-in.txt).
---

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 363172a4c0..0ffb5b203c 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -556,7 +556,7 @@ Escapes const & get_regexp_escapes()
 		escape_map.push_back(P(".", "_x_."));
 		escape_map.push_back(P("\\", "(?:\\\\|\\\\backslash)"));
 		escape_map.push_back(P("~", "(?:\\\\textasciitilde|\\\\sim)"));
-		escape_map.push_back(P("^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\mathcircumflex)"));
+		escape_map.push_back(P("^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\textasciicircum|\\\\mathcircumflex)"));
 		escape_map.push_back(P("_x_", "\\"));
 	}
 	return escape_map;
@@ -589,12 +589,12 @@ Escapes const & get_regexp_latex_escapes()
 
 	static Escapes escape_map;
 	if (escape_map.empty()) {
-		escape_map.push_back(P("\\\\", "(?:\\\\\\\\|\\\\backslash|\\\\textbackslash\\{\\})"));
+		escape_map.push_back(P("\\\\", "(?:\\\\\\\\|\\\\backslash|\\\\textbackslash\\{\\}|\\\\textbackslash)"));
 		escape_map.push_back(P("(<?!\\\\\\\\textbackslash)\\{", "\\\\\\{"));
 		escape_map.push_back(P("(<?!\\\\\\\\textbackslash\\\\\\{)\\}", "\\\\\\}"));
 		escape_map.push_back(P("\\[", "\\{\\[\\}"));
 		escape_map.push_back(P("\\]", "\\{\\]\\}"));
-		escape_map.push_back(P("\\^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\mathcircumflex)"));
+		escape_map.push_back(P("\\^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\textasciicircum|\\\\mathcircumflex)"));
 		escape_map.push_back(P("%", "\\\\\\%"));
 	}
 	return escape_map;