From d9f93a28e47b6ede00f6bf6501ba6bbbc9b08d7c Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Wed, 26 Jul 2017 20:58:37 +0300
Subject: [PATCH] Regular expression should support french names.

--HG--
branch : develop
---
 src/libs/ifc/schema/pattern/v0.5.1.xsd | 2 +-
 src/libs/qmuparser/qmudef.cpp          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/ifc/schema/pattern/v0.5.1.xsd b/src/libs/ifc/schema/pattern/v0.5.1.xsd
index 86976e8f5..9f51ef000 100644
--- a/src/libs/ifc/schema/pattern/v0.5.1.xsd
+++ b/src/libs/ifc/schema/pattern/v0.5.1.xsd
@@ -647,7 +647,7 @@
   </xs:element>
   <xs:simpleType name="shortName">
     <xs:restriction base="xs:string">
-      <xs:pattern value="^([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^\()\-−+.,٫, ٬.'’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^\()\-−+.,٫, ٬.'’=?:;\&quot;]){0,}$"/>
+      <xs:pattern value="^([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}$"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="units">
diff --git a/src/libs/qmuparser/qmudef.cpp b/src/libs/qmuparser/qmudef.cpp
index 5a55325bd..4f876e0d9 100644
--- a/src/libs/qmuparser/qmudef.cpp
+++ b/src/libs/qmuparser/qmudef.cpp
@@ -316,6 +316,7 @@ QString NameRegExp()
         }
 
         negativeSigns.replace('-', "\\-");
+        groupSeparators.remove('\'');
 
         //Same regexp in pattern.xsd shema file. Don't forget to synchronize.
         // \p{Nd} - \p{Decimal_Digit_Number}