[Libreoffice-commits] core.git: writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Sun Aug 24 04:44:13 PDT 2014


 writerfilter/source/ooxml/model.xml |17882 ++++++++++++++++++------------------
 1 file changed, 8941 insertions(+), 8941 deletions(-)

New commits:
commit 7163f563cef2db7117ba8639daeeb4d07f753f1b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Aug 24 13:27:56 2014 +0200

    Indentation fixes
    
    This makes model.xml about 20kb smaller. Most inconsistencies were
    introduced when unused tags were removed, like <optional>.
    
    Change-Id: I5e77860cf09bad4cad3e9dd7383371a10386c260

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 40beca2..42559b8 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -56,9 +56,9 @@
       <define name="CT_EmptyElement">
       </define>
       <define name="CT_ColorMapping">
-          <element name="extLst">
-            <ref name="CT_OfficeArtExtensionList"/>
-          </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
         <attribute name="bg1">
           <ref name="ST_ColorSchemeIndex"/>
         </attribute>
@@ -110,45 +110,45 @@
         <element name="clrScheme">
           <ref name="CT_ColorScheme"/>
         </element>
-          <element name="clrMap">
-            <ref name="CT_ColorMapping"/>
-          </element>
+        <element name="clrMap">
+          <ref name="CT_ColorMapping"/>
+        </element>
       </define>
       <define name="CT_ColorSchemeList">
-          <element name="extraClrScheme">
-            <ref name="CT_ColorSchemeAndMapping"/>
-          </element>
+        <element name="extraClrScheme">
+          <ref name="CT_ColorSchemeAndMapping"/>
+        </element>
       </define>
       <define name="CT_OfficeStyleSheet">
-          <element name="themeElements">
-            <ref name="CT_BaseStyles"/>
-          </element>
-            <element name="objectDefaults">
-              <ref name="CT_ObjectStyleDefaults"/>
-            </element>
-            <element name="extraClrSchemeLst">
-              <ref name="CT_ColorSchemeList"/>
-            </element>
-            <element name="custClrLst">
-              <ref name="CT_CustomColorList"/>
-            </element>
-            <element name="extLst">
-              <ref name="CT_OfficeArtExtensionList"/>
-            </element>
-          <attribute name="name">
-            <data type="string"/>
-          </attribute>
+        <element name="themeElements">
+          <ref name="CT_BaseStyles"/>
+        </element>
+        <element name="objectDefaults">
+          <ref name="CT_ObjectStyleDefaults"/>
+        </element>
+        <element name="extraClrSchemeLst">
+          <ref name="CT_ColorSchemeList"/>
+        </element>
+        <element name="custClrLst">
+          <ref name="CT_CustomColorList"/>
+        </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
+        <attribute name="name">
+          <data type="string"/>
+        </attribute>
       </define>
       <define name="CT_BaseStylesOverride">
-          <element name="clrScheme">
-            <ref name="CT_ColorScheme"/>
-          </element>
-          <element name="fontScheme">
-            <ref name="CT_FontScheme"/>
-          </element>
-          <element name="fmtScheme">
-            <ref name="CT_StyleMatrix"/>
-          </element>
+        <element name="clrScheme">
+          <ref name="CT_ColorScheme"/>
+        </element>
+        <element name="fontScheme">
+          <ref name="CT_FontScheme"/>
+        </element>
+        <element name="fmtScheme">
+          <ref name="CT_StyleMatrix"/>
+        </element>
       </define>
       <define name="CT_ClipboardStyleSheet">
         <element name="themeElements">
@@ -159,9 +159,9 @@
         </element>
       </define>
       <define name="CT_Hyperlink">
-          <attribute name="r:id">
-            <text/>
-          </attribute>
+        <attribute name="r:id">
+          <text/>
+        </attribute>
       </define>
       <define name="theme">
         <element name="theme">
@@ -205,110 +205,110 @@
         <element name="spPr">
           <ref name="CT_ShapeProperties"/>
         </element>
-          <element name="extLst">
-            <ref name="CT_OfficeArtExtensionList"/>
-          </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
       </define>
       <define name="CT_ObjectStyleDefaults">
-          <element name="spDef">
-            <ref name="CT_DefaultShapeDefinition"/>
-          </element>
-          <element name="lnDef">
-            <ref name="CT_DefaultShapeDefinition"/>
-          </element>
-          <element name="txDef">
-            <ref name="CT_DefaultShapeDefinition"/>
-          </element>
-          <element name="extLst">
-            <ref name="CT_OfficeArtExtensionList"/>
-          </element>
+        <element name="spDef">
+          <ref name="CT_DefaultShapeDefinition"/>
+        </element>
+        <element name="lnDef">
+          <ref name="CT_DefaultShapeDefinition"/>
+        </element>
+        <element name="txDef">
+          <ref name="CT_DefaultShapeDefinition"/>
+        </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
       </define>
     </grammar>
   </namespace>
   <namespace name="dml-shape3DLighting" file="dml-shape3DLighting.rng">
     <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
       <define name="ST_LightRigDirection">
-          <choice>
-            <!-- Top Left -->
-            <value>tl</value>
-            <!-- Top -->
-            <value>t</value>
-            <!-- Top Right -->
-            <value>tr</value>
-            <!-- Left -->
-            <value>l</value>
-            <!-- Right -->
-            <value>r</value>
-            <!-- Bottom Left -->
-            <value>bl</value>
-            <!-- Bottom -->
-            <value>b</value>
-            <!-- Bottom Right -->
-            <value>br</value>
-          </choice>
+        <choice>
+          <!-- Top Left -->
+          <value>tl</value>
+          <!-- Top -->
+          <value>t</value>
+          <!-- Top Right -->
+          <value>tr</value>
+          <!-- Left -->
+          <value>l</value>
+          <!-- Right -->
+          <value>r</value>
+          <!-- Bottom Left -->
+          <value>bl</value>
+          <!-- Bottom -->
+          <value>b</value>
+          <!-- Bottom Right -->
+          <value>br</value>
+        </choice>
       </define>
       <define name="ST_LightRigType">
-          <choice>
-            <!-- Legacy Flat 1 -->
-            <value>legacyFlat1</value>
-            <!-- Legacy Flat 2 -->
-            <value>legacyFlat2</value>
-            <!-- Legacy Flat 3 -->
-            <value>legacyFlat3</value>
-            <!-- Legacy Flat 4 -->
-            <value>legacyFlat4</value>
-            <!-- Legacy Normal 1 -->
-            <value>legacyNormal1</value>
-            <!-- Legacy Normal 2 -->
-            <value>legacyNormal2</value>
-            <!-- Legacy Normal 3 -->
-            <value>legacyNormal3</value>
-            <!-- Legacy Normal 4 -->
-            <value>legacyNormal4</value>
-            <!-- Legacy Harsh 1 -->
-            <value>legacyHarsh1</value>
-            <!-- Legacy Harsh 2 -->
-            <value>legacyHarsh2</value>
-            <!-- Legacy Harsh 3 -->
-            <value>legacyHarsh3</value>
-            <!-- Legacy Harsh 4 -->
-            <value>legacyHarsh4</value>
-            <!-- Three Point -->
-            <value>threePt</value>
-            <!-- Light Rig Enum ( Balanced ) -->
-            <value>balanced</value>
-            <!-- Soft -->
-            <value>soft</value>
-            <!-- Harsh -->
-            <value>harsh</value>
-            <!-- Flood -->
-            <value>flood</value>
-            <!-- Contrasting -->
-            <value>contrasting</value>
-            <!-- Morning -->
-            <value>morning</value>
-            <!-- Sunrise -->
-            <value>sunrise</value>
-            <!-- Sunset -->
-            <value>sunset</value>
-            <!-- Chilly -->
-            <value>chilly</value>
-            <!-- Freezing -->
-            <value>freezing</value>
-            <!-- Flat -->
-            <value>flat</value>
-            <!-- Two Point -->
-            <value>twoPt</value>
-            <!-- Glow -->
-            <value>glow</value>
-            <!-- Bright Room -->
-            <value>brightRoom</value>
-          </choice>
+        <choice>
+          <!-- Legacy Flat 1 -->
+          <value>legacyFlat1</value>
+          <!-- Legacy Flat 2 -->
+          <value>legacyFlat2</value>
+          <!-- Legacy Flat 3 -->
+          <value>legacyFlat3</value>
+          <!-- Legacy Flat 4 -->
+          <value>legacyFlat4</value>
+          <!-- Legacy Normal 1 -->
+          <value>legacyNormal1</value>
+          <!-- Legacy Normal 2 -->
+          <value>legacyNormal2</value>
+          <!-- Legacy Normal 3 -->
+          <value>legacyNormal3</value>
+          <!-- Legacy Normal 4 -->
+          <value>legacyNormal4</value>
+          <!-- Legacy Harsh 1 -->
+          <value>legacyHarsh1</value>
+          <!-- Legacy Harsh 2 -->
+          <value>legacyHarsh2</value>
+          <!-- Legacy Harsh 3 -->
+          <value>legacyHarsh3</value>
+          <!-- Legacy Harsh 4 -->
+          <value>legacyHarsh4</value>
+          <!-- Three Point -->
+          <value>threePt</value>
+          <!-- Light Rig Enum ( Balanced ) -->
+          <value>balanced</value>
+          <!-- Soft -->
+          <value>soft</value>
+          <!-- Harsh -->
+          <value>harsh</value>
+          <!-- Flood -->
+          <value>flood</value>
+          <!-- Contrasting -->
+          <value>contrasting</value>
+          <!-- Morning -->
+          <value>morning</value>
+          <!-- Sunrise -->
+          <value>sunrise</value>
+          <!-- Sunset -->
+          <value>sunset</value>
+          <!-- Chilly -->
+          <value>chilly</value>
+          <!-- Freezing -->
+          <value>freezing</value>
+          <!-- Flat -->
+          <value>flat</value>
+          <!-- Two Point -->
+          <value>twoPt</value>
+          <!-- Glow -->
+          <value>glow</value>
+          <!-- Bright Room -->
+          <value>brightRoom</value>
+        </choice>
       </define>
       <define name="CT_LightRig">
-          <element name="rot">
-            <ref name="CT_SphereCoords"/>
-          </element>
+        <element name="rot">
+          <ref name="CT_SphereCoords"/>
+        </element>
         <attribute name="rig">
           <ref name="ST_LightRigType"/>
         </attribute>
@@ -369,9 +369,9 @@
         <element name="lightRig">
           <ref name="CT_LightRig"/>
         </element>
-          <element name="extLst">
-            <ref name="CT_OfficeArtExtensionList"/>
-          </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
       </define>
     </grammar>
   </namespace>
@@ -380,111 +380,111 @@
       <!-- ISO RELAX NG Schema -->
       <include href="dml-shapeGeometry.rng"/>
       <define name="ST_BevelPresetType">
-          <choice>
-            <!-- Relaxed Inset -->
-            <value>relaxedInset</value>
-            <!-- Circle -->
-            <value>circle</value>
-            <!-- Slope -->
-            <value>slope</value>
-            <!-- Cross -->
-            <value>cross</value>
-            <!-- Angle -->
-            <value>angle</value>
-            <!-- Soft Round -->
-            <value>softRound</value>
-            <!-- Convex -->
-            <value>convex</value>
-            <!-- Cool Slant -->
-            <value>coolSlant</value>
-            <!-- Divot -->
-            <value>divot</value>
-            <!-- Riblet -->
-            <value>riblet</value>
-            <!-- Hard Edge -->
-            <value>hardEdge</value>
-            <!-- Art Deco -->
-            <value>artDeco</value>
-          </choice>
+        <choice>
+          <!-- Relaxed Inset -->
+          <value>relaxedInset</value>
+          <!-- Circle -->
+          <value>circle</value>
+          <!-- Slope -->
+          <value>slope</value>
+          <!-- Cross -->
+          <value>cross</value>
+          <!-- Angle -->
+          <value>angle</value>
+          <!-- Soft Round -->
+          <value>softRound</value>
+          <!-- Convex -->
+          <value>convex</value>
+          <!-- Cool Slant -->
+          <value>coolSlant</value>
+          <!-- Divot -->
+          <value>divot</value>
+          <!-- Riblet -->
+          <value>riblet</value>
+          <!-- Hard Edge -->
+          <value>hardEdge</value>
+          <!-- Art Deco -->
+          <value>artDeco</value>
+        </choice>
       </define>
       <define name="CT_Bevel">
-          <attribute name="w">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="h">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="prst">
-            <ref name="ST_BevelPresetType"/>
-          </attribute>
+        <attribute name="w">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="h">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="prst">
+          <ref name="ST_BevelPresetType"/>
+        </attribute>
       </define>
       <define name="ST_PresetMaterialType">
-          <choice>
-            <!-- Legacy Matte -->
-            <value>legacyMatte</value>
-            <!-- Legacy Plastic -->
-            <value>legacyPlastic</value>
-            <!-- Legacy Metal -->
-            <value>legacyMetal</value>
-            <!-- Legacy Wireframe -->
-            <value>legacyWireframe</value>
-            <!-- Matte -->
-            <value>matte</value>
-            <!-- Plastic -->
-            <value>plastic</value>
-            <!-- Metal -->
-            <value>metal</value>
-            <!-- Warm Matte -->
-            <value>warmMatte</value>
-            <!-- Translucent Powder -->
-            <value>translucentPowder</value>
-            <!-- Powder -->
-            <value>powder</value>
-            <!-- Dark Edge -->
-            <value>dkEdge</value>
-            <!-- Soft Edge -->
-            <value>softEdge</value>
-            <!-- Clear -->
-            <value>clear</value>
-            <!-- Flat -->
-            <value>flat</value>
-            <!-- Soft Metal -->
-            <value>softmetal</value>
-          </choice>
+        <choice>
+          <!-- Legacy Matte -->
+          <value>legacyMatte</value>
+          <!-- Legacy Plastic -->
+          <value>legacyPlastic</value>
+          <!-- Legacy Metal -->
+          <value>legacyMetal</value>
+          <!-- Legacy Wireframe -->
+          <value>legacyWireframe</value>
+          <!-- Matte -->
+          <value>matte</value>
+          <!-- Plastic -->
+          <value>plastic</value>
+          <!-- Metal -->
+          <value>metal</value>
+          <!-- Warm Matte -->
+          <value>warmMatte</value>
+          <!-- Translucent Powder -->
+          <value>translucentPowder</value>
+          <!-- Powder -->
+          <value>powder</value>
+          <!-- Dark Edge -->
+          <value>dkEdge</value>
+          <!-- Soft Edge -->
+          <value>softEdge</value>
+          <!-- Clear -->
+          <value>clear</value>
+          <!-- Flat -->
+          <value>flat</value>
+          <!-- Soft Metal -->
+          <value>softmetal</value>
+        </choice>
       </define>
       <define name="CT_Shape3D">
-            <element name="bevelT">
-              <ref name="CT_Bevel"/>
-            </element>
-            <element name="bevelB">
-              <ref name="CT_Bevel"/>
-            </element>
-            <element name="extrusionClr">
-              <ref name="CT_Color"/>
-            </element>
-            <element name="contourClr">
-              <ref name="CT_Color"/>
-            </element>
-            <element name="extLst">
-              <ref name="CT_OfficeArtExtensionList"/>
-            </element>
-          <attribute name="z">
-            <ref name="ST_Coordinate"/>
-          </attribute>
-          <attribute name="extrusionH">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="contourW">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="prstMaterial">
-            <ref name="ST_PresetMaterialType"/>
-          </attribute>
+        <element name="bevelT">
+          <ref name="CT_Bevel"/>
+        </element>
+        <element name="bevelB">
+          <ref name="CT_Bevel"/>
+        </element>
+        <element name="extrusionClr">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="contourClr">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
+        <attribute name="z">
+          <ref name="ST_Coordinate"/>
+        </attribute>
+        <attribute name="extrusionH">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="contourW">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="prstMaterial">
+          <ref name="ST_PresetMaterialType"/>
+        </attribute>
       </define>
       <define name="CT_FlatText">
-          <attribute name="z">
-            <ref name="ST_Coordinate"/>
-          </attribute>
+        <attribute name="z">
+          <ref name="ST_Coordinate"/>
+        </attribute>
       </define>
       <define name="EG_Text3D">
         <choice>
@@ -532,148 +532,148 @@
   <namespace name="dml-shape3DCamera" file="dml-shape3DCamera.rng">
     <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
       <define name="ST_PresetCameraType">
-          <choice>
-            <!-- Legacy Oblique Top Left -->
-            <value>legacyObliqueTopLeft</value>
-            <!-- Legacy Oblique Top -->
-            <value>legacyObliqueTop</value>
-            <!-- Legacy Oblique Top Right -->
-            <value>legacyObliqueTopRight</value>
-            <!-- Legacy Oblique Left -->
-            <value>legacyObliqueLeft</value>
-            <!-- Legacy Oblique Front -->
-            <value>legacyObliqueFront</value>
-            <!-- Legacy Oblique Right -->
-            <value>legacyObliqueRight</value>
-            <!-- Legacy Oblique Bottom Left -->
-            <value>legacyObliqueBottomLeft</value>
-            <!-- Legacy Oblique Bottom -->
-            <value>legacyObliqueBottom</value>
-            <!-- Legacy Oblique Bottom Right -->
-            <value>legacyObliqueBottomRight</value>
-            <!-- Legacy Perspective Top Left -->
-            <value>legacyPerspectiveTopLeft</value>
-            <!-- Legacy Perspective Top -->
-            <value>legacyPerspectiveTop</value>
-            <!-- Legacy Perspective Top Right -->
-            <value>legacyPerspectiveTopRight</value>
-            <!-- Legacy Perspective Left -->
-            <value>legacyPerspectiveLeft</value>
-            <!-- Legacy Perspective Front -->
-            <value>legacyPerspectiveFront</value>
-            <!-- Legacy Perspective Right -->
-            <value>legacyPerspectiveRight</value>
-            <!-- Legacy Perspective Bottom Left -->
-            <value>legacyPerspectiveBottomLeft</value>
-            <!-- Legacy Perspective Bottom -->
-            <value>legacyPerspectiveBottom</value>
-            <!-- Legacy Perspective Bottom Right -->
-            <value>legacyPerspectiveBottomRight</value>
-            <!-- Orthographic Front -->
-            <value>orthographicFront</value>
-            <!-- Isometric Top Up -->
-            <value>isometricTopUp</value>
-            <!-- Isometric Top Down -->
-            <value>isometricTopDown</value>
-            <!-- Isometric Bottom Up -->
-            <value>isometricBottomUp</value>
-            <!-- Isometric Bottom Down -->
-            <value>isometricBottomDown</value>
-            <!-- Isometric Left Up -->
-            <value>isometricLeftUp</value>
-            <!-- Isometric Left Down -->
-            <value>isometricLeftDown</value>
-            <!-- Isometric Right Up -->
-            <value>isometricRightUp</value>
-            <!-- Isometric Right Down -->
-            <value>isometricRightDown</value>
-            <!-- Isometric Off Axis 1 Left -->
-            <value>isometricOffAxis1Left</value>
-            <!-- Isometric Off Axis 1 Right -->
-            <value>isometricOffAxis1Right</value>
-            <!-- Isometric Off Axis 1 Top -->
-            <value>isometricOffAxis1Top</value>
-            <!-- Isometric Off Axis 2 Left -->
-            <value>isometricOffAxis2Left</value>
-            <!-- Isometric Off Axis 2 Right -->
-            <value>isometricOffAxis2Right</value>
-            <!-- Isometric Off Axis 2 Top -->
-            <value>isometricOffAxis2Top</value>
-            <!-- Isometric Off Axis 3 Left -->
-            <value>isometricOffAxis3Left</value>
-            <!-- Isometric Off Axis 3 Right -->
-            <value>isometricOffAxis3Right</value>
-            <!-- Isometric Off Axis 3 Bottom -->
-            <value>isometricOffAxis3Bottom</value>
-            <!-- Isometric Off Axis 4 Left -->
-            <value>isometricOffAxis4Left</value>
-            <!-- Isometric Off Axis 4 Right -->
-            <value>isometricOffAxis4Right</value>
-            <!-- Isometric Off Axis 4 Bottom -->
-            <value>isometricOffAxis4Bottom</value>
-            <!-- Oblique Top Left -->
-            <value>obliqueTopLeft</value>
-            <!-- Oblique Top -->
-            <value>obliqueTop</value>
-            <!-- Oblique Top Right -->
-            <value>obliqueTopRight</value>
-            <!-- Oblique Left -->
-            <value>obliqueLeft</value>
-            <!-- Oblique Right -->
-            <value>obliqueRight</value>
-            <!-- Oblique Bottom Left -->
-            <value>obliqueBottomLeft</value>
-            <!-- Oblique Bottom -->
-            <value>obliqueBottom</value>
-            <!-- Oblique Bottom Right -->
-            <value>obliqueBottomRight</value>
-            <!-- Perspective Front -->
-            <value>perspectiveFront</value>
-            <!-- Perspective Left -->
-            <value>perspectiveLeft</value>
-            <!-- Perspective Right -->
-            <value>perspectiveRight</value>
-            <!-- Orthographic Above -->
-            <value>perspectiveAbove</value>
-            <!-- Perspective Below -->
-            <value>perspectiveBelow</value>
-            <!-- Perspective Above Left Facing -->
-            <value>perspectiveAboveLeftFacing</value>
-            <!-- Perspective Above Right Facing -->
-            <value>perspectiveAboveRightFacing</value>
-            <!-- Perspective Contrasting Left Facing -->
-            <value>perspectiveContrastingLeftFacing</value>
-            <!-- Perspective Contrasting Right Facing -->
-            <value>perspectiveContrastingRightFacing</value>
-            <!-- Perspective Heroic Left Facing -->
-            <value>perspectiveHeroicLeftFacing</value>
-            <!-- Perspective Heroic Right Facing -->
-            <value>perspectiveHeroicRightFacing</value>
-            <!-- Perspective Heroic Extreme Left Facing -->
-            <value>perspectiveHeroicExtremeLeftFacing</value>
-            <!-- Perspective Heroic Extreme Right Facing -->
-            <value>perspectiveHeroicExtremeRightFacing</value>
-            <!-- Perspective Relaxed -->
-            <value>perspectiveRelaxed</value>
-            <!-- Perspective Relaxed Moderately -->
-            <value>perspectiveRelaxedModerately</value>
-          </choice>
+        <choice>
+          <!-- Legacy Oblique Top Left -->
+          <value>legacyObliqueTopLeft</value>
+          <!-- Legacy Oblique Top -->
+          <value>legacyObliqueTop</value>
+          <!-- Legacy Oblique Top Right -->
+          <value>legacyObliqueTopRight</value>
+          <!-- Legacy Oblique Left -->
+          <value>legacyObliqueLeft</value>
+          <!-- Legacy Oblique Front -->
+          <value>legacyObliqueFront</value>
+          <!-- Legacy Oblique Right -->
+          <value>legacyObliqueRight</value>
+          <!-- Legacy Oblique Bottom Left -->
+          <value>legacyObliqueBottomLeft</value>
+          <!-- Legacy Oblique Bottom -->
+          <value>legacyObliqueBottom</value>
+          <!-- Legacy Oblique Bottom Right -->
+          <value>legacyObliqueBottomRight</value>
+          <!-- Legacy Perspective Top Left -->
+          <value>legacyPerspectiveTopLeft</value>
+          <!-- Legacy Perspective Top -->
+          <value>legacyPerspectiveTop</value>
+          <!-- Legacy Perspective Top Right -->
+          <value>legacyPerspectiveTopRight</value>
+          <!-- Legacy Perspective Left -->
+          <value>legacyPerspectiveLeft</value>
+          <!-- Legacy Perspective Front -->
+          <value>legacyPerspectiveFront</value>
+          <!-- Legacy Perspective Right -->
+          <value>legacyPerspectiveRight</value>
+          <!-- Legacy Perspective Bottom Left -->
+          <value>legacyPerspectiveBottomLeft</value>
+          <!-- Legacy Perspective Bottom -->
+          <value>legacyPerspectiveBottom</value>
+          <!-- Legacy Perspective Bottom Right -->
+          <value>legacyPerspectiveBottomRight</value>
+          <!-- Orthographic Front -->
+          <value>orthographicFront</value>
+          <!-- Isometric Top Up -->
+          <value>isometricTopUp</value>
+          <!-- Isometric Top Down -->
+          <value>isometricTopDown</value>
+          <!-- Isometric Bottom Up -->
+          <value>isometricBottomUp</value>
+          <!-- Isometric Bottom Down -->
+          <value>isometricBottomDown</value>
+          <!-- Isometric Left Up -->
+          <value>isometricLeftUp</value>
+          <!-- Isometric Left Down -->
+          <value>isometricLeftDown</value>
+          <!-- Isometric Right Up -->
+          <value>isometricRightUp</value>
+          <!-- Isometric Right Down -->
+          <value>isometricRightDown</value>
+          <!-- Isometric Off Axis 1 Left -->
+          <value>isometricOffAxis1Left</value>
+          <!-- Isometric Off Axis 1 Right -->
+          <value>isometricOffAxis1Right</value>
+          <!-- Isometric Off Axis 1 Top -->
+          <value>isometricOffAxis1Top</value>
+          <!-- Isometric Off Axis 2 Left -->
+          <value>isometricOffAxis2Left</value>
+          <!-- Isometric Off Axis 2 Right -->
+          <value>isometricOffAxis2Right</value>
+          <!-- Isometric Off Axis 2 Top -->
+          <value>isometricOffAxis2Top</value>
+          <!-- Isometric Off Axis 3 Left -->
+          <value>isometricOffAxis3Left</value>
+          <!-- Isometric Off Axis 3 Right -->
+          <value>isometricOffAxis3Right</value>
+          <!-- Isometric Off Axis 3 Bottom -->
+          <value>isometricOffAxis3Bottom</value>
+          <!-- Isometric Off Axis 4 Left -->
+          <value>isometricOffAxis4Left</value>
+          <!-- Isometric Off Axis 4 Right -->
+          <value>isometricOffAxis4Right</value>
+          <!-- Isometric Off Axis 4 Bottom -->
+          <value>isometricOffAxis4Bottom</value>
+          <!-- Oblique Top Left -->
+          <value>obliqueTopLeft</value>
+          <!-- Oblique Top -->
+          <value>obliqueTop</value>
+          <!-- Oblique Top Right -->
+          <value>obliqueTopRight</value>
+          <!-- Oblique Left -->
+          <value>obliqueLeft</value>
+          <!-- Oblique Right -->
+          <value>obliqueRight</value>
+          <!-- Oblique Bottom Left -->
+          <value>obliqueBottomLeft</value>
+          <!-- Oblique Bottom -->
+          <value>obliqueBottom</value>
+          <!-- Oblique Bottom Right -->
+          <value>obliqueBottomRight</value>
+          <!-- Perspective Front -->
+          <value>perspectiveFront</value>
+          <!-- Perspective Left -->
+          <value>perspectiveLeft</value>
+          <!-- Perspective Right -->
+          <value>perspectiveRight</value>
+          <!-- Orthographic Above -->
+          <value>perspectiveAbove</value>
+          <!-- Perspective Below -->
+          <value>perspectiveBelow</value>
+          <!-- Perspective Above Left Facing -->
+          <value>perspectiveAboveLeftFacing</value>
+          <!-- Perspective Above Right Facing -->
+          <value>perspectiveAboveRightFacing</value>
+          <!-- Perspective Contrasting Left Facing -->
+          <value>perspectiveContrastingLeftFacing</value>
+          <!-- Perspective Contrasting Right Facing -->
+          <value>perspectiveContrastingRightFacing</value>
+          <!-- Perspective Heroic Left Facing -->
+          <value>perspectiveHeroicLeftFacing</value>
+          <!-- Perspective Heroic Right Facing -->
+          <value>perspectiveHeroicRightFacing</value>
+          <!-- Perspective Heroic Extreme Left Facing -->
+          <value>perspectiveHeroicExtremeLeftFacing</value>
+          <!-- Perspective Heroic Extreme Right Facing -->
+          <value>perspectiveHeroicExtremeRightFacing</value>
+          <!-- Perspective Relaxed -->
+          <value>perspectiveRelaxed</value>
+          <!-- Perspective Relaxed Moderately -->
+          <value>perspectiveRelaxedModerately</value>
+        </choice>
       </define>
       <define name="ST_FOVAngle">
       </define>
       <define name="CT_Camera">
-          <element name="rot">
-            <ref name="CT_SphereCoords"/>
-          </element>
+        <element name="rot">
+          <ref name="CT_SphereCoords"/>
+        </element>
         <attribute name="prst">
           <ref name="ST_PresetCameraType"/>
         </attribute>
-          <attribute name="fov">
-            <ref name="ST_FOVAngle"/>
-          </attribute>
-          <attribute name="zoom">
-            <ref name="ST_PositivePercentage"/>
-          </attribute>
+        <attribute name="fov">
+          <ref name="ST_FOVAngle"/>
+        </attribute>
+        <attribute name="zoom">
+          <ref name="ST_PositivePercentage"/>
+        </attribute>
       </define>
     </grammar>
     <resource name="ST_PresetCameraType" resource="List">
@@ -745,73 +745,73 @@
     <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
       <!-- ISO RELAX NG Schema -->
       <define name="ST_ColorSchemeIndex">
-          <choice>
-            <!-- Dark 1 -->
-            <value>dk1</value>
-            <!-- Light 1 -->
-            <value>lt1</value>
-            <!-- Dark 2 -->
-            <value>dk2</value>
-            <!-- Light 2 -->
-            <value>lt2</value>
-            <!-- Accent 1 -->
-            <value>accent1</value>
-            <!-- Accent 2 -->
-            <value>accent2</value>
-            <!-- Accent 3 -->
-            <value>accent3</value>
-            <!-- Accent 4 -->
-            <value>accent4</value>
-            <!-- Accent 5 -->
-            <value>accent5</value>
-            <!-- Accent 6 -->
-            <value>accent6</value>
-            <!-- Hyperlink -->
-            <value>hlink</value>
-            <!-- Followed Hyperlink -->
-            <value>folHlink</value>
-          </choice>
+        <choice>
+          <!-- Dark 1 -->
+          <value>dk1</value>
+          <!-- Light 1 -->
+          <value>lt1</value>
+          <!-- Dark 2 -->
+          <value>dk2</value>
+          <!-- Light 2 -->
+          <value>lt2</value>
+          <!-- Accent 1 -->
+          <value>accent1</value>
+          <!-- Accent 2 -->
+          <value>accent2</value>
+          <!-- Accent 3 -->
+          <value>accent3</value>
+          <!-- Accent 4 -->
+          <value>accent4</value>
+          <!-- Accent 5 -->
+          <value>accent5</value>
+          <!-- Accent 6 -->
+          <value>accent6</value>
+          <!-- Hyperlink -->
+          <value>hlink</value>
+          <!-- Followed Hyperlink -->
+          <value>folHlink</value>
+        </choice>
       </define>
       <define name="CT_ColorScheme">
-          <element name="dk1">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="lt1">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="dk2">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="lt2">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="accent1">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="accent2">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="accent3">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="accent4">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="accent5">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="accent6">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="hlink">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="folHlink">
-            <ref name="CT_Color"/>
-          </element>
-            <element name="extLst">
-              <ref name="CT_OfficeArtExtensionList"/>
-            </element>
+        <element name="dk1">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="lt1">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="dk2">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="lt2">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="accent1">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="accent2">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="accent3">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="accent4">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="accent5">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="accent6">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="hlink">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="folHlink">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
         <attribute name="name">
           <data type="string">
           </data>
@@ -819,10 +819,10 @@
       </define>
       <define name="CT_CustomColor">
         <ref name="EG_ColorChoice"/>
-          <attribute name="name">
-            <data type="string">
-            </data>
-          </attribute>
+        <attribute name="name">
+          <data type="string">
+          </data>
+        </attribute>
       </define>
       <define name="CT_SupplementalFont">
         <attribute name="script">
@@ -836,9 +836,9 @@
         </attribute>
       </define>
       <define name="CT_CustomColorList">
-          <element name="custClr">
-            <ref name="CT_CustomColor"/>
-          </element>
+        <element name="custClr">
+          <ref name="CT_CustomColor"/>
+        </element>
       </define>
       <define name="CT_FontCollection">
         <element name="latin">
@@ -850,68 +850,68 @@
         <element name="cs">
           <ref name="CT_TextFont"/>
         </element>
-          <element name="font">
-            <ref name="CT_SupplementalFont"/>
-          </element>
-          <element name="extLst">
-            <ref name="CT_OfficeArtExtensionList"/>
-          </element>
+        <element name="font">
+          <ref name="CT_SupplementalFont"/>
+        </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
       </define>
       <define name="CT_EffectStyleItem">
         <ref name="EG_EffectProperties"/>
-          <element name="scene3d">
-            <ref name="CT_Scene3D"/>
-          </element>
-          <element name="sp3d">
-            <ref name="CT_Shape3D"/>
-          </element>
+        <element name="scene3d">
+          <ref name="CT_Scene3D"/>
+        </element>
+        <element name="sp3d">
+          <ref name="CT_Shape3D"/>
+        </element>
       </define>
       <define name="CT_FontScheme">
-          <element name="majorFont">
-            <ref name="CT_FontCollection"/>
-          </element>
-          <element name="minorFont">
-            <ref name="CT_FontCollection"/>
-          </element>
-            <element name="extLst">
-              <ref name="CT_OfficeArtExtensionList"/>
-            </element>
+        <element name="majorFont">
+          <ref name="CT_FontCollection"/>
+        </element>
+        <element name="minorFont">
+          <ref name="CT_FontCollection"/>
+        </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
         <attribute name="name">
           <data type="string"/>
         </attribute>
       </define>
       <define name="CT_FillStyleList">
-          <ref name="EG_FillProperties"/>
+        <ref name="EG_FillProperties"/>
       </define>
       <define name="CT_LineStyleList">
-          <element name="ln">
-            <ref name="CT_LineProperties"/>
-          </element>
+        <element name="ln">
+          <ref name="CT_LineProperties"/>
+        </element>
       </define>
       <define name="CT_EffectStyleList">
-          <element name="effectStyle">
-            <ref name="CT_EffectStyleItem"/>
-          </element>
+        <element name="effectStyle">
+          <ref name="CT_EffectStyleItem"/>
+        </element>
       </define>
       <define name="CT_BackgroundFillStyleList">
-          <ref name="EG_FillProperties"/>
+        <ref name="EG_FillProperties"/>
       </define>
       <define name="CT_StyleMatrix">
-          <element name="fillStyleLst">
-            <ref name="CT_FillStyleList"/>
-          </element>
-          <element name="lnStyleLst">
-            <ref name="CT_LineStyleList"/>
-          </element>
-          <element name="effectStyleLst">
-            <ref name="CT_EffectStyleList"/>
-          </element>
-          <element name="bgFillStyleLst">
-            <ref name="CT_BackgroundFillStyleList"/>
-          </element>
-          <attribute name="name">
-            <data type="string"/>
-          </attribute>
+        <element name="fillStyleLst">
+          <ref name="CT_FillStyleList"/>
+        </element>
+        <element name="lnStyleLst">
+          <ref name="CT_LineStyleList"/>
+        </element>
+        <element name="effectStyleLst">
+          <ref name="CT_EffectStyleList"/>
+        </element>
+        <element name="bgFillStyleLst">
+          <ref name="CT_BackgroundFillStyleList"/>
+        </element>
+        <attribute name="name">
+          <data type="string"/>
+        </attribute>
       </define>
       <define name="CT_BaseStyles">
         <element name="clrScheme">
@@ -923,9 +923,9 @@
         <element name="fmtScheme">
           <ref name="CT_StyleMatrix"/>
         </element>
-          <element name="extLst">
-            <ref name="CT_OfficeArtExtensionList"/>
-          </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
       </define>
     </grammar>
     <resource name="ST_ColorSchemeIndex" resource="List">
@@ -1021,58 +1021,58 @@
         <attribute name="typeface">
           <ref name="ST_TextTypeface"/>
         </attribute>
-          <attribute name="panose">
-            <ref name="ST_Panose"/>
-          </attribute>
-          <attribute name="pitchFamily">
-            <data type="byte"/>
-          </attribute>
-          <attribute name="charset">
-            <data type="byte"/>
-          </attribute>
+        <attribute name="panose">
+          <ref name="ST_Panose"/>
+        </attribute>
+        <attribute name="pitchFamily">
+          <data type="byte"/>
+        </attribute>
+        <attribute name="charset">
+          <data type="byte"/>
+        </attribute>
       </define>
       <define name="ST_TextLanguageID">
         <data type="string"/>
       </define>
       <define name="ST_TextUnderlineType">
-          <choice>
-            <!-- Text Underline Enum ( None ) -->
-            <value>none</value>
-            <!-- Text Underline Enum ( Words ) -->
-            <value>words</value>
-            <!-- Text Underline Enum ( Single ) -->
-            <value>sng</value>
-            <!-- Text Underline Enum ( Double ) -->
-            <value>dbl</value>
-            <!-- Text Underline Enum ( Heavy ) -->
-            <value>heavy</value>
-            <!-- Text Underline Enum ( Dotted ) -->
-            <value>dotted</value>
-            <!-- Text Underline Enum ( Heavy Dotted  ) -->
-            <value>dottedHeavy</value>
-            <!-- Text Underline Enum ( Dashed ) -->
-            <value>dash</value>
-            <!-- Text Underline Enum ( Heavy Dashed ) -->
-            <value>dashHeavy</value>
-            <!-- Text Underline Enum ( Long Dashed ) -->
-            <value>dashLong</value>
-            <!-- Text Underline Enum ( Heavy Long Dashed ) -->
-            <value>dashLongHeavy</value>
-            <!-- Text Underline Enum ( Dot Dash ) -->
-            <value>dotDash</value>
-            <!-- Text Underline Enum ( Heavy Dot Dash ) -->
-            <value>dotDashHeavy</value>
-            <!-- Text Underline Enum ( Dot Dot Dash ) -->
-            <value>dotDotDash</value>
-            <!-- Text Underline Enum ( Heavy Dot Dot Dash ) -->
-            <value>dotDotDashHeavy</value>
-            <!-- Text Underline Enum ( Wavy ) -->
-            <value>wavy</value>
-            <!-- Text Underline Enum ( Heavy Wavy ) -->
-            <value>wavyHeavy</value>
-            <!-- Text Underline Enum ( Double Wavy ) -->
-            <value>wavyDbl</value>
-          </choice>
+        <choice>
+          <!-- Text Underline Enum ( None ) -->
+          <value>none</value>
+          <!-- Text Underline Enum ( Words ) -->
+          <value>words</value>
+          <!-- Text Underline Enum ( Single ) -->
+          <value>sng</value>
+          <!-- Text Underline Enum ( Double ) -->
+          <value>dbl</value>
+          <!-- Text Underline Enum ( Heavy ) -->
+          <value>heavy</value>
+          <!-- Text Underline Enum ( Dotted ) -->
+          <value>dotted</value>
+          <!-- Text Underline Enum ( Heavy Dotted  ) -->
+          <value>dottedHeavy</value>
+          <!-- Text Underline Enum ( Dashed ) -->
+          <value>dash</value>
+          <!-- Text Underline Enum ( Heavy Dashed ) -->
+          <value>dashHeavy</value>
+          <!-- Text Underline Enum ( Long Dashed ) -->
+          <value>dashLong</value>
+          <!-- Text Underline Enum ( Heavy Long Dashed ) -->
+          <value>dashLongHeavy</value>
+          <!-- Text Underline Enum ( Dot Dash ) -->
+          <value>dotDash</value>
+          <!-- Text Underline Enum ( Heavy Dot Dash ) -->
+          <value>dotDashHeavy</value>
+          <!-- Text Underline Enum ( Dot Dot Dash ) -->
+          <value>dotDotDash</value>
+          <!-- Text Underline Enum ( Heavy Dot Dot Dash ) -->
+          <value>dotDotDashHeavy</value>
+          <!-- Text Underline Enum ( Wavy ) -->
+          <value>wavy</value>
+          <!-- Text Underline Enum ( Heavy Wavy ) -->
+          <value>wavyHeavy</value>
+          <!-- Text Underline Enum ( Double Wavy ) -->
+          <value>wavyDbl</value>
+        </choice>
       </define>
       <define name="CT_TextUnderlineLineFollowText">
       </define>
@@ -1086,9 +1086,9 @@
           <element name="uLnTx">
             <ref name="CT_TextUnderlineLineFollowText"/>
           </element>
-            <element name="uLn">
-              <ref name="CT_LineProperties"/>
-            </element>
+          <element name="uLn">
+            <ref name="CT_LineProperties"/>
+          </element>
         </choice>
       </define>
       <define name="EG_TextUnderlineFill">
@@ -1102,149 +1102,149 @@
         </choice>
       </define>
       <define name="ST_TextStrikeType">
-          <choice>
-            <!-- Text Strike Enum ( No Strike ) -->
-            <value>noStrike</value>
-            <!-- Text Strike Enum ( Single Strike ) -->
-            <value>sngStrike</value>
-            <!-- Text Strike Enum ( Double Strike ) -->
-            <value>dblStrike</value>
-          </choice>
+        <choice>
+          <!-- Text Strike Enum ( No Strike ) -->
+          <value>noStrike</value>
+          <!-- Text Strike Enum ( Single Strike ) -->
+          <value>sngStrike</value>
+          <!-- Text Strike Enum ( Double Strike ) -->
+          <value>dblStrike</value>
+        </choice>
       </define>
       <define name="ST_TextCapsType">
-          <choice>
-            <!-- Text Caps Enum ( None ) -->
-            <value>none</value>
-            <!-- Text Caps Enum ( Small ) -->
-            <value>small</value>
-            <!-- Text Caps Enum ( All ) -->
-            <value>all</value>
-          </choice>
+        <choice>
+          <!-- Text Caps Enum ( None ) -->
+          <value>none</value>
+          <!-- Text Caps Enum ( Small ) -->
+          <value>small</value>
+          <!-- Text Caps Enum ( All ) -->
+          <value>all</value>
+        </choice>
       </define>
       <define name="CT_TextCharacterProperties">
-            <element name="ln">
-              <ref name="CT_LineProperties"/>
-            </element>
-            <ref name="EG_FillProperties"/>
-            <ref name="EG_EffectProperties"/>
-            <element name="highlight">
-              <ref name="CT_Color"/>
-            </element>
-            <ref name="EG_TextUnderlineLine"/>
-            <ref name="EG_TextUnderlineFill"/>
-            <element name="latin">
-              <ref name="CT_TextFont"/>
-            </element>
-            <element name="ea">
-              <ref name="CT_TextFont"/>
-            </element>
-            <element name="cs">
-              <ref name="CT_TextFont"/>
-            </element>
-            <element name="sym">
-              <ref name="CT_TextFont"/>
-            </element>
-            <element name="hlinkClick">
-              <ref name="CT_Hyperlink"/>
-            </element>
-            <element name="hlinkMouseOver">
-              <ref name="CT_Hyperlink"/>
-            </element>
-            <element name="extLst">
-              <ref name="CT_OfficeArtExtensionList"/>
-            </element>
-          <attribute name="kumimoji">
-            <data type="boolean"/>
-          </attribute>
-          <attribute name="lang">
-            <ref name="ST_TextLanguageID"/>
-          </attribute>
-          <attribute name="altLang">
-            <ref name="ST_TextLanguageID"/>
-          </attribute>
-          <attribute name="sz">
-            <ref name="ST_TextFontSize"/>
-          </attribute>
-          <attribute name="b">
-            <data type="boolean"/>
-          </attribute>
-          <attribute name="i">
-            <data type="boolean"/>
-          </attribute>
-          <attribute name="u">
-            <ref name="ST_TextUnderlineType"/>
-          </attribute>
-          <attribute name="strike">
-            <ref name="ST_TextStrikeType"/>
-          </attribute>
-          <attribute name="kern">
-            <ref name="ST_TextNonNegativePoint"/>
-          </attribute>
-          <attribute name="cap">
-            <ref name="ST_TextCapsType"/>
-          </attribute>
-          <attribute name="spc">
-            <ref name="ST_TextPoint"/>
-          </attribute>
-          <attribute name="normalizeH">
-            <data type="boolean"/>
-          </attribute>
-          <attribute name="baseline">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="noProof">
-            <data type="boolean"/>
-          </attribute>
-          <attribute name="dirty">
-            <data type="boolean"/>
-          </attribute>
-          <attribute name="err">
-            <data type="boolean"/>
-          </attribute>
-          <attribute name="smtClean">
-            <data type="boolean"/>
-          </attribute>
-          <attribute name="smtId">
-            <data type="unsignedInt"/>
-          </attribute>
-          <attribute name="bmk">
-            <data type="string"/>
-          </attribute>
-      </define>
-    </grammar>
-    <resource name="ST_TextPoint" resource="Integer"/>
-    <resource name="ST_TextNonNegativePoint" resource="Integer"/>
-    <resource name="ST_TextFontSize" resource="Integer"/>
-    <resource name="ST_Panose" resource="Hex"/>
-    <resource name="ST_TextTypeface" resource="String"/>
-    <resource name="CT_TextFont" resource="Properties">
-      <attribute name="typeface" tokenid="ooxml:CT_TextFont_typeface"/>
-      <attribute name="panose" tokenid="ooxml:CT_TextFont_panose"/>
-      <attribute name="pitchFamily" tokenid="ooxml:CT_TextFont_pitchFamily"/>
-      <attribute name="charset" tokenid="ooxml:CT_TextFont_charset"/>
-    </resource>
-    <resource name="ST_TextLanguageID" resource="String"/>
-    <resource name="ST_TextUnderlineType" resource="List">
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_none">none</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_words">words</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_sng">sng</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dbl">dbl</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_heavy">heavy</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotted">dotted</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dottedHeavy">dottedHeavy</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dash">dash</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashHeavy">dashHeavy</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashLong">dashLong</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashLongHeavy">dashLongHeavy</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDash">dotDash</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDashHeavy">dotDashHeavy</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDotDash">dotDotDash</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDotDashHeavy">dotDotDashHeavy</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavy">wavy</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavyHeavy">wavyHeavy</value>
-      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavyDbl">wavyDbl</value>
-    </resource>
-    <resource name="ST_TextStrikeType" resource="List">
+        <element name="ln">
+          <ref name="CT_LineProperties"/>
+        </element>
+        <ref name="EG_FillProperties"/>
+        <ref name="EG_EffectProperties"/>
+        <element name="highlight">
+          <ref name="CT_Color"/>
+        </element>
+        <ref name="EG_TextUnderlineLine"/>
+        <ref name="EG_TextUnderlineFill"/>
+        <element name="latin">
+          <ref name="CT_TextFont"/>
+        </element>
+        <element name="ea">
+          <ref name="CT_TextFont"/>
+        </element>
+        <element name="cs">
+          <ref name="CT_TextFont"/>
+        </element>
+        <element name="sym">
+          <ref name="CT_TextFont"/>
+        </element>
+        <element name="hlinkClick">
+          <ref name="CT_Hyperlink"/>
+        </element>
+        <element name="hlinkMouseOver">
+          <ref name="CT_Hyperlink"/>
+        </element>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
+        <attribute name="kumimoji">
+          <data type="boolean"/>
+        </attribute>
+        <attribute name="lang">
+          <ref name="ST_TextLanguageID"/>
+        </attribute>
+        <attribute name="altLang">
+          <ref name="ST_TextLanguageID"/>
+        </attribute>
+        <attribute name="sz">
+          <ref name="ST_TextFontSize"/>
+        </attribute>
+        <attribute name="b">
+          <data type="boolean"/>
+        </attribute>
+        <attribute name="i">
+          <data type="boolean"/>
+        </attribute>
+        <attribute name="u">
+          <ref name="ST_TextUnderlineType"/>
+        </attribute>
+        <attribute name="strike">
+          <ref name="ST_TextStrikeType"/>
+        </attribute>
+        <attribute name="kern">
+          <ref name="ST_TextNonNegativePoint"/>
+        </attribute>
+        <attribute name="cap">
+          <ref name="ST_TextCapsType"/>
+        </attribute>
+        <attribute name="spc">
+          <ref name="ST_TextPoint"/>
+        </attribute>
+        <attribute name="normalizeH">
+          <data type="boolean"/>
+        </attribute>
+        <attribute name="baseline">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="noProof">
+          <data type="boolean"/>
+        </attribute>
+        <attribute name="dirty">
+          <data type="boolean"/>
+        </attribute>
+        <attribute name="err">
+          <data type="boolean"/>
+        </attribute>
+        <attribute name="smtClean">
+          <data type="boolean"/>
+        </attribute>
+        <attribute name="smtId">
+          <data type="unsignedInt"/>
+        </attribute>
+        <attribute name="bmk">
+          <data type="string"/>
+        </attribute>
+      </define>
+    </grammar>
+    <resource name="ST_TextPoint" resource="Integer"/>
+    <resource name="ST_TextNonNegativePoint" resource="Integer"/>
+    <resource name="ST_TextFontSize" resource="Integer"/>
+    <resource name="ST_Panose" resource="Hex"/>
+    <resource name="ST_TextTypeface" resource="String"/>
+    <resource name="CT_TextFont" resource="Properties">
+      <attribute name="typeface" tokenid="ooxml:CT_TextFont_typeface"/>
+      <attribute name="panose" tokenid="ooxml:CT_TextFont_panose"/>
+      <attribute name="pitchFamily" tokenid="ooxml:CT_TextFont_pitchFamily"/>
+      <attribute name="charset" tokenid="ooxml:CT_TextFont_charset"/>
+    </resource>
+    <resource name="ST_TextLanguageID" resource="String"/>
+    <resource name="ST_TextUnderlineType" resource="List">
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_none">none</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_words">words</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_sng">sng</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dbl">dbl</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_heavy">heavy</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotted">dotted</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dottedHeavy">dottedHeavy</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dash">dash</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashHeavy">dashHeavy</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashLong">dashLong</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashLongHeavy">dashLongHeavy</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDash">dotDash</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDashHeavy">dotDashHeavy</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDotDash">dotDotDash</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDotDashHeavy">dotDotDashHeavy</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavy">wavy</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavyHeavy">wavyHeavy</value>
+      <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavyDbl">wavyDbl</value>
+    </resource>
+    <resource name="ST_TextStrikeType" resource="List">
       <value tokenid="ooxml:Value_drawingml_ST_TextStrikeType_noStrike">noStrike</value>
       <value tokenid="ooxml:Value_drawingml_ST_TextStrikeType_sngStrike">sngStrike</value>
       <value tokenid="ooxml:Value_drawingml_ST_TextStrikeType_dblStrike">dblStrike</value>
@@ -1268,17 +1268,17 @@
       <define name="CT_AlphaFloorEffect">
       </define>
       <define name="CT_AlphaInverseEffect">
-          <ref name="EG_ColorChoice"/>
+        <ref name="EG_ColorChoice"/>
       </define>
       <define name="CT_AlphaModulateFixedEffect">
-          <attribute name="amt">
-            <ref name="ST_PositivePercentage"/>
-          </attribute>
+        <attribute name="amt">
+          <ref name="ST_PositivePercentage"/>
+        </attribute>
       </define>
       <define name="CT_AlphaOutsetEffect">
-          <attribute name="rad">
-            <ref name="ST_Coordinate"/>
-          </attribute>
+        <attribute name="rad">
+          <ref name="ST_Coordinate"/>
+        </attribute>
       </define>
       <define name="CT_AlphaReplaceEffect">
         <attribute name="a">
@@ -1291,206 +1291,206 @@
         </attribute>
       </define>
       <define name="CT_BlurEffect">
-          <attribute name="rad">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="grow">
-            <data type="boolean"/>
-          </attribute>
+        <attribute name="rad">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="grow">
+          <data type="boolean"/>
+        </attribute>
       </define>
       <define name="CT_ColorChangeEffect">
-          <element name="clrFrom">
-            <ref name="CT_Color"/>
-          </element>
-          <element name="clrTo">
-            <ref name="CT_Color"/>
-          </element>
-          <attribute name="useA">
-            <data type="boolean"/>
-          </attribute>
+        <element name="clrFrom">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="clrTo">
+          <ref name="CT_Color"/>
+        </element>
+        <attribute name="useA">
+          <data type="boolean"/>
+        </attribute>
       </define>
       <define name="CT_ColorReplaceEffect">
         <ref name="EG_ColorChoice"/>
       </define>
       <define name="CT_DuotoneEffect">
-          <ref name="EG_ColorChoice"/>
+        <ref name="EG_ColorChoice"/>
       </define>
       <define name="CT_GlowEffect">
         <ref name="EG_ColorChoice"/>
-          <attribute name="rad">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
+        <attribute name="rad">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
       </define>
       <define name="CT_GrayscaleEffect">
       </define>
       <define name="CT_HSLEffect">
-          <attribute name="hue">
-            <ref name="ST_PositiveFixedAngle"/>
-          </attribute>
-          <attribute name="sat">
-            <ref name="ST_FixedPercentage"/>
-          </attribute>
-          <attribute name="lum">
-            <ref name="ST_FixedPercentage"/>
-          </attribute>
+        <attribute name="hue">
+          <ref name="ST_PositiveFixedAngle"/>
+        </attribute>
+        <attribute name="sat">
+          <ref name="ST_FixedPercentage"/>
+        </attribute>
+        <attribute name="lum">
+          <ref name="ST_FixedPercentage"/>
+        </attribute>
       </define>
       <define name="CT_InnerShadowEffect">
         <ref name="EG_ColorChoice"/>
-          <attribute name="blurRad">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="dist">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="dir">
-            <ref name="ST_PositiveFixedAngle"/>
-          </attribute>
+        <attribute name="blurRad">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="dist">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="dir">
+          <ref name="ST_PositiveFixedAngle"/>
+        </attribute>
       </define>
       <define name="CT_LuminanceEffect">
-          <attribute name="bright">
-            <ref name="ST_FixedPercentage"/>
-          </attribute>
-          <attribute name="contrast">
-            <ref name="ST_FixedPercentage"/>
-          </attribute>
+        <attribute name="bright">
+          <ref name="ST_FixedPercentage"/>
+        </attribute>
+        <attribute name="contrast">
+          <ref name="ST_FixedPercentage"/>
+        </attribute>
       </define>
       <define name="CT_OuterShadowEffect">
         <ref name="EG_ColorChoice"/>
-          <attribute name="blurRad">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="dist">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="dir">
-            <ref name="ST_PositiveFixedAngle"/>
-          </attribute>
-          <attribute name="sx">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="sy">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="kx">
-            <ref name="ST_FixedAngle"/>
-          </attribute>
-          <attribute name="ky">
-            <ref name="ST_FixedAngle"/>
-          </attribute>
-          <attribute name="algn">
-            <ref name="ST_RectAlignment"/>
-          </attribute>
-          <attribute name="rotWithShape">
-            <data type="boolean"/>
-          </attribute>
+        <attribute name="blurRad">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="dist">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="dir">
+          <ref name="ST_PositiveFixedAngle"/>
+        </attribute>
+        <attribute name="sx">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="sy">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="kx">
+          <ref name="ST_FixedAngle"/>
+        </attribute>
+        <attribute name="ky">
+          <ref name="ST_FixedAngle"/>
+        </attribute>
+        <attribute name="algn">
+          <ref name="ST_RectAlignment"/>
+        </attribute>
+        <attribute name="rotWithShape">
+          <data type="boolean"/>
+        </attribute>
       </define>
       <define name="ST_PresetShadowVal">
-          <choice>
-            <!-- Top Left Drop Shadow -->
-            <value>shdw1</value>
-            <!-- Top Right Drop Shadow -->
-            <value>shdw2</value>
-            <!-- Back Left Perspective Shadow -->
-            <value>shdw3</value>
-            <!-- Back Right Perspective Shadow -->
-            <value>shdw4</value>
-            <!-- Bottom Left Drop Shadow -->
-            <value>shdw5</value>
-            <!-- Bottom Right Drop Shadow -->
-            <value>shdw6</value>
-            <!-- Front Left Perspective Shadow -->
-            <value>shdw7</value>
-            <!-- Front Right Perspective Shadow -->
-            <value>shdw8</value>
-            <!-- Top Left Small Drop Shadow -->
-            <value>shdw9</value>
-            <!-- Top Left Large Drop Shadow -->
-            <value>shdw10</value>
-            <!-- Back Left Long Perspective Shadow -->
-            <value>shdw11</value>
-            <!-- Back Right Long Perspective Shadow -->
-            <value>shdw12</value>
-            <!-- Top Left Double Drop Shadow -->
-            <value>shdw13</value>
-            <!-- Bottom Right Small Drop Shadow -->
-            <value>shdw14</value>
-            <!-- Front Left Long Perspective Shadow -->
-            <value>shdw15</value>
-            <!-- Front Right LongPerspective Shadow -->
-            <value>shdw16</value>
-            <!-- 3D Outer Box Shadow -->
-            <value>shdw17</value>
-            <!-- 3D Inner Box Shadow -->
-            <value>shdw18</value>
-            <!-- Back Center Perspective Shadow -->
-            <value>shdw19</value>
-            <!-- Front Bottom Shadow -->
-            <value>shdw20</value>
-          </choice>
+        <choice>
+          <!-- Top Left Drop Shadow -->
+          <value>shdw1</value>
+          <!-- Top Right Drop Shadow -->
+          <value>shdw2</value>
+          <!-- Back Left Perspective Shadow -->
+          <value>shdw3</value>
+          <!-- Back Right Perspective Shadow -->
+          <value>shdw4</value>
+          <!-- Bottom Left Drop Shadow -->
+          <value>shdw5</value>
+          <!-- Bottom Right Drop Shadow -->
+          <value>shdw6</value>
+          <!-- Front Left Perspective Shadow -->
+          <value>shdw7</value>
+          <!-- Front Right Perspective Shadow -->
+          <value>shdw8</value>
+          <!-- Top Left Small Drop Shadow -->
+          <value>shdw9</value>
+          <!-- Top Left Large Drop Shadow -->
+          <value>shdw10</value>
+          <!-- Back Left Long Perspective Shadow -->
+          <value>shdw11</value>
+          <!-- Back Right Long Perspective Shadow -->
+          <value>shdw12</value>
+          <!-- Top Left Double Drop Shadow -->
+          <value>shdw13</value>
+          <!-- Bottom Right Small Drop Shadow -->
+          <value>shdw14</value>
+          <!-- Front Left Long Perspective Shadow -->
+          <value>shdw15</value>
+          <!-- Front Right LongPerspective Shadow -->
+          <value>shdw16</value>
+          <!-- 3D Outer Box Shadow -->
+          <value>shdw17</value>
+          <!-- 3D Inner Box Shadow -->
+          <value>shdw18</value>
+          <!-- Back Center Perspective Shadow -->
+          <value>shdw19</value>
+          <!-- Front Bottom Shadow -->
+          <value>shdw20</value>
+        </choice>
       </define>
       <define name="CT_PresetShadowEffect">
         <ref name="EG_ColorChoice"/>
         <attribute name="prst">
           <ref name="ST_PresetShadowVal"/>
         </attribute>
-          <attribute name="dist">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="dir">
-            <ref name="ST_PositiveFixedAngle"/>
-          </attribute>
+        <attribute name="dist">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="dir">
+          <ref name="ST_PositiveFixedAngle"/>
+        </attribute>
       </define>
       <define name="CT_ReflectionEffect">
-          <attribute name="blurRad">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="stA">
-            <ref name="ST_PositiveFixedPercentage"/>
-          </attribute>
-          <attribute name="stPos">
-            <ref name="ST_PositiveFixedPercentage"/>
-          </attribute>
-          <attribute name="endA">
-            <ref name="ST_PositiveFixedPercentage"/>
-          </attribute>
-          <attribute name="endPos">
-            <ref name="ST_PositiveFixedPercentage"/>
-          </attribute>
-          <attribute name="dist">
-            <ref name="ST_PositiveCoordinate"/>
-          </attribute>
-          <attribute name="dir">
-            <ref name="ST_PositiveFixedAngle"/>
-          </attribute>
-          <attribute name="fadeDir">
-            <ref name="ST_PositiveFixedAngle"/>
-          </attribute>
-          <attribute name="sx">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="sy">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="kx">
-            <ref name="ST_FixedAngle"/>
-          </attribute>
-          <attribute name="ky">
-            <ref name="ST_FixedAngle"/>
-          </attribute>
-          <attribute name="algn">
-            <ref name="ST_RectAlignment"/>
-          </attribute>
-          <attribute name="rotWithShape">
-            <data type="boolean"/>
-          </attribute>
+        <attribute name="blurRad">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="stA">
+          <ref name="ST_PositiveFixedPercentage"/>
+        </attribute>
+        <attribute name="stPos">
+          <ref name="ST_PositiveFixedPercentage"/>
+        </attribute>
+        <attribute name="endA">
+          <ref name="ST_PositiveFixedPercentage"/>
+        </attribute>
+        <attribute name="endPos">
+          <ref name="ST_PositiveFixedPercentage"/>
+        </attribute>
+        <attribute name="dist">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+        <attribute name="dir">
+          <ref name="ST_PositiveFixedAngle"/>
+        </attribute>
+        <attribute name="fadeDir">
+          <ref name="ST_PositiveFixedAngle"/>
+        </attribute>
+        <attribute name="sx">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="sy">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="kx">
+          <ref name="ST_FixedAngle"/>
+        </attribute>
+        <attribute name="ky">
+          <ref name="ST_FixedAngle"/>
+        </attribute>
+        <attribute name="algn">
+          <ref name="ST_RectAlignment"/>
+        </attribute>
+        <attribute name="rotWithShape">
+          <data type="boolean"/>
+        </attribute>
       </define>
       <define name="CT_RelativeOffsetEffect">
-          <attribute name="tx">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="ty">
-            <ref name="ST_Percentage"/>
-          </attribute>
+        <attribute name="tx">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="ty">
+          <ref name="ST_Percentage"/>
+        </attribute>
       </define>
       <define name="CT_SoftEdgesEffect">
         <attribute name="rad">
@@ -1498,63 +1498,63 @@
         </attribute>
       </define>
       <define name="CT_TintEffect">
-          <attribute name="hue">
-            <ref name="ST_PositiveFixedAngle"/>
-          </attribute>
-          <attribute name="amt">
-            <ref name="ST_FixedPercentage"/>
-          </attribute>
+        <attribute name="hue">
+          <ref name="ST_PositiveFixedAngle"/>
+        </attribute>
+        <attribute name="amt">
+          <ref name="ST_FixedPercentage"/>
+        </attribute>
       </define>
       <define name="CT_TransformEffect">
-          <attribute name="sx">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="sy">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="kx">
-            <ref name="ST_FixedAngle"/>
-          </attribute>
-          <attribute name="ky">
-            <ref name="ST_FixedAngle"/>
-          </attribute>
-          <attribute name="tx">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="ty">
-            <ref name="ST_Percentage"/>
-          </attribute>
+        <attribute name="sx">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="sy">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="kx">
+          <ref name="ST_FixedAngle"/>
+        </attribute>
+        <attribute name="ky">
+          <ref name="ST_FixedAngle"/>
+        </attribute>
+        <attribute name="tx">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="ty">
+          <ref name="ST_Percentage"/>
+        </attribute>
       </define>
       <define name="CT_NoFillProperties">
       </define>
       <define name="CT_SolidColorFillProperties">
-          <ref name="EG_ColorChoice"/>
+        <ref name="EG_ColorChoice"/>
       </define>
       <define name="CT_LinearShadeProperties">
-          <attribute name="ang">
-            <ref name="ST_PositiveFixedAngle"/>
-          </attribute>
-          <attribute name="scaled">
-            <data type="boolean"/>
-          </attribute>
+        <attribute name="ang">
+          <ref name="ST_PositiveFixedAngle"/>
+        </attribute>
+        <attribute name="scaled">
+          <data type="boolean"/>
+        </attribute>
       </define>
       <define name="ST_PathShadeType">
-          <choice>
-            <!-- Shape -->
-            <value>shape</value>
-            <!-- Circle -->
-            <value>circle</value>
-            <!-- Rectangle -->
-            <value>rect</value>
-          </choice>
+        <choice>
+          <!-- Shape -->
+          <value>shape</value>
+          <!-- Circle -->
+          <value>circle</value>
+          <!-- Rectangle -->
+          <value>rect</value>
+        </choice>
       </define>
       <define name="CT_PathShadeProperties">
-          <element name="fillToRect">
-            <ref name="CT_RelativeRect"/>
-          </element>
-          <attribute name="path">
-            <ref name="ST_PathShadeType"/>
-          </attribute>
+        <element name="fillToRect">
+          <ref name="CT_RelativeRect"/>
+        </element>
+        <attribute name="path">
+          <ref name="ST_PathShadeType"/>
+        </attribute>
       </define>
       <define name="EG_ShadeProperties">
         <choice>
@@ -1567,16 +1567,16 @@
         </choice>
       </define>
       <define name="ST_TileFlipMode">
-          <choice>
-            <!-- None -->
-            <value>none</value>
-            <!-- Horizontal -->
-            <value>x</value>
-            <!-- Vertical -->
-            <value>y</value>
-            <!-- Horizontal and Vertical -->
-            <value>xy</value>
-          </choice>
+        <choice>
+          <!-- None -->
+          <value>none</value>
+          <!-- Horizontal -->
+          <value>x</value>
+          <!-- Vertical -->
+          <value>y</value>
+          <!-- Horizontal and Vertical -->
+          <value>xy</value>
+        </choice>
       </define>
       <define name="CT_GradientStop">
         <ref name="EG_ColorChoice"/>
@@ -1585,49 +1585,49 @@
         </attribute>
       </define>
       <define name="CT_GradientStopList">
-          <element name="gs">
-            <ref name="CT_GradientStop"/>
-          </element>
+        <element name="gs">
+          <ref name="CT_GradientStop"/>
+        </element>
       </define>
       <define name="CT_GradientFillProperties">
-            <element name="gsLst">
-              <ref name="CT_GradientStopList"/>
-            </element>
-            <ref name="EG_ShadeProperties"/>
-            <element name="tileRect">
-              <ref name="CT_RelativeRect"/>
-            </element>
-          <attribute name="flip">
-            <ref name="ST_TileFlipMode"/>
-          </attribute>
-          <attribute name="rotWithShape">
-            <data type="boolean"/>
-          </attribute>
+        <element name="gsLst">
+          <ref name="CT_GradientStopList"/>
+        </element>
+        <ref name="EG_ShadeProperties"/>
+        <element name="tileRect">
+          <ref name="CT_RelativeRect"/>
+        </element>
+        <attribute name="flip">
+          <ref name="ST_TileFlipMode"/>
+        </attribute>
+        <attribute name="rotWithShape">
+          <data type="boolean"/>
+        </attribute>
       </define>
       <define name="CT_TileInfoProperties">
-          <attribute name="tx">
-            <ref name="ST_Coordinate"/>
-          </attribute>
-          <attribute name="ty">
-            <ref name="ST_Coordinate"/>
-          </attribute>
-          <attribute name="sx">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="sy">
-            <ref name="ST_Percentage"/>
-          </attribute>
-          <attribute name="flip">
-            <ref name="ST_TileFlipMode"/>
-          </attribute>
-          <attribute name="algn">
-            <ref name="ST_RectAlignment"/>
-          </attribute>
+        <attribute name="tx">
+          <ref name="ST_Coordinate"/>
+        </attribute>
+        <attribute name="ty">
+          <ref name="ST_Coordinate"/>
+        </attribute>
+        <attribute name="sx">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="sy">
+          <ref name="ST_Percentage"/>
+        </attribute>
+        <attribute name="flip">
+          <ref name="ST_TileFlipMode"/>
+        </attribute>
+        <attribute name="algn">
+          <ref name="ST_RectAlignment"/>
+        </attribute>
       </define>
       <define name="CT_StretchInfoProperties">
-          <element name="fillRect">
-            <ref name="CT_RelativeRect"/>
-          </element>
+        <element name="fillRect">
+          <ref name="CT_RelativeRect"/>
+        </element>
       </define>
       <define name="EG_FillModeProperties">
         <choice>
@@ -1640,225 +1640,225 @@
         </choice>
       </define>
       <define name="ST_BlipCompression">
-          <choice>
-            <!-- Email Compression -->
-            <value>email</value>
-            <!-- Screen Viewing Compression -->
-            <value>screen</value>
-            <!-- Printing Compression -->
-            <value>print</value>
-            <!-- High Quality Printing Compression -->
-            <value>hqprint</value>
-            <!-- No Compression -->
-            <value>none</value>
-          </choice>
+        <choice>
+          <!-- Email Compression -->
+          <value>email</value>
+          <!-- Screen Viewing Compression -->
+          <value>screen</value>
+          <!-- Printing Compression -->
+          <value>print</value>
+          <!-- High Quality Printing Compression -->
+          <value>hqprint</value>
+          <!-- No Compression -->
+          <value>none</value>
+        </choice>
       </define>
       <define name="CT_Blip">
-            <choice>
-              <element name="alphaBiLevel">
-                <ref name="CT_AlphaBiLevelEffect"/>
-              </element>
-              <element name="alphaCeiling">
-                <ref name="CT_AlphaCeilingEffect"/>
-              </element>
-              <element name="alphaFloor">
-                <ref name="CT_AlphaFloorEffect"/>
-              </element>
-              <element name="alphaInv">
-                <ref name="CT_AlphaInverseEffect"/>
-              </element>
-              <element name="alphaMod">
-                <ref name="CT_AlphaModulateEffect"/>
-              </element>
-              <element name="alphaModFix">
-                <ref name="CT_AlphaModulateFixedEffect"/>
-              </element>
-              <element name="alphaRepl">
-                <ref name="CT_AlphaReplaceEffect"/>
-              </element>
-              <element name="biLevel">
-                <ref name="CT_BiLevelEffect"/>
-              </element>
-              <element name="blur">
-                <ref name="CT_BlurEffect"/>
-              </element>
-              <element name="clrChange">
-                <ref name="CT_ColorChangeEffect"/>
-              </element>
-              <element name="clrRepl">
-                <ref name="CT_ColorReplaceEffect"/>
-              </element>
-              <element name="duotone">
-                <ref name="CT_DuotoneEffect"/>
-              </element>
-              <element name="fillOverlay">
-                <ref name="CT_FillOverlayEffect"/>
-              </element>
-              <element name="grayscl">
-                <ref name="CT_GrayscaleEffect"/>
-              </element>
-              <element name="hsl">
-                <ref name="CT_HSLEffect"/>
-              </element>
-              <element name="lum">
-                <ref name="CT_LuminanceEffect"/>
-              </element>
-              <element name="tint">
-                <ref name="CT_TintEffect"/>
-              </element>
-            </choice>
-            <element name="extLst">
-              <ref name="CT_OfficeArtExtensionList"/>
-            </element>
-        <ref name="AG_Blob"/>
-          <attribute name="cstate">
-            <ref name="ST_BlipCompression"/>
-          </attribute>
-      </define>
-      <define name="CT_BlipFillProperties">
-            <element name="blip">
-              <ref name="CT_Blip"/>
-            </element>
-            <element name="srcRect">
-              <ref name="CT_RelativeRect"/>
-            </element>
-            <ref name="EG_FillModeProperties"/>
-          <attribute name="dpi">
-            <data type="unsignedInt"/>
-          </attribute>
-          <attribute name="rotWithShape">
-            <data type="boolean"/>
-          </attribute>
-      </define>
-      <define name="ST_PresetPatternVal">
-          <choice>
-            <!-- 5% -->
-            <value>pct5</value>
-            <!-- 10% -->
-            <value>pct10</value>
-            <!-- 20% -->
-            <value>pct20</value>
-            <!-- 25% -->
-            <value>pct25</value>
-            <!-- 30% -->
-            <value>pct30</value>
-            <!-- 40% -->
-            <value>pct40</value>
-            <!-- 50% -->
-            <value>pct50</value>
-            <!-- 60% -->
-            <value>pct60</value>
-            <!-- 70% -->
-            <value>pct70</value>
-            <!-- 75% -->
-            <value>pct75</value>
-            <!-- 80% -->
-            <value>pct80</value>
-            <!-- 90% -->
-            <value>pct90</value>
-            <!-- Horizontal -->
-            <value>horz</value>
-            <!-- Vertical -->
-            <value>vert</value>
-            <!-- Light Horizontal -->
-            <value>ltHorz</value>
-            <!-- Light Vertical -->
-            <value>ltVert</value>
-            <!-- Dark Horizontal -->
-            <value>dkHorz</value>
-            <!-- Dark Vertical -->
-            <value>dkVert</value>
-            <!-- Narrow Horizontal -->
-            <value>narHorz</value>
-            <!-- Narrow Vertical -->
-            <value>narVert</value>
-            <!-- Dashed Horizontal -->
-            <value>dashHorz</value>
-            <!-- Dashed Vertical -->
-            <value>dashVert</value>
-            <!-- Cross -->
-            <value>cross</value>
-            <!-- Downward Diagonal -->
-            <value>dnDiag</value>
-            <!-- Upward Diagonal -->
-            <value>upDiag</value>
-            <!-- Light Downward Diagonal -->
-            <value>ltDnDiag</value>
-            <!-- Light Upward Diagonal -->
-            <value>ltUpDiag</value>
-            <!-- Dark Downward Diagonal -->
-            <value>dkDnDiag</value>
-            <!-- Dark Upward Diagonal -->
-            <value>dkUpDiag</value>
-            <!-- Wide Downward Diagonal -->
-            <value>wdDnDiag</value>
-            <!-- Wide Upward Diagonal -->
-            <value>wdUpDiag</value>
-            <!-- Dashed Downward Diagonal -->
-            <value>dashDnDiag</value>
-            <!-- Dashed Upward DIagonal -->
-            <value>dashUpDiag</value>
-            <!-- Diagonal Cross -->
-            <value>diagCross</value>
-            <!-- Small Checker Board -->
-            <value>smCheck</value>
-            <!-- Large Checker Board -->
-            <value>lgCheck</value>
-            <!-- Small Grid -->
-            <value>smGrid</value>
-            <!-- Large Grid -->
-            <value>lgGrid</value>
-            <!-- Dotted Grid -->
-            <value>dotGrid</value>
-            <!-- Small Confetti -->
-            <value>smConfetti</value>
-            <!-- Large Confetti -->
-            <value>lgConfetti</value>
-            <!-- Horizontal Brick -->
-            <value>horzBrick</value>
-            <!-- Diagonal Brick -->
-            <value>diagBrick</value>
-            <!-- Solid Diamond -->
-            <value>solidDmnd</value>
-            <!-- Open Diamond -->
-            <value>openDmnd</value>
-            <!-- Dotted Diamond -->
-            <value>dotDmnd</value>
-            <!-- Plaid -->
-            <value>plaid</value>
-            <!-- Sphere -->
-            <value>sphere</value>
-            <!-- Weave -->
-            <value>weave</value>
-            <!-- Divot -->
-            <value>divot</value>
-            <!-- Shingle -->
-            <value>shingle</value>
-            <!-- Wave -->
-            <value>wave</value>
-            <!-- Trellis -->
-            <value>trellis</value>
-            <!-- Zig Zag -->
-            <value>zigZag</value>
-          </choice>
-      </define>
-      <define name="CT_PatternFillProperties">
-            <element name="fgClr">
-              <ref name="CT_Color"/>
-            </element>
-            <element name="bgClr">
-              <ref name="CT_Color"/>
-            </element>
-          <attribute name="prst">
-            <ref name="ST_PresetPatternVal"/>
-          </attribute>
-      </define>
-      <define name="CT_GroupFillProperties">
-      </define>
-      <define name="EG_FillProperties">
         <choice>
-          <element name="noFill">
-            <ref name="CT_NoFillProperties"/>
+          <element name="alphaBiLevel">
+            <ref name="CT_AlphaBiLevelEffect"/>
+          </element>
+          <element name="alphaCeiling">
+            <ref name="CT_AlphaCeilingEffect"/>
+          </element>
+          <element name="alphaFloor">
+            <ref name="CT_AlphaFloorEffect"/>
+          </element>
+          <element name="alphaInv">
+            <ref name="CT_AlphaInverseEffect"/>
+          </element>
+          <element name="alphaMod">
+            <ref name="CT_AlphaModulateEffect"/>
+          </element>
+          <element name="alphaModFix">
+            <ref name="CT_AlphaModulateFixedEffect"/>
+          </element>
+          <element name="alphaRepl">
+            <ref name="CT_AlphaReplaceEffect"/>
+          </element>
+          <element name="biLevel">
+            <ref name="CT_BiLevelEffect"/>
+          </element>
+          <element name="blur">
+            <ref name="CT_BlurEffect"/>
+          </element>
+          <element name="clrChange">
+            <ref name="CT_ColorChangeEffect"/>
+          </element>
+          <element name="clrRepl">
+            <ref name="CT_ColorReplaceEffect"/>
+          </element>
+          <element name="duotone">
+            <ref name="CT_DuotoneEffect"/>
+          </element>
+          <element name="fillOverlay">
+            <ref name="CT_FillOverlayEffect"/>
+          </element>
+          <element name="grayscl">
+            <ref name="CT_GrayscaleEffect"/>
+          </element>
+          <element name="hsl">
+            <ref name="CT_HSLEffect"/>
+          </element>
+          <element name="lum">
+            <ref name="CT_LuminanceEffect"/>
+          </element>
+          <element name="tint">
+            <ref name="CT_TintEffect"/>
+          </element>
+        </choice>
+        <element name="extLst">
+          <ref name="CT_OfficeArtExtensionList"/>
+        </element>
+        <ref name="AG_Blob"/>
+        <attribute name="cstate">
+          <ref name="ST_BlipCompression"/>
+        </attribute>
+      </define>
+      <define name="CT_BlipFillProperties">
+        <element name="blip">
+          <ref name="CT_Blip"/>
+        </element>
+        <element name="srcRect">
+          <ref name="CT_RelativeRect"/>
+        </element>
+        <ref name="EG_FillModeProperties"/>
+        <attribute name="dpi">
+          <data type="unsignedInt"/>
+        </attribute>
+        <attribute name="rotWithShape">
+          <data type="boolean"/>
+        </attribute>
+      </define>
+      <define name="ST_PresetPatternVal">
+        <choice>
+          <!-- 5% -->
+          <value>pct5</value>
+          <!-- 10% -->
+          <value>pct10</value>
+          <!-- 20% -->
+          <value>pct20</value>
+          <!-- 25% -->
+          <value>pct25</value>
+          <!-- 30% -->
+          <value>pct30</value>
+          <!-- 40% -->
+          <value>pct40</value>
+          <!-- 50% -->
+          <value>pct50</value>
+          <!-- 60% -->
+          <value>pct60</value>
+          <!-- 70% -->
+          <value>pct70</value>
+          <!-- 75% -->
+          <value>pct75</value>
+          <!-- 80% -->
+          <value>pct80</value>
+          <!-- 90% -->
+          <value>pct90</value>
+          <!-- Horizontal -->
+          <value>horz</value>
+          <!-- Vertical -->
+          <value>vert</value>
+          <!-- Light Horizontal -->
+          <value>ltHorz</value>
+          <!-- Light Vertical -->
+          <value>ltVert</value>
+          <!-- Dark Horizontal -->
+          <value>dkHorz</value>
+          <!-- Dark Vertical -->
+          <value>dkVert</value>
+          <!-- Narrow Horizontal -->
+          <value>narHorz</value>
+          <!-- Narrow Vertical -->
+          <value>narVert</value>
+          <!-- Dashed Horizontal -->
+          <value>dashHorz</value>
+          <!-- Dashed Vertical -->
+          <value>dashVert</value>
+          <!-- Cross -->
+          <value>cross</value>
+          <!-- Downward Diagonal -->
+          <value>dnDiag</value>
+          <!-- Upward Diagonal -->
+          <value>upDiag</value>
+          <!-- Light Downward Diagonal -->
+          <value>ltDnDiag</value>
+          <!-- Light Upward Diagonal -->
+          <value>ltUpDiag</value>
+          <!-- Dark Downward Diagonal -->
+          <value>dkDnDiag</value>
+          <!-- Dark Upward Diagonal -->
+          <value>dkUpDiag</value>
+          <!-- Wide Downward Diagonal -->
+          <value>wdDnDiag</value>
+          <!-- Wide Upward Diagonal -->
+          <value>wdUpDiag</value>
+          <!-- Dashed Downward Diagonal -->
+          <value>dashDnDiag</value>
+          <!-- Dashed Upward DIagonal -->
+          <value>dashUpDiag</value>
+          <!-- Diagonal Cross -->
+          <value>diagCross</value>
+          <!-- Small Checker Board -->
+          <value>smCheck</value>
+          <!-- Large Checker Board -->
+          <value>lgCheck</value>
+          <!-- Small Grid -->
+          <value>smGrid</value>
+          <!-- Large Grid -->
+          <value>lgGrid</value>
+          <!-- Dotted Grid -->
+          <value>dotGrid</value>
+          <!-- Small Confetti -->
+          <value>smConfetti</value>
+          <!-- Large Confetti -->
+          <value>lgConfetti</value>
+          <!-- Horizontal Brick -->
+          <value>horzBrick</value>
+          <!-- Diagonal Brick -->
+          <value>diagBrick</value>
+          <!-- Solid Diamond -->
+          <value>solidDmnd</value>
+          <!-- Open Diamond -->
+          <value>openDmnd</value>
+          <!-- Dotted Diamond -->
+          <value>dotDmnd</value>
+          <!-- Plaid -->
+          <value>plaid</value>
+          <!-- Sphere -->
+          <value>sphere</value>
+          <!-- Weave -->
+          <value>weave</value>
+          <!-- Divot -->
+          <value>divot</value>
+          <!-- Shingle -->
+          <value>shingle</value>
+          <!-- Wave -->
+          <value>wave</value>
+          <!-- Trellis -->
+          <value>trellis</value>
+          <!-- Zig Zag -->
+          <value>zigZag</value>
+        </choice>
+      </define>
+      <define name="CT_PatternFillProperties">
+        <element name="fgClr">
+          <ref name="CT_Color"/>
+        </element>
+        <element name="bgClr">
+          <ref name="CT_Color"/>
+        </element>
+        <attribute name="prst">
+          <ref name="ST_PresetPatternVal"/>
+        </attribute>
+      </define>
+      <define name="CT_GroupFillProperties">
+      </define>
+      <define name="EG_FillProperties">
+        <choice>
+          <element name="noFill">
+            <ref name="CT_NoFillProperties"/>
           </element>
           <element name="solidFill">
             <ref name="CT_SolidColorFillProperties"/>
@@ -1884,18 +1884,18 @@
         <ref name="EG_FillProperties"/>
       </define>
       <define name="ST_BlendMode">
-          <choice>
-            <!-- Overlay -->
-            <value>over</value>
-            <!-- Multiply -->
-            <value>mult</value>
-            <!-- Screen -->
-            <value>screen</value>
-            <!-- Darken -->
-            <value>darken</value>
-            <!-- Lighten -->
-            <value>lighten</value>
-          </choice>
+        <choice>
+          <!-- Overlay -->
+          <value>over</value>
+          <!-- Multiply -->
+          <value>mult</value>
+          <!-- Screen -->
+          <value>screen</value>
+          <!-- Darken -->
+          <value>darken</value>
+          <!-- Lighten -->
+          <value>lighten</value>
+        </choice>
       </define>
       <define name="CT_FillOverlayEffect">
         <ref name="EG_FillProperties"/>
@@ -2003,21 +2003,21 @@
         </choice>
       </define>
       <define name="ST_EffectContainerType">
-          <choice>
-            <!-- Sibling -->
-            <value>sib</value>
-            <!-- Tree -->
-            <value>tree</value>
-          </choice>
+        <choice>
+          <!-- Sibling -->
+          <value>sib</value>
+          <!-- Tree -->
+          <value>tree</value>
+        </choice>
       </define>
       <define name="CT_EffectContainer">
-          <ref name="EG_Effect"/>
-          <attribute name="type">
-            <ref name="ST_EffectContainerType"/>
-          </attribute>
-          <attribute name="name">
-            <data type="token"/>
-          </attribute>
+        <ref name="EG_Effect"/>
+        <attribute name="type">
+          <ref name="ST_EffectContainerType"/>
+        </attribute>
+        <attribute name="name">
+          <data type="token"/>
+        </attribute>
       </define>
       <define name="CT_AlphaModulateEffect">
         <element name="cont">
@@ -2033,30 +2033,30 @@
         </attribute>
       </define>
       <define name="CT_EffectList">
-          <element name="blur">
-            <ref name="CT_BlurEffect"/>
-          </element>
-          <element name="fillOverlay">
-            <ref name="CT_FillOverlayEffect"/>
-          </element>
-          <element name="glow">
-            <ref name="CT_GlowEffect"/>
-          </element>
-          <element name="innerShdw">
-            <ref name="CT_InnerShadowEffect"/>
-          </element>
-          <element name="outerShdw">
-            <ref name="CT_OuterShadowEffect"/>
-          </element>
-          <element name="prstShdw">
-            <ref name="CT_PresetShadowEffect"/>
-          </element>
-          <element name="reflection">
-            <ref name="CT_ReflectionEffect"/>
-          </element>
-          <element name="softEdge">
-            <ref name="CT_SoftEdgesEffect"/>
-          </element>
+        <element name="blur">
+          <ref name="CT_BlurEffect"/>
+        </element>
+        <element name="fillOverlay">
+          <ref name="CT_FillOverlayEffect"/>
+        </element>
+        <element name="glow">
+          <ref name="CT_GlowEffect"/>
+        </element>
+        <element name="innerShdw">
+          <ref name="CT_InnerShadowEffect"/>
+        </element>
+        <element name="outerShdw">
+          <ref name="CT_OuterShadowEffect"/>
+        </element>
+        <element name="prstShdw">
+          <ref name="CT_PresetShadowEffect"/>
+        </element>
+        <element name="reflection">
+          <ref name="CT_ReflectionEffect"/>
+        </element>
+        <element name="softEdge">
+          <ref name="CT_SoftEdgesEffect"/>
+        </element>
       </define>
       <define name="EG_EffectProperties">
         <choice>
@@ -2272,51 +2272,51 @@
       <!-- ISO RELAX NG Schema -->
       <include href="dml-shapeEffects.rng"/>
       <define name="ST_LineEndType">
-          <choice>
-            <!-- None -->
-            <value>none</value>
-            <!-- Triangle Arrow Head -->
-            <value>triangle</value>
-            <!-- Stealth Arrow -->
-            <value>stealth</value>
-            <!-- Diamond -->
-            <value>diamond</value>
-            <!-- Oval -->
-            <value>oval</value>
-            <!-- Arrow Head -->
-            <value>arrow</value>
-          </choice>
+        <choice>
+          <!-- None -->
+          <value>none</value>
+          <!-- Triangle Arrow Head -->
+          <value>triangle</value>
+          <!-- Stealth Arrow -->
+          <value>stealth</value>
+          <!-- Diamond -->
+          <value>diamond</value>
+          <!-- Oval -->
+          <value>oval</value>
+          <!-- Arrow Head -->
+          <value>arrow</value>
+        </choice>
       </define>
       <define name="ST_LineEndWidth">
-          <choice>
-            <!-- Small -->
-            <value>sm</value>
-            <!-- Medium -->
-            <value>med</value>
-            <!-- Large -->
-            <value>lg</value>
-          </choice>
+        <choice>
+          <!-- Small -->
+          <value>sm</value>
+          <!-- Medium -->
+          <value>med</value>
+          <!-- Large -->
+          <value>lg</value>
+        </choice>
       </define>
       <define name="ST_LineEndLength">
-          <choice>
-            <!-- Small -->
-            <value>sm</value>
-            <!-- Medium -->
-            <value>med</value>
-            <!-- Large -->
-            <value>lg</value>
-          </choice>
+        <choice>
+          <!-- Small -->
+          <value>sm</value>
+          <!-- Medium -->
+          <value>med</value>
+          <!-- Large -->
+          <value>lg</value>
+        </choice>
       </define>
       <define name="CT_LineEndProperties">
-          <attribute name="type">
-            <ref name="ST_LineEndType"/>
-          </attribute>
-          <attribute name="w">
-            <ref name="ST_LineEndWidth"/>
-          </attribute>
-          <attribute name="len">
-            <ref name="ST_LineEndLength"/>
-          </attribute>
+        <attribute name="type">
+          <ref name="ST_LineEndType"/>
+        </attribute>
+        <attribute name="w">

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list