From c79c4ed256e7c635a87b5a6bfd9fd1b044b10a8c Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Tue, 3 Jan 2017 11:02:24 +0200
Subject: [PATCH] Update name regex to support all supported locales.

--HG--
branch : develop
---
 src/libs/ifc/schema/individual_measurements/v0.3.3.xsd | 2 +-
 src/libs/ifc/schema/pattern/v0.3.9.xsd                 | 2 +-
 src/libs/ifc/schema/standard_measurements/v0.4.3.xsd   | 2 +-
 src/libs/qmuparser/qmudef.h                            | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/libs/ifc/schema/individual_measurements/v0.3.3.xsd b/src/libs/ifc/schema/individual_measurements/v0.3.3.xsd
index a6a241e53..489ebd973 100644
--- a/src/libs/ifc/schema/individual_measurements/v0.3.3.xsd
+++ b/src/libs/ifc/schema/individual_measurements/v0.3.3.xsd
@@ -42,7 +42,7 @@
 	</xs:element>
 	<xs:simpleType name="shortName">
 		<xs:restriction base="xs:string">   
-			<xs:pattern value="^([^0-9*/^+\-=\s()?%:;!.,`'\&quot;]){1,1}([^*/^+\-=\s()?%:;!.,`'\&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="formatVersion">
diff --git a/src/libs/ifc/schema/pattern/v0.3.9.xsd b/src/libs/ifc/schema/pattern/v0.3.9.xsd
index e78d7b6f3..bd98bd5e3 100644
--- a/src/libs/ifc/schema/pattern/v0.3.9.xsd
+++ b/src/libs/ifc/schema/pattern/v0.3.9.xsd
@@ -475,7 +475,7 @@
          </xs:element>
     <xs:simpleType name="shortName">
         <xs:restriction base="xs:string">   
-            <xs:pattern value="^([^0-9*/^+\-=\s()?%:;!.,`'\&quot;]){1,1}([^*/^+\-=\s()?%:;!.,`'\&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/ifc/schema/standard_measurements/v0.4.3.xsd b/src/libs/ifc/schema/standard_measurements/v0.4.3.xsd
index c3a665826..dc72b8300 100644
--- a/src/libs/ifc/schema/standard_measurements/v0.4.3.xsd
+++ b/src/libs/ifc/schema/standard_measurements/v0.4.3.xsd
@@ -43,7 +43,7 @@
 	  </xs:element>
 	<xs:simpleType name="shortName">
 		<xs:restriction base="xs:string">   
-			<xs:pattern value="^([^0-9*/^+\-=\s()?%:;!.,`'\&quot;]){1,1}([^*/^+\-=\s()?%:;!.,`'\&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.h b/src/libs/qmuparser/qmudef.h
index 62f720ba2..40b17d15e 100644
--- a/src/libs/qmuparser/qmudef.h
+++ b/src/libs/qmuparser/qmudef.h
@@ -93,8 +93,11 @@ QT_WARNING_DISABLE_GCC("-Wattributes")
 //---------------------------------------------------------------------------------------------------------------------
 inline QString NameRegExp()
 {
-    //Same regexp in pattern.xsd shema file. Don't forget synchronize.
-    return QStringLiteral("^([^0-9*/^+\\-=\\s()?%:;!.,`'\"]){1,1}([^*/^+\\-=\\s()?%:;!.,`\"]){0,}$");
+    //Same regexp in pattern.xsd shema file. Don't forget to synchronize.
+    // \p{Nd} - \p{Decimal_Digit_Number}
+    // \p{Zs} - \p{Space_Separator}
+    // Note. All three minus characters are different!
+    return QStringLiteral("^([^\\p{Nd}\\p{Zs}*/&|!<>^\\-()–+−=?:;'\"]){1,1}([^\\p{Zs}*/&|!<>^\\-()–+−=?:;\"]){0,}$");
 }
 
 QT_WARNING_POP