From 5d2cb92f889638d281e79091d514da89f9739682 Mon Sep 17 00:00:00 2001
From: MURATA Makoto <eb2m-mrt@asahi-net.or.jp>
Date: Tue, 16 Oct 2018 23:54:42 +0900
Subject: [PATCH] Chaged the type of @ptsTypes. (+1 squashed commits)

Squashed commits:

[e2eab54] Changed the datatype of @ptsTypes.
---
 Part1/OfficeOpenXML-RELAXNG-Strict/pml.rnc         | 6 +++++-
 Part1/OfficeOpenXML-XMLSchema-Strict/pml.xsd       | 7 ++++++-
 Part4/OfficeOpenXML-RELAXNG-Transitional/pml.rnc   | 6 +++++-
 Part4/OfficeOpenXML-XMLSchema-Transitional/pml.xsd | 7 ++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Part1/OfficeOpenXML-RELAXNG-Strict/pml.rnc b/Part1/OfficeOpenXML-RELAXNG-Strict/pml.rnc
index a7f2ea8..62bcf3f 100644
--- a/Part1/OfficeOpenXML-RELAXNG-Strict/pml.rnc
+++ b/Part1/OfficeOpenXML-RELAXNG-Strict/pml.rnc
@@ -338,6 +338,10 @@ p_ST_TLAnimateMotionPathEditMode = "relative" | "fixed"
 p_CT_TLPoint =
   attribute x { a_ST_Percentage },
   attribute y { a_ST_Percentage }
+p_ST_AnimMotionPtsTypes =
+  xsd:string {
+    pattern = "[AFTSafts]*"
+  }
 p_CT_TLAnimateMotionBehavior =
 
   ## default value: parent
@@ -353,7 +357,7 @@ p_CT_TLAnimateMotionBehavior =
   attribute rAng { a_ST_Angle }?,
 
   ## default value: A
-  attribute ptsTypes { xsd:string }?,
+  attribute ptsTypes { p_ST_AnimMotionPtsTypes }?,
   element cBhvr { p_CT_TLCommonBehaviorData },
   element by { p_CT_TLPoint }?,
   element from { p_CT_TLPoint }?,
diff --git a/Part1/OfficeOpenXML-XMLSchema-Strict/pml.xsd b/Part1/OfficeOpenXML-XMLSchema-Strict/pml.xsd
index a40a342..6cc1a06 100644
--- a/Part1/OfficeOpenXML-XMLSchema-Strict/pml.xsd
+++ b/Part1/OfficeOpenXML-XMLSchema-Strict/pml.xsd
@@ -551,6 +551,11 @@
     <xsd:attribute name="x" type="a:ST_Percentage" use="required"/>
     <xsd:attribute name="y" type="a:ST_Percentage" use="required"/>
   </xsd:complexType>
+  <xsd:simpleType name="ST_AnimMotionPtsTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[AFTSafts]*"/>
+    </xsd:restriction>
+  </xsd:simpleType>
   <xsd:complexType name="CT_TLAnimateMotionBehavior">
     <xsd:sequence>
       <xsd:element name="cBhvr" type="CT_TLCommonBehaviorData" minOccurs="1" maxOccurs="1"/>
@@ -565,7 +570,7 @@
     <xsd:attribute name="pathEditMode" type="ST_TLAnimateMotionPathEditMode" use="optional"
         default="relative"/>
     <xsd:attribute name="rAng" type="a:ST_Angle" use="optional" default="0"/>
-    <xsd:attribute name="ptsTypes" type="xsd:string" use="optional"
+    <xsd:attribute name="ptsTypes" type="ST_AnimMotionPtsTypes" use="optional"
       default="A"/>
   </xsd:complexType>
   <xsd:complexType name="CT_TLAnimateRotationBehavior">
diff --git a/Part4/OfficeOpenXML-RELAXNG-Transitional/pml.rnc b/Part4/OfficeOpenXML-RELAXNG-Transitional/pml.rnc
index 2ca51fe..7a680e2 100644
--- a/Part4/OfficeOpenXML-RELAXNG-Transitional/pml.rnc
+++ b/Part4/OfficeOpenXML-RELAXNG-Transitional/pml.rnc
@@ -342,6 +342,10 @@ p_ST_TLAnimateMotionPathEditMode = "relative" | "fixed"
 p_CT_TLPoint =
   attribute x { a_ST_Percentage },
   attribute y { a_ST_Percentage }
+p_ST_AnimMotionPtsTypes =
+  xsd:string {
+    pattern = "[AFTSafts]*"
+  }
 p_CT_TLAnimateMotionBehavior =
 
   ## default value: parent
@@ -357,7 +361,7 @@ p_CT_TLAnimateMotionBehavior =
   attribute rAng { a_ST_Angle }?,
 
   ## default value: A
-  attribute ptsTypes { xsd:string }?,
+  attribute ptsTypes { p_ST_AnimMotionPtsTypes }?,
   element cBhvr { p_CT_TLCommonBehaviorData },
   element by { p_CT_TLPoint }?,
   element from { p_CT_TLPoint }?,
diff --git a/Part4/OfficeOpenXML-XMLSchema-Transitional/pml.xsd b/Part4/OfficeOpenXML-XMLSchema-Transitional/pml.xsd
index 1217674..f6f49fe 100644
--- a/Part4/OfficeOpenXML-XMLSchema-Transitional/pml.xsd
+++ b/Part4/OfficeOpenXML-XMLSchema-Transitional/pml.xsd
@@ -553,6 +553,11 @@
     <xsd:attribute name="x" type="a:ST_Percentage" use="required"/>
     <xsd:attribute name="y" type="a:ST_Percentage" use="required"/>
   </xsd:complexType>
+  <xsd:simpleType name="ST_AnimMotionPtsTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[AFTSafts]*"/>
+    </xsd:restriction>
+  </xsd:simpleType>
   <xsd:complexType name="CT_TLAnimateMotionBehavior">
     <xsd:sequence>
       <xsd:element name="cBhvr" type="CT_TLCommonBehaviorData" minOccurs="1" maxOccurs="1"/>
@@ -567,7 +572,7 @@
     <xsd:attribute name="pathEditMode" type="ST_TLAnimateMotionPathEditMode" use="optional"
         default="relative"/>
     <xsd:attribute name="rAng" type="a:ST_Angle" use="optional" default="0"/>
-    <xsd:attribute name="ptsTypes" type="xsd:string" use="optional"
+    <xsd:attribute name="ptsTypes" type="ST_AnimMotionPtsTypes" use="optional"
       default="A"/>
   </xsd:complexType>
   <xsd:complexType name="CT_TLAnimateRotationBehavior">