summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-08-08 16:40:33 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-08-08 18:40:23 +0200
commit3f02b29b6573a637592f096c2d2659534b1683ab (patch)
treea59d17c21bc94a87e2e4a1cba8027af77cd28d88
parentf1227224023ac27df43334aa162bf0f3707dd1de (diff)
Unused optional elements
The scripts parsing this file don't care if an element is optional or not, so why bother. Change-Id: I0860c9209347d6fab83e1faf2867db4de94216ac
-rw-r--r--writerfilter/source/ooxml/model.xml3222
1 files changed, 0 insertions, 3222 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 9083de0facda..c3600f5b41cf 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -87,11 +87,9 @@
<empty/>
</define>
<define name="CT_ColorMapping">
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
<attribute name="bg1">
<ref name="ST_ColorSchemeIndex"/>
</attribute>
@@ -143,11 +141,9 @@
<element name="clrScheme">
<ref name="CT_ColorScheme"/>
</element>
- <optional>
<element name="clrMap">
<ref name="CT_ColorMapping"/>
</element>
- </optional>
</define>
<define name="CT_ColorSchemeList">
<zeroOrMore>
@@ -161,49 +157,33 @@
<element name="themeElements">
<ref name="CT_BaseStyles"/>
</element>
- <optional>
<element name="objectDefaults">
<ref name="CT_ObjectStyleDefaults"/>
</element>
- </optional>
- <optional>
<element name="extraClrSchemeLst">
<ref name="CT_ColorSchemeList"/>
</element>
- </optional>
- <optional>
<element name="custClrLst">
<ref name="CT_CustomColorList"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="name">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_BaseStylesOverride">
- <optional>
<element name="clrScheme">
<ref name="CT_ColorScheme"/>
</element>
- </optional>
- <optional>
<element name="fontScheme">
<ref name="CT_FontScheme"/>
</element>
- </optional>
- <optional>
<element name="fmtScheme">
<ref name="CT_StyleMatrix"/>
</element>
- </optional>
</define>
<define name="CT_ClipboardStyleSheet">
<element name="themeElements">
@@ -214,11 +194,9 @@
</element>
</define>
<define name="CT_Hyperlink">
- <optional>
<attribute name="r:id">
<text/>
</attribute>
- </optional>
</define>
<define name="theme">
<element name="theme">
@@ -262,33 +240,23 @@
<element name="spPr">
<ref name="CT_ShapeProperties"/>
</element>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</define>
<define name="CT_ObjectStyleDefaults">
- <optional>
<element name="spDef">
<ref name="CT_DefaultShapeDefinition"/>
</element>
- </optional>
- <optional>
<element name="lnDef">
<ref name="CT_DefaultShapeDefinition"/>
</element>
- </optional>
- <optional>
<element name="txDef">
<ref name="CT_DefaultShapeDefinition"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</define>
</grammar>
</namespace>
@@ -373,11 +341,9 @@
</choice>
</define>
<define name="CT_LightRig">
- <optional>
<element name="rot">
<ref name="CT_SphereCoords"/>
</element>
- </optional>
<attribute name="rig">
<ref name="ST_LightRigType"/>
</attribute>
@@ -438,11 +404,9 @@
<element name="lightRig">
<ref name="CT_LightRig"/>
</element>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</define>
</grammar>
</namespace>
@@ -479,21 +443,15 @@
</choice>
</define>
<define name="CT_Bevel">
- <optional>
<attribute name="w">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="h">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="prst">
<ref name="ST_BevelPresetType"/>
</attribute>
- </optional>
</define>
<define name="ST_PresetMaterialType">
<choice>
@@ -531,59 +489,39 @@
</define>
<define name="CT_Shape3D">
<group>
- <optional>
<element name="bevelT">
<ref name="CT_Bevel"/>
</element>
- </optional>
- <optional>
<element name="bevelB">
<ref name="CT_Bevel"/>
</element>
- </optional>
- <optional>
<element name="extrusionClr">
<ref name="CT_Color"/>
</element>
- </optional>
- <optional>
<element name="contourClr">
<ref name="CT_Color"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="z">
<ref name="ST_Coordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="extrusionH">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="contourW">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="prstMaterial">
<ref name="ST_PresetMaterialType"/>
</attribute>
- </optional>
</define>
<define name="CT_FlatText">
- <optional>
<attribute name="z">
<ref name="ST_Coordinate"/>
</attribute>
- </optional>
</define>
<define name="EG_Text3D">
<choice>
@@ -762,24 +700,18 @@
<empty/>
</define>
<define name="CT_Camera">
- <optional>
<element name="rot">
<ref name="CT_SphereCoords"/>
</element>
- </optional>
<attribute name="prst">
<ref name="ST_PresetCameraType"/>
</attribute>
- <optional>
<attribute name="fov">
<ref name="ST_FOVAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="zoom">
<ref name="ST_PositivePercentage"/>
</attribute>
- </optional>
</define>
</grammar>
<resource name="ST_PresetCameraType" resource="List">
@@ -930,11 +862,9 @@
<element name="folHlink">
<ref name="CT_Color"/>
</element>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
<attribute name="name">
<data type="string">
@@ -943,12 +873,10 @@
</define>
<define name="CT_CustomColor">
<ref name="EG_ColorChoice"/>
- <optional>
<attribute name="name">
<data type="string">
</data>
</attribute>
- </optional>
</define>
<define name="CT_SupplementalFont">
<attribute name="script">
@@ -983,24 +911,18 @@
<ref name="CT_SupplementalFont"/>
</element>
</zeroOrMore>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</define>
<define name="CT_EffectStyleItem">
<ref name="EG_EffectProperties"/>
- <optional>
<element name="scene3d">
<ref name="CT_Scene3D"/>
</element>
- </optional>
- <optional>
<element name="sp3d">
<ref name="CT_Shape3D"/>
</element>
- </optional>
</define>
<define name="CT_FontScheme">
<group>
@@ -1010,11 +932,9 @@
<element name="minorFont">
<ref name="CT_FontCollection"/>
</element>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
<attribute name="name">
<data type="string"/>
@@ -1059,11 +979,9 @@
<ref name="CT_BackgroundFillStyleList"/>
</element>
</group>
- <optional>
<attribute name="name">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_BaseStyles">
<element name="clrScheme">
@@ -1075,11 +993,9 @@
<element name="fmtScheme">
<ref name="CT_StyleMatrix"/>
</element>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</define>
</grammar>
<resource name="ST_StyleMatrixColumnIndex" resource="Integer"/>
@@ -1181,21 +1097,15 @@
<attribute name="typeface">
<ref name="ST_TextTypeface"/>
</attribute>
- <optional>
<attribute name="panose">
<ref name="ST_Panose"/>
</attribute>
- </optional>
- <optional>
<attribute name="pitchFamily">
<data type="byte"/>
</attribute>
- </optional>
- <optional>
<attribute name="charset">
<data type="byte"/>
</attribute>
- </optional>
</define>
<define name="ST_TextLanguageID">
<data type="string"/>
@@ -1254,11 +1164,9 @@
<element name="uLnTx">
<ref name="CT_TextUnderlineLineFollowText"/>
</element>
- <optional>
<element name="uLn">
<ref name="CT_LineProperties"/>
</element>
- </optional>
</choice>
</define>
<define name="EG_TextUnderlineFill">
@@ -1293,159 +1201,95 @@
</define>
<define name="CT_TextCharacterProperties">
<group>
- <optional>
<element name="ln">
<ref name="CT_LineProperties"/>
</element>
- </optional>
- <optional>
<ref name="EG_FillProperties"/>
- </optional>
- <optional>
<ref name="EG_EffectProperties"/>
- </optional>
- <optional>
<element name="highlight">
<ref name="CT_Color"/>
</element>
- </optional>
- <optional>
<ref name="EG_TextUnderlineLine"/>
- </optional>
- <optional>
<ref name="EG_TextUnderlineFill"/>
- </optional>
- <optional>
<element name="latin">
<ref name="CT_TextFont"/>
</element>
- </optional>
- <optional>
<element name="ea">
<ref name="CT_TextFont"/>
</element>
- </optional>
- <optional>
<element name="cs">
<ref name="CT_TextFont"/>
</element>
- </optional>
- <optional>
<element name="sym">
<ref name="CT_TextFont"/>
</element>
- </optional>
- <optional>
<element name="hlinkClick">
<ref name="CT_Hyperlink"/>
</element>
- </optional>
- <optional>
<element name="hlinkMouseOver">
<ref name="CT_Hyperlink"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="kumimoji">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="lang">
<ref name="ST_TextLanguageID"/>
</attribute>
- </optional>
- <optional>
<attribute name="altLang">
<ref name="ST_TextLanguageID"/>
</attribute>
- </optional>
- <optional>
<attribute name="sz">
<ref name="ST_TextFontSize"/>
</attribute>
- </optional>
- <optional>
<attribute name="b">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="i">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="u">
<ref name="ST_TextUnderlineType"/>
</attribute>
- </optional>
- <optional>
<attribute name="strike">
<ref name="ST_TextStrikeType"/>
</attribute>
- </optional>
- <optional>
<attribute name="kern">
<ref name="ST_TextNonNegativePoint"/>
</attribute>
- </optional>
- <optional>
<attribute name="cap">
<ref name="ST_TextCapsType"/>
</attribute>
- </optional>
- <optional>
<attribute name="spc">
<ref name="ST_TextPoint"/>
</attribute>
- </optional>
- <optional>
<attribute name="normalizeH">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="baseline">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="noProof">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="dirty">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="err">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="smtClean">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="smtId">
<data type="unsignedInt"/>
</attribute>
- </optional>
- <optional>
<attribute name="bmk">
<data type="string"/>
</attribute>
- </optional>
</define>
</grammar>
<resource name="ST_TextPoint" resource="Integer"/>
@@ -1506,23 +1350,17 @@
<empty/>
</define>
<define name="CT_AlphaInverseEffect">
- <optional>
<ref name="EG_ColorChoice"/>
- </optional>
</define>
<define name="CT_AlphaModulateFixedEffect">
- <optional>
<attribute name="amt">
<ref name="ST_PositivePercentage"/>
</attribute>
- </optional>
</define>
<define name="CT_AlphaOutsetEffect">
- <optional>
<attribute name="rad">
<ref name="ST_Coordinate"/>
</attribute>
- </optional>
</define>
<define name="CT_AlphaReplaceEffect">
<attribute name="a">
@@ -1535,16 +1373,12 @@
</attribute>
</define>
<define name="CT_BlurEffect">
- <optional>
<attribute name="rad">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="grow">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_ColorChangeEffect">
<group>
@@ -1555,11 +1389,9 @@
<ref name="CT_Color"/>
</element>
</group>
- <optional>
<attribute name="useA">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_ColorReplaceEffect">
<ref name="EG_ColorChoice"/>
@@ -1571,109 +1403,73 @@
</define>
<define name="CT_GlowEffect">
<ref name="EG_ColorChoice"/>
- <optional>
<attribute name="rad">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
</define>
<define name="CT_GrayscaleEffect">
<empty/>
</define>
<define name="CT_HSLEffect">
- <optional>
<attribute name="hue">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="sat">
<ref name="ST_FixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="lum">
<ref name="ST_FixedPercentage"/>
</attribute>
- </optional>
</define>
<define name="CT_InnerShadowEffect">
<ref name="EG_ColorChoice"/>
- <optional>
<attribute name="blurRad">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dist">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dir">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
</define>
<define name="CT_LuminanceEffect">
- <optional>
<attribute name="bright">
<ref name="ST_FixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="contrast">
<ref name="ST_FixedPercentage"/>
</attribute>
- </optional>
</define>
<define name="CT_OuterShadowEffect">
<ref name="EG_ColorChoice"/>
- <optional>
<attribute name="blurRad">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dist">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dir">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="sx">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="sy">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="kx">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="ky">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="algn">
<ref name="ST_RectAlignment"/>
</attribute>
- </optional>
- <optional>
<attribute name="rotWithShape">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="ST_PresetShadowVal">
<choice>
@@ -1724,100 +1520,64 @@
<attribute name="prst">
<ref name="ST_PresetShadowVal"/>
</attribute>
- <optional>
<attribute name="dist">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dir">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
</define>
<define name="CT_ReflectionEffect">
- <optional>
<attribute name="blurRad">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="stA">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="stPos">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="endA">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="endPos">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="dist">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dir">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="fadeDir">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="sx">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="sy">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="kx">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="ky">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="algn">
<ref name="ST_RectAlignment"/>
</attribute>
- </optional>
- <optional>
<attribute name="rotWithShape">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_RelativeOffsetEffect">
- <optional>
<attribute name="tx">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="ty">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
</define>
<define name="CT_SoftEdgesEffect">
<attribute name="rad">
@@ -1825,68 +1585,46 @@
</attribute>
</define>
<define name="CT_TintEffect">
- <optional>
<attribute name="hue">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="amt">
<ref name="ST_FixedPercentage"/>
</attribute>
- </optional>
</define>
<define name="CT_TransformEffect">
- <optional>
<attribute name="sx">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="sy">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="kx">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="ky">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="tx">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="ty">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
</define>
<define name="CT_NoFillProperties">
<empty/>
</define>
<define name="CT_SolidColorFillProperties">
- <optional>
<ref name="EG_ColorChoice"/>
- </optional>
</define>
<define name="CT_LinearShadeProperties">
- <optional>
<attribute name="ang">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="scaled">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="ST_PathShadeType">
<choice>
@@ -1899,16 +1637,12 @@
</choice>
</define>
<define name="CT_PathShadeProperties">
- <optional>
<element name="fillToRect">
<ref name="CT_RelativeRect"/>
</element>
- </optional>
- <optional>
<attribute name="path">
<ref name="ST_PathShadeType"/>
</attribute>
- </optional>
</define>
<define name="EG_ShadeProperties">
<choice>
@@ -1947,69 +1681,45 @@
</define>
<define name="CT_GradientFillProperties">
<group>
- <optional>
<element name="gsLst">
<ref name="CT_GradientStopList"/>
</element>
- </optional>
- <optional>
<ref name="EG_ShadeProperties"/>
- </optional>
- <optional>
<element name="tileRect">
<ref name="CT_RelativeRect"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="flip">
<ref name="ST_TileFlipMode"/>
</attribute>
- </optional>
- <optional>
<attribute name="rotWithShape">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_TileInfoProperties">
- <optional>
<attribute name="tx">
<ref name="ST_Coordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="ty">
<ref name="ST_Coordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="sx">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="sy">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="flip">
<ref name="ST_TileFlipMode"/>
</attribute>
- </optional>
- <optional>
<attribute name="algn">
<ref name="ST_RectAlignment"/>
</attribute>
- </optional>
</define>
<define name="CT_StretchInfoProperties">
- <optional>
<element name="fillRect">
<ref name="CT_RelativeRect"/>
</element>
- </optional>
</define>
<define name="EG_FillModeProperties">
<choice>
@@ -2092,45 +1802,31 @@
</element>
</choice>
</zeroOrMore>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
<ref name="AG_Blob"/>
- <optional>
<attribute name="cstate">
<ref name="ST_BlipCompression"/>
</attribute>
- </optional>
</define>
<define name="CT_BlipFillProperties">
<group>
- <optional>
<element name="blip">
<ref name="CT_Blip"/>
</element>
- </optional>
- <optional>
<element name="srcRect">
<ref name="CT_RelativeRect"/>
</element>
- </optional>
- <optional>
<ref name="EG_FillModeProperties"/>
- </optional>
</group>
- <optional>
<attribute name="dpi">
<data type="unsignedInt"/>
</attribute>
- </optional>
- <optional>
<attribute name="rotWithShape">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="ST_PresetPatternVal">
<choice>
@@ -2246,22 +1942,16 @@
</define>
<define name="CT_PatternFillProperties">
<group>
- <optional>
<element name="fgClr">
<ref name="CT_Color"/>
</element>
- </optional>
- <optional>
<element name="bgClr">
<ref name="CT_Color"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="prst">
<ref name="ST_PresetPatternVal"/>
</attribute>
- </optional>
</define>
<define name="CT_GroupFillProperties">
<empty/>
@@ -2425,16 +2115,12 @@
<zeroOrMore>
<ref name="EG_Effect"/>
</zeroOrMore>
- <optional>
<attribute name="type">
<ref name="ST_EffectContainerType"/>
</attribute>
- </optional>
- <optional>
<attribute name="name">
<data type="token"/>
</attribute>
- </optional>
</define>
<define name="CT_AlphaModulateEffect">
<element name="cont">
@@ -2450,46 +2136,30 @@
</attribute>
</define>
<define name="CT_EffectList">
- <optional>
<element name="blur">
<ref name="CT_BlurEffect"/>
</element>
- </optional>
- <optional>
<element name="fillOverlay">
<ref name="CT_FillOverlayEffect"/>
</element>
- </optional>
- <optional>
<element name="glow">
<ref name="CT_GlowEffect"/>
</element>
- </optional>
- <optional>
<element name="innerShdw">
<ref name="CT_InnerShadowEffect"/>
</element>
- </optional>
- <optional>
<element name="outerShdw">
<ref name="CT_OuterShadowEffect"/>
</element>
- </optional>
- <optional>
<element name="prstShdw">
<ref name="CT_PresetShadowEffect"/>
</element>
- </optional>
- <optional>
<element name="reflection">
<ref name="CT_ReflectionEffect"/>
</element>
- </optional>
- <optional>
<element name="softEdge">
<ref name="CT_SoftEdgesEffect"/>
</element>
- </optional>
</define>
<define name="EG_EffectProperties">
<choice>
@@ -2741,21 +2411,15 @@
</choice>
</define>
<define name="CT_LineEndProperties">
- <optional>
<attribute name="type">
<ref name="ST_LineEndType"/>
</attribute>
- </optional>
- <optional>
<attribute name="w">
<ref name="ST_LineEndWidth"/>
</attribute>
- </optional>
- <optional>
<attribute name="len">
<ref name="ST_LineEndLength"/>
</attribute>
- </optional>
</define>
<define name="EG_LineFillProperties">
<choice>
@@ -2780,11 +2444,9 @@
<empty/>
</define>
<define name="CT_LineJoinMiterProperties">
- <optional>
<attribute name="lim">
<ref name="ST_PositivePercentage"/>
</attribute>
- </optional>
</define>
<define name="EG_LineJoinProperties">
<choice>
@@ -2826,11 +2488,9 @@
</choice>
</define>
<define name="CT_PresetLineDashProperties">
- <optional>
<attribute name="val">
<ref name="ST_PresetLineDashVal"/>
</attribute>
- </optional>
</define>
<define name="CT_DashStop">
<attribute name="d">
@@ -2894,51 +2554,31 @@
</define>
<define name="CT_LineProperties">
<group>
- <optional>
<ref name="EG_LineFillProperties"/>
- </optional>
- <optional>
<ref name="EG_LineDashProperties"/>
- </optional>
- <optional>
<ref name="EG_LineJoinProperties"/>
- </optional>
- <optional>
<element name="headEnd">
<ref name="CT_LineEndProperties"/>
</element>
- </optional>
- <optional>
<element name="tailEnd">
<ref name="CT_LineEndProperties"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="w">
<ref name="ST_LineWidth"/>
</attribute>
- </optional>
- <optional>
<attribute name="cap">
<ref name="ST_LineCap"/>
</attribute>
- </optional>
- <optional>
<attribute name="cmpd">
<ref name="ST_CompoundLine"/>
</attribute>
- </optional>
- <optional>
<attribute name="algn">
<ref name="ST_PenAlignment"/>
</attribute>
- </optional>
</define>
</grammar>
<resource name="ST_LineEndType" resource="List">
@@ -3019,76 +2659,46 @@
<include href="dml-shapeLineProperties.rng"/>
<define name="CT_ShapeProperties">
<group>
- <optional>
<element name="xfrm">
<ref name="CT_Transform2D"/>
</element>
- </optional>
- <optional>
<ref name="EG_Geometry"/>
- </optional>
- <optional>
<ref name="EG_FillProperties"/>
- </optional>
- <optional>
<element name="ln">
<ref name="CT_LineProperties"/>
</element>
- </optional>
- <optional>
<ref name="EG_EffectProperties"/>
- </optional>
- <optional>
<element name="scene3d">
<ref name="CT_Scene3D"/>
</element>
- </optional>
- <optional>
<element name="sp3d">
<ref name="CT_Shape3D"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="bwMode">
<ref name="ST_BlackWhiteMode"/>
</attribute>
- </optional>
</define>
<define name="CT_GroupShapeProperties">
<group>
- <optional>
<element name="xfrm">
<ref name="CT_GroupTransform2D"/>
</element>
- </optional>
- <optional>
<ref name="EG_FillProperties"/>
- </optional>
- <optional>
<ref name="EG_EffectProperties"/>
- </optional>
- <optional>
<element name="scene3d">
<ref name="CT_Scene3D"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="bwMode">
<ref name="ST_BlackWhiteMode"/>
</attribute>
- </optional>
</define>
</grammar>
<resource name="CT_ShapeProperties" resource="Properties">
@@ -3413,11 +3023,9 @@
<attribute name="val">
<ref name="ST_SystemColorVal"/>
</attribute>
- <optional>
<attribute name="lastClr">
<ref name="ST_HexBinary3"/>
</attribute>
- </optional>
</define>
<define name="ST_SchemeColorVal">
<choice>
@@ -3777,71 +3385,47 @@
</define>
<define name="CT_Transform2D">
<group>
- <optional>
<element name="off">
<ref name="CT_Point2D"/>
</element>
- </optional>
- <optional>
<element name="ext">
<ref name="CT_PositiveSize2D"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="rot">
<ref name="ST_Angle"/>
</attribute>
- </optional>
- <optional>
<attribute name="flipH">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="flipV">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_GroupTransform2D">
<group>
- <optional>
<element name="off">
<ref name="CT_Point2D"/>
</element>
- </optional>
- <optional>
<element name="ext">
<ref name="CT_PositiveSize2D"/>
</element>
- </optional>
- <optional>
<element name="chOff">
<ref name="CT_Point2D"/>
</element>
- </optional>
- <optional>
<element name="chExt">
<ref name="CT_PositiveSize2D"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="rot">
<ref name="ST_Angle"/>
</attribute>
- </optional>
- <optional>
<attribute name="flipH">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="flipV">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_Point3D">
<attribute name="x">
@@ -3877,26 +3461,18 @@
</attribute>
</define>
<define name="CT_RelativeRect">
- <optional>
<attribute name="l">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="t">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="r">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="b">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
</define>
<define name="ST_RectAlignment">
<choice>
@@ -3980,81 +3556,53 @@
</choice>
</define>
<define name="AG_Blob">
- <optional>
<attribute name="r:embed">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="r:link">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_EmbeddedWAVAudioFile">
<attribute name="r:embed"/>
- <optional>
<attribute name="name">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="builtIn">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_Hyperlink">
<group>
- <optional>
<element name="snd">
<ref name="CT_EmbeddedWAVAudioFile"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="r:id"/>
- </optional>
- <optional>
<attribute name="invalidUrl">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="action">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="tgtFrame">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="tooltip">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="history">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="highlightClick">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="endSnd">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="ST_DrawingElementId">
<data type="unsignedInt"/>
@@ -4366,187 +3914,121 @@
<!-- ISO RELAX NG Schema -->
<include href="dml-shapeGeometry.rng"/>
<define name="AG_Locking">
- <optional>
<attribute name="noGrp">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noSelect">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noRot">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noChangeAspect">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noMove">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noResize">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noEditPoints">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noAdjustHandles">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noChangeArrowheads">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noChangeShapeType">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_ConnectorLocking">
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
<ref name="AG_Locking"/>
</define>
<define name="CT_ShapeLocking">
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
<ref name="AG_Locking"/>
- <optional>
<attribute name="noTextEdit">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureLocking">
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
<ref name="AG_Locking"/>
- <optional>
<attribute name="noCrop">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_GroupLocking">
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
- <optional>
<attribute name="noGrp">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noUngrp">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noSelect">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noRot">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noChangeAspect">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noMove">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noResize">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_GraphicalObjectFrameLocking">
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
- <optional>
<attribute name="noGrp">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noDrilldown">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noSelect">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noChangeAspect">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noMove">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="noResize">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_NonVisualDrawingProps">
<group>
- <optional>
<element name="a:hlinkClick">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="hlinkHover">
<ref name="CT_Hyperlink"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
<attribute name="id">
<ref name="ST_DrawingElementId"/>
@@ -4554,105 +4036,71 @@
<attribute name="name">
<data type="string"/>
</attribute>
- <optional>
<attribute name="descr">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="hidden">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="title">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_NonVisualDrawingShapeProps">
<group>
- <optional>
<element name="spLocks">
<ref name="CT_ShapeLocking"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="txBox">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_NonVisualConnectorProperties">
- <optional>
<element name="cxnSpLocks">
<ref name="CT_ConnectorLocking"/>
</element>
- </optional>
- <optional>
<element name="stCxn">
<ref name="CT_Connection"/>
</element>
- </optional>
- <optional>
<element name="endCxn">
<ref name="CT_Connection"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</define>
<define name="CT_NonVisualPictureProperties">
<group>
- <optional>
<element name="picLocks">
<ref name="CT_PictureLocking"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="preferRelativeResize">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_NonVisualGroupDrawingShapeProps">
- <optional>
<element name="grpSpLocks">
<ref name="CT_GroupLocking"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</define>
<define name="CT_NonVisualGraphicFrameProperties">
- <optional>
<element name="graphicFrameLocks">
<ref name="CT_GraphicalObjectFrameLocking"/>
</element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
- </optional>
</define>
</grammar>
<resource name="CT_GraphicalObjectFrameLocking" resource="Properties">
@@ -5126,131 +4574,89 @@
<define name="EG_ColorChoice">
<choice>
- <optional>
<element name="srgbClr">
<ref name="CT_SRgbColor"/>
</element>
- </optional>
- <optional>
<element name="schemeClr">
<ref name="CT_SchemeColor"/>
</element>
- </optional>
</choice>
</define>
<define name="EG_ColorTransform">
<choice>
- <optional>
<element name="tint">
<ref name="CT_PositiveFixedPercentage"/>
</element>
- </optional>
- <optional>
<element name="shade">
<ref name="CT_PositiveFixedPercentage"/>
</element>
- </optional>
- <optional>
<element name="alpha">
<ref name="CT_PositiveFixedPercentage"/>
</element>
- </optional>
- <optional>
<element name="hueMod">
<ref name="CT_PositivePercentage"/>
</element>
- </optional>
- <optional>
<element name="sat">
<ref name="CT_Percentage"/>
</element>
- </optional>
- <optional>
<element name="satOff">
<ref name="CT_Percentage"/>
</element>
- </optional>
- <optional>
<element name="satMod">
<ref name="CT_Percentage"/>
</element>
- </optional>
- <optional>
<element name="lum">
<ref name="CT_Percentage"/>
</element>
- </optional>
- <optional>
<element name="lumOff">
<ref name="CT_Percentage"/>
</element>
- </optional>
- <optional>
<element name="lumMod">
<ref name="CT_Percentage"/>
</element>
- </optional>
</choice>
</define>
<define name="EG_FillProperties">
<choice>
- <optional>
<element name="noFill">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="solidFill">
<ref name="CT_SolidColorFillProperties"/>
</element>
- </optional>
- <optional>
<element name="gradFill">
<ref name="CT_GradientFillProperties"/>
</element>
- </optional>
</choice>
</define>
<define name="EG_ShadeProperties">
<choice>
- <optional>
<element name="lin">
<ref name="CT_LinearShadeProperties"/>
</element>
- </optional>
- <optional>
<element name="path">
<ref name="CT_PathShadeProperties"/>
</element>
- </optional>
</choice>
</define>
<define name="EG_LineDashProperties">
<choice>
- <optional>
<element name="prstDash">
<ref name="CT_PresetLineDashProperties"/>
</element>
- </optional>
</choice>
</define>
<define name="EG_LineJoinProperties">
<choice>
- <optional>
<element name="round">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="bevel">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="miter">
<ref name="CT_LineJoinMiterProperties"/>
</element>
- </optional>
</choice>
</define>
@@ -5288,38 +4694,26 @@
<ref name="EG_ColorChoice"/>
</define>
<define name="CT_GradientFillProperties">
- <optional>
<element name="gsLst">
<ref name="CT_GradientStopList"/>
</element>
- </optional>
- <optional>
<ref name="EG_ShadeProperties"/>
- </optional>
</define>
<define name="CT_LinearShadeProperties">
- <optional>
<attribute name="ang">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="scaled">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<define name="CT_PathShadeProperties">
- <optional>
<element name="fillToRect">
<ref name="CT_RelativeRect"/>
</element>
- </optional>
- <optional>
<attribute name="path">
<ref name="ST_PathShadeType"/>
</attribute>
- </optional>
</define>
<define name="CT_GradientStopList">
<oneOrMore>
@@ -5335,47 +4729,33 @@
</attribute>
</define>
<define name="CT_RelativeRect">
- <optional>
<attribute name="l">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="t">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="r">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="b">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
</define>
<define name="CT_PresetLineDashProperties">
- <optional>
<attribute name="val">
<ref name="ST_PresetLineDashVal"/>
</attribute>
- </optional>
</define>
<define name="CT_LineJoinMiterProperties">
- <optional>
<attribute name="lim">
<ref name="ST_PositivePercentage"/>
</attribute>
- </optional>
</define>
<define name="CT_Camera">
- <optional>
<attribute name="prst">
<ref name="ST_PresetCameraType"/>
</attribute>
- </optional>
</define>
<define name="CT_LightRig">
<element name="rot">
@@ -5400,21 +4780,15 @@
</attribute>
</define>
<define name="CT_Bevel">
- <optional>
<attribute name="w">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="h">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="prst">
<ref name="ST_BevelPresetType"/>
</attribute>
- </optional>
</define>
<define name="CT_Color">
<ref name="EG_ColorChoice"/>
@@ -5423,177 +4797,111 @@
<attribute name="id">
<ref name="ST_UnsignedDecimalNumber"/>
</attribute>
- <optional>
<attribute name="val">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<define name="CT_OnOff">
- <optional>
<attribute name="val">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<!-- Main Elements-->
<define name="CT_Glow">
- <optional>
<ref name="EG_ColorChoice"/>
- </optional>
<attribute name="rad">
<ref name="ST_PositiveCoordinate"/>
</attribute>
</define>
<define name="CT_Shadow">
- <optional>
<ref name="EG_ColorChoice"/>
- </optional>
- <optional>
<attribute name="blurRad">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dist">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dir">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="sx">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="sy">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="kx">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="ky">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="algn">
<ref name="ST_RectAlignment"/>
</attribute>
- </optional>
</define>
<define name="CT_Reflection">
- <optional>
<attribute name="blurRad">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="stA">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="stPos">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="endA">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="endPos">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="dist">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="dir">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="fadeDir">
<ref name="ST_PositiveFixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="sx">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="sy">
<ref name="ST_Percentage"/>
</attribute>
- </optional>
- <optional>
<attribute name="kx">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="ky">
<ref name="ST_FixedAngle"/>
</attribute>
- </optional>
- <optional>
<attribute name="algn">
<ref name="ST_RectAlignment"/>
</attribute>
- </optional>
</define>
<define name="CT_TextOutlineEffect">
- <optional>
<ref name="EG_FillProperties"/>
- </optional>
- <optional>
<ref name="EG_LineDashProperties"/>
- </optional>
- <optional>
<ref name="EG_LineJoinProperties"/>
- </optional>
- <optional>
<attribute name="w">
<ref name="ST_LineWidth"/>
</attribute>
- </optional>
- <optional>
<attribute name="cap">
<ref name="ST_LineCap"/>
</attribute>
- </optional>
- <optional>
<attribute name="cmpd">
<ref name="ST_CompoundLine"/>
</attribute>
- </optional>
- <optional>
<attribute name="algn">
<ref name="ST_PenAlignment"/>
</attribute>
- </optional>
</define>
<define name="CT_FillTextEffect">
- <optional>
<ref name="EG_FillProperties"/>
- </optional>
</define>
<define name="CT_Scene3D">
<element name="camera">
@@ -5616,21 +4924,15 @@
<element name="contourClr">
<ref name="CT_Color"/>
</element>
- <optional>
<attribute name="extrusionH">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="contourW">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="prstMaterial">
<ref name="ST_PresetMaterialType"/>
</attribute>
- </optional>
</define>
<define name="CT_Ligatures">
<attribute name="val">
@@ -5725,21 +5027,15 @@
</attribute>
</define>
<define name="CT_SdtCheckbox">
- <optional>
<element name="checked">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="checkedState">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="uncheckedState">
<ref name="CT_String"/>
</element>
- </optional>
</define>
</grammar>
@@ -6233,252 +5529,200 @@
<!-- Complex types for effects -->
<define name="CT_PictureEffectBlur">
- <optional>
<attribute name="visible">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectCement">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="crackSpacing">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectChalkSketch">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam4"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectCrisscrossEtching">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam4"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectCutout">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="numberOfShades">
<ref name="ST_ArtisticEffectParam6"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectFilmGrain">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="grainSize">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectGlass">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectGlowDiffused">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="intensity">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectGlowEdges">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="smoothness">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectLightScreen">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="gridSize">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectLineDrawing">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pencilSize">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectMarker">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="size">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectMosiaicBubbles">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectPaintStrokes">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="intensity">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectPaintBrush">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="brushSize">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectPastelsSmooth">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectPencilGrayscale">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pencilSize">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectPencilSketch">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectPhotocopy">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="detail">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectPlasticWrap">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="smoothness">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectTexturizer">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectWatercolorSponge">
- <optional>
<attribute name="trans">
<ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="brushSize">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectBrightnessContrast">
- <optional>
<attribute name="bright">
<ref name="ST_FixedPercentage"/>
</attribute>
<attribute name="contrast">
<ref name="ST_FixedPercentage"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectColorTemperature">
- <optional>
<attribute name="colorTemp">
<ref name="ST_ColorTemperature"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectSaturation">
- <optional>
<attribute name="sat">
<ref name="ST_SaturationAmount"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureEffectSharpenSoften">
- <optional>
<attribute name="amount">
<ref name="ST_FixedPercentage"/>
</attribute>
- </optional>
</define>
<!-- Complex types for containers -->
@@ -6563,11 +5807,9 @@
<ref name="CT_PictureEffectSharpenSoften"/>
</element>
</choice>
- <optional>
<attribute name="visible">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_PictureLayer">
<zeroOrMore>
@@ -7115,71 +6357,47 @@
<element name="pos">
<ref name="CT_AdjPoint2D"/>
</element>
- <optional>
<attribute name="gdRefX">
<ref name="ST_GeomGuideName"/>
</attribute>
- </optional>
- <optional>
<attribute name="minX">
<ref name="ST_AdjCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="maxX">
<ref name="ST_AdjCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="gdRefY">
<ref name="ST_GeomGuideName"/>
</attribute>
- </optional>
- <optional>
<attribute name="minY">
<ref name="ST_AdjCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="maxY">
<ref name="ST_AdjCoordinate"/>
</attribute>
- </optional>
</define>
<define name="CT_PolarAdjustHandle">
<element name="pos">
<ref name="CT_AdjPoint2D"/>
</element>
- <optional>
<attribute name="gdRefR">
<ref name="ST_GeomGuideName"/>
</attribute>
- </optional>
- <optional>
<attribute name="minR">
<ref name="ST_AdjCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="maxR">
<ref name="ST_AdjCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="gdRefAng">
<ref name="ST_GeomGuideName"/>
</attribute>
- </optional>
- <optional>
<attribute name="minAng">
<ref name="ST_AdjCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="maxAng">
<ref name="ST_AdjCoordinate"/>
</attribute>
- </optional>
</define>
<define name="CT_ConnectionSite">
<element name="pos">
@@ -7296,31 +6514,21 @@
</element>
</choice>
</zeroOrMore>
- <optional>
<attribute name="w">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="h">
<ref name="ST_PositiveCoordinate"/>
</attribute>
- </optional>
- <optional>
<attribute name="fill">
<ref name="ST_PathFillMode"/>
</attribute>
- </optional>
- <optional>
<attribute name="stroke">
<data type="boolean"/>
</attribute>
- </optional>
- <optional>
<attribute name="extrusionOk">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_Path2DList">
<zeroOrMore>
@@ -7330,51 +6538,37 @@
</zeroOrMore>
</define>
<define name="CT_PresetGeometry2D">
- <optional>
<element name="avLst">
<ref name="CT_GeomGuideList"/>
</element>
- </optional>
<attribute name="prst">
<ref name="ST_ShapeType"/>
</attribute>
</define>
<define name="CT_PresetTextShape">
- <optional>
<element name="avLst">
<ref name="CT_GeomGuideList"/>
</element>
- </optional>
<attribute name="prst">
<ref name="ST_TextShapeType"/>
</attribute>
</define>
<define name="CT_CustomGeometry2D">
- <optional>
<element name="avLst">
<ref name="CT_GeomGuideList"/>
</element>
- </optional>
- <optional>
<element name="gdLst">
<ref name="CT_GeomGuideList"/>
</element>
- </optional>
- <optional>
<element name="ahLst">
<ref name="CT_AdjustHandleList"/>
</element>
- </optional>
- <optional>
<element name="cxnLst">
<ref name="CT_ConnectionSiteList"/>
</element>
- </optional>
- <optional>
<element name="rect">
<ref name="CT_GeomRect"/>
</element>
- </optional>
<element name="pathLst">
<ref name="CT_Path2DList"/>
</element>
@@ -7695,58 +6889,40 @@
<element name="extent">
<ref name="CT_PositiveSize2D"/>
</element>
- <optional>
<element name="effectExtent">
<ref name="CT_EffectExtent"/>
</element>
- </optional>
<element name="docPr">
<ref name="CT_NonVisualDrawingProps"/>
</element>
- <optional>
<element name="cNvGraphicFramePr">
<ref name="CT_NonVisualGraphicFrameProperties"/>
</element>
- </optional>
<element name="a:graphic">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- <optional>
<element name="wp14:sizeRelH">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="wp14:sizeRelV">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="distT">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distB">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distL">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distR">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="wp14:anchorId">
<ref name="ST_EditId"/>
</attribute>
- </optional>
</define>
<define name="ST_WrapText">
<choice>
@@ -7771,44 +6947,32 @@
</element>
</oneOrMore>
</group>
- <optional>
<attribute name="edited">
<data type="boolean"/>
</attribute>
- </optional>
</define>
<define name="CT_WrapNone">
<empty/>
</define>
<define name="CT_WrapSquare">
- <optional>
<element name="effectExtent">
<ref name="CT_EffectExtent"/>
</element>
- </optional>
<attribute name="wrapText">
<ref name="ST_WrapText"/>
</attribute>
- <optional>
<attribute name="distT">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distB">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distL">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distR">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
</define>
<define name="CT_WrapTight">
<element name="wrapPolygon">
@@ -7817,16 +6981,12 @@
<attribute name="wrapText">
<ref name="ST_WrapText"/>
</attribute>
- <optional>
<attribute name="distL">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distR">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
</define>
<define name="CT_WrapThrough">
<element name="wrapPolygon">
@@ -7835,33 +6995,23 @@
<attribute name="wrapText">
<ref name="ST_WrapText"/>
</attribute>
- <optional>
<attribute name="distL">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distR">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
</define>
<define name="CT_WrapTopBottom">
- <optional>
<element name="effectExtent">
<ref name="CT_EffectExtent"/>
</element>
- </optional>
- <optional>
<attribute name="distT">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distB">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
</define>
<define name="EG_WrapType">
<choice>
@@ -7993,54 +7143,38 @@
<element name="extent">
<ref name="CT_PositiveSize2D"/>
</element>
- <optional>
<element name="effectExtent">
<ref name="CT_EffectExtent"/>
</element>
- </optional>
<ref name="EG_WrapType"/>
<element name="docPr">
<ref name="CT_NonVisualDrawingProps"/>
</element>
- <optional>
<element name="cNvGraphicFramePr">
<ref name="CT_NonVisualGraphicFrameProperties"/>
</element>
- </optional>
<element name="a:graphic">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- <optional>
<element name="wp14:sizeRelH">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="wp14:sizeRelV">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="distT">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distB">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distL">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
- <optional>
<attribute name="distR">
<ref name="ST_WrapDistance"/>
</attribute>
- </optional>
<attribute name="simplePos">
<data type="boolean"/>
</attribute>
@@ -8056,19 +7190,15 @@
<attribute name="layoutInCell">
<data type="boolean"/>
</attribute>
- <optional>
<attribute name="hidden">
<data type="boolean"/>
</attribute>
- </optional>
<attribute name="allowOverlap">
<data type="boolean"/>
</attribute>
- <optional>
<attribute name="wp14:anchorId">
<ref name="ST_EditId"/>
</attribute>
- </optional>
</define>
<define name="inline">
<element name="inline">
@@ -8445,256 +7575,174 @@
</attribute>
</define>
<define name="EG_ScriptStyle">
- <optional>
<element name="scr">
<ref name="CT_Script"/>
</element>
- </optional>
- <optional>
<element name="sty">
<ref name="CT_Style"/>
</element>
- </optional>
</define>
<define name="CT_RPR">
- <optional>
<element name="lit">
<ref name="CT_OnOff"/>
</element>
- </optional>
<choice>
- <optional>
<element name="nor">
<ref name="CT_OnOff"/>
</element>
- </optional>
<ref name="EG_ScriptStyle"/>
</choice>
- <optional>
<element name="brk">
<ref name="CT_ManualBreak"/>
</element>
- </optional>
- <optional>
<element name="aln">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="CT_Text">
<ref name="ST_String"/>
- <optional>
<attribute name="xml:space">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_R">
- <optional>
<element name="rPr">
<ref name="CT_RPR"/>
</element>
- </optional>
- <optional>
<ref name="EG_RPr"/>
- </optional>
<zeroOrMore>
<choice>
<ref name="EG_RunInnerContent"/>
- <optional>
<element name="t">
<ref name="CT_Text"/>
</element>
- </optional>
</choice>
</zeroOrMore>
</define>
<define name="CT_CtrlPr">
- <optional>
<ref name="EG_RPrMath"/>
- </optional>
</define>
<define name="CT_AccPr">
- <optional>
<element name="chr">
<ref name="CT_Char"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_Acc">
- <optional>
<element name="accPr">
<ref name="CT_AccPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
</define>
<define name="CT_BarPr">
- <optional>
<element name="pos">
<ref name="CT_TopBot"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_Bar">
- <optional>
<element name="barPr">
<ref name="CT_BarPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
</define>
<define name="CT_BoxPr">
- <optional>
<element name="opEmu">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noBreak">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="diff">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="brk">
<ref name="CT_ManualBreak"/>
</element>
- </optional>
- <optional>
<element name="aln">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_Box">
- <optional>
<element name="boxPr">
<ref name="CT_BoxPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
</define>
<define name="CT_BorderBoxPr">
- <optional>
<element name="hideTop">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="hideBot">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="hideLeft">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="hideRight">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="strikeH">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="strikeV">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="strikeBLTR">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="strikeTLBR">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_BorderBox">
- <optional>
<element name="borderBoxPr">
<ref name="CT_BorderBoxPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
</define>
<define name="CT_DPr">
- <optional>
<element name="begChr">
<ref name="CT_Char"/>
</element>
- </optional>
- <optional>
<element name="sepChr">
<ref name="CT_Char"/>
</element>
- </optional>
- <optional>
<element name="endChr">
<ref name="CT_Char"/>
</element>
- </optional>
- <optional>
<element name="grow">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="shp">
<ref name="CT_Shp"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_D">
- <optional>
<element name="dPr">
<ref name="CT_DPr"/>
</element>
- </optional>
<oneOrMore>
<element name="e">
<ref name="CT_OMathArg"/>
@@ -8702,43 +7750,29 @@
</oneOrMore>
</define>
<define name="CT_EqArrPr">
- <optional>
<element name="baseJc">
<ref name="CT_YAlign"/>
</element>
- </optional>
- <optional>
<element name="maxDist">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="objDist">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="rSpRule">
<ref name="CT_SpacingRule"/>
</element>
- </optional>
- <optional>
<element name="rSp">
<ref name="CT_UnSignedInteger"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_EqArr">
- <optional>
<element name="eqArrPr">
<ref name="CT_EqArrPr"/>
</element>
- </optional>
<oneOrMore>
<element name="e">
<ref name="CT_OMathArg"/>
@@ -8746,23 +7780,17 @@
</oneOrMore>
</define>
<define name="CT_FPr">
- <optional>
<element name="type">
<ref name="CT_FType"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_F">
- <optional>
<element name="fPr">
<ref name="CT_FPr"/>
</element>
- </optional>
<element name="num">
<ref name="CT_OMathArg"/>
</element>
@@ -8771,18 +7799,14 @@
</element>
</define>
<define name="CT_FuncPr">
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_Func">
- <optional>
<element name="funcPr">
<ref name="CT_FuncPr"/>
</element>
- </optional>
<element name="fName">
<ref name="CT_OMathArg"/>
</element>
@@ -8791,50 +7815,36 @@
</element>
</define>
<define name="CT_GroupChrPr">
- <optional>
<element name="chr">
<ref name="CT_Char"/>
</element>
- </optional>
- <optional>
<element name="pos">
<ref name="CT_TopBot"/>
</element>
- </optional>
- <optional>
<element name="vertJc">
<ref name="CT_TopBot"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_GroupChr">
- <optional>
<element name="groupChrPr">
<ref name="CT_GroupChrPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
</define>
<define name="CT_LimLowPr">
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_LimLow">
- <optional>
<element name="limLowPr">
<ref name="CT_LimLowPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
@@ -8843,18 +7853,14 @@
</element>
</define>
<define name="CT_LimUppPr">
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_LimUpp">
- <optional>
<element name="limUppPr">
<ref name="CT_LimUppPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
@@ -8863,23 +7869,17 @@
</element>
</define>
<define name="CT_MCPr">
- <optional>
<element name="count">
<ref name="CT_Integer255"/>
</element>
- </optional>
- <optional>
<element name="mcJc">
<ref name="CT_XAlign"/>
</element>
- </optional>
</define>
<define name="CT_MC">
- <optional>
<element name="mcPr">
<ref name="CT_MCPr"/>
</element>
- </optional>
</define>
<define name="CT_MCS">
<oneOrMore>
@@ -8889,51 +7889,33 @@
</oneOrMore>
</define>
<define name="CT_MPr">
- <optional>
<element name="baseJc">
<ref name="CT_YAlign"/>
</element>
- </optional>
- <optional>
<element name="plcHide">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="rSpRule">
<ref name="CT_SpacingRule"/>
</element>
- </optional>
- <optional>
<element name="cGpRule">
<ref name="CT_SpacingRule"/>
</element>
- </optional>
- <optional>
<element name="rSp">
<ref name="CT_UnSignedInteger"/>
</element>
- </optional>
- <optional>
<element name="cSp">
<ref name="CT_UnSignedInteger"/>
</element>
- </optional>
- <optional>
<element name="cGp">
<ref name="CT_UnSignedInteger"/>
</element>
- </optional>
- <optional>
<element name="mcs">
<ref name="CT_MCS"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_MR">
<oneOrMore>
@@ -8943,11 +7925,9 @@
</oneOrMore>
</define>
<define name="CT_M">
- <optional>
<element name="mPr">
<ref name="CT_MPr"/>
</element>
- </optional>
<oneOrMore>
<element name="mr">
<ref name="CT_MR"/>
@@ -8955,43 +7935,29 @@
</oneOrMore>
</define>
<define name="CT_NaryPr">
- <optional>
<element name="chr">
<ref name="CT_Char"/>
</element>
- </optional>
- <optional>
<element name="limLoc">
<ref name="CT_LimLoc"/>
</element>
- </optional>
- <optional>
<element name="grow">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="subHide">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="supHide">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_Nary">
- <optional>
<element name="naryPr">
<ref name="CT_NaryPr"/>
</element>
- </optional>
<element name="sub">
<ref name="CT_OMathArg"/>
</element>
@@ -9003,65 +7969,45 @@
</element>
</define>
<define name="CT_PhantPr">
- <optional>
<element name="show">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="zeroWid">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="zeroAsc">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="zeroDesc">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="transp">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_Phant">
- <optional>
<element name="phantPr">
<ref name="CT_PhantPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
</define>
<define name="CT_RadPr">
- <optional>
<element name="degHide">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_Rad">
- <optional>
<element name="radPr">
<ref name="CT_RadPr"/>
</element>
- </optional>
<element name="deg">
<ref name="CT_OMathArg"/>
</element>
@@ -9070,18 +8016,14 @@
</element>
</define>
<define name="CT_SPrePr">
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_SPre">
- <optional>
<element name="sPrePr">
<ref name="CT_SPrePr"/>
</element>
- </optional>
<element name="sub">
<ref name="CT_OMathArg"/>
</element>
@@ -9093,18 +8035,14 @@
</element>
</define>
<define name="CT_SSubPr">
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_SSub">
- <optional>
<element name="sSubPr">
<ref name="CT_SSubPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
@@ -9113,23 +8051,17 @@
</element>
</define>
<define name="CT_SSubSupPr">
- <optional>
<element name="alnScr">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_SSubSup">
- <optional>
<element name="sSubSupPr">
<ref name="CT_SSubSupPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
@@ -9141,18 +8073,14 @@
</element>
</define>
<define name="CT_SSupPr">
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="CT_SSup">
- <optional>
<element name="sSupPr">
<ref name="CT_SSupPr"/>
</element>
- </optional>
<element name="e">
<ref name="CT_OMathArg"/>
</element>
@@ -9231,26 +8159,20 @@
</choice>
</define>
<define name="CT_OMathArgPr">
- <optional>
<element name="argSz">
<ref name="CT_Integer2"/>
</element>
- </optional>
</define>
<define name="CT_OMathArg">
- <optional>
<element name="argPr">
<ref name="CT_OMathArgPr"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_OMathElements"/>
</zeroOrMore>
- <optional>
<element name="ctrlPr">
<ref name="CT_CtrlPr"/>
</element>
- </optional>
</define>
<define name="ST_Jc">
<choice>
@@ -9274,11 +8196,9 @@
</attribute>
</define>
<define name="CT_OMathParaPr">
- <optional>
<element name="jc">
<ref name="CT_OMathJc"/>
</element>
- </optional>
</define>
<define name="ST_TwipsMeasure">
<data type="unsignedInt"/>
@@ -9319,67 +8239,42 @@
</attribute>
</define>
<define name="CT_MathPr">
- <optional>
<element name="mathFont">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="brkBin">
<ref name="CT_BreakBin"/>
</element>
- </optional>
- <optional>
<element name="brkBinSub">
<ref name="CT_BreakBinSub"/>
</element>
- </optional>
- <optional>
<element name="smallFrac">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="dispDef">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="lMargin">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="rMargin">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="defJc">
<ref name="CT_OMathJc"/>
</element>
- </optional>
- <optional>
<element name="preSp">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="postSp">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="interSp">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="intraSp">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<choice>
<element name="wrapIndent">
<ref name="CT_TwipsMeasure"/>
@@ -9388,17 +8283,12 @@
<ref name="CT_OnOff"/>
</element>
</choice>
- </optional>
- <optional>
<element name="intLim">
<ref name="CT_LimLoc"/>
</element>
- </optional>
- <optional>
<element name="naryLim">
<ref name="CT_LimLoc"/>
</element>
- </optional>
</define>
<define name="mathPr">
<element name="mathPr">
@@ -9406,11 +8296,9 @@
</element>
</define>
<define name="CT_OMathPara">
- <optional>
<element name="oMathParaPr">
<ref name="CT_OMathParaPr"/>
</element>
- </optional>
<oneOrMore>
<element name="oMath">
<ref name="CT_OMath"/>
@@ -9794,58 +8682,42 @@
<include href="vml-wordprocessingDrawing.rng"/>
<!-- start = shape | shapetype | group | background | fill | formulas | handles | imagedata | path | textbox | shadow | stroke | textpath | arc | curve | image | line | oval | polyline | rect | roundrect -->
<define name="AG_Id">
- <optional>
<attribute name="id">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="AG_Style">
- <optional>
<attribute name="style">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="AG_Type">
- <optional>
<attribute name="type">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="AG_Adj">
- <optional>
<attribute name="adj">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="AG_Path">
- <optional>
<attribute name="path">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="AG_Fill">
- <optional>
<attribute name="filled">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="fillcolor">
<text/>
</attribute>
- </optional>
</define>
<define name="AG_Chromakey">
- <optional>
<attribute name="chromakey">
<text/>
</attribute>
- </optional>
</define>
<define name="AG_Ext">
<attribute name="ext">
@@ -9855,80 +8727,52 @@
<define name="AG_CoreAttributes">
<ref name="AG_Id"/>
<ref name="AG_Style"/>
- <optional>
<attribute name="href">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="target">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="class">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="title">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="alt">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="coordsize">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="coordorigin">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="wrapcoords">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="print">
<text/>
</attribute>
- </optional>
</define>
<define name="AG_ShapeAttributes">
<ref name="AG_Chromakey"/>
<ref name="AG_Fill"/>
- <optional>
<attribute name="opacity">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="stroked">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="strokecolor">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="strokeweight">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="insetpen">
<text/>
</attribute>
- </optional>
</define>
<define name="AG_OfficeCoreAttributes">
<attribute name="o:spid"/>
@@ -9977,175 +8821,109 @@
<ref name="AG_OfficeShapeAttributes"/>
</define>
<define name="AG_ImageAttributes">
- <optional>
<attribute name="src">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="cropleft">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="croptop">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="cropright">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="cropbottom">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="gain">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="blacklevel">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="gamma">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="grayscale">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="bilevel">
<text/>
</attribute>
- </optional>
</define>
<define name="AG_StrokeAttributes">
- <optional>
<attribute name="on">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="weight">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="color">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="opacity">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="linestyle">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="miterlimit">
<data type="decimal"/>
</attribute>
- </optional>
- <optional>
<attribute name="joinstyle">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="endcap">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="dashstyle">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="filltype">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="src">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="imageaspect">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="imagesize">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="imagealignshape">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="color2">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="startarrow">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="startarrowwidth">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="startarrowlength">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="endarrow">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="endarrowwidth">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="endarrowlength">
<text/>
</attribute>
- </optional>
<attribute name="o:href"/>
<attribute name="o:althref"/>
<attribute name="o:title"/>
<attribute name="o:forcedash"/>
- <optional>
<attribute name="r:id"/>
- </optional>
- <optional>
<attribute name="insetpen">
<text/>
</attribute>
- </optional>
<attribute name="o:relid"/>
</define>
<define name="EG_ShapeElements">
@@ -10195,16 +8973,12 @@
<element name="wvml:borderright">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- <optional>
<element name="x:ClientData">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="p:textdata">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
</choice>
</define>
<define name="shape">
@@ -10245,22 +9019,18 @@
<ref name="AG_Adj"/>
<ref name="AG_Path"/>
<attribute name="o:gfxdata"/>
- <optional>
<attribute name="equationxml">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_Shapetype">
<group>
<zeroOrMore>
<ref name="EG_ShapeElements"/>
</zeroOrMore>
- <optional>
<element name="o:complex">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
</group>
<ref name="AG_AllCoreAttributes"/>
<ref name="AG_AllShapeAttributes"/>
@@ -10290,18 +9060,14 @@
</oneOrMore>
<ref name="AG_AllCoreAttributes"/>
<ref name="AG_Fill"/>
- <optional>
<attribute name="editas">
<text/>
</attribute>
- </optional>
<attribute name="o:tableproperties"/>
<attribute name="o:tablelimits"/>
</define>
<define name="CT_Background">
- <optional>
<ref name="fill"/>
- </optional>
<ref name="AG_Id"/>
<ref name="AG_Fill"/>
<attribute name="o:bwmode"/>
@@ -10355,118 +9121,74 @@
</element>
</define>
<define name="CT_Fill">
- <optional>
<element name="o:fill">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
<ref name="AG_Id"/>
- <optional>
<attribute name="type">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="on">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="color">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="opacity">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="color2">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="src">
<data type="string"/>
</attribute>
- </optional>
<attribute name="o:href"/>
<attribute name="o:althref"/>
- <optional>
<attribute name="size">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="origin">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="position">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="aspect">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="colors">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="angle">
<data type="decimal"/>
</attribute>
- </optional>
- <optional>
<attribute name="alignshape">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="focus">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="focussize">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="focusposition">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="method">
<text/>
</attribute>
- </optional>
<attribute name="o:detectmouseclick"/>
<attribute name="o:title"/>
<attribute name="o:opacity2"/>
- <optional>
<attribute name="recolor">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="rotate">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="r:id"/>
- </optional>
- <optional>
<attribute name="o:relid"/>
- </optional>
</define>
<define name="CT_Formulas">
<zeroOrMore>
@@ -10520,11 +9242,9 @@
<ref name="AG_Id"/>
<ref name="AG_ImageAttributes"/>
<ref name="AG_Chromakey"/>
- <optional>
<attribute name="embosscolor">
<text/>
</attribute>
- </optional>
<attribute name="recolortarget">
<text/>
</attribute>
@@ -10541,56 +9261,36 @@
</define>
<define name="CT_Path">
<ref name="AG_Id"/>
- <optional>
<attribute name="v">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="limo">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="textboxrect">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="fillok">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="strokeok">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="shadowok">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="arrowok">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="gradientshapeok">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="textpathok">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="insetpenok">
<text/>
</attribute>
- </optional>
<attribute name="o:connecttype"/>
<attribute name="o:connectlocs"/>
<attribute name="o:connectangles"/>
@@ -10598,95 +9298,63 @@
</define>
<define name="CT_Shadow">
<ref name="AG_Id"/>
- <optional>
<attribute name="on">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="type">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="obscured">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="color">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="opacity">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="offset">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="color2">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="offset2">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="origin">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="matrix">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_Stroke">
<group>
- <optional>
<element name="o:left">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="o:top">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="o:right">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="o:bottom">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="o:column">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
</group>
<ref name="AG_Id"/>
<ref name="AG_StrokeAttributes"/>
</define>
<define name="CT_Textbox">
<choice>
- <optional>
<element name="w:txbxContent">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
<element>
<anyName/>
<ref name="BUILT_IN_ANY_TYPE"/>
@@ -10694,47 +9362,33 @@
</choice>
<ref name="AG_Id"/>
<ref name="AG_Style"/>
- <optional>
<attribute name="inset">
<data type="string"/>
</attribute>
- </optional>
<attribute name="o:singleclick"/>
<attribute name="o:insetmode"/>
</define>
<define name="CT_TextPath">
<ref name="AG_Id"/>
<ref name="AG_Style"/>
- <optional>
<attribute name="on">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="fitshape">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="fitpath">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="trim">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="xscale">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="string">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="arc">
<element name="arc">
@@ -10782,16 +9436,12 @@
</zeroOrMore>
<ref name="AG_AllCoreAttributes"/>
<ref name="AG_AllShapeAttributes"/>
- <optional>
<attribute name="startAngle">
<data type="decimal"/>
</attribute>
- </optional>
- <optional>
<attribute name="endAngle">
<data type="decimal"/>
</attribute>
- </optional>
</define>
<define name="CT_Curve">
<zeroOrMore>
@@ -10799,26 +9449,18 @@
</zeroOrMore>
<ref name="AG_AllCoreAttributes"/>
<ref name="AG_AllShapeAttributes"/>
- <optional>
<attribute name="from">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="control1">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="control2">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="to">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_Image">
<zeroOrMore>
@@ -10834,16 +9476,12 @@
</zeroOrMore>
<ref name="AG_AllCoreAttributes"/>
<ref name="AG_AllShapeAttributes"/>
- <optional>
<attribute name="from">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="to">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_Oval">
<oneOrMore>
@@ -10865,11 +9503,9 @@
</zeroOrMore>
<ref name="AG_AllCoreAttributes"/>
<ref name="AG_AllShapeAttributes"/>
- <optional>
<attribute name="points">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_Rect">
<oneOrMore>
@@ -10888,11 +9524,9 @@
</oneOrMore>
<ref name="AG_AllCoreAttributes"/>
<ref name="AG_AllShapeAttributes"/>
- <optional>
<attribute name="arcsize">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="ST_Ext">
<choice>
@@ -11441,78 +10075,46 @@
</element>
</define>
<define name="CT_ShapeDefaults">
- <optional>
<interleave>
- <optional>
<element name="v:fill">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="v:stroke">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="v:textbox">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="v:shadow">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<ref name="skew"/>
- </optional>
- <optional>
<ref name="extrusion"/>
- </optional>
- <optional>
<ref name="callout"/>
- </optional>
- <optional>
<ref name="lock"/>
- </optional>
- <optional>
<element name="colormru">
<ref name="CT_ColorMru"/>
</element>
- </optional>
- <optional>
<element name="colormenu">
<ref name="CT_ColorMenu"/>
</element>
- </optional>
</interleave>
- </optional>
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="spidmax">
<data type="integer"/>
</attribute>
- </optional>
- <optional>
<attribute name="style">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="fill">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="fillcolor">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="stroke">
<text/>
</attribute>
- </optional>
<attribute name="strokecolor">
<text/>
</attribute>
@@ -11570,31 +10172,23 @@
</define>
<define name="CT_ShapeLayout">
<interleave>
- <optional>
<element name="idmap">
<ref name="CT_IdMap"/>
</element>
- </optional>
- <optional>
<element name="regrouptable">
<ref name="CT_RegroupTable"/>
</element>
- </optional>
- <optional>
<element name="rules">
<ref name="CT_Rules"/>
</element>
- </optional>
</interleave>
<ref name="BUILT_IN_ANY_TYPE"/>
</define>
<define name="CT_IdMap">
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="data">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_RegroupTable">
<zeroOrMore>
@@ -11605,16 +10199,12 @@
<ref name="BUILT_IN_ANY_TYPE"/>
</define>
<define name="CT_Entry">
- <optional>
<attribute name="new">
<data type="int"/>
</attribute>
- </optional>
- <optional>
<attribute name="old">
<data type="int"/>
</attribute>
- </optional>
</define>
<define name="CT_Rules">
<zeroOrMore>
@@ -11633,96 +10223,62 @@
<attribute name="id">
<data type="string"/>
</attribute>
- <optional>
<attribute name="type">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="how">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="idref">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_Proxy">
- <optional>
<attribute name="start">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="end">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="idref">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="connectloc">
<data type="int"/>
</attribute>
- </optional>
</define>
<define name="CT_Diagram">
- <optional>
<element name="relationtable">
<ref name="CT_RelationTable"/>
</element>
- </optional>
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="dgmstyle">
<data type="integer"/>
</attribute>
- </optional>
- <optional>
<attribute name="autoformat">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="reverse">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="autolayout">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="dgmscalex">
<data type="integer"/>
</attribute>
- </optional>
- <optional>
<attribute name="dgmscaley">
<data type="integer"/>
</attribute>
- </optional>
- <optional>
<attribute name="dgmfontsize">
<data type="integer"/>
</attribute>
- </optional>
- <optional>
<attribute name="constrainbounds">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="dgmbasetextscale">
<data type="integer"/>
</attribute>
- </optional>
</define>
<define name="CT_RelationTable">
<zeroOrMore>
@@ -11734,21 +10290,15 @@
</define>
<define name="CT_Relation">
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="idsrc">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="iddest">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="idcntr">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_ColorMru">
<ref name="BUILT_IN_ANY_TYPE"/>
@@ -11838,490 +10388,304 @@
</define>
<define name="CT_Skew">
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="id">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="on">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="offset">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="origin">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="matrix">
<data type="string"/>
</attribute>
- </optional>
</define>
<define name="CT_Extrusion">
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="on">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="type">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="render">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="viewpointorigin">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="viewpoint">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="plane">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="skewangle">
<data type="float"/>
</attribute>
- </optional>
- <optional>
<attribute name="skewamt">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="foredepth">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="backdepth">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="orientation">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="orientationangle">
<data type="float"/>
</attribute>
- </optional>
- <optional>
<attribute name="lockrotationcenter">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="autorotationcenter">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="rotationcenter">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="rotationangle">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="colormode">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="color">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="shininess">
<data type="float"/>
</attribute>
- </optional>
- <optional>
<attribute name="specularity">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="diffusity">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="metal">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="edge">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="facet">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="lightface">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="brightness">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="lightposition">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="lightlevel">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="lightharsh">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="lightposition2">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="lightlevel2">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="lightharsh2">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_Callout">
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="on">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="type">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="gap">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="angle">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="dropauto">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="drop">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="distance">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="lengthspecified">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="length">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="accentbar">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="textborder">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="minusx">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="minusy">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_Lock">
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="position">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="selection">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="grouping">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="ungrouping">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="rotation">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="cropping">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="verticies">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="adjusthandles">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="text">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="aspectratio">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="shapetype">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_OLEObject">
<group>
- <optional>
<element name="LinkType">
<ref name="ST_OLELinkType"/>
</element>
- </optional>
- <optional>
<element name="LockedField">
<ref name="ST_TrueFalseBlank"/>
</element>
- </optional>
- <optional>
<element name="FieldCodes">
<data type="string"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="Type">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="ProgID">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="ShapeID">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="DrawAspect">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="ObjectID">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="r:id">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="UpdateMode">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_Complex">
<ref name="BUILT_IN_ANY_TYPE"/>
</define>
<define name="CT_StrokeChild">
<ref name="BUILT_IN_ANY_TYPE"/>
- <optional>
<attribute name="on">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="weight">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="color">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="color2">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="opacity">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="linestyle">
<ref name="ST_StrokeLineStyle"/>
</attribute>
- </optional>
- <optional>
<attribute name="miterlimit">
<data type="decimal"/>
</attribute>
- </optional>
- <optional>
<attribute name="joinstyle">
<ref name="ST_StrokeJoinStyle"/>
</attribute>
- </optional>
- <optional>
<attribute name="endcap">
<ref name="ST_StrokeEndCap"/>
</attribute>
- </optional>
- <optional>
<attribute name="dashstyle">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="insetpen">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="filltype">
<ref name="ST_FillType"/>
</attribute>
- </optional>
- <optional>
<attribute name="src">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="imageaspect">
<ref name="ST_ImageAspect"/>
</attribute>
- </optional>
- <optional>
<attribute name="imagesize">
<data type="string"/>
</attribute>
- </optional>
- <optional>
<attribute name="imagealignshape">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="startarrow">
<ref name="ST_StrokeArrowType"/>
</attribute>
- </optional>
- <optional>
<attribute name="startarrowwidth">
<ref name="ST_StrokeArrowWidth"/>
</attribute>
- </optional>
- <optional>
<attribute name="startarrowlength">
<ref name="ST_StrokeArrowLength"/>
</attribute>
- </optional>
- <optional>
<attribute name="endarrow">
<ref name="ST_StrokeArrowType"/>
</attribute>
- </optional>
- <optional>
<attribute name="endarrowwidth">
<ref name="ST_StrokeArrowWidth"/>
</attribute>
- </optional>
- <optional>
<attribute name="endarrowlength">
<ref name="ST_StrokeArrowLength"/>
</attribute>
- </optional>
<ref name="href"/>
<ref name="althref"/>
<ref name="title"/>
@@ -12791,9 +11155,7 @@
<oneOrMore>
<ref name="Choice"/>
</oneOrMore>
- <optional>
<ref name="Fallback"/>
- </optional>
</element>
</define>
<define name="Choice">
@@ -12846,21 +11208,15 @@
</element>
</define>
<define name="CT_Border">
- <optional>
<attribute name="type">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="width">
<data type="positiveInteger"/>
</attribute>
- </optional>
- <optional>
<attribute name="shadow">
<text/>
</attribute>
- </optional>
</define>
<define name="wrap">
<element name="wrap">
@@ -12868,26 +11224,18 @@
</element>
</define>
<define name="CT_Wrap">
- <optional>
<attribute name="type">
<ref name="ST_WrapType"/>
</attribute>
- </optional>
- <optional>
<attribute name="side">
<ref name="ST_WrapSide"/>
</attribute>
- </optional>
- <optional>
<attribute name="anchorx">
<ref name="ST_HorizontalAnchor"/>
</attribute>
- </optional>
- <optional>
<attribute name="anchory">
<ref name="ST_VerticalAnchor"/>
</attribute>
- </optional>
</define>
<define name="anchorlock">
<element name="anchorlock">
@@ -13303,21 +11651,15 @@
<attribute name="val">
<ref name="ST_HexColor"/>
</attribute>
- <optional>
<attribute name="themeColor">
<ref name="ST_ThemeColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeTint">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeShade">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
</define>
<define name="ST_LangCode">
<data type="hexBinary"/>
@@ -13383,31 +11725,21 @@
</choice>
</define>
<define name="CT_Underline">
- <optional>
<attribute name="val">
<ref name="ST_Underline"/>
</attribute>
- </optional>
- <optional>
<attribute name="color">
<ref name="ST_HexColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeColor">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="themeTint">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="themeShade">
<text/>
</attribute>
- </optional>
</define>
<define name="ST_TextEffect">
<choice>
@@ -13822,46 +12154,30 @@
<attribute name="val">
<ref name="ST_Border"/>
</attribute>
- <optional>
<attribute name="color">
<ref name="ST_HexColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeColor">
<ref name="ST_ThemeColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeTint">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeShade">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="sz">
<ref name="ST_EighthPointMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="space">
<ref name="ST_PointMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="shadow">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="frame">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<define name="ST_Shd">
<choice>
@@ -13947,46 +12263,30 @@
<attribute name="val">
<ref name="ST_Shd"/>
</attribute>
- <optional>
<attribute name="color">
<ref name="ST_HexColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeColor">
<ref name="ST_ThemeColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeTint">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeShade">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="fill">
<ref name="ST_HexColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeFill">
<ref name="ST_ThemeColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeFillTint">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeFillShade">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
</define>
<define name="ST_VerticalAlignRun">
<choice>
@@ -14007,11 +12307,9 @@
<attribute name="val">
<text/>
</attribute>
- <optional>
<attribute name="id">
<text/>
</attribute>
- </optional>
</define>
<define name="ST_Em">
<choice>
@@ -14033,21 +12331,15 @@
</attribute>
</define>
<define name="CT_Language">
- <optional>
<attribute name="val">
<ref name="ST_Lang"/>
</attribute>
- </optional>
- <optional>
<attribute name="eastAsia">
<ref name="ST_Lang"/>
</attribute>
- </optional>
- <optional>
<attribute name="bidi">
<ref name="ST_Lang"/>
</attribute>
- </optional>
</define>
<define name="ST_CombineBrackets">
<choice>
@@ -14064,31 +12356,21 @@
</choice>
</define>
<define name="CT_EastAsianLayout">
- <optional>
<attribute name="id">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="combine">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="combineBrackets">
<ref name="ST_CombineBrackets"/>
</attribute>
- </optional>
- <optional>
<attribute name="vert">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="vertCompress">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<define name="ST_XAlign">
<choice>
@@ -14177,81 +12459,51 @@
</choice>
</define>
<define name="CT_FramePr">
- <optional>
<attribute name="dropCap">
<ref name="ST_DropCap"/>
</attribute>
- </optional>
- <optional>
<attribute name="lines">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="w">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="h">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="vSpace">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="hSpace">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="wrap">
<ref name="ST_Wrap"/>
</attribute>
- </optional>
- <optional>
<attribute name="hAnchor">
<ref name="ST_HAnchor"/>
</attribute>
- </optional>
- <optional>
<attribute name="vAnchor">
<ref name="ST_VAnchor"/>
</attribute>
- </optional>
- <optional>
<attribute name="x">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="xAlign">
<ref name="ST_XAlign"/>
</attribute>
- </optional>
- <optional>
<attribute name="y">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="yAlign">
<ref name="ST_YAlign"/>
</attribute>
- </optional>
- <optional>
<attribute name="hRule">
<ref name="ST_HeightRule"/>
</attribute>
- </optional>
- <optional>
<attribute name="anchorLock">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<define name="ST_TabJc">
<choice>
@@ -14295,11 +12547,9 @@
<attribute name="val">
<ref name="ST_TabJc"/>
</attribute>
- <optional>
<attribute name="leader">
<ref name="ST_TabTlc"/>
</attribute>
- </optional>
<attribute name="pos">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
@@ -14315,108 +12565,68 @@
</choice>
</define>
<define name="CT_Spacing">
- <optional>
<attribute name="before">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="beforeLines">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="beforeAutospacing">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="after">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="afterLines">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="afterAutospacing">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="line">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="lineRule">
<ref name="ST_LineSpacingRule"/>
</attribute>
- </optional>
</define>
<define name="CT_Ind">
- <optional>
<attribute name="end">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="endChars">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="start">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="startChars">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="left">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="leftChars">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="right">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="rightChars">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="hanging">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="hangingChars">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="firstLine">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="firstLineChars">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
</define>
<define name="ST_Jc">
<choice>
@@ -14488,11 +12698,9 @@
<data type="int"/>
</define>
<define name="CT_Zoom">
- <optional>
<attribute name="val">
<ref name="ST_Zoom"/>
</attribute>
- </optional>
<attribute name="percent">
<ref name="ST_Percentage"/>
</attribute>
@@ -14507,11 +12715,9 @@
<attribute name="dllVersion">
<text/>
</attribute>
- <optional>
<attribute name="nlCheck">
<text/>
</attribute>
- </optional>
<attribute name="checkStyle">
<text/>
</attribute>
@@ -14528,16 +12734,12 @@
</choice>
</define>
<define name="CT_Proof">
- <optional>
<attribute name="spelling">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="grammar">
<text/>
</attribute>
- </optional>
</define>
<define name="ST_DocType">
<choice>
@@ -14627,16 +12829,12 @@
</attribute>
</define>
<define name="CT_DocProtect">
- <optional>
<attribute name="edit">
<ref name="ST_DocProtect"/>
</attribute>
- </optional>
- <optional>
<attribute name="formatting">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
<attribute name="enforcement">
<ref name="ST_OnOff"/>
</attribute>
@@ -14715,31 +12913,21 @@
</attribute>
</define>
<define name="CT_TrackChangesView">
- <optional>
<attribute name="markup">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="comments">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="insDel">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="formatting">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="inkAnnotations">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<define name="CT_Kinsoku">
<attribute name="lang">
@@ -14815,40 +13003,30 @@
<attribute name="author">
<ref name="ST_String"/>
</attribute>
- <optional>
<attribute name="date">
<ref name="ST_DateTime"/>
</attribute>
- </optional>
</define>
<define name="CT_CellMergeTrackChange">
<ref name="CT_TrackChange"/>
- <optional>
<attribute name="vMerge">
<ref name="ST_AnnotationVMerge"/>
</attribute>
- </optional>
- <optional>
<attribute name="vMergeOrig">
<ref name="ST_AnnotationVMerge"/>
</attribute>
- </optional>
</define>
<define name="CT_TrackChangeRange">
<ref name="CT_TrackChange"/>
- <optional>
<attribute name="displacedByCustomXml">
<ref name="ST_DisplacedByCustomXml"/>
</attribute>
- </optional>
</define>
<define name="CT_MarkupRange">
<ref name="CT_Markup"/>
- <optional>
<attribute name="displacedByCustomXml">
<ref name="ST_DisplacedByCustomXml"/>
</attribute>
- </optional>
</define>
<define name="CT_MarkupRangeBookmark">
<attribute name="id">
@@ -14864,16 +13042,12 @@
</define>
<define name="CT_BookmarkRange">
<ref name="CT_MarkupRangeBookmark"/>
- <optional>
<attribute name="colFirst">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="colLast">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_Bookmark">
<ref name="CT_BookmarkRange"/>
@@ -14898,19 +13072,15 @@
<zeroOrMore>
<ref name="EG_BlockLevelElts"/>
</zeroOrMore>
- <optional>
<attribute name="initials">
<ref name="ST_String"/>
</attribute>
- </optional>
</define>
<define name="CT_TrackChangeNumbering">
<ref name="CT_TrackChange"/>
- <optional>
<attribute name="original">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_TblPrExChange">
<ref name="CT_TrackChange"/>
@@ -14944,11 +13114,9 @@
</define>
<define name="CT_SectPrChange">
<ref name="CT_TrackChange"/>
- <optional>
<element name="sectPr">
<ref name="CT_SectPrBase"/>
</element>
- </optional>
</define>
<define name="CT_PPrChange">
<ref name="CT_TrackChange"/>
@@ -14979,21 +13147,15 @@
</define>
<define name="EG_CellMarkupElements">
<choice>
- <optional>
<element name="cellIns">
<ref name="CT_TrackChange"/>
</element>
- </optional>
- <optional>
<element name="cellDel">
<ref name="CT_TrackChange"/>
</element>
- </optional>
- <optional>
<element name="cellMerge">
<ref name="CT_CellMergeTrackChange"/>
</element>
- </optional>
</choice>
</define>
<define name="EG_RangeMarkupElements">
@@ -15049,58 +13211,38 @@
</choice>
</define>
<define name="CT_NumPr">
- <optional>
<element name="ilvl">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="numId">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="numberingChange">
<ref name="CT_TrackChangeNumbering"/>
</element>
- </optional>
- <optional>
<element name="ins">
<ref name="CT_TrackChange"/>
</element>
- </optional>
</define>
<define name="CT_PBdr">
- <optional>
<element name="top">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="left">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="bottom">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="right">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="between">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="bar">
<ref name="CT_Border"/>
</element>
- </optional>
</define>
<define name="CT_Tabs">
<oneOrMore>
@@ -15129,236 +13271,148 @@
</attribute>
</define>
<define name="CT_PPrBase">
- <optional>
<element name="pStyle">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="keepNext">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="keepLines">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="pageBreakBefore">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="framePr">
<ref name="CT_FramePr"/>
</element>
- </optional>
- <optional>
<element name="widowControl">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="numPr">
<ref name="CT_NumPr"/>
</element>
- </optional>
- <optional>
<element name="suppressLineNumbers">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="pBdr">
<ref name="CT_PBdr"/>
</element>
- </optional>
- <optional>
<element name="shd">
<ref name="CT_Shd"/>
</element>
- </optional>
- <optional>
<element name="tabs">
<ref name="CT_Tabs"/>
</element>
- </optional>
- <optional>
<element name="suppressAutoHyphens">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="kinsoku">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="wordWrap">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="overflowPunct">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="topLinePunct">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="autoSpaceDE">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="autoSpaceDN">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="bidi">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="adjustRightInd">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="snapToGrid">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="spacing">
<ref name="CT_Spacing"/>
</element>
- </optional>
- <optional>
<element name="ind">
<ref name="CT_Ind"/>
</element>
- </optional>
- <optional>
<element name="contextualSpacing">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="mirrorIndents">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="suppressOverlap">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="jc">
<ref name="CT_Jc"/>
</element>
- </optional>
- <optional>
<element name="textDirection">
<ref name="CT_TextDirection"/>
</element>
- </optional>
- <optional>
<element name="textAlignment">
<ref name="CT_TextAlignment"/>
</element>
- </optional>
- <optional>
<element name="textboxTightWrap">
<ref name="CT_TextboxTightWrap"/>
</element>
- </optional>
- <optional>
<element name="outlineLvl">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="divId">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="cnfStyle">
<ref name="CT_Cnf"/>
</element>
- </optional>
</define>
<define name="CT_PPr">
<ref name="CT_PPrBase"/>
<group>
- <optional>
<element name="rPr">
<ref name="CT_ParaRPr"/>
</element>
- </optional>
- <optional>
<element name="sectPr">
<ref name="CT_SectPr"/>
</element>
- </optional>
- <optional>
<element name="pPrChange">
<ref name="CT_PPrChange"/>
</element>
- </optional>
</group>
</define>
<define name="CT_Control">
- <optional>
<attribute name="name">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="shapeid">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="r:id">
<ref name="ST_String"/>
</attribute>
- </optional>
</define>
<define name="CT_Background">
<ref name="CT_PictureBase"/>
- <optional>
<attribute name="color">
<ref name="ST_HexColor"/>
</attribute>
- </optional>
- <optional>
<attribute name="themeColor">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="themeTint">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="themeShade">
<text/>
</attribute>
- </optional>
- <optional>
<element name="v:background">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
</define>
<define name="CT_Rel">
<attribute name="r:id">
@@ -15367,66 +13421,48 @@
</define>
<define name="CT_PictureBase">
<oneOrMore>
- <optional>
<element>
<anyName/>
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
</oneOrMore>
</define>
<define name="CT_Object">
<ref name="CT_PictureBase"/>
- <optional>
<element name="control">
<ref name="CT_Control"/>
</element>
- </optional>
- <optional>
<attribute name="dxaOrig">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="dyaOrig">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_Picture">
<ref name="CT_PictureBase"/>
<group>
- <optional>
<element name="movie">
<ref name="CT_Rel"/>
</element>
- </optional>
- <optional>
<element name="control">
<ref name="CT_Control"/>
</element>
- </optional>
</group>
</define>
<define name="CT_Drawing">
<oneOrMore>
<choice>
- <optional>
<ref name="anchor"/>
- </optional>
- <optional>
<ref name="inline"/>
- </optional>
</choice>
</oneOrMore>
</define>
<define name="CT_SimpleField">
<group>
- <optional>
<element name="fldData">
<ref name="CT_FLDData"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_PContent"/>
</zeroOrMore>
@@ -15496,21 +13532,15 @@
</define>
<define name="CT_FldChar">
<choice>
- <optional>
<element name="fldData">
<ref name="CT_FLDData"/>
</element>
- </optional>
- <optional>
<element name="ffData">
<ref name="CT_FFData"/>
</element>
- </optional>
- <optional>
<element name="numberingChange">
<ref name="CT_TrackChangeNumbering"/>
</element>
- </optional>
</choice>
<attribute name="fldCharType">
<ref name="ST_FldCharType"/>
@@ -15526,31 +13556,21 @@
<zeroOrMore>
<ref name="EG_PContent"/>
</zeroOrMore>
- <optional>
<attribute name="tgtFrame">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="tooltip">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="docLocation">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="history">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="anchor">
<text/>
</attribute>
- </optional>
<attribute name="r:id">
<ref name="ST_String"/>
</attribute>
@@ -15570,26 +13590,18 @@
<element name="calcOnExit">
<ref name="CT_OnOff"/>
</element>
- <optional>
<element name="entryMacro">
<ref name="CT_MacroName"/>
</element>
- </optional>
- <optional>
<element name="exitMacro">
<ref name="CT_MacroName"/>
</element>
- </optional>
- <optional>
<element name="helpText">
<ref name="CT_FFHelpText"/>
</element>
- </optional>
- <optional>
<element name="statusText">
<ref name="CT_FFStatusText"/>
</element>
- </optional>
<choice>
<element name="checkBox">
<ref name="CT_FFCheckBox"/>
@@ -15629,28 +13641,20 @@
<ref name="CT_OnOff"/>
</element>
</choice>
- <optional>
<element name="default">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="checked">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="CT_FFDDList">
- <optional>
<element name="result">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="default">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
<zeroOrMore>
<element name="listEntry">
<ref name="CT_String"/>
@@ -15658,26 +13662,18 @@
</zeroOrMore>
</define>
<define name="CT_FFTextInput">
- <optional>
<element name="type">
<ref name="CT_FFTextType"/>
</element>
- </optional>
- <optional>
<element name="default">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="maxLength">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="format">
<ref name="CT_String"/>
</element>
- </optional>
</define>
<define name="ST_SectionMark">
<choice>
@@ -15839,21 +13835,15 @@
</choice>
</define>
<define name="CT_PageSz">
- <optional>
<attribute name="w">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="h">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="orient">
<ref name="ST_PageOrientation"/>
</attribute>
- </optional>
<attribute name="code">
<ref name="ST_DecimalNumber"/>
</attribute>
@@ -15909,42 +13899,28 @@
</define>
<define name="CT_PageBorders">
<group>
- <optional>
<element name="top">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="left">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="bottom">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="right">
<ref name="CT_Border"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="zOrder">
<ref name="ST_PageBorderZOrder"/>
</attribute>
- </optional>
- <optional>
<attribute name="display">
<ref name="ST_PageBorderDisplay"/>
</attribute>
- </optional>
- <optional>
<attribute name="offsetFrom">
<ref name="ST_PageBorderOffset"/>
</attribute>
- </optional>
</define>
<define name="ST_ChapterSep">
<choice>
@@ -15971,60 +13947,40 @@
</choice>
</define>
<define name="CT_LineNumber">
- <optional>
<attribute name="countBy">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="start">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="distance">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="restart">
<ref name="ST_LineNumberRestart"/>
</attribute>
- </optional>
</define>
<define name="CT_PageNumber">
- <optional>
<attribute name="fmt">
<ref name="ST_NumberFormat"/>
</attribute>
- </optional>
- <optional>
<attribute name="start">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="chapStyle">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="chapSep">
<ref name="ST_ChapterSep"/>
</attribute>
- </optional>
</define>
<define name="CT_Column">
- <optional>
<attribute name="w">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="space">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
</define>
<define name="CT_Columns">
<zeroOrMore>
@@ -16032,26 +13988,18 @@
<ref name="CT_Column"/>
</element>
</zeroOrMore>
- <optional>
<attribute name="equalWidth">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="space">
<ref name="ST_TwipsMeasure"/>
</attribute>
- </optional>
- <optional>
<attribute name="num">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="sep">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<define name="ST_VerticalJc">
<choice>
@@ -16119,24 +14067,18 @@
<attribute name="type">
<ref name="ST_HdrFtr"/>
</attribute>
- <optional>
<attribute name="r:id">
<ref name="ST_String"/>
</attribute>
- </optional>
</define>
<define name="EG_HdrFtrReferences">
<choice>
- <optional>
<element name="headerReference">
<ref name="CT_HdrFtrRef"/>
</element>
- </optional>
- <optional>
<element name="footerReference">
<ref name="CT_HdrFtrRef"/>
</element>
- </optional>
</choice>
</define>
<define name="CT_HdrFtr">
@@ -16145,101 +14087,63 @@
</oneOrMore>
</define>
<define name="EG_SectPrContents">
- <optional>
<element name="footnotePr">
<ref name="CT_FtnProps"/>
</element>
- </optional>
- <optional>
<element name="endnotePr">
<ref name="CT_EdnProps"/>
</element>
- </optional>
- <optional>
<element name="type">
<ref name="CT_SectType"/>
</element>
- </optional>
- <optional>
<element name="pgSz">
<ref name="CT_PageSz"/>
</element>
- </optional>
- <optional>
<element name="pgMar">
<ref name="CT_PageMar"/>
</element>
- </optional>
- <optional>
<element name="paperSrc">
<ref name="CT_PaperSource"/>
</element>
- </optional>
- <optional>
<element name="pgBorders">
<ref name="CT_PageBorders"/>
</element>
- </optional>
- <optional>
<element name="lnNumType">
<ref name="CT_LineNumber"/>
</element>
- </optional>
- <optional>
<element name="pgNumType">
<ref name="CT_PageNumber"/>
</element>
- </optional>
- <optional>
<element name="cols">
<ref name="CT_Columns"/>
</element>
- </optional>
- <optional>
<element name="formProt">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="vAlign">
<ref name="CT_VerticalJc"/>
</element>
- </optional>
- <optional>
<element name="noEndnote">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="titlePg">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="textDirection">
<ref name="CT_TextDirection"/>
</element>
- </optional>
- <optional>
<element name="bidi">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="rtlGutter">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="docGrid">
<ref name="CT_DocGrid"/>
</element>
- </optional>
- <optional>
<element name="printerSettings">
<ref name="CT_Rel"/>
</element>
- </optional>
</define>
<define name="AG_SectPrAttributes">
<attribute name="rsidRPr">
@@ -16256,9 +14160,7 @@
</attribute>
</define>
<define name="CT_SectPrBase">
- <optional>
<ref name="EG_SectPrContents"/>
- </optional>
<ref name="AG_SectPrAttributes"/>
</define>
<define name="CT_SectPr">
@@ -16266,14 +14168,10 @@
<zeroOrMore>
<ref name="EG_HdrFtrReferences"/>
</zeroOrMore>
- <optional>
<ref name="EG_SectPrContents"/>
- </optional>
- <optional>
<element name="sectPrChange">
<ref name="CT_SectPrChange"/>
</element>
- </optional>
</group>
<ref name="AG_SectPrAttributes"/>
</define>
@@ -16300,16 +14198,12 @@
</choice>
</define>
<define name="CT_Br">
- <optional>
<attribute name="type">
<ref name="ST_BrType"/>
</attribute>
- </optional>
- <optional>
<attribute name="clear">
<ref name="ST_BrClear"/>
</attribute>
- </optional>
</define>
<define name="ST_PTabAlignment">
<choice>
@@ -16401,42 +14295,30 @@
<attribute name="id">
<text/>
</attribute>
- <optional>
<attribute name="displacedByCustomXml">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_PermStart">
<ref name="CT_Perm"/>
- <optional>
<attribute name="edGrp">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="ed">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="colFirst">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="colLast">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_Text">
<ref name="ST_String"/>
- <optional>
<attribute name="xml:space">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_FtnEdnRefChar">
<empty/>
@@ -16476,86 +14358,54 @@
<element name="noBreakHyphen">
<ref name="CT_Empty"/>
</element>
- <optional>
<element name="softHyphen">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="dayShort">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="monthShort">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="yearShort">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="dayLong">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="monthLong">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="yearLong">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="annotationRef">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="footnoteRef">
<ref name="CT_FtnEdnRefChar"/>
</element>
- </optional>
- <optional>
<element name="endnoteRef">
<ref name="CT_FtnEdnRefChar"/>
</element>
- </optional>
- <optional>
<element name="separator">
<ref name="CT_FtnEdnSep"/>
</element>
- </optional>
- <optional>
<element name="continuationSeparator">
<ref name="CT_FtnEdnCont"/>
</element>
- </optional>
- <optional>
<element name="sym">
<ref name="CT_Sym"/>
</element>
- </optional>
- <optional>
<element name="pgNum">
<ref name="CT_PgNum"/>
</element>
- </optional>
- <optional>
<element name="cr">
<ref name="CT_Cr"/>
</element>
- </optional>
- <optional>
<element name="tab">
<ref name="CT_Tab"/>
</element>
- </optional>
<element name="object">
<ref name="CT_Object"/>
</element>
@@ -16580,23 +14430,17 @@
<element name="drawing">
<ref name="CT_Drawing"/>
</element>
- <optional>
<element name="ptab">
<ref name="CT_PTab"/>
</element>
- </optional>
- <optional>
<element name="lastRenderedPageBreak">
<ref name="CT_Empty"/>
</element>
- </optional>
</choice>
</define>
<define name="CT_R">
<group>
- <optional>
<ref name="EG_RPr"/>
- </optional>
<zeroOrMore>
<ref name="EG_RunInnerContent"/>
</zeroOrMore>
@@ -16671,283 +14515,173 @@
</attribute>
</define>
<define name="EG_RPrBase">
- <optional>
<element name="rStyle">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="rFonts">
<ref name="CT_Fonts"/>
</element>
- </optional>
- <optional>
<element name="b">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="bCs">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="i">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="iCs">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="caps">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="smallCaps">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="strike">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="dstrike">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="outline">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="shadow">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="emboss">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="imprint">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noProof">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="snapToGrid">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="vanish">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="webHidden">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="color">
<ref name="CT_Color"/>
</element>
- </optional>
- <optional>
<element name="spacing">
<ref name="CT_SignedTwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="w">
<ref name="CT_TextScale"/>
</element>
- </optional>
- <optional>
<element name="kern">
<ref name="CT_HpsMeasure"/>
</element>
- </optional>
- <optional>
<element name="position">
<ref name="CT_SignedHpsMeasure"/>
</element>
- </optional>
- <optional>
<element name="sz">
<ref name="CT_HpsMeasure"/>
</element>
- </optional>
- <optional>
<element name="szCs">
<ref name="CT_HpsMeasure"/>
</element>
- </optional>
- <optional>
<element name="highlight">
<ref name="CT_Highlight"/>
</element>
- </optional>
- <optional>
<element name="u">
<ref name="CT_Underline"/>
</element>
- </optional>
- <optional>
<element name="effect">
<ref name="CT_TextEffect"/>
</element>
- </optional>
- <optional>
<element name="bdr">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="shd">
<ref name="CT_Shd"/>
</element>
- </optional>
- <optional>
<element name="fitText">
<ref name="CT_FitText"/>
</element>
- </optional>
- <optional>
<element name="vertAlign">
<ref name="CT_VerticalAlignRun"/>
</element>
- </optional>
- <optional>
<element name="rtl">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="cs">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="em">
<ref name="CT_Em"/>
</element>
- </optional>
- <optional>
<element name="lang">
<ref name="CT_Language"/>
</element>
- </optional>
- <optional>
<element name="eastAsianLayout">
<ref name="CT_EastAsianLayout"/>
</element>
- </optional>
- <optional>
<element name="specVanish">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="oMath">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="w14:glow">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:shadow">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:reflection">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:textOutline">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:textFill">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:scene3d">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:props3d">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:ligatures">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:numForm">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:numSpacing">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:stylisticSets">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
- <optional>
<element name="w14:cntxtAlts">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>
</define>
<define name="EG_RPrContent">
- <optional>
<ref name="EG_RPrBase"/>
- </optional>
- <optional>
<element name="rPrChange">
<ref name="CT_RPrChange"/>
</element>
- </optional>
</define>
<define name="CT_RPr">
- <optional>
<ref name="EG_RPrContent"/>
- </optional>
</define>
<define name="EG_RPr">
- <optional>
<element name="rPr">
<ref name="CT_RPr"/>
</element>
- </optional>
</define>
<define name="EG_RPrMath">
<choice>
@@ -16966,69 +14700,47 @@
</zeroOrMore>
</define>
<define name="CT_ParaRPrOriginal">
- <optional>
<ref name="EG_ParaRPrTrackChanges"/>
- </optional>
<zeroOrMore>
<ref name="EG_RPrBase"/>
</zeroOrMore>
</define>
<define name="CT_ParaRPr">
- <optional>
<ref name="EG_ParaRPrTrackChanges"/>
- </optional>
- <optional>
<ref name="EG_RPrBase"/>
- </optional>
- <optional>
<element name="rPrChange">
<ref name="CT_ParaRPrChange"/>
</element>
- </optional>
</define>
<define name="CT_ParaTrackChange">
<ref name="CT_TrackChange"/>
</define>
<define name="EG_ParaRPrTrackChanges">
- <optional>
<element name="ins">
<ref name="CT_ParaTrackChange"/>
</element>
- </optional>
- <optional>
<element name="del">
<ref name="CT_ParaTrackChange"/>
</element>
- </optional>
- <optional>
<element name="moveFrom">
<ref name="CT_TrackChange"/>
</element>
- </optional>
- <optional>
<element name="moveTo">
<ref name="CT_TrackChange"/>
</element>
- </optional>
</define>
<define name="CT_AltChunk">
- <optional>
<element name="altChunkPr">
<ref name="CT_AltChunkPr"/>
</element>
- </optional>
- <optional>
<attribute name="r:id">
<ref name="ST_String"/>
</attribute>
- </optional>
</define>
<define name="CT_AltChunkPr">
- <optional>
<element name="matchSrc">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="ST_RubyAlign">
<choice>
@@ -17067,11 +14779,9 @@
<element name="lid">
<ref name="CT_Lang"/>
</element>
- <optional>
<element name="dirty">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="EG_RubyContent">
<choice>
@@ -17170,49 +14880,33 @@
</define>
<define name="CT_SdtDate">
<group>
- <optional>
<element name="dateFormat">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="lid">
<ref name="CT_Lang"/>
</element>
- </optional>
- <optional>
<element name="storeMappedDataAs">
<ref name="CT_SdtDateMappingType"/>
</element>
- </optional>
- <optional>
<element name="calendar">
<ref name="CT_CalendarType"/>
</element>
- </optional>
</group>
- <optional>
<attribute name="fullDate">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_SdtDocPart">
- <optional>
<element name="docPartGallery">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="docPartCategory">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="docPartUnique">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="CT_SdtDropDownList">
<zeroOrMore>
@@ -17220,11 +14914,9 @@
<ref name="CT_SdtListItem"/>
</element>
</zeroOrMore>
- <optional>
<attribute name="lastValue">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_Placeholder">
<element name="docPart">
@@ -17250,52 +14942,33 @@
<define name="CT_SdtPr">
<oneOrMore>
<choice>
- <optional>
<element name="rPr">
<ref name="CT_RPr"/>
</element>
- </optional>
- <optional>
<element name="alias">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="lock">
<ref name="CT_Lock"/>
</element>
- </optional>
- <optional>
<element name="placeholder">
<ref name="CT_Placeholder"/>
</element>
- </optional>
- <optional>
<element name="showingPlcHdr">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="dataBinding">
<ref name="CT_DataBinding"/>
</element>
- </optional>
- <optional>
<element name="temporary">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="id">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="tag">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<choice>
<element name="equation">
<ref name="CT_OnOff"/>
@@ -17337,17 +15010,14 @@
<ref name="CT_Empty"/>
</element>
</choice>
- </optional>
</choice>
</oneOrMore>
</define>
<define name="CT_SdtEndPr">
<oneOrMore>
- <optional>
<element name="rPr">
<ref name="CT_RPr"/>
</element>
- </optional>
</oneOrMore>
</define>
<define name="EG_ContentRunContent">
@@ -17449,72 +15119,48 @@
</zeroOrMore>
</define>
<define name="CT_SdtBlock">
- <optional>
<element name="sdtPr">
<ref name="CT_SdtPr"/>
</element>
- </optional>
- <optional>
<element name="sdtEndPr">
<ref name="CT_SdtEndPr"/>
</element>
- </optional>
- <optional>
<element name="sdtContent">
<ref name="CT_SdtContentBlock"/>
</element>
- </optional>
</define>
<define name="CT_SdtRun">
- <optional>
<element name="sdtPr">
<ref name="CT_SdtPr"/>
</element>
- </optional>
- <optional>
<element name="sdtEndPr">
<ref name="CT_SdtEndPr"/>
</element>
- </optional>
- <optional>
<element name="sdtContent">
<ref name="CT_SdtContentRun"/>
</element>
- </optional>
</define>
<define name="CT_SdtCell">
- <optional>
<element name="sdtPr">
<ref name="CT_SdtPr"/>
</element>
- </optional>
- <optional>
<element name="sdtEndPr">
<ref name="CT_SdtEndPr"/>
</element>
- </optional>
- <optional>
<element name="sdtContent">
<ref name="CT_SdtContentCell"/>
</element>
- </optional>
</define>
<define name="CT_SdtRow">
- <optional>
<element name="sdtPr">
<ref name="CT_SdtPr"/>
</element>
- </optional>
- <optional>
<element name="sdtEndPr">
<ref name="CT_SdtEndPr"/>
</element>
- </optional>
- <optional>
<element name="sdtContent">
<ref name="CT_SdtContentRow"/>
</element>
- </optional>
</define>
<define name="CT_Attr">
<attribute name="uri">
@@ -17529,11 +15175,9 @@
</define>
<define name="CT_CustomXmlRun">
<group>
- <optional>
<element name="customXmlPr">
<ref name="CT_CustomXmlPr"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_PContent"/>
</zeroOrMore>
@@ -17547,11 +15191,9 @@
</define>
<define name="CT_SmartTagRun">
<group>
- <optional>
<element name="smartTagPr">
<ref name="CT_SmartTagPr"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_PContent"/>
</zeroOrMore>
@@ -17565,11 +15207,9 @@
</define>
<define name="CT_CustomXmlBlock">
<group>
- <optional>
<element name="customXmlPr">
<ref name="CT_CustomXmlPr"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_ContentBlockContent"/>
</zeroOrMore>
@@ -17582,11 +15222,9 @@
</attribute>
</define>
<define name="CT_CustomXmlPr">
- <optional>
<element name="placeholder">
<ref name="CT_String"/>
</element>
- </optional>
<zeroOrMore>
<element name="attr">
<ref name="CT_Attr"/>
@@ -17595,11 +15233,9 @@
</define>
<define name="CT_CustomXmlRow">
<group>
- <optional>
<element name="customXmlPr">
<ref name="CT_CustomXmlPr"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_ContentRowContent"/>
</zeroOrMore>
@@ -17613,11 +15249,9 @@
</define>
<define name="CT_CustomXmlCell">
<group>
- <optional>
<element name="customXmlPr">
<ref name="CT_CustomXmlPr"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_ContentCellContent"/>
</zeroOrMore>
@@ -17656,11 +15290,9 @@
</define>
<define name="CT_P">
<group>
- <optional>
<element name="pPr">
<ref name="CT_PPr"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_PContent"/>
</zeroOrMore>
@@ -17723,95 +15355,61 @@
</define>
<define name="CT_TblGrid">
<ref name="CT_TblGridBase"/>
- <optional>
<element name="tblGridChange">
<ref name="CT_TblGridChange"/>
</element>
- </optional>
</define>
<define name="CT_TcBorders">
- <optional>
<element name="top">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="start">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="left">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="bottom">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="end">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="right">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="insideH">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="insideV">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="tl2br">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="tr2bl">
<ref name="CT_Border"/>
</element>
- </optional>
</define>
<define name="CT_TcMar">
- <optional>
<element name="top">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="start">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="left">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="bottom">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="right">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="end">
<ref name="CT_TblWidth"/>
</element>
- </optional>
</define>
<define name="ST_Merge">
<choice>
@@ -17832,92 +15430,60 @@
</attribute>
</define>
<define name="CT_TcPrBase">
- <optional>
<element name="cnfStyle">
<ref name="CT_Cnf"/>
</element>
- </optional>
- <optional>
<element name="tcW">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="gridSpan">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="hMerge">
<ref name="CT_HMerge"/>
</element>
- </optional>
- <optional>
<element name="vMerge">
<ref name="CT_VMerge"/>
</element>
- </optional>
- <optional>
<element name="tcBorders">
<ref name="CT_TcBorders"/>
</element>
- </optional>
- <optional>
<element name="shd">
<ref name="CT_Shd"/>
</element>
- </optional>
- <optional>
<element name="noWrap">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="tcMar">
<ref name="CT_TcMar"/>
</element>
- </optional>
- <optional>
<element name="textDirection">
<ref name="CT_TextDirection"/>
</element>
- </optional>
- <optional>
<element name="tcFitText">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="vAlign">
<ref name="CT_VerticalJc"/>
</element>
- </optional>
- <optional>
<element name="hideMark">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="CT_TcPr">
<ref name="CT_TcPrInner"/>
- <optional>
<element name="tcPrChange">
<ref name="CT_TcPrChange"/>
</element>
- </optional>
</define>
<define name="CT_TcPrInner">
<ref name="CT_TcPrBase"/>
- <optional>
<ref name="EG_CellMarkupElements"/>
- </optional>
</define>
<define name="CT_Tc">
- <optional>
<element name="tcPr">
<ref name="CT_TcPr"/>
</element>
- </optional>
<oneOrMore>
<ref name="EG_BlockLevelElts"/>
</oneOrMore>
@@ -17969,66 +15535,42 @@
<define name="CT_TrPrBase">
<oneOrMore>
<choice>
- <optional>
<element name="cnfStyle">
<ref name="CT_Cnf"/>
</element>
- </optional>
- <optional>
<element name="divId">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="gridBefore">
<ref name="CT_TrPrBaseGridBefore"/>
</element>
- </optional>
- <optional>
<element name="gridAfter">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="wBefore">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="wAfter">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="cantSplit">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="trHeight">
<ref name="CT_Height"/>
</element>
- </optional>
- <optional>
<element name="tblHeader">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="tblCellSpacing">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="jc">
<ref name="CT_Jc"/>
</element>
- </optional>
- <optional>
<element name="hidden">
<ref name="CT_OnOff"/>
</element>
- </optional>
</choice>
</oneOrMore>
</define>
@@ -18040,35 +15582,25 @@
<define name="CT_TrPr">
<ref name="CT_TrPrBase"/>
<group>
- <optional>
<element name="ins">
<ref name="CT_TrackChange"/>
</element>
- </optional>
- <optional>
<element name="del">
<ref name="CT_TrackChange"/>
</element>
- </optional>
- <optional>
<element name="trPrChange">
<ref name="CT_TrPrChange"/>
</element>
- </optional>
</group>
</define>
<define name="CT_Row">
<group>
- <optional>
<element name="tblPrEx">
<ref name="CT_TblPrEx"/>
</element>
- </optional>
- <optional>
<element name="trPr">
<ref name="CT_TrPr"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_ContentCellContent"/>
</zeroOrMore>
@@ -18145,218 +15677,138 @@
</attribute>
</define>
<define name="CT_TblCellMar">
- <optional>
<element name="top">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="start">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="left">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="bottom">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="right">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="end">
<ref name="CT_TblWidth"/>
</element>
- </optional>
</define>
<define name="CT_TblBorders">
- <optional>
<element name="top">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="start">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="left">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="bottom">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="end">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="right">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="insideH">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="insideV">
<ref name="CT_Border"/>
</element>
- </optional>
</define>
<define name="CT_TblPrBase">
- <optional>
<element name="tblStyle">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="tblpPr">
<ref name="CT_TblPPr"/>
</element>
- </optional>
- <optional>
<element name="tblOverlap">
<ref name="CT_TblOverlap"/>
</element>
- </optional>
- <optional>
<element name="bidiVisual">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="tblStyleRowBandSize">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="tblStyleColBandSize">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="tblW">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="jc">
<ref name="CT_Jc"/>
</element>
- </optional>
- <optional>
<element name="tblCellSpacing">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="tblInd">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="tblBorders">
<ref name="CT_TblBorders"/>
</element>
- </optional>
- <optional>
<element name="shd">
<ref name="CT_Shd"/>
</element>
- </optional>
- <optional>
<element name="tblLayout">
<ref name="CT_TblLayoutType"/>
</element>
- </optional>
- <optional>
<element name="tblCellMar">
<ref name="CT_TblCellMar"/>
</element>
- </optional>
- <optional>
<element name="tblLook">
<ref name="CT_TblLook"/>
</element>
- </optional>
</define>
<define name="CT_TblPr">
<ref name="CT_TblPrBase"/>
- <optional>
<element name="tblPrChange">
<ref name="CT_TblPrChange"/>
</element>
- </optional>
</define>
<define name="CT_TblPrExBase">
- <optional>
<element name="tblW">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="jc">
<ref name="CT_Jc"/>
</element>
- </optional>
- <optional>
<element name="tblCellSpacing">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="tblInd">
<ref name="CT_TblWidth"/>
</element>
- </optional>
- <optional>
<element name="tblBorders">
<ref name="CT_TblBorders"/>
</element>
- </optional>
- <optional>
<element name="shd">
<ref name="CT_Shd"/>
</element>
- </optional>
- <optional>
<element name="tblLayout">
<ref name="CT_TblLayoutType"/>
</element>
- </optional>
- <optional>
<element name="tblCellMar">
<ref name="CT_TblCellMar"/>
</element>
- </optional>
- <optional>
<element name="tblLook">
<ref name="CT_ShortHexNumber"/>
</element>
- </optional>
</define>
<define name="CT_TblPrEx">
<ref name="CT_TblPrExBase"/>
- <optional>
<element name="tblPrExChange">
<ref name="CT_TblPrExChange"/>
</element>
- </optional>
</define>
<define name="CT_Tbl">
<zeroOrMore>
@@ -18446,11 +15898,9 @@
</attribute>
</define>
<define name="CT_FtnEdnRef">
- <optional>
<attribute name="customMarkFollows">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
<attribute name="id">
<ref name="ST_DecimalNumber"/>
</attribute>
@@ -18464,11 +15914,9 @@
<oneOrMore>
<ref name="EG_BlockLevelElts"/>
</oneOrMore>
- <optional>
<attribute name="type">
<ref name="ST_FtnEdn"/>
</attribute>
- </optional>
<attribute name="id">
<ref name="ST_DecimalNumber"/>
</attribute>
@@ -18477,46 +15925,30 @@
<ref name="CT_Markup"/>
</define>
<define name="EG_FtnEdnNumProps">
- <optional>
<element name="numStart">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="numRestart">
<ref name="CT_NumRestart"/>
</element>
- </optional>
</define>
<define name="CT_FtnProps">
- <optional>
<element name="pos">
<ref name="CT_FtnPos"/>
</element>
- </optional>
- <optional>
<element name="numFmt">
<ref name="CT_NumFmt"/>
</element>
- </optional>
- <optional>
<ref name="EG_FtnEdnNumProps"/>
- </optional>
</define>
<define name="CT_EdnProps">
- <optional>
<element name="pos">
<ref name="CT_EdnPos"/>
</element>
- </optional>
- <optional>
<element name="numFmt">
<ref name="CT_NumFmt"/>
</element>
- </optional>
- <optional>
<ref name="EG_FtnEdnNumProps"/>
- </optional>
</define>
<define name="CT_FtnDocProps">
<ref name="CT_FtnProps"/>
@@ -18535,11 +15967,9 @@
</zeroOrMore>
</define>
<define name="CT_RecipientData">
- <optional>
<element name="active">
<ref name="CT_OnOff"/>
</element>
- </optional>
<element name="column">
<ref name="CT_DecimalNumber"/>
</element>
@@ -18560,36 +15990,24 @@
</element>
</define>
<define name="CT_OdsoFieldMapData">
- <optional>
<element name="type">
<ref name="CT_MailMergeOdsoFMDFieldType"/>
</element>
- </optional>
- <optional>
<element name="name">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="mappedName">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="column">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="lid">
<ref name="CT_Lang"/>
</element>
- </optional>
- <optional>
<element name="dynamicAddress">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="ST_MailMergeSourceType">
<choice>
@@ -18619,36 +16037,24 @@
</attribute>
</define>
<define name="CT_Odso">
- <optional>
<element name="udl">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="table">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="src">
<ref name="CT_Rel"/>
</element>
- </optional>
- <optional>
<element name="colDelim">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="type">
<ref name="CT_MailMergeSourceType"/>
</element>
- </optional>
- <optional>
<element name="fHdr">
<ref name="CT_OnOff"/>
</element>
- </optional>
<zeroOrMore>
<element name="fieldMapData">
<ref name="CT_OdsoFieldMapData"/>
@@ -18664,79 +16070,51 @@
<element name="mainDocumentType">
<ref name="CT_MailMergeDocType"/>
</element>
- <optional>
<element name="linkToQuery">
<ref name="CT_OnOff"/>
</element>
- </optional>
<element name="dataType">
<ref name="CT_MailMergeDataType"/>
</element>
- <optional>
<element name="connectString">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="query">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="dataSource">
<ref name="CT_Rel"/>
</element>
- </optional>
- <optional>
<element name="headerSource">
<ref name="CT_Rel"/>
</element>
- </optional>
- <optional>
<element name="doNotSuppressBlankLines">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="destination">
<ref name="CT_MailMergeDest"/>
</element>
- </optional>
- <optional>
<element name="addressFieldName">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="mailSubject">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="mailAsAttachment">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="viewMergedData">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="activeRecord">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="checkErrors">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="odso">
<ref name="CT_Odso"/>
</element>
- </optional>
</define>
<define name="ST_TargetScreenSz">
<choice>
@@ -18770,336 +16148,204 @@
</attribute>
</define>
<define name="CT_Compat">
- <optional>
<element name="useSingleBorderforContiguousCells">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="wpJustification">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noTabHangInd">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noLeading">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="spaceForUL">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noColumnBalance">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="balanceSingleByteDoubleByteWidth">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noExtraLineSpacing">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotLeaveBackslashAlone">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="ulTrailSpace">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotExpandShiftReturn">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="spacingInWholePoints">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="lineWrapLikeWord6">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="printBodyTextBeforeHeader">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="printColBlack">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="wpSpaceWidth">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="showBreaksInFrames">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="subFontBySize">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="suppressBottomSpacing">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="suppressTopSpacing">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="suppressSpacingAtTopOfPage">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="suppressTopSpacingWP">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="suppressSpBfAfterPgBrk">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="swapBordersFacingPages">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="convMailMergeEsc">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="truncateFontHeightsLikeWP6">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="mwSmallCaps">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="usePrinterMetrics">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotSuppressParagraphBorders">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="wrapTrailSpaces">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="footnoteLayoutLikeWW8">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="shapeLayoutLikeWW8">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="alignTablesRowByRow">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="forgetLastTabAlignment">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="adjustLineHeightInTable">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="autoSpaceLikeWord95">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noSpaceRaiseLower">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotUseHTMLParagraphAutoSpacing">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="layoutRawTableWidth">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="layoutTableRowsApart">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="useWord97LineBreakRules">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotBreakWrappedTables">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotSnapToGridInCell">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="selectFldWithFirstOrLastChar">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="applyBreakingRules">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotWrapTextWithPunct">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotUseEastAsianBreakRules">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="useWord2002TableStyleRules">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="growAutofit">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="useFELayout">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="useNormalStyleForList">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotUseIndentAsNumberingTabStop">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="useAltKinsokuLineBreakRules">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="allowSpaceOfSameStyleInTable">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotSuppressIndentation">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotAutofitConstrainedTables">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="autofitToFirstFixedWidthCell">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="underlineTabInNumList">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="displayHangulFixedWidth">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="splitPgBreakAndParaMark">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotVertAlignCellWithSp">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotBreakConstrainedForcedTable">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotVertAlignInTxbx">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="useAnsiKerningPairs">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="cachedColBalance">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="compatSetting">
<ref name="CT_CompatSetting"/>
</element>
- </optional>
</define>
<define name="CT_CompatSetting">
<attribute name="name">
@@ -19128,11 +16374,9 @@
</zeroOrMore>
</define>
<define name="CT_DocRsids">
- <optional>
<element name="rsidRoot">
<ref name="CT_LongHexNumber"/>
</element>
- </optional>
<zeroOrMore>
<element name="rsid">
<ref name="CT_LongHexNumber"/>
@@ -19155,42 +16399,30 @@
</attribute>
</define>
<define name="CT_SaveThroughXslt">
- <optional>
<attribute name="r:id">
<ref name="ST_String"/>
</attribute>
- </optional>
- <optional>
<attribute name="solutionID">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_RPrDefault">
- <optional>
<element name="rPr">
<ref name="CT_RPr"/>
</element>
- </optional>
</define>
<define name="CT_PPrDefault">
- <optional>
<element name="pPr">
<ref name="CT_PPr"/>
</element>
- </optional>
</define>
<define name="CT_DocDefaults">
- <optional>
<element name="rPrDefault">
<ref name="CT_RPrDefault"/>
</element>
- </optional>
- <optional>
<element name="pPrDefault">
<ref name="CT_PPrDefault"/>
</element>
- </optional>
</define>
<define name="ST_ColorSchemeIndex">
<choice>
@@ -19273,577 +16505,355 @@
</attribute>
</define>
<define name="CT_WriteProtection">
- <optional>
<attribute name="recommended">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
<ref name="AG_Password"/>
</define>
<define name="CT_Settings">
- <optional>
<element name="writeProtection">
<ref name="CT_WriteProtection"/>
</element>
- </optional>
- <optional>
<element name="view">
<ref name="CT_View"/>
</element>
- </optional>
- <optional>
<element name="zoom">
<ref name="CT_Zoom"/>
</element>
- </optional>
- <optional>
<element name="linkStyles">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="removePersonalInformation">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="removeDateAndTime">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotDisplayPageBoundaries">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="displayBackgroundShape">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="printPostScriptOverText">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="printFractionalCharacterWidth">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="printFormsData">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="embedTrueTypeFonts">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="embedSystemFonts">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="saveSubsetFonts">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="saveFormsData">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="mirrorMargins">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="alignBordersAndEdges">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="bordersDoNotSurroundHeader">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="bordersDoNotSurroundFooter">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="gutterAtTop">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="hideSpellingErrors">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="hideGrammaticalErrors">
<ref name="CT_OnOff"/>
</element>
- </optional>
<zeroOrMore>
<element name="activeWritingStyle">
<ref name="CT_WritingStyle"/>
</element>
</zeroOrMore>
- <optional>
<element name="proofState">
<ref name="CT_Proof"/>
</element>
- </optional>
- <optional>
<element name="formsDesign">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="attachedTemplate">
<ref name="CT_Rel"/>
</element>
- </optional>
- <optional>
<element name="linkStyles">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="stylePaneFormatFilter">
<ref name="CT_ShortHexNumber"/>
</element>
- </optional>
- <optional>
<element name="stylePaneSortMethod">
<ref name="CT_ShortHexNumber"/>
</element>
- </optional>
- <optional>
<element name="documentType">
<ref name="CT_DocType"/>
</element>
- </optional>
- <optional>
<element name="mailMerge">
<ref name="CT_MailMerge"/>
</element>
- </optional>
- <optional>
<element name="revisionView">
<ref name="CT_TrackChangesView"/>
</element>
- </optional>
- <optional>
<element name="trackRevisions">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotTrackMoves">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotTrackFormatting">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="documentProtection">
<ref name="CT_DocProtect"/>
</element>
- </optional>
- <optional>
<element name="autoFormatOverride">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="styleLockTheme">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="styleLockQFSet">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="defaultTabStop">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="autoHyphenation">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="consecutiveHyphenLimit">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="hyphenationZone">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="doNotHyphenateCaps">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="showEnvelope">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="summaryLength">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="clickAndTypeStyle">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="defaultTableStyle">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="evenAndOddHeaders">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="bookFoldRevPrinting">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="bookFoldPrinting">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="bookFoldPrintingSheets">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="drawingGridHorizontalSpacing">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="drawingGridVerticalSpacing">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="displayHorizontalDrawingGridEvery">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="displayVerticalDrawingGridEvery">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="doNotUseMarginsForDrawingGridOrigin">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="drawingGridHorizontalOrigin">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="drawingGridVerticalOrigin">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="doNotShadeFormData">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noPunctuationKerning">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="characterSpacingControl">
<ref name="CT_CharacterSpacing"/>
</element>
- </optional>
- <optional>
<element name="printTwoOnOne">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="strictFirstAndLastChars">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="noLineBreaksAfter">
<ref name="CT_Kinsoku"/>
</element>
- </optional>
- <optional>
<element name="noLineBreaksBefore">
<ref name="CT_Kinsoku"/>
</element>
- </optional>
- <optional>
<element name="savePreviewPicture">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotValidateAgainstSchema">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="saveInvalidXml">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="ignoreMixedContent">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="alwaysShowPlaceholderText">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotDemarcateInvalidXml">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="saveXmlDataOnly">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="useXSLTWhenSaving">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="saveThroughXslt">
<ref name="CT_SaveThroughXslt"/>
</element>
- </optional>
- <optional>
<element name="showXMLTags">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="alwaysMergeEmptyNamespace">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="updateFields">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="hdrShapeDefaults">
<ref name="CT_ShapeDefaults"/>
</element>
- </optional>
- <optional>
<element name="footnotePr">
<ref name="CT_FtnDocProps"/>
</element>
- </optional>
- <optional>
<element name="endnotePr">
<ref name="CT_EdnDocProps"/>
</element>
- </optional>
- <optional>
<element name="compat">
<ref name="CT_Compat"/>
</element>
- </optional>
- <optional>
<element name="docVars">
<ref name="CT_DocVars"/>
</element>
- </optional>
- <optional>
<element name="rsids">
<ref name="CT_DocRsids"/>
</element>
- </optional>
- <optional>
<ref name="mathPr"/>
- </optional>
- <optional>
<element name="uiCompat97To2003">
<ref name="CT_OnOff"/>
</element>
- </optional>
<zeroOrMore>
<element name="attachedSchema">
<ref name="CT_String"/>
</element>
</zeroOrMore>
- <optional>
<element name="themeFontLang">
<ref name="CT_Language"/>
</element>
- </optional>
- <optional>
<element name="clrSchemeMapping">
<ref name="CT_ColorSchemeMapping"/>
</element>
- </optional>
- <optional>
<element name="doNotIncludeSubdocsInStats">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotAutoCompressPictures">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="forceUpgrade">
<ref name="CT_Empty"/>
</element>
- </optional>
- <optional>
<element name="captions">
<ref name="CT_Captions"/>
</element>
- </optional>
- <optional>
<element name="readModeInkLockDown">
<ref name="CT_ReadingModeInkLockDown"/>
</element>
- </optional>
<zeroOrMore>
<element name="smartTagType">
<ref name="CT_SmartTagType"/>
</element>
</zeroOrMore>
- <optional>
<ref name="schemaLibrary"/>
- </optional>
- <optional>
<element name="shapeDefaults">
<ref name="CT_ShapeDefaults"/>
</element>
- </optional>
- <optional>
<element name="doNotEmbedSmartTags">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="decimalSymbol">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="listSeparator">
<ref name="CT_String"/>
</element>
- </optional>
</define>
<define name="CT_WebSettings">
- <optional>
<element name="frameset">
<ref name="CT_Frameset"/>
</element>
- </optional>
- <optional>
<element name="divs">
<ref name="CT_Divs"/>
</element>
- </optional>
- <optional>
<element name="encoding">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="optimizeForBrowser">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="relyOnVML">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="allowPNG">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotRelyOnCSS">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotSaveAsSingleFile">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotOrganizeInFolder">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="doNotUseLongFileNames">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="pixelsPerInch">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="targetScreenSz">
<ref name="CT_TargetScreenSz"/>
</element>
- </optional>
- <optional>
<element name="saveSmartTagsAsXml">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="ST_FrameScrollbar">
<choice>
@@ -19861,46 +16871,30 @@
</attribute>
</define>
<define name="CT_Frame">
- <optional>
<element name="sz">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="name">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="sourceFileName">
<ref name="CT_Rel"/>
</element>
- </optional>
- <optional>
<element name="marW">
<ref name="CT_PixelsMeasure"/>
</element>
- </optional>
- <optional>
<element name="marH">
<ref name="CT_PixelsMeasure"/>
</element>
- </optional>
- <optional>
<element name="scrollbar">
<ref name="CT_FrameScrollbar"/>
</element>
- </optional>
- <optional>
<element name="noResizeAllowed">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="linkedToFile">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="ST_FrameLayout">
<choice>
@@ -19918,43 +16912,29 @@
</attribute>
</define>
<define name="CT_FramesetSplitbar">
- <optional>
<element name="w">
<ref name="CT_TwipsMeasure"/>
</element>
- </optional>
- <optional>
<element name="color">
<ref name="CT_Color"/>
</element>
- </optional>
- <optional>
<element name="noBorder">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="flatBorders">
<ref name="CT_OnOff"/>
</element>
- </optional>
</define>
<define name="CT_Frameset">
- <optional>
<element name="sz">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="framesetSplitbar">
<ref name="CT_FramesetSplitbar"/>
</element>
- </optional>
- <optional>
<element name="frameLayout">
<ref name="CT_FrameLayout"/>
</element>
- </optional>
<zeroOrMore>
<choice>
<zeroOrMore>
@@ -19994,110 +16974,72 @@
</attribute>
</define>
<define name="CT_LevelText">
- <optional>
<attribute name="val">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="null">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_LvlLegacy">
- <optional>
<attribute name="legacy">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="legacySpace">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="legacyIndent">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_Lvl">
<group>
- <optional>
<element name="start">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="numFmt">
<ref name="CT_NumFmt"/>
</element>
- </optional>
- <optional>
<element name="lvlRestart">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="pStyle">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="isLgl">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="suff">
<ref name="CT_LevelSuffix"/>
</element>
- </optional>
- <optional>
<element name="lvlText">
<ref name="CT_LevelText"/>
</element>
- </optional>
- <optional>
<element name="lvlPicBulletId">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="legacy">
<ref name="CT_LvlLegacy"/>
</element>
- </optional>
- <optional>
<element name="lvlJc">
<ref name="CT_Jc"/>
</element>
- </optional>
- <optional>
<element name="pPr">
<ref name="CT_PPr"/>
</element>
- </optional>
- <optional>
<element name="rPr">
<ref name="CT_RPr"/>
</element>
- </optional>
</group>
<attribute name="ilvl">
<text/>
</attribute>
- <optional>
<attribute name="tplc">
<text/>
</attribute>
- </optional>
- <optional>
<attribute name="tentative">
<text/>
</attribute>
- </optional>
</define>
<define name="ST_MultiLevelType">
<choice>
@@ -20116,36 +17058,24 @@
</define>
<define name="CT_AbstractNum">
<group>
- <optional>
<element name="nsid">
<ref name="CT_LongHexNumber"/>
</element>
- </optional>
- <optional>
<element name="multiLevelType">
<ref name="CT_MultiLevelType"/>
</element>
- </optional>
- <optional>
<element name="tmpl">
<ref name="CT_LongHexNumber"/>
</element>
- </optional>
- <optional>
<element name="name">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="styleLink">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="numStyleLink">
<ref name="CT_String"/>
</element>
- </optional>
<zeroOrMore>
<element name="lvl">
<ref name="CT_Lvl"/>
@@ -20158,16 +17088,12 @@
</define>
<define name="CT_NumLvl">
<group>
- <optional>
<element name="startOverride">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="lvl">
<ref name="CT_Lvl"/>
</element>
- </optional>
</group>
<attribute name="ilvl">
<text/>
@@ -20204,11 +17130,9 @@
<ref name="CT_Num"/>
</element>
</zeroOrMore>
- <optional>
<element name="numIdMacAtCleanup">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
</define>
<define name="ST_TblStyleOverrideType">
<choice>
@@ -20242,31 +17166,21 @@
</define>
<define name="CT_Style_tblStylePr">
<group>
- <optional>
<element name="pPr">
<ref name="CT_PPrBase"/>
</element>
- </optional>
- <optional>
<element name="rPr">
<ref name="EG_RPrBase"/>
</element>
- </optional>
- <optional>
<element name="tblPr">
<ref name="CT_TblPrBase"/>
</element>
- </optional>
- <optional>
<element name="trPr">
<ref name="CT_TrPrBase"/>
</element>
- </optional>
- <optional>
<element name="tcPr">
<ref name="CT_TcPrBase"/>
</element>
- </optional>
</group>
<attribute name="type">
<ref name="ST_TblStyleOverrideType"/>
@@ -20295,137 +17209,87 @@
</define>
<define name="CT_Style">
<group>
- <optional>
<element name="name">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="aliases">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="basedOn">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="next">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="link">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="autoRedefine">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="hidden">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="uiPriority">
<ref name="CT_DecimalNumber"/>
</element>
- </optional>
- <optional>
<element name="semiHidden">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="unhideWhenUsed">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="qFormat">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="locked">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="personal">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="personalCompose">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="personalReply">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="rsid">
<ref name="CT_LongHexNumber"/>
</element>
- </optional>
- <optional>
<element name="pPr">
<ref name="CT_PPrBase"/>
</element>
- </optional>
- <optional>
<element name="rPr">
<ref name="EG_RPrBase"/>
</element>
- </optional>
- <optional>
<element name="tblPr">
<ref name="CT_TblPrBase"/>
</element>
- </optional>
- <optional>
<element name="trPr">
<ref name="CT_TrPrBase"/>
</element>
- </optional>
- <optional>
<element name="tcPr">
<ref name="CT_TcPrBase"/>
</element>
- </optional>
<zeroOrMore>
<element name="tblStylePr">
<ref name="CT_Style_tblStylePr"/>
</element>
</zeroOrMore>
</group>
- <optional>
<attribute name="type">
<ref name="ST_StyleType"/>
</attribute>
- </optional>
- <optional>
<attribute name="styleId">
<ref name="ST_String"/>
</attribute>
- </optional>
- <optional>
<attribute name="default">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="customStyle">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
</define>
<define name="CT_LsdException">
<attribute name="name">
@@ -20473,16 +17337,12 @@
</attribute>
</define>
<define name="CT_Styles">
- <optional>
<element name="docDefaults">
<ref name="CT_DocDefaults"/>
</element>
- </optional>
- <optional>
<element name="latentStyles">
<ref name="CT_LatentStyles"/>
</element>
- </optional>
<zeroOrMore>
<element name="style">
<ref name="CT_Style"/>
@@ -20564,66 +17424,42 @@
</define>
<define name="CT_Font">
<group>
- <optional>
<element name="altName">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="panose1">
<ref name="CT_Panose"/>
</element>
- </optional>
- <optional>
<element name="charset">
<ref name="CT_Charset"/>
</element>
- </optional>
- <optional>
<element name="characterSet">
<ref name="CT_String"/>
</element>
- </optional>
- <optional>
<element name="family">
<ref name="CT_FontFamily"/>
</element>
- </optional>
- <optional>
<element name="notTrueType">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="pitch">
<ref name="CT_Pitch"/>
</element>
- </optional>
- <optional>
<element name="sig">
<ref name="CT_FontSig"/>
</element>
- </optional>
- <optional>
<element name="embedRegular">
<ref name="CT_FontRel"/>
</element>
- </optional>
- <optional>
<element name="embedBold">
<ref name="CT_FontRel"/>
</element>
- </optional>
- <optional>
<element name="embedItalic">
<ref name="CT_FontRel"/>
</element>
- </optional>
- <optional>
<element name="embedBoldItalic">
<ref name="CT_FontRel"/>
</element>
- </optional>
</group>
<attribute name="name">
<text/>
@@ -20637,51 +17473,35 @@
</zeroOrMore>
</define>
<define name="CT_Charset">
- <optional>
<attribute name="val">
<ref name="ST_UcharHexNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="characterSet">
<ref name="ST_String"/>
</attribute>
- </optional>
</define>
<define name="CT_DivBdr">
- <optional>
<element name="top">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="left">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="bottom">
<ref name="CT_Border"/>
</element>
- </optional>
- <optional>
<element name="right">
<ref name="CT_Border"/>
</element>
- </optional>
</define>
<define name="CT_Div">
<group>
- <optional>
<element name="blockQuote">
<ref name="CT_OnOff"/>
</element>
- </optional>
- <optional>
<element name="bodyDiv">
<ref name="CT_OnOff"/>
</element>
- </optional>
<element name="marLeft">
<ref name="CT_SignedTwipsMeasure"/>
</element>
@@ -20694,11 +17514,9 @@
<element name="marBottom">
<ref name="CT_SignedTwipsMeasure"/>
</element>
- <optional>
<element name="divBdr">
<ref name="CT_DivBdr"/>
</element>
- </optional>
<zeroOrMore>
<element name="divsChild">
<ref name="CT_Divs"/>
@@ -20751,34 +17569,24 @@
</define>
<define name="EG_RunLevelElts">
<choice>
- <optional>
<element name="proofErr">
<ref name="CT_ProofErr"/>
</element>
- </optional>
- <optional>
<element name="permStart">
<ref name="CT_PermStart"/>
</element>
- </optional>
- <optional>
<element name="permEnd">
<ref name="CT_Perm"/>
</element>
- </optional>
<zeroOrMore>
<ref name="EG_RangeMarkupElements"/>
</zeroOrMore>
- <optional>
<element name="ins">
<ref name="CT_RunTrackChange"/>
</element>
- </optional>
- <optional>
<element name="del">
<ref name="CT_RunTrackChange"/>
</element>
- </optional>
<element name="moveFrom">
<ref name="CT_RunTrackChange"/>
</element>
@@ -20794,11 +17602,9 @@
<zeroOrMore>
<ref name="EG_BlockLevelElts"/>
</zeroOrMore>
- <optional>
<element name="sectPr">
<ref name="CT_SectPr"/>
</element>
- </optional>
</define>
<define name="CT_ShapeDefaults">
<oneOrMore>
@@ -20956,11 +17762,9 @@
<ref name="CT_DocPartType"/>
</element>
</oneOrMore>
- <optional>
<attribute name="all">
<text/>
</attribute>
- </optional>
</define>
<define name="ST_DocPartGallery">
<choice>
@@ -21059,11 +17863,9 @@
<attribute name="val">
<text/>
</attribute>
- <optional>
<attribute name="decorated">
<text/>
</attribute>
- </optional>
</define>
<define name="CT_DocPartPr">
<oneOrMore>
@@ -21093,16 +17895,12 @@
</oneOrMore>
</define>
<define name="CT_DocPart">
- <optional>
<element name="docPartPr">
<ref name="CT_DocPartPr"/>
</element>
- </optional>
- <optional>
<element name="docPartBody">
<ref name="CT_Body"/>
</element>
- </optional>
</define>
<define name="CT_DocParts">
<oneOrMore>
@@ -21152,36 +17950,24 @@
<attribute name="name">
<ref name="ST_String"/>
</attribute>
- <optional>
<attribute name="pos">
<ref name="ST_CaptionPos"/>
</attribute>
- </optional>
- <optional>
<attribute name="chapNum">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="heading">
<ref name="ST_DecimalNumber"/>
</attribute>
- </optional>
- <optional>
<attribute name="noLabel">
<ref name="ST_OnOff"/>
</attribute>
- </optional>
- <optional>
<attribute name="numFmt">
<ref name="ST_NumberFormat"/>
</attribute>
- </optional>
- <optional>
<attribute name="sep">
<ref name="ST_ChapterSep"/>
</attribute>
- </optional>
</define>
<define name="CT_AutoCaption">
<attribute name="name">
@@ -21204,34 +17990,26 @@
<ref name="CT_Caption"/>
</element>
</oneOrMore>
- <optional>
<element name="autoCaptions">
<ref name="CT_AutoCaptions"/>
</element>
- </optional>
</define>
<define name="CT_DocumentBase">
- <optional>
<element name="background">
<ref name="CT_Background"/>
</element>
- </optional>
</define>
<define name="CT_Document">
<ref name="CT_DocumentBase"/>
- <optional>
<element name="body">
<ref name="CT_Body"/>
</element>
- </optional>
</define>
<define name="CT_GlossaryDocument">
<ref name="CT_DocumentBase"/>
- <optional>
<element name="docParts">
<ref name="CT_DocParts"/>
</element>
- </optional>
</define>
<define name="document">
<element name="document">