Fixes #558

Author: ue71603

examples/functions/versioning/Netex_VersioningExample_Step_05.xml

@@ -109,7 +109,10 @@ This is part 4 of a multistep example on versioning.
 							<PrivateCode>mycodeA</PrivateCode>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="002" created="2010-05-18T09:30:47.0Z" changed="2010-06-18T09:30:47.0Z" modification="revise" id="mybus:SSP0002B">
-							<Name>Haltstelle B</Name>
+							<Name>
+								<Text>Haltstelle B</Text>
+								<Text lang="en">stop B</Text>
+							</Name>
 							<Description>Version two of stop B</Description>
 							<PrivateCode>mycodeB</PrivateCode>
 						</ScheduledStopPoint>

xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd

@@ -93,11 +93,15 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:restriction base="xsd:string">
 			<xsd:enumeration value="alias"/>
-			<xsd:enumeration value="translation"/>
+			<xsd:enumeration value="translation">
+				<xsd:annotation>
+					<xsd:documentation>Deprecated in v2.0 for AlternativeName. Use MultiligualString directly with Text subelements.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="copy"/>
 			<xsd:enumeration value="label"/>
 			<xsd:enumeration value="other"/>
 		</xsd:restriction>
 	</xsd:simpleType>
 	<!-- ======================================================================= -->
-</xsd:schema>
+</xsd:schema>

xsd/netex_framework/netex_utility/netex_utility_xml.xsd

@@ -55,22 +55,21 @@ Rail transport, Roads and Road transport
 		<xsd:documentation>Xml utility types for NeTEX</xsd:documentation>
 	</xsd:annotation>
 	<!-- ======================================================================= -->
-	<xsd:complexType name="MultilingualString">
-		<xsd:annotation>
-			<xsd:documentation>Type for a string in a specified language.</xsd:documentation>
-		</xsd:annotation>
+	<xsd:complexType name="MultilingualString" mixed="true">
+	<xsd:annotation>
+	<xsd:documentation>Either use with simple text (as was used in NeTEx priori to v2.0) or use only Text elements withing the MultilingualString. The old version will be deprecated. Also to take advantage of mixed may not be processable by some data consumers.</xsd:documentation>
+	</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="Text" type="TextType" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:attribute name="lang" type="xsd:string"/>
+		<xsd:attribute name="textIdType" type="xsd:string"/>
+	</xsd:complexType>
+	<xsd:complexType name="TextType">
 		<xsd:simpleContent>
-			<xsd:extension base="xsd:normalizedString">
-				<xsd:attribute name="lang" type="xsd:language">
-					<xsd:annotation>
-						<xsd:documentation>Language of string contents.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="textIdType" type="xsd:normalizedString">
-					<xsd:annotation>
-						<xsd:documentation>Resource id of string.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
+			<xsd:extension base="xsd:string">
+				<xsd:attribute name="lang" type="xsd:string"/>
+				<xsd:attribute name="textIdType" type="xsd:string"/>
 			</xsd:extension>
 		</xsd:simpleContent>
 	</xsd:complexType>
@@ -100,4 +99,4 @@ Rail transport, Roads and Road transport
 			</xsd:any>
 		</xsd:sequence>
 	</xsd:complexType>
-</xsd:schema>
+</xsd:schema>