Index: Format order.xsl
===================================================================
diff -u -r221 -r250
--- Format order.xsl	(.../Format order.xsl)	(revision 221)
+++ Format order.xsl	(.../Format order.xsl)	(revision 250)
@@ -20,89 +20,251 @@
 				<style type="text/css" media="print">
 					TD    { background-color:white; background-image:none; }
 				</style>
+				<xsl:if test="not(descendant::DRAWSVG)"> 
+			<SCRIPT>
+	function SetObjectSize(objSizeMe, NWidth, NHeight) {
+		if (!objSizeMe) { return; }
+		objSizeMe.style.width = Math.ceil(NWidth);
+		objSizeMe.style.height = Math.ceil(NHeight);
+		return;
+	}
 
-				<SCRIPT LANGUAGE="JavaScript">
-function SetObjectSize(objSizeMe, NWidth, NHeight) {
-	if (!objSizeMe) { return; }
-	objSizeMe.style.width = Math.ceil(NWidth);
-	objSizeMe.style.height = Math.ceil(NHeight);
-	return;
-}
 
+	function ScaledHeight(coords, NWidth) {
+		if (!coords || !NWidth) { return(0); }
+		return (NWidth * coords.Y / coords.X);
+	}
 
-function ScaledHeight(coords, NWidth) {
-	if (!coords || !NWidth) { return(0); }
-	return (NWidth * coords.Y / coords.X);
-}
+	function ScaledWidth(coords, NHeight) {
+		if (!coords || !NHeight) { return(0); }
+		return (NHeight * coords.X / coords.Y);
+	}
 
-function ScaledWidth(coords, NHeight) {
-	if (!coords || !NHeight) { return(0); }
-	return (NHeight * coords.X / coords.Y);
-}
+	function GetMaximalSize(objToSize, maxX, maxY) {
+		var newX,newY
+		var limitcoord
+		var objNewSize
 
-function GetMaximalSize(objToSize, maxX, maxY) {
-	var newX,newY
-	var limitcoord
-	var objNewSize
+		limitcoord = 'Y';
+		newY = maxY;
+		newX = ScaledWidth (objToSize.coordsize, newY);
+		if (newX > maxX) {
+			newX = maxX;
+			newY = ScaledHeight (objToSize.coordsize, newX);
+			limitcoord = 'X';
+		}
+		return ( {X:newX,Y:newY} );
+	}
 
-	limitcoord = 'Y';
-	newY = maxY;
-	newX = ScaledWidth (objToSize.coordsize, newY);
-	if (newX > maxX) {
-		newX = maxX;
-		newY = ScaledHeight (objToSize.coordsize, newX);
-		limitcoord = 'X';
+	function SetMaximalSize(objToSize, maxX, maxY) {
+		var objNSize
+
+		objNSize = GetMaximalSize (objToSize, maxX, maxY);
+		SetObjectSize (objToSize, objNSize.X, objNSize.Y);
+		return;
 	}
-	return ( {X:newX,Y:newY} );
-}
 
-function SetMaximalSize(objToSize, maxX, maxY) {
-	var objNSize
 
-	objNSize = GetMaximalSize (objToSize, maxX, maxY);
-	SetObjectSize (objToSize, objNSize.X, objNSize.Y);
-	return;
-}
+	function ResizeObject (NrObj) {
+		var PageSize
+		var maxHeight
+		var maxWidth
+		var MinScale = 0.333;				// = 1/3 (pt/mm)
+	//	var objGrpDraw = eval("groupDRAW"+NrObj);
+		var objGrpDraw = document.getElementById("groupDRAW"+NrObj);
+		if (!objGrpDraw) { return; }
 
+		var vctCoords = objGrpDraw.coordsize;
+		PageSize = {X:650,Y:950};
+		maxWidth = PageSize.X - eval("DATATABLE"+NrObj).offsetLeft;
+		maxHeight = PageSize.Y - 10 - eval("DATATABLE"+NrObj).offsetHeight - eval("DRAWTEXT"+NrObj).offsetHeight;
 
-function ResizeObject (NrObj) {
-	var PageSize
-	var maxHeight
-	var maxWidth
-	var MinScale = 0.333;				// = 1/3 (pt/mm)
-//	var objGrpDraw = eval("groupDRAW"+NrObj);
-	var objGrpDraw = document.getElementById("groupDRAW"+NrObj);
-	if (!objGrpDraw) { return; }
+	// alert (NrObj + "test " + PageSize.Y + "  Table Height: " + eval("DATATABLE"+NrObj).offsetHeight  + "  TextHgt: " + eval("DRAWTEXT"+NrObj).offsetHeight + " Hght: " + maxHeight);
 
-	var vctCoords = objGrpDraw.coordsize;
-	PageSize = {X:650,Y:950};
-	maxWidth = PageSize.X - eval("DATATABLE"+NrObj).offsetLeft;
-	maxHeight = PageSize.Y - 10 - eval("DATATABLE"+NrObj).offsetHeight - eval("DRAWTEXT"+NrObj).offsetHeight;
+		if ((maxHeight/vctCoords.Y &lt; MinScale) &amp;&amp; (eval("DATATABLE"+NrObj).offsetHeight > PageSize.Y * 0.25))  {
+			maxHeight = PageSize.Y - 10;
+			eval("DRAWTABLE"+NrObj).style.pageBreakBefore="always";
+			}
+		else {
+			eval("DRAWTABLE"+NrObj).style.pageBreakBefore="";
+		}
+		SetMaximalSize (objGrpDraw, maxWidth, maxHeight);
+		objGrpDraw.style.visibility="visible";
+		// Resize DRAWTEXT object to maxWidth
+		if (eval("DRAWTEXT"+NrObj))  { eval("DRAWTEXT"+NrObj).style.width = maxWidth; }
+		return;
+	}
 
-// alert (NrObj + "test " + PageSize.Y + "  Table Height: " + eval("DATATABLE"+NrObj).offsetHeight  + "  TextHgt: " + eval("DRAWTEXT"+NrObj).offsetHeight + " Hght: " + maxHeight);
+	function Initialize () {
+		for (i=1; i&lt;=<xsl:value-of select="count(ORDERLIJN)"/>; i++)
+		{
+			ResizeObject(i);
+		}
+	}
+	</SCRIPT>
+</xsl:if>
+<xsl:if test="descendant::DRAWSVG"> 
+<SCRIPT LANGUAGE="JavaScript">
+	//er wordt een apart script toegevoegd voor vml of voor svg, vml werkt met coordorigin en svg werkt met viewbox
+	var height
+	var width
 
-	if ((maxHeight/vctCoords.Y &lt; MinScale) &amp;&amp; (eval("DATATABLE"+NrObj).offsetHeight > PageSize.Y * 0.25))  {
-		maxHeight = PageSize.Y - 10;
-		eval("DRAWTABLE"+NrObj).style.pageBreakBefore="always";
+	window.onbeforeprint = function() {
+	// walk through all the elements in the document with CLASS="clsHidePrint"
+	// and set it to "clsExpanded" just for printing.
+		var colls = document.getElementsByTagName("rect");
+		var coll;
+		if (colls!=null) {
+			for(coll of colls){
+				let name = coll.getAttribute("class")
+				if(name == "clsHidePrint") {
+					coll.setAttribute("before",coll.getAttribute("fill"));
+					coll.setAttribute("fill","white");
+				}
+			}
 		}
-	else {
-		eval("DRAWTABLE"+NrObj).style.pageBreakBefore="";
 	}
-	SetMaximalSize (objGrpDraw, maxWidth, maxHeight);
-	objGrpDraw.style.visibility="visible";
-	// Resize DRAWTEXT object to maxWidth
-	if (eval("DRAWTEXT"+NrObj))  { eval("DRAWTEXT"+NrObj).style.width = maxWidth; }
-	return;
-}
 
-function Initialize () {
-	for (i=1; i&lt;=<xsl:value-of select="count(ORDERLIJN)"/>; i++)
-	{
-		ResizeObject(i);
+	window.onafterprint = function() {
+		var colls = document.getElementsByTagName("rect");
+		var coll;
+		if (colls!=null) {
+			for(coll of colls){
+				let name = coll.getAttribute("class");
+				if(name == "clsHidePrint") {
+					coll.setAttribute("fill",coll.getAttribute("before"));
+					coll.setAttribute("before","");
+				}
+			}
+		}
 	}
-}</SCRIPT>
+
+	function ScaledHeight(NWidth) {
+		if (!NWidth) { return(0); }
+		return (NWidth * height / width);
+	}
+
+	function ScaledWidth(NHeight) {
+		if (!NHeight) { return(0); }
+		return (NHeight * width / height);
+	}
+
+	function GetMaximalSize(objToSize, maxX, maxY) {
+		var newX,newY
+		var limitcoord
+		var objNewSize
+		limitcoord = 'Y';
+		newY = maxY;
+		newX = ScaledWidth (newY);
+		if (newX > maxX) {
+			newX = maxX;
+			newY = ScaledHeight (newX);
+			limitcoord = 'X';
+		}
+		return ( {X:newX,Y:newY} );
+	}
+
+	function SetObjectSize(objSizeMe, NWidth, NHeight) {
+		if (!objSizeMe) { return; }
+		objSizeMe.style.width = Math.ceil(NWidth) + "px";
+		objSizeMe.style.height = Math.ceil(NHeight) + "px";
+		return;
+	}
+
+	function SetMaximalSize(objToSize, maxX, maxY) {
+		var objNSize
+		objNSize = GetMaximalSize (objToSize, maxX, maxY);
+		SetObjectSize (objToSize, objNSize.X, objNSize.Y);
+		return;
+	}
+
+	function ResizeObject (NrObj) {
+		var PageSize = {X:650,Y:950};
+		var MinScale = 0.333;		
+		// = 1/3 (pt/mm)
+		var svgObject = document.getElementById("groupDRAW"+NrObj);
+		width = svgObject.getAttribute("width");
+		height = svgObject.getAttribute("height");
+		if (!svgObject) { return; }
+		var svgDiv = svgObject.parentElement; 
+		var text = document.getElementById("DRAWTEXT"+NrObj);
+		
+		var maxWidth = PageSize.X - eval("DATATABLE"+NrObj).offsetLeft;
+		var maxHeight = PageSize.Y - 10 - eval("DATATABLE"+NrObj).offsetHeight - text.offsetHeight;
+
+		if ((maxHeight/height &lt; MinScale) &amp;&amp; (eval("DATATABLE"+NrObj).offsetHeight > PageSize.Y * 0.25))  {
+			maxHeight = PageSize.Y - 10;
+			eval("DRAWTABLE"+NrObj).style.pageBreakBefore="always";
+			}
+		else {
+			eval("DRAWTABLE"+NrObj).style.pageBreakBefore="";
+		}
+		SetMaximalSize (svgDiv, maxWidth, maxHeight);	
+		RemoveAttributesFromSvg(NrObj);
+		
+		// in firefox moet de svg tag gerefreshed worden anders wordt deze niet gescaled hiervoor wordt feature detection gebruikt
+		if (typeof InstallTrigger !== 'undefined') {
+			ResetSvgForFirefox(NrObj);
+		}
+		return;
+	}
+	
+	function RemoveAttributesFromSvg(NrObj) {
+		var svgObject = document.getElementById("groupDRAW"+NrObj);
+		svgObject.removeAttribute("x");
+		svgObject.removeAttribute("y");
+		svgObject.removeAttribute("style");
+		svgObject.setAttribute("width", "100%");
+		svgObject.setAttribute("height", "100%");
+	}
+
+
+	
+	function ResetSvgForFirefox(NrObj) {
+		console.log("dit is firefox");
+		var svgObject = document.getElementById("groupDRAW"+NrObj);
+		var svgDiv = svgObject.parentElement; 
+		var SvgInnerHTML = svgDiv.innerHTML; 
+		svgObject.innerHTML = "";
+		svgObject.innerHTML = SvgInnerHTML;
+	}
+
+	function alterIDs() {
+	var draws = document.getElementsByTagName("svg");
+		var draw;
+		var current = 1;
+		if (draws!=null) {
+			for(draw of draws){
+				if(draw.getAttribute("id") == "groupDRAW") {
+					draw.setAttribute("id", "groupDRAW"+current);
+					current = current + 1;
+				}
+			}
+		}
+		var texts = document.getElementsByTagName("text");
+		var text 
+		current = 1;
+		if (texts!=null) {
+			for(text of texts){
+				text.setAttribute("id", "DRAWTEXT"+current);
+				current = current +1;
+			}
+		}
+	}
+
+	function Initialize () {
+		alterIDs();
+		for (i=1; i&lt;=<xsl:value-of select="count(ORDERLIJN)"/>; i++)
+		{
+			ResizeObject(i)
+		}
+	}
+</SCRIPT>	
+		</xsl:if>
+		
+			
 			</HEAD>
-			<BODY onload="Initialize();">
+			<BODY onload="Initialize()">
 				<FONT face="ARIAL">
 					<xsl:apply-templates select="ORDERLIJN[PRODUCT[count(GAPROD)=0]]">
 						<xsl:sort select="SORTKEY" order="ascending"/>
@@ -231,6 +393,7 @@
 
 		</TABLE>
 		<xsl:apply-templates select="DRAW"/>
+		<xsl:apply-templates select="DRAWSVG"/>
 		<BR/>
 	</xsl:template>
 
@@ -474,10 +637,33 @@
 	<xsl:template match="OPMERKING" mode="BESLAG">
 		<xsl:if test=".!=''"><BR/> <U><xsl:value-of select="./@label"/></U>: <xsl:value-of select="."/> </xsl:if>
 	</xsl:template>
+<xsl:template match="DRAWSVG">
+<TABLE border="0" bordercolor="#707070" cellpadding="2" cellspacing="0" bgcolor="white" WIDTH="100%" STYLE="page-break-before:auto">
+<xsl:attribute name="ID">DRAWTABLE<xsl:value-of select="ancestor::ORDERLIJN[1]/LIJNREF"/></xsl:attribute>
+	<TR>
+		<TD VALIGN="Top">
+			<xsl:for-each select="node()[name(.) = 'svg']">
+				<DIV style="min-height:0; overflow:hidden; display:inline-block; padding-top:5px;">
+					<xsl:copy-of select="."/>
+				</DIV>
+			</xsl:for-each>
+			<xsl:for-each select="node()[name(.) = 'text']">
+				<DIV style="padding-top:5px;" >
+					<xsl:copy-of select="."/>
+				</DIV>
+			</xsl:for-each>
+		</TD>
+	</TR>
+</TABLE>
 
+</xsl:template>
+
+
 	<xsl:template match="DRAW">
 		<TABLE border="0" bordercolor="#707070" cellpadding="2" cellspacing="0" bgcolor="white" WIDTH="100%" STYLE="page-break-before:auto">
+
 			<xsl:attribute name="ID">DRAWTABLE<xsl:value-of select="ancestor::ORDERLIJN[1]/LIJNREF"/></xsl:attribute>
+			
 			<TR>
 				<TD VALIGN="Top">
 					<BR/>
@@ -487,6 +673,7 @@
 		</TABLE>
 	</xsl:template>
 
+
 	<xsl:template match="v:GROUP">	
 		<!-- v:GROUP ID="groupDRAW" style='position:relative; left:0pt; top:0pt; width:44pt; height:62pt;' coordsize="440,620" coordorigin="-10,-10" -->
 		<v:GROUP style="{@style}" coordsize="{@coordsize}" coordorigin="{@coordorigin}">