@@ -32,24 +32,7 @@ Schema excerpt
3232 <xsd:attribute name="rsidRDefault" type="ST_LongHexNumber"/>
3333 </xsd:complexType>
3434
35- <xsd:complexType name="CT_Text">
36- <xsd:simpleContent>
37- <xsd:extension base="s:ST_String">
38- <xsd:attribute ref="xml:space" use="optional"/>
39- </xsd:extension>
40- </xsd:simpleContent>
41- </xsd:complexType>
42-
43- <xsd:group name="EG_PContent">
44- <xsd:choice>
45- <xsd:group ref="EG_ContentRunContent" minOccurs="0" maxOccurs="unbounded"/>
46- <xsd:element name="fldSimple" type="CT_SimpleField" minOccurs="0" maxOccurs="unbounded"/>
47- <xsd:element name="hyperlink" type="CT_Hyperlink"/>
48- <xsd:element name="subDoc" type="CT_Rel"/>
49- </xsd:choice>
50- </xsd:group>
51-
52- <xsd:group name="EG_ContentRunContent">
35+ <xsd:group name="EG_PContent"> <!-- denormalized -->
5336 <xsd:choice>
5437 <xsd:element name="customXml" type="CT_CustomXmlRun"/>
5538 <xsd:element name="smartTag" type="CT_SmartTagRun"/>
@@ -58,6 +41,38 @@ Schema excerpt
5841 <xsd:element name="bdo" type="CT_BdoContentRun"/>
5942 <xsd:element name="r" type="CT_R"/>
6043 <xsd:group ref="EG_RunLevelElts" minOccurs="0" maxOccurs="unbounded"/>
44+ <xsd:element name="fldSimple" type="CT_SimpleField"/>
45+ <xsd:element name="hyperlink" type="CT_Hyperlink"/>
46+ <xsd:element name="subDoc" type="CT_Rel"/>
47+ </xsd:choice>
48+ </xsd:group>
49+
50+ <xsd:group name="EG_RunLevelElts">
51+ <xsd:choice>
52+ <xsd:element name="proofErr" type="CT_ProofErr"/>
53+ <xsd:element name="permStart" type="CT_PermStart"/>
54+ <xsd:element name="permEnd" type="CT_Perm"/>
55+ <xsd:element name="bookmarkStart" type="CT_Bookmark"/>
56+ <xsd:element name="bookmarkEnd" type="CT_MarkupRange"/>
57+ <xsd:element name="moveFromRangeStart" type="CT_MoveBookmark"/>
58+ <xsd:element name="moveFromRangeEnd" type="CT_MarkupRange"/>
59+ <xsd:element name="moveToRangeStart" type="CT_MoveBookmark"/>
60+ <xsd:element name="moveToRangeEnd" type="CT_MarkupRange"/>
61+ <xsd:element name="commentRangeStart" type="CT_MarkupRange"/>
62+ <xsd:element name="commentRangeEnd" type="CT_MarkupRange"/>
63+ <xsd:element name="customXmlInsRangeStart" type="CT_TrackChange"/>
64+ <xsd:element name="customXmlInsRangeEnd" type="CT_Markup"/>
65+ <xsd:element name="customXmlDelRangeStart" type="CT_TrackChange"/>
66+ <xsd:element name="customXmlDelRangeEnd" type="CT_Markup"/>
67+ <xsd:element name="customXmlMoveFromRangeStart" type="CT_TrackChange"/>
68+ <xsd:element name="customXmlMoveFromRangeEnd" type="CT_Markup"/>
69+ <xsd:element name="customXmlMoveToRangeStart" type="CT_TrackChange"/>
70+ <xsd:element name="customXmlMoveToRangeEnd" type="CT_Markup"/>
71+ <xsd:element name="ins" type="CT_RunTrackChange"/>
72+ <xsd:element name="del" type="CT_RunTrackChange"/>
73+ <xsd:element name="moveFrom" type="CT_RunTrackChange"/>
74+ <xsd:element name="moveTo" type="CT_RunTrackChange"/>
75+ <xsd:group ref="EG_MathContent" minOccurs="0" maxOccurs="unbounded"/>
6176 </xsd:choice>
6277 </xsd:group>
6378
@@ -80,22 +95,22 @@ Schema excerpt
8095 <xsd:element name="instrText" type="CT_Text"/>
8196 <xsd:element name="delInstrText" type="CT_Text"/>
8297 <xsd:element name="noBreakHyphen" type="CT_Empty"/>
83- <xsd:element name="softHyphen" type="CT_Empty" minOccurs="0" />
84- <xsd:element name="dayShort" type="CT_Empty" minOccurs="0" />
85- <xsd:element name="monthShort" type="CT_Empty" minOccurs="0" />
86- <xsd:element name="yearShort" type="CT_Empty" minOccurs="0" />
87- <xsd:element name="dayLong" type="CT_Empty" minOccurs="0" />
88- <xsd:element name="monthLong" type="CT_Empty" minOccurs="0" />
89- <xsd:element name="yearLong" type="CT_Empty" minOccurs="0" />
90- <xsd:element name="annotationRef" type="CT_Empty" minOccurs="0" />
91- <xsd:element name="footnoteRef" type="CT_Empty" minOccurs="0" />
92- <xsd:element name="endnoteRef" type="CT_Empty" minOccurs="0" />
93- <xsd:element name="separator" type="CT_Empty" minOccurs="0" />
94- <xsd:element name="continuationSeparator" type="CT_Empty" minOccurs="0" />
95- <xsd:element name="sym" type="CT_Sym" minOccurs="0" />
96- <xsd:element name="pgNum" type="CT_Empty" minOccurs="0" />
97- <xsd:element name="cr" type="CT_Empty" minOccurs="0" />
98- <xsd:element name="tab" type="CT_Empty" minOccurs="0" />
98+ <xsd:element name="softHyphen" type="CT_Empty"/>
99+ <xsd:element name="dayShort" type="CT_Empty"/>
100+ <xsd:element name="monthShort" type="CT_Empty"/>
101+ <xsd:element name="yearShort" type="CT_Empty"/>
102+ <xsd:element name="dayLong" type="CT_Empty"/>
103+ <xsd:element name="monthLong" type="CT_Empty"/>
104+ <xsd:element name="yearLong" type="CT_Empty"/>
105+ <xsd:element name="annotationRef" type="CT_Empty"/>
106+ <xsd:element name="footnoteRef" type="CT_Empty"/>
107+ <xsd:element name="endnoteRef" type="CT_Empty"/>
108+ <xsd:element name="separator" type="CT_Empty"/>
109+ <xsd:element name="continuationSeparator" type="CT_Empty"/>
110+ <xsd:element name="sym" type="CT_Sym" />
111+ <xsd:element name="pgNum" type="CT_Empty"/>
112+ <xsd:element name="cr" type="CT_Empty"/>
113+ <xsd:element name="tab" type="CT_Empty"/>
99114 <xsd:element name="object" type="CT_Object"/>
100115 <xsd:element name="pict" type="CT_Picture"/>
101116 <xsd:element name="fldChar" type="CT_FldChar"/>
@@ -104,7 +119,15 @@ Schema excerpt
104119 <xsd:element name="endnoteReference" type="CT_FtnEdnRef"/>
105120 <xsd:element name="commentReference" type="CT_Markup"/>
106121 <xsd:element name="drawing" type="CT_Drawing"/>
107- <xsd:element name="ptab" type="CT_PTab" minOccurs="0" />
108- <xsd:element name="lastRenderedPageBreak" type="CT_Empty" minOccurs="0" maxOccurs="1" />
122+ <xsd:element name="ptab" type="CT_PTab"/>
123+ <xsd:element name="lastRenderedPageBreak" type="CT_Empty"/>
109124 </xsd:choice>
110125 </xsd:group>
126+
127+ <xsd:complexType name="CT_Text">
128+ <xsd:simpleContent>
129+ <xsd:extension base="s:ST_String">
130+ <xsd:attribute ref="xml:space" use="optional"/>
131+ </xsd:extension>
132+ </xsd:simpleContent>
133+ </xsd:complexType>
0 commit comments