From 7f93b4001f3b7266695b46b3a5c95d0b9c66af35 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
Date: Sat, 22 Feb 2014 20:37:28 +0100
Subject: writerfilter: add all main w14 elements for a rPr

Change-Id: I8fa71bdf837eac6ea277d2e2507622a783625a11
---
 writerfilter/source/ooxml/model.xml | 332 +++++++++++++++++++++++++++++++++---
 1 file changed, 307 insertions(+), 25 deletions(-)

(limited to 'writerfilter')

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 69b97dd77d7a..16fd71e3c37a 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5317,8 +5317,49 @@
   </namespace>
   <namespace name="w14" file="w14.rng">
     <start name="glow"/>
+    <start name="shadow"/>
+    <start name="reflection"/>
+    <start name="textOutline"/>
+    <start name="textFill"/>
+    <start name="scene3d"/>
+    <start name="props3d"/>
+    <start name="ligatures"/>
+    <start name="numForm"/>
+    <start name="numSpacing"/>
+    <start name="stylisticSets"/>
+    <start name="cntxtAlts"/>
     <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" attributeFormDefault="qualified">
 
+      <define name="ST_SchemeColorVal">
+        <choice>
+          <value>bg1</value>
+          <value>tx1</value>
+          <value>bg2</value>
+          <value>tx2</value>
+          <value>accent1</value>
+          <value>accent2</value>
+          <value>accent3</value>
+          <value>accent4</value>
+          <value>accent5</value>
+          <value>accent6</value>
+        </choice>
+      </define>
+
+      <define name="ST_RectAlignment">
+        <choice>
+          <value>none</value>
+          <value>tl</value>
+          <value>t</value>
+          <value>tr</value>
+          <value>l</value>
+          <value>ctr</value>
+          <value>r</value>
+          <value>bl</value>
+          <value>b</value>
+          <value>br</value>
+        </choice>
+      </define>
+
       <define name="ST_PositiveCoordinate">
         <data type="long">
           <xs:documentation>Positive Coordinate</xs:documentation>
@@ -5358,19 +5399,20 @@
         </data>
       </define>
 
-      <define name="ST_SchemeColorVal">
-        <choice>
-          <value>bg1</value>
-          <value>tx1</value>
-          <value>bg2</value>
-          <value>tx2</value>
-          <value>accent1</value>
-          <value>accent2</value>
-          <value>accent3</value>
-          <value>accent4</value>
-          <value>accent5</value>
-          <value>accent6</value>
-        </choice>
+      <define name="ST_PositiveFixedAngle">
+        <data type="int">
+          <xs:documentation>Positive fixed angle</xs:documentation>
+          <param name="minInclusive">0</param>
+          <param name="maxInclusive">21600000</param>
+        </data>
+      </define>
+
+      <define name="ST_FixedAngle">
+        <data type="int">
+          <xs:documentation>Fixed angle</xs:documentation>
+          <param name="minInclusive">-5400000</param>
+          <param name="maxInclusive">5400000</param>
+        </data>
       </define>
 
       <define name="EG_ColorChoice">
@@ -5443,29 +5485,18 @@
         </choice>
       </define>
 
-      <define name="CT_Glow">
-        <optional>
-            <ref name="EG_ColorChoice"/>
-        </optional>
-        <attribute name="rad">
-          <ref name="ST_PositiveCoordinate"/>
-        </attribute>
-      </define>
-
       <define name="CT_SRgbColor">
         <ref name="EG_ColorTransform"/>
         <attribute name="val">
           <ref name="ST_HexColorRGB"/>
         </attribute>
       </define>
-
       <define name="CT_SchemeColor">
         <ref name="EG_ColorTransform"/>
         <attribute name="val">
           <ref name="ST_SchemeColorVal"/>
         </attribute>
       </define>
-
       <define name="CT_PositiveFixedPercentage">
         <attribute name="val">
           <ref name="ST_PositiveFixedPercentage"/>
@@ -5482,13 +5513,136 @@
         </attribute>
       </define>
 
+      <define name="CT_Glow">
+        <optional>
+            <ref name="EG_ColorChoice"/>
+        </optional>
+        <attribute name="rad">
+          <ref name="ST_PositiveCoordinate"/>
+        </attribute>
+      </define>
+
+      <define name="CT_Shadow">
+        <optional>
+            <ref name="EG_ColorChoice"/>
+        </optional>
+        <optional>
+          <attribute name="blurRad">
+            <ref name="ST_PositiveCoordinate"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="dist">
+            <ref name="ST_PositiveCoordinate"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="dir">
+            <ref name="ST_PositiveFixedAngle"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="sx">
+            <ref name="ST_Percentage"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="sy">
+            <ref name="ST_Percentage"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="kx">
+            <ref name="ST_FixedAngle"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="ky">
+            <ref name="ST_FixedAngle"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="algn">
+            <ref name="ST_RectAlignment"/>
+          </attribute>
+        </optional>
+      </define>
+
       <define name="glow">
         <element name="glow">
           <ref name="CT_Glow"/>
         </element>
       </define>
+
+      <define name="shadow">
+        <element name="shadow">
+          <ref name="CT_Shadow"/>
+        </element>
+      </define>
+
+      <define name="reflection">
+        <element name="reflection">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="textOutline">
+        <element name="textOutline">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="textFill">
+        <element name="textFill">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="scene3d">
+        <element name="scene3d">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="props3d">
+        <element name="props3d">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="ligatures">
+        <element name="ligatures">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="numForm">
+        <element name="numForm">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="numSpacing">
+        <element name="numSpacing">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="stylisticSets">
+        <element name="stylisticSets">
+          <empty/>
+        </element>
+      </define>
+
+      <define name="cntxtAlts">
+        <element name="cntxtAlts">
+          <empty/>
+        </element>
+      </define>
+
     </grammar>
 
+    <!-- Simple Types Resource Definitions -->
     <resource name="ST_SchemeColorVal" resource="List" generated="yes">
       <value name="bg1" tokenid="ooxml:ST_SchemeColorVal_bg1">bg1</value>
       <value name="tx1" tokenid="ooxml:ST_SchemeColorVal_tx1">tx1</value>
@@ -5501,12 +5655,29 @@
       <value name="accent5" tokenid="ooxml:ST_SchemeColorVal_accent5">accent5</value>
       <value name="accent6" tokenid="ooxml:ST_SchemeColorVal_accent6">accent6</value>
     </resource>
+
+    <resource name="ST_RectAlignment" resource="List" generated="yes">
+      <value name="none" tokenid="ooxml:ST_RectAlignment_none">none</value>
+      <value name="tl" tokenid="ooxml:ST_RectAlignment_tl">tl</value>
+      <value name="t" tokenid="ooxml:ST_RectAlignment_t">t</value>
+      <value name="tr" tokenid="ooxml:ST_RectAlignment_tr">tr</value>
+      <value name="l" tokenid="ooxml:ST_RectAlignment_l">l</value>
+      <value name="ctr" tokenid="ooxml:ST_RectAlignment_ctr">ctr</value>
+      <value name="r" tokenid="ooxml:ST_RectAlignment_r">r</value>
+      <value name="bl" tokenid="ooxml:ST_RectAlignment_bl">bl</value>
+      <value name="b" tokenid="ooxml:ST_RectAlignment_b">b</value>
+      <value name="br" tokenid="ooxml:ST_RectAlignment_br">br</value>
+    </resource>
+
     <resource name="ST_PositiveCoordinate" resource="Integer" generated="yes"/>
     <resource name="ST_HexColorRGB" resource="Hex"/>
     <resource name="ST_PositivePercentage" resource="Integer" generated="yes"/>
     <resource name="ST_PositiveFixedPercentage" resource="Integer" generated="yes"/>
     <resource name="ST_Percentage" resource="Integer" generated="yes"/>
+    <resource name="ST_PositiveFixedAngle" resource="Integer" generated="yes"/>
+    <resource name="ST_FixedAngle" resource="Integer" generated="yes"/>
 
+    <!-- Groups Resource Definitions -->
     <resource name="EG_ColorTransform" resource="Properties" tag="character">
       <element name="tint" tokenid="ooxml:EG_ColorTransform_tint"/>
       <element name="shade" tokenid="ooxml:EG_ColorTransform_shade"/>
@@ -5523,6 +5694,8 @@
       <element name="srgbClr" tokenid="ooxml:EG_ColorChoice_srgbClr"/>
       <element name="schemeClr" tokenid="ooxml:EG_ColorChoice_schemeClr"/>
     </resource>
+
+    <!-- Complex Types Resource Definitions -->
     <resource name="CT_Glow" resource="Properties" tag="character">
       <attribute name="rad" tokenid="ooxml:CT_Glow_rad"/>
     </resource>
@@ -5541,9 +5714,52 @@
     <resource name="CT_Percentage" resource="Properties" tag="character">
       <attribute name="val" tokenid="ooxml:CT_Percentage_val"/>
     </resource>
+    <resource name="CT_Shadow" resource="Properties" tag="character">
+      <attribute name="blurRad" tokenid="ooxml:CT_Shadow_blurRad"/>
+      <attribute name="dist" tokenid="ooxml:CT_Shadow_dist"/>
+      <attribute name="dir" tokenid="ooxml:CT_Shadow_dir"/>
+      <attribute name="sx" tokenid="ooxml:CT_Shadow_sx"/>
+      <attribute name="sy" tokenid="ooxml:CT_Shadow_sy"/>
+      <attribute name="kx" tokenid="ooxml:CT_Shadow_kx"/>
+      <attribute name="ky" tokenid="ooxml:CT_Shadow_ky"/>
+      <attribute name="algn" tokenid="ooxml:CT_Shadow_algn"/>
+    </resource>
     <resource name="glow" resource="Properties" tag="character">
       <element name="glow" tokenid="ooxml:glow_glow"/>
     </resource>
+    <resource name="shadow" resource="Properties" tag="character">
+      <element name="shadow" tokenid="ooxml:shadow_shadow"/>
+    </resource>
+    <resource name="reflection" resource="Properties" tag="character">
+      <element name="reflection" tokenid="ooxml:reflection_reflection"/>
+    </resource>
+    <resource name="textOutline" resource="Properties" tag="character">
+      <element name="textOutline" tokenid="ooxml:textOutline_textOutline"/>
+    </resource>
+    <resource name="textFill" resource="Properties" tag="character">
+      <element name="textFill" tokenid="ooxml:textFill_textFill"/>
+    </resource>
+    <resource name="scene3d" resource="Properties" tag="character">
+      <element name="scene3d" tokenid="ooxml:scene3d_scene3d"/>
+    </resource>
+    <resource name="props3d" resource="Properties" tag="character">
+      <element name="props3d" tokenid="ooxml:props3d_props3d"/>
+    </resource>
+    <resource name="ligatures" resource="Properties" tag="character">
+      <element name="ligatures" tokenid="ooxml:ligatures_ligatures"/>
+    </resource>
+    <resource name="numForm" resource="Properties" tag="character">
+      <element name="numForm" tokenid="ooxml:numForm_numForm"/>
+    </resource>
+    <resource name="numSpacing" resource="Properties" tag="character">
+      <element name="numSpacing" tokenid="ooxml:numSpacing_numSpacing"/>
+    </resource>
+    <resource name="stylisticSets" resource="Properties" tag="character">
+      <element name="stylisticSets" tokenid="ooxml:stylisticSets_stylisticSets"/>
+    </resource>
+    <resource name="cntxtAlts" resource="Properties" tag="character">
+      <element name="cntxtAlts" tokenid="ooxml:cntxtAlts_cntxtAlts"/>
+    </resource>
   </namespace>
   <namespace name="dml-shapeGeometry" file="dml-shapeGeometry.rng" todo="ignore">
     <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" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
@@ -17177,11 +17393,66 @@
             <ref name="CT_OnOff"/>
           </element>
         </optional>
-         <optional>
+        <optional>
           <element name="w14:glow">
             <ref name="BUILT_IN_ANY_TYPE"/>
           </element>
         </optional>
+        <optional>
+          <element name="w14:shadow">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:reflection">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:textOutline">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:textFill">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:scene3d">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:props3d">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:ligatures">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:numForm">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:numSpacing">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:stylisticSets">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="w14:cntxtAlts">
+            <ref name="BUILT_IN_ANY_TYPE"/>
+          </element>
+        </optional>
       </define>
       <define name="EG_RPrContent">
         <optional>
@@ -23150,6 +23421,17 @@
       <element name="specVanish" tokenid="sprm:CFspecVanish"/>
       <element name="oMath" tokenid="ooxml:EG_RPrBase_oMath"/>
       <element name="w14:glow" tokenid="ooxml:EG_RPrBase_w14_glow"/>
+      <element name="w14:shadow" tokenid="ooxml:EG_RPrBase_w14_shadow"/>
+      <element name="w14:reflection" tokenid="ooxml:EG_RPrBase_w14_reflection"/>
+      <element name="w14:textOutline" tokenid="ooxml:EG_RPrBase_w14_textOutline"/>
+      <element name="w14:textFill" tokenid="ooxml:EG_RPrBase_w14_textFill"/>
+      <element name="w14:scene3d" tokenid="ooxml:EG_RPrBase_w14_scene3d"/>
+      <element name="w14:props3d" tokenid="ooxml:EG_RPrBase_w14_props3d"/>
+      <element name="w14:ligatures" tokenid="ooxml:EG_RPrBase_w14_ligatures"/>
+      <element name="w14:numForm" tokenid="ooxml:EG_RPrBase_w14_numForm"/>
+      <element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/>
+      <element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/>
+      <element name="w14:cntxtAlts" tokenid="ooxml:EG_RPrBase_w14_cntxtAlts"/>
     </resource>
     <resource name="EG_RPrContent" resource="Properties" tag="character">
       <element name="rPrChange" tokenid="ooxml:EG_RPrContent_rPrChange"/>
-- 
cgit