Permalink
Browse files

Added per-label TEXT attribute in xml schema and xsl (closes #4639)

  • Loading branch information...
1 parent 3b531be commit 1097872f8eccf9bc4a6cbf118dfa629315c6f857 Alan Boudreault committed Apr 29, 2013
Showing with 9 additions and 2 deletions.
  1. +3 −2 xmlmapfile/mapfile.xsd
  2. +5 −0 xmlmapfile/mapfile.xsl
  3. +1 −0 xmlmapfile/tests/layerset.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ms="http://www.mapserver.org/mapserver" targetNamespace="http://www.mapserver.org/mapserver" elementFormDefault="qualified" attributeFormDefault="unqualified" version="6.0.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ms="http://www.mapserver.org/mapserver" targetNamespace="http://www.mapserver.org/mapserver" elementFormDefault="qualified" attributeFormDefault="unqualified" version="6.2.1">
<!-- Definition of types -->
<xs:simpleType name="rgbColorValueType">
<xs:restriction base="xs:integer">
@@ -347,7 +347,8 @@
</xs:simpleType>
</xs:element>
<xs:element name="Style" type="ms:Style" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="wrap" type="xs:string" minOccurs="0"/>
+ <xs:element name="text" type="xs:string" minOccurs="0"/>
+ <xs:element name="wrap" type="xs:string" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="type" use="required">
<xs:simpleType>
@@ -682,6 +682,11 @@
</xsl:apply-templates>
<xsl:call-template name="print">
<xsl:with-param name="indent" select="$indent"/>
+ <xsl:with-param name="node" select="'ms:text'"/>
+ <xsl:with-param name="quote" select="1"/>
+ </xsl:call-template>
+ <xsl:call-template name="print">
+ <xsl:with-param name="indent" select="$indent"/>
<xsl:with-param name="node" select="'ms:wrap'"/>
<xsl:with-param name="quote" select="1"/>
</xsl:call-template>
@@ -32,6 +32,7 @@
<shadowColor red="244" green="43" blue="22"/>
<shadowSize x="15" y="14"/>
<size>TINY</size>
+ <text>Test</text>
<wrap>\n</wrap>
</Label>
<LabelLeader>

0 comments on commit 1097872

Please sign in to comment.