Index: APPS/Halux/PPS/impl/Formatter/Mat.cls.xml
===================================================================
diff -u -r37292 -r37299
--- APPS/Halux/PPS/impl/Formatter/Mat.cls.xml	(.../Mat.cls.xml)	(revision 37292)
+++ APPS/Halux/PPS/impl/Formatter/Mat.cls.xml	(.../Mat.cls.xml)	(revision 37299)
@@ -26,22 +26,32 @@
 <Method name="GeefKorteNotatie">
 <FormalSpec>Materiaal:DOM.PM.enu.MATMateriaal,Kleur:DOM.PM.enu.MATKleur</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit $piece(..#KorteNotatieMateriaal,",",..Pos(##class(DOM.PM.enu.MATMateriaal).ValueList(),Materiaal))_"/"_$piece(..#KorteNotatieKleur,",",..Pos(##class(DOM.PM.enu.MATKleur).ValueList(),Kleur))
+<Implementation><![CDATA[	quit ..GeefNotatie(Materiaal,..#KorteNotatieMateriaal,Kleur,..#KorteNotatieKleur,"/")
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLangeNotatie">
 <FormalSpec>Materiaal:DOM.PM.enu.MATMateriaal,Kleur:DOM.PM.enu.MATKleur</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit $piece(..#LangeNotatieMateriaal,",",..Pos(##class(DOM.PM.enu.MATMateriaal).ValueList(),Materiaal))_" "_$piece(..#LangeNotatieKleur,",",..Pos(##class(DOM.PM.enu.MATKleur).ValueList(),Kleur))
+<Implementation><![CDATA[	quit ..GeefNotatie(Materiaal,..#LangeNotatieMateriaal,Kleur,..#LangeNotatieKleur," ")
 ]]></Implementation>
 </Method>
 
+<Method name="GeefNotatie">
+<FormalSpec>Materiaal:%String,Materialen:%String,Kleur:%String,Kleuren:%String,Delim:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim PosMateriaal As %Integer = ..Pos(##class(DOM.PM.enu.MATMateriaal).ValueList(),Materiaal)
+	#dim PosKleur As %Integer = ..Pos(##class(DOM.PM.enu.MATKleur).ValueList(),Kleur)
+	quit $$$If(PosKleur&&PosMateriaal, $piece(Materialen,",",PosMateriaal+1)_Delim_$piece(Kleuren,",",PosKleur+1) ,Materiaal_Delim_Kleur)
+]]></Implementation>
+</Method>
+
 <Method name="Pos">
 <FormalSpec>ValueList:%ListOfDataTypes,Value:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	quit ValueList.Find(Value)+1
+<Implementation><![CDATA[	quit ValueList.Find(Value)
 ]]></Implementation>
 </Method>
 </Class>