Added optional whitespace characters in before and/or after the content within <eleme...

Added Alignment optional attribute to the <Section> tag
Changed the UserExtension Identifier from int to string

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2303 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 8d076eeace886c63037221d79911a3d502280575..2f8b8aff853b576dcbda2b0eefc170e57cedbcba 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -266,6 +266,7 @@
     <xs:attribute name="Compressible" type="xs:boolean" default="true" use="optional"/>\r
     <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
     <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
+    <xs:attribute name="Alignment" type="xs:string" use="optional"/>\r
     <xs:attribute name="ToolName" type="xs:string" use="optional"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index db1a585f8a6d06a74ac8d57b87b1fc422911d2e7..977020829bc439ec222821413f54f571baa872bf 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -910,7 +910,7 @@
         <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>\r
       </xs:sequence>\r
       <xs:attribute name="UserID" type="xs:NCName" use="required"/>\r
-      <xs:attribute name="Identifier" type="xs:nonNegativeInteger" use="required"/>\r
+      <xs:attribute name="Identifier" type="xs:string" use="required"/>\r
     </xs:complexType>\r
   </xs:element>\r
   <xs:element name="Variables">\r

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index b90b2e5b3ba15875b09ae328da9839dfbefbd862..c2074ff69f99634adbf5ca2a4395d74f7c8e659d 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -26,7 +26,7 @@
   </xs:simpleType>\r
   <xs:simpleType name="BlockNameType">\r
     <xs:restriction base="UCNameType">\r
-      <xs:pattern value="BLOCK[A-F0-9]{2}"/>\r
+      <xs:pattern value="\s*BLOCK[A-F0-9]{2}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="BootModeNames">\r
@@ -104,7 +104,6 @@
   </xs:simpleType>\r
   <xs:simpleType name="DatumSizeLimitation">\r
     <xs:restriction base="xs:nonNegativeInteger">\r
-      <xs:minExclusive value="0"/>\r
       <xs:maxExclusive value="13777216"/>\r
       <xs:pattern value="(\s)*[1-9][0-9]*(\s)*"/>\r
     </xs:restriction>\r
@@ -264,7 +263,7 @@
   <xs:simpleType name="HexByteArrayListType">\r
     <xs:restriction base="xs:normalizedString">\r
       <xs:minLength value="4"/>\r
-      <xs:pattern value="((( )?0x[a-fA-F0-9]{2})(,)?)+( )?"/>\r
+      <xs:pattern value="\s*((( )?0x[a-fA-F0-9]{2})(,)?)+( )?"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="HexByteArrayType">\r
@@ -341,7 +340,7 @@
   </xs:simpleType>\r
   <xs:simpleType name="Md5sumType">\r
     <xs:restriction base="xs:normalizedString">\r
-      <xs:pattern value="[a-fA-F0-9]{32}"/>\r
+      <xs:pattern value="\s*[a-fA-F0-9]{32}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="PrimaryModuleListType">\r
@@ -453,7 +452,7 @@
   <xs:simpleType name="SkuListType">\r
     <xs:restriction base="xs:normalizedString">\r
       <xs:minLength value="1"/>\r
-      <xs:pattern value="(\d)+((,)?(\s)*(\d)+)*"/>\r
+      <xs:pattern value="\s*(\d)+((,)?(\s)*(\d)+)*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="SupportedArchitectures">\r
@@ -522,7 +521,7 @@
   <xs:simpleType name="VariableOffsetValues">\r
     <xs:restriction base="xs:string">\r
       <xs:minLength value="1"/>\r
-      <xs:pattern value="\d+(:)?\d*"/>\r
+      <xs:pattern value="\s*\d+(:)?\d*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="VariableUsage">\r

diff --git a/Tools/XMLSchema/FrameworkPlatformDataTypes.xsd b/Tools/XMLSchema/FrameworkPlatformDataTypes.xsd
index 8631918cc7857b4eadb1693c820018f02c2cfa6d..014289ff5acb436a864910e3c2fa47d0de4417b5 100644 (file)
--- a/Tools/XMLSchema/FrameworkPlatformDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataTypes.xsd
@@ -83,7 +83,7 @@
   </xs:simpleType>\r
   <xs:simpleType name="FfsDataAlignmentType">\r
     <xs:restriction base="xs:nonNegativeInteger">\r
-      <xs:pattern value="[0-7]{1}"/>\r
+      <xs:pattern value="\s*[0-7]{1}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="FfsNameType">\r
@@ -91,7 +91,7 @@
       <xs:documentation xml:lang="en"> This defines what an FFS Name can consist of.</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="[a-zA-Z][_\-a-zA-Z0-9]*(\.)?[a-zA-Z0-9]*"/>\r
+      <xs:pattern value="\s*[a-zA-Z][_\-a-zA-Z0-9]*(\.)?[a-zA-Z0-9]*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="FlashSize">\r

diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
index 936b6f2741a9e03e7f3058b69667bec9287ae46d..978a365ff4b0e25994082067b9ea73ee2eeda3b4 100644 (file)
--- a/Tools/XMLSchema/NamingConvention.xsd
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -20,7 +20,7 @@
       <xs:documentation xml:lang="en"> C_Names must start with either an underscore (_) character followed by one or more alpha characters, followed by any combination of underscore or alphanumeric characters.</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="(_)*[a-zA-Z]+((_)*[a-zA-Z0-9]*)*"/>\r
+      <xs:pattern value="\s*(_)*[a-zA-Z]+((_)*[a-zA-Z0-9]*)*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="FileNameConvention">\r
@@ -28,7 +28,7 @@
       <xs:documentation xml:lang="en"> This defines what a Filename is: Alphanumeric characters and optional underscore (_) or dash (-) characters, followed by a optional dot and more alphanumeric characters. </xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="[a-zA-Z](\.?[-_a-zA-Z0-9]+)*"/>\r
+      <xs:pattern value="\s*[a-zA-Z](\.?[\-_a-zA-Z0-9]+)*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="GuidType">\r
@@ -42,7 +42,7 @@
       <xs:documentation xml:lang="en"> This defines the minimum specification for a GUID Array which is 8 Hex Digits - 4 Hex Digits - 4 Hex Digits - 8 Hex Bytes, the last 16 Hex Digits can be enclosed in sqiggle {} brackets.</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\})?"/>\r
+      <xs:pattern value="\s*0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\})?\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="GuidType2">\r
@@ -50,7 +50,7 @@
       <xs:documentation xml:lang="en"> A GUID must contain five different Hexadecimal character sets that are separated by a dash (-) character. </xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"/>\r
+      <xs:pattern value="\s*[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="Hex64BitDataType">\r
@@ -58,7 +58,7 @@
       <xs:documentation xml:lang="en">Define a Hex 64 Bit Value to be 0x[a-f0-9]{16}</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="(0x)?[a-fA-F0-9]{1,16}"/>\r
+      <xs:pattern value="\s*(0x)?[a-fA-F0-9]{1,16}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="HexAddressType">\r
@@ -66,7 +66,7 @@
       <xs:documentation xml:lang="en">Define a Hex Address, 0x[a-fA-F0-9]{1,16}</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="0x[a-fA-F0-9]{1,16}"/>\r
+      <xs:pattern value="\s*0x[a-fA-F0-9]{1,16}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="HexByteDataType">\r
@@ -74,7 +74,7 @@
       <xs:documentation xml:lang="en">Define a Hex Byte Value to be 0x[a-f0-9]{2}</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="(0x)?[a-fA-F0-9]{1,2}"/>\r
+      <xs:pattern value="\s*(0x)?[a-fA-F0-9]{1,2}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="HexDataType">\r
@@ -82,7 +82,7 @@
       <xs:documentation xml:lang="en">Define a Hex Value to be 0x[a-f0-9]+</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="0x[a-fA-F0-9]+"/>\r
+      <xs:pattern value="\s*0x[a-fA-F0-9]+\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="HexDigitType">\r
@@ -90,7 +90,7 @@
       <xs:documentation xml:lang="en">Define a Hex Diget to be 0x[a-f0-9]</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="[a-fA-F0-9]{1}"/>\r
+      <xs:pattern value="\s*[a-fA-F0-9]{1}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="HexDoubleWordDataType">\r
@@ -98,7 +98,7 @@
       <xs:documentation xml:lang="en">Define a Hex Double Word Value to be 0x[a-f0-9]{8}</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="0x[a-fA-F0-9]{1,8}"/>\r
+      <xs:pattern value="\s*0x[a-fA-F0-9]{1,8}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="HexWordDataType">\r
@@ -106,18 +106,18 @@
       <xs:documentation xml:lang="en">Define a Hex Word Value to be 0x[a-f0-9]{4}</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="0x[a-fA-F0-9]{1,4}"/>\r
+      <xs:pattern value="\s*0x[a-fA-F0-9]{1,4}\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="KeywordList">\r
     <xs:restriction base="xs:string">\r
       <xs:minLength value="1"/>\r
-      <xs:pattern value="[a-zA-Z]+(\ *_*[a-zA-Z0-9]*)*"/>\r
+      <xs:pattern value="\s*[a-zA-Z]+(\ *_*[a-zA-Z0-9]*)*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="KeywordType">\r
     <xs:restriction base="xs:normalizedString">\r
-      <xs:pattern value="[a-zA-Z]+(_*[a-zA-Z0-9]*)*"/>\r
+      <xs:pattern value="\s*[a-zA-Z]+(_*[a-zA-Z0-9]*)*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="Paragraph">\r
@@ -137,7 +137,7 @@
       <xs:documentation xml:lang="en">Limit Polarity vaild values to 0 and 1</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:int">\r
-      <xs:pattern value="0|1"/>\r
+      <xs:pattern value="\s*0|1\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="Sentence">\r
@@ -145,7 +145,7 @@
       <xs:documentation xml:lang="en"> This data type requires two or more words </xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:normalizedString">\r
-      <xs:pattern value="(\w+\W*)+( )+(\W*\w*\W*\s*)*"/>\r
+      <xs:pattern value="\s*(\w+\W*)+( )+(\W*\w*\W*\s*)*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="ToolsNameConvention">\r
@@ -153,7 +153,7 @@
       <xs:documentation xml:lang="en">This data type is used for ToolCommand, ToolChainFamily and TagName.</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:NCName">\r
-      <xs:pattern value="[a-zA-Z][a-zA-Z0-9]*"/>\r
+      <xs:pattern value="\s*[a-zA-Z][a-zA-Z0-9]*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="UCNameType">\r
@@ -161,7 +161,7 @@
       <xs:documentation xml:lang="en"> Definition of a UpperCase Name, which can be any combination of upper case characters followed by zero or more underscore and/or uppercase alphanumeric characters </xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="[A-Z]+(_*[A-Z0-9]*)*"/>\r
+      <xs:pattern value="\s*[A-Z]+(_*[A-Z0-9]*)*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="VersionDataType">\r
@@ -172,7 +172,7 @@
       </xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:pattern value="\d+(\.\d+)*"/>\r
+      <xs:pattern value="\s*\d+(\.\d+)*\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
   <xs:simpleType name="Zero">\r
@@ -180,7 +180,7 @@
       <xs:documentation xml:lang="en">Define Zero as a vaild value</xs:documentation>\r
     </xs:annotation>\r
     <xs:restriction base="xs:int">\r
-      <xs:pattern value="0"/>\r
+      <xs:pattern value="\s*0\s*"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
 </xs:schema>\r