Merge pull request #1784 from CruGlobal/specWebTextAttributes

GT-2585 Add more web overrides for text attributes

Author: frett

public/xmlns/content.xsd

@@ -589,35 +589,25 @@
                             </xs:documentation>
                         </xs:annotation>
                     </xs:attribute>
-                    <xs:attribute name="start-image-size" default="40">
+                    <xs:attribute name="start-image-size" type="content:textImageSize" default="40">
                         <xs:annotation>
                             <xs:documentation>Defines the size in "density-independent pixels"/"points" of the start
                                 image. This defaults to 40.
                             </xs:documentation>
                         </xs:annotation>
-                        <xs:simpleType>
-                            <xs:restriction base="xs:int">
-                                <xs:minInclusive value="1" />
-                            </xs:restriction>
-                        </xs:simpleType>
                     </xs:attribute>
                     <xs:attribute name="end-image" type="xs:string">
                         <xs:annotation>
                             <xs:documentation>Defines an image to display to the "end" of this text node.
                             </xs:documentation>
                         </xs:annotation>
                     </xs:attribute>
-                    <xs:attribute name="end-image-size" default="40">
+                    <xs:attribute name="end-image-size" type="content:textImageSize" default="40">
                         <xs:annotation>
                             <xs:documentation>Defines the size in "density-independent pixels"/"points" of the end
                                 image. This defaults to 40.
                             </xs:documentation>
                         </xs:annotation>
-                        <xs:simpleType>
-                            <xs:restriction base="xs:int">
-                                <xs:minInclusive value="1" />
-                            </xs:restriction>
-                        </xs:simpleType>
                     </xs:attribute>
 
                     <xs:attribute name="minimum-lines" default="0" type="content:textMinimumLines">
@@ -629,6 +619,7 @@
                     </xs:attribute>
 
                     <xs:attributeGroup ref="content:baseAttributes" />
+                    <xs:attributeGroup ref="web:contentTextElement" />
                 </xs:extension>
             </xs:simpleContent>
         </xs:complexType>
@@ -680,6 +671,11 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:simpleType name="textImageSize">
+        <xs:restriction base="xs:int">
+            <xs:minInclusive value="1" />
+        </xs:restriction>
+    </xs:simpleType>
     <xs:simpleType name="textMinimumLines">
         <xs:restriction base="xs:int">
             <xs:minInclusive value="0" />

public/xmlns/web.xsd

@@ -27,12 +27,25 @@
 
     <!-- region: content:text attributes -->
     <xs:attribute name="font-weight" type="content:fontWeight" />
+    <xs:attribute name="text-align" type="content:horizontalGravity" />
+    <xs:attribute name="text-color" type="content:colorValue" />
     <xs:attribute name="text-scale" type="xs:float" />
+    <xs:attribute name="text-style" type="content:textStyles" />
+
+    <xs:attribute name="start-image-size" type="content:textImageSize" />
+    <xs:attribute name="end-image-size" type="content:textImageSize" />
     <xs:attribute name="minimum-lines" type="content:textMinimumLines" />
 
     <xs:attributeGroup name="contentTextType">
         <xs:attribute ref="web:font-weight" />
+        <xs:attribute ref="web:text-align" />
+        <xs:attribute ref="web:text-color" />
         <xs:attribute ref="web:text-scale" />
+        <xs:attribute ref="web:text-style" />
+    </xs:attributeGroup>
+    <xs:attributeGroup name="contentTextElement">
+        <xs:attribute ref="web:start-image-size" />
+        <xs:attribute ref="web:end-image-size" />
         <xs:attribute ref="web:minimum-lines" />
     </xs:attributeGroup>
     <!-- endregion: content:text attributes -->

schema_tests/content/valid/tests/text_web_overrides.xml

@@ -0,0 +1,4 @@
+<content:text xmlns:content="https://mobile-content-api.cru.org/xmlns/content"
+    xmlns:web="https://mobile-content-api.cru.org/xmlns/web" font-weight="400" minimum-lines="2" text-align="center"
+    text-color="rgba(255,0,0,1)" text-style="italic" web:font-weight="700" web:minimum-lines="5"
+    web:text-align="start" web:text-color="rgba(0,255,255,1)" web:text-style="underline" />