Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboring/Vandaag.txt
===================================================================
diff -u -r61539 -r61604
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboring/Vandaag.txt	(.../Vandaag.txt)	(revision 61539)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboring/Vandaag.txt	(.../Vandaag.txt)	(revision 61604)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg x="0" y="0" height="800" width="470">
+<svg x="0" y="0" height="800" width="470" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="kader">
     <rect fill="#F0F0F0" stroke="black" stroke-width="1" stroke-dasharray="none" x="0" y="0" width="470" height="800"></rect>
     <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="none" x="8" y="8" width="454" height="784"></rect>
Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnZijboring/Vandaag.txt
===================================================================
diff -u -r61539 -r61604
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnZijboring/Vandaag.txt	(.../Vandaag.txt)	(revision 61539)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnZijboring/Vandaag.txt	(.../Vandaag.txt)	(revision 61604)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg x="0" y="0" height="800" width="470">
+<svg x="0" y="0" height="800" width="470" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="kader">
     <rect fill="#F0F0F0" stroke="black" stroke-width="1" stroke-dasharray="none" x="0" y="0" width="470" height="800"></rect>
     <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="none" x="8" y="8" width="454" height="784"></rect>
Index: APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml
===================================================================
diff -u -r61539 -r61604
--- APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml	(.../Kaderdeur.cls.xml)	(revision 61539)
+++ APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml	(.../Kaderdeur.cls.xml)	(revision 61604)
@@ -55,16 +55,26 @@
 	Set ..HoekverbinderToevoeger = $$$Inject(HoekverbinderToevoeger, ##class(APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur.HoekverbinderToevoeger).%New())
 	Set ..SchuinehoekenToevoeger = $$$Inject(SchuinehoekenToevoeger, ##class(APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur.SchuineHoekenToevoeger).%New())
 	
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="VulInStream">
+<FormalSpec>DevObj:%Library.Stream</FormalSpec>
+<Implementation><![CDATA[
+	//#dim Status As %Status = ..SvgBox.XMLExportToStream(DevObj)
+	//Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(Status)
+	Do WRITE^XMLWRITE(DevObj, $$ObjToXML^vhLib(..SvgBox))
+]]></Implementation>
+</Method>
+
 <Method name="GenereerSvg">
 <FormalSpec>KaderdeurObject:Prod.GADef.KaderDeur</FormalSpec>
 <Implementation><![CDATA[
 	#dim Breedte As %Integer = KaderdeurObject.Breedte
 	#dim Hoogte As %Integer = KaderdeurObject.Hoogte
-	Set ..SvgBox  = ..BasisElementFactory.MaakSvgBox(0,0,Hoogte,Breedte)
+	Set ..SvgBox  = ..BasisElementFactory.MaakSvgBox(0,0,Hoogte,Breedte, "http://www.w3.org/2000/svg", "http://www.w3.org/1999/xlink")
     ;Kader v/d kaderdeur
 	Do ..MaakKader(KaderdeurObject)
 	;Verbinders
@@ -87,6 +97,7 @@
 <FormalSpec>SvgBox:TECH.Svg.Basis.SvgBox,Locatie:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	#dim DoelLocatie As %String
+	
 	Try {
 		If (Locatie ="") {
 			Set DoelLocatie = "D:\CacheExport\2010v2\DEV1\test2.xml"
@@ -134,16 +145,9 @@
 <Method name="MaakVerbinders">
 <FormalSpec>KaderdeurObject:Prod.GADef.KaderDeur</FormalSpec>
 <Implementation><![CDATA[
-	#dim ProfPlaats As %String
-	#dim Breedte As %Integer = KaderdeurObject.Breedte
-	#dim Hoogte As %Integer = KaderdeurObject.Hoogte
-	If (KaderdeurObject.ProductieWijzeGetObjectId()="LPR") {
-	  	Set ProfPlaats  = KaderdeurObject.Onderdelen.GetNext("")
-	} Else {
-		Set ProfPlaats = "All"
-	}
+	
 	Set VerbindersGroup =##class(TECH.Svg.Basis.Group).%New()
-	Set VerbindersGroup = ..HoekverbinderToevoeger.VoegToeVerbinder(KaderdeurObject.ProductieWijzeGetObjectId(), ProfPlaats ,KaderdeurObject.ProfType.Hoek.ItemID, Breedte, Hoogte)
+	Set VerbindersGroup = ..HoekverbinderToevoeger.VoegToeVerbinders(KaderdeurObject)
 	Do VerbindersGroup.VoegToeID("VerbindersGroep")
 	
 	Do ..ElementToevoeger.VoegToeElement(..SvgBox, VerbindersGroup)
Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardlade/Vandaag.txt
===================================================================
diff -u -r61539 -r61604
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardlade/Vandaag.txt	(.../Vandaag.txt)	(revision 61539)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardlade/Vandaag.txt	(.../Vandaag.txt)	(revision 61604)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg x="0" y="0" height="800" width="470">
+<svg x="0" y="0" height="800" width="470" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="kader">
     <rect fill="#F0F0F0" stroke="black" stroke-width="1" stroke-dasharray="none" x="0" y="0" width="470" height="800"></rect>
     <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="none" x="8" y="8" width="454" height="784"></rect>
Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetBeslagEnBoringLosprofiel/Vandaag.txt
===================================================================
diff -u -r61540 -r61604
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetBeslagEnBoringLosprofiel/Vandaag.txt	(.../Vandaag.txt)	(revision 61540)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetBeslagEnBoringLosprofiel/Vandaag.txt	(.../Vandaag.txt)	(revision 61604)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg x="0" y="0" height="800" width="470">
+<svg x="0" y="0" height="800" width="470" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="kader">
     <rect fill="none" stroke="black" stroke-width="1" stroke-dasharray="2" x="0" y="0" width="470" height="800"></rect>
     <rect fill="none" stroke="black" stroke-width="1" stroke-dasharray="2" x="8" y="8" width="454" height="784"></rect>
Index: csp/prgaproduct.cls.xml
===================================================================
diff -u -r39461 -r61604
--- csp/prgaproduct.cls.xml	(.../prgaproduct.cls.xml)	(revision 39461)
+++ csp/prgaproduct.cls.xml	(.../prgaproduct.cls.xml)	(revision 61604)
@@ -37,6 +37,7 @@
  Set Key=$G(%request.Data("KEY",1))
  Set CheckDigit=$G(%request.Data("CHK",1))
  Set Taal=$G(%request.Data("TAAL",1))
+ #dim IsSvg As %Boolean = ($G(%request.Data("SVG",1),0) = 1 ) 
  Set:(Taal="") Taal=##class(Res.PI.Taal).BasisTaalID()   ; Default Taal
  
  If PRNr?4.7N Do
@@ -68,7 +69,12 @@
  If '$IsObject(PR) {
 	 Do TAGWRITE^XMLWRITE(0,"ERROR","Invalid data : (Prod.GADef.KaderDeur ID="_ProdID_")")
  }Else{ 
-	 Do PR.XMLWrite(0,Taal,"GAO;GAF;GAV",$S($G(%request.Data("NOXSL",1))=1:"", 1:"Format GADefKader.xsl"))
+ 	 Set XMLWriteOpties = "GAO;GAF;GAV"
+ 	 
+ 	 If (IsSvg) {
+	 	 Set XMLWriteOpties = "GAO;GAF;GASVG"
+	 }
+	 Do PR.XMLWrite(0,Taal, XMLWriteOpties ,$S($G(%request.Data("NOXSL",1))=1:"", 1:"Format GADefKader.xsl"))
 	 Set PR=""
  }
  Quit
Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestGlasKaderdeurMetBeslagEnBoring/Vandaag.txt
===================================================================
diff -u -r61540 -r61604
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestGlasKaderdeurMetBeslagEnBoring/Vandaag.txt	(.../Vandaag.txt)	(revision 61540)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestGlasKaderdeurMetBeslagEnBoring/Vandaag.txt	(.../Vandaag.txt)	(revision 61604)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg x="0" y="0" height="800" width="470">
+<svg x="0" y="0" height="800" width="470" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="kader">
     <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="2" x="0" y="0" width="470" height="800"></rect>
     <rect fill="rgb(224,255,224)" stroke="black" stroke-width="1" stroke-dasharray="none" x="3" y="3" width="464" height="794"></rect>
Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnSpecialeBoring/Vandaag.txt
===================================================================
diff -u -r61539 -r61604
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnSpecialeBoring/Vandaag.txt	(.../Vandaag.txt)	(revision 61539)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnSpecialeBoring/Vandaag.txt	(.../Vandaag.txt)	(revision 61604)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg x="0" y="0" height="800" width="470">
+<svg x="0" y="0" height="800" width="470" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="kader">
     <rect fill="#F0F0F0" stroke="black" stroke-width="1" stroke-dasharray="none" x="0" y="0" width="470" height="800"></rect>
     <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="none" x="8" y="8" width="454" height="784"></rect>
Index: Prod/GADef/KaderDeur.cls.xml
===================================================================
diff -u -r60138 -r61604
--- Prod/GADef/KaderDeur.cls.xml	(.../KaderDeur.cls.xml)	(revision 60138)
+++ Prod/GADef/KaderDeur.cls.xml	(.../KaderDeur.cls.xml)	(revision 61604)
@@ -2785,6 +2785,13 @@
  . Do ..XMLVectorWrite(DevObj,$G(Opties),Taal)
  . Do ENDTAG^XMLWRITE(DevObj,"DRAW")
  . Do WRITELN^XMLWRITE(DevObj)
+ #dim SvgKaderdeur = ##class(APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).%New()
+ If $G(Opties)["GASVG" Do  ; Tekening opnemen
+ . Do SvgKaderdeur.GenereerSvg(%this)
+ . Do BEGINTAG^XMLWRITE(DevObj,"SVN", "" )
+ . Do SvgKaderdeur.VulInStream(DevObj)
+ . Do ENDTAG^XMLWRITE(DevObj,"SVN")
+ . Do WRITELN^XMLWRITE(DevObj)
 
  Do ENDTAG^XMLWRITE(DevObj,Tag)
  Do WRITELN^XMLWRITE(DevObj)