Index: Format GADefKader.xsl
===================================================================
diff -u -r12 -r45
--- Format GADefKader.xsl	(.../Format GADefKader.xsl)	(revision 12)
+++ Format GADefKader.xsl	(.../Format GADefKader.xsl)	(revision 45)
@@ -8,7 +8,7 @@
 <xsl:template match="PRODUCTEN">
 	<HTML xmlns:v="urn:schemas-microsoft-com:vml">
 		<HEAD>
-			<title>VAN HOECKE N.V. - HALUX</title>
+			<title>VAN HOECKE nv - ALU</title>
 			<style>
 				TD    {font:10pt ARIAL;}
 			</style>
@@ -36,10 +36,10 @@
 	<xsl:apply-templates select="PROFIEL"/>
 
 	<TR>
-		<TD width="30%" bgcolor="#e0e0e0">Afmeting</TD>
+		<TD width="30%" bgcolor="#e0e0e0"><xsl:value-of select="AFMETINGEN/@label"/></TD>
 		<TD width="70%" bgcolor="#f0f0f0">
-		<font color="#707070">H:</font><xsl:value-of select="HOOGTE"/>
-		<font color="#707070"><xsl:value-of select="HOOGTE/@UNIT"/> x B:</font><xsl:value-of select="BREEDTE"/>
+		<font color="#707070"><xsl:value-of select="HOOGTE/@labelkort"/>:</font><xsl:value-of select="HOOGTE"/>
+		<font color="#707070"><xsl:value-of select="HOOGTE/@UNIT"/> x <xsl:value-of select="BREEDTE/@labelkort"/>:</font><xsl:value-of select="BREEDTE"/>
 		<font color="#707070"><xsl:value-of select="BREEDTE/@UNIT"/></font>
 		</TD>
 	</TR>
@@ -53,23 +53,23 @@
 
 	<xsl:if test="count(BESLAG) > 0">
 	<TR>
-		<TD bgcolor="#E0E0E0">Beslag</TD>
+		<TD bgcolor="#E0E0E0"><xsl:value-of select="BESLAG/@label"/></TD>
 		<TD bgcolor="#F0F0F0"><xsl:apply-templates select="BESLAG"/></TD>
 	</TR>
 	</xsl:if>
 
 	<xsl:if test="count(child::BORING) > 0">
 	<TR>
 		<TD bgcolor="#f0f0f0" margin="5mm" colspan="2">
-		Boringen<BR/>
+		<xsl:value-of select="BORINGEN/@label"/><BR/>
 		<TABLE WIDTH="100%" BORDER="1" bordercolor="#707070" COLS="6" cellpadding="1" cellspacing="0" STYLE="border-collapse:collapse">
 			<TR>
-				<TD align="CENTER" WIDTH="7%"><NOBR><B>Plaats</B></NOBR></TD>
+				<TD align="CENTER" WIDTH="7%"><NOBR><B><xsl:value-of select="BORINGEN/VERTALINGEN/HDR_BOORPLAATS/@label"/></B></NOBR></TD>
 				<TD align="CENTER" WIDTH="9%"><NOBR><B>X</B> (mm)</NOBR></TD>
 				<TD align="CENTER" WIDTH="9%"><NOBR><B>Y</B> (mm)</NOBR></TD>
-				<TD align="LEFT"><NOBR><B>Andere gegevens</B></NOBR></TD>
-				<TD align="CENTER" WIDTH="9%"><NOBR><B>Lengte</B></NOBR></TD>
-				<TD align="CENTER" WIDTH="9%"><NOBR><B>Rand</B></NOBR></TD>
+				<TD align="LEFT"><NOBR><B><xsl:value-of select="BORINGEN/VERTALINGEN/HDR_ANDEREGGVS/@label"/></B></NOBR></TD>
+				<TD align="CENTER" WIDTH="9%"><NOBR><B><xsl:value-of select="BORINGEN/VERTALINGEN/HDR_LPOS/@label"/></B></NOBR></TD>
+				<TD align="CENTER" WIDTH="9%"><NOBR><B><xsl:value-of select="BORINGEN/VERTALINGEN/HDR_RANDPOS/@label"/></B></NOBR></TD>
 			</TR>
 			<xsl:for-each select="BORING">
 			<TR valign="TOP">
@@ -83,12 +83,12 @@
 
 	<xsl:if test="(VULLING/VULEXTRA='INV') or (VULLING/VULEXTRA='SPEC') or (count(MONTAGE/@OMS)+count(VERPAKKING/@OMS)+count(PRODUCTIEWIJZE/@OMS)+count(ONDERDELEN/@OMS)+count(HERSTELLING/@OMS)+count(OPMERKING) > 0)">
 	<TR>
-		<TD bgcolor="#E0E0E0">Opties</TD>
+		<TD bgcolor="#E0E0E0"><xsl:value-of select="OPTIES/@label"/></TD>
 		<TD bgcolor="#F0F0F0">
 			<UL style="list-style-type:square; margin:0; margin-left:20; text-indent:0;">
 				<xsl:for-each select="VULLING/VULEXTRA">
 					<xsl:if test="(.='INV') or (.='SPEC')">
-						<LI><font color="#707070">Vulling : </font><xsl:value-of select="@OMS"/></LI>
+						<LI><font color="#707070"><xsl:value-of select="VULLING/@label"/> : </font><xsl:value-of select="@OMS"/></LI>
 					</xsl:if>
 				</xsl:for-each>
 				<xsl:apply-templates select="MONTAGE"/>
@@ -110,18 +110,18 @@
 
 <xsl:template match="PROFIEL">
 <TR>
-	<TD bgcolor="#E0E0E0" width="30%">Profiel </TD>
+	<TD bgcolor="#E0E0E0" width="30%"><xsl:value-of select="./@label"/> </TD>
 	<TD bgcolor="#f0f0f0" width="70%"><font color="red"><xsl:value-of select="PROFTYPE"/>-<xsl:value-of select="PROFAFW"/> : <xsl:value-of select="PROFTYPE/@OMS"/> - <xsl:value-of select="PROFAFW/@OMS"/></font></TD>
 </TR>
 </xsl:template>
 
 <xsl:template match="VULLING">
 <TR>
-	<TD bgcolor="#E0E0E0">Vulling</TD>
+	<TD bgcolor="#E0E0E0"><xsl:value-of select="./@label"/></TD>
 	<TD bgcolor="#f0f0f0">
 		<xsl:value-of select="VULTYPE"/><xsl:apply-templates select="VULTYPE/@OMS"/>
-		<BR/><font color="#707070">(H:</font><xsl:value-of select="HOOGTE"/>
-		<font color="#707070"><xsl:value-of select="HOOGTE/@UNIT"/> x B:</font><xsl:value-of select="BREEDTE"/>
+		<BR/><font color="#707070">(<xsl:value-of select="HOOGTE/@labelkort"/>:</font><xsl:value-of select="HOOGTE"/>
+		<font color="#707070"><xsl:value-of select="HOOGTE/@UNIT"/> x <xsl:value-of select="BREEDTE/@labelkort"/>:</font><xsl:value-of select="BREEDTE"/>
 		<font color="#707070"><xsl:value-of select="BREEDTE/@UNIT"/>)</font>
 		<UL style="list-style-type:square; margin:0; margin-left:20; text-indent:0;">
 		<xsl:for-each select="VULEXTRA">
@@ -135,10 +135,13 @@
 <xsl:template match="OPHANGPLAATS">
 <TR>
 	<TD bgcolor="#E0E0E0">
-	<xsl:choose>
-		<xsl:when test="contains(';L;R;B;',.)">Draairichting</xsl:when>
-		<xsl:otherwise>Ophangplaats</xsl:otherwise>
-	</xsl:choose>
+<!--
+		<xsl:choose>
+			<xsl:when test="contains(';L;R;B;',.)">Draairichting</xsl:when>
+			<xsl:otherwise>Ophangplaats</xsl:otherwise>
+		</xsl:choose>
+-->
+		<xsl:value-of select="./@label"/>
 	</TD>
 	<TD bgcolor="#f0f0f0"><xsl:value-of select="."/> - <xsl:value-of select="@OMS"/></TD>
 </TR>
@@ -156,7 +159,7 @@
 <xsl:choose>
 	<xsl:when test="contains('S;VV;VC;VS;VB;VO;GA;GB;GC;GD;HFC;HFM;HFV',BESLAGTYPE)">   <!-- Beslag in lijstvorm -->
 		<xsl:apply-templates select="BESLAGPOS[1]/AFSTANDRAND"/>
-		<BR/><FONT color="#707070"><xsl:apply-templates select="BESLAGTYPE"/></FONT>
+		<BR/><FONT color="#707070"><xsl:apply-templates select="BESLAGTYPE"/> : </FONT>
 		<xsl:for-each select="BESLAGPOS">
 			<xsl:value-of select="LENGTEPOS"/>
 			<FONT color="#707070"><xsl:value-of select="LENGTEPOS/@UNIT"/>
@@ -169,7 +172,7 @@
 		<UL style="list-style-type:square; margin:0; margin-left:20; text-indent:0;">
 		<xsl:for-each select="BESLAGPOS">
 			<LI><xsl:value-of select="@OMS"/> :
-			<BR/><FONT color="#707070">Van onderkant : </FONT><xsl:value-of select="LENGTEPOS"/>
+			<BR/><FONT color="#707070"><xsl:apply-templates select="../BESLAGTYPE"/> : </FONT><xsl:value-of select="LENGTEPOS"/>
 			<FONT color="#707070"><xsl:value-of select="LENGTEPOS/@UNIT"/></FONT>
 			<xsl:apply-templates select="AFSTANDRAND"/>
 			</LI>
@@ -180,7 +183,7 @@
 		<UL style="list-style-type:square; margin:0; margin-left:20; text-indent:0;">
 		<xsl:for-each select="BESLAGPOS">
 			<LI><xsl:value-of select="@OMS"/> :
-			<BR/><FONT color="#707070">Van bovenkant : </FONT><xsl:value-of select="LENGTEPOS"/>
+			<BR/><FONT color="#707070"><xsl:apply-templates select="../BESLAGTYPE"/> : </FONT><xsl:value-of select="LENGTEPOS"/>
 			<FONT color="#707070"><xsl:value-of select="LENGTEPOS/@UNIT"/></FONT> <xsl:apply-templates select="OPDEKY"/>
 			<xsl:apply-templates select="AFSTANDRAND"/> <xsl:apply-templates select="OPDEKX"/>
 			</LI>
@@ -189,7 +192,7 @@
 	</xsl:when>
 	<xsl:when test="contains('HFA;HK;HZ;HL',BESLAGTYPE)">   <!-- Aventos ophangbeslag -->
 		<xsl:for-each select="BESLAGPOS[1]">
-			<BR/><FONT color="#707070">Van bovenkant : </FONT><xsl:value-of select="LENGTEPOS"/>
+			<BR/><FONT color="#707070"><xsl:apply-templates select="../BESLAGTYPE"/> : </FONT><xsl:value-of select="LENGTEPOS"/>
 			<FONT color="#707070"><xsl:value-of select="LENGTEPOS/@UNIT"/></FONT> <xsl:apply-templates select="OPDEKY"/> <xsl:apply-templates select="VOEGY"/>
 		</xsl:for-each>
 		<UL style="list-style-type:square; margin:0; margin-left:20; text-indent:0;">
@@ -210,52 +213,58 @@
 </xsl:template>
 
 <xsl:template match="BESLAGTYPE">
+	<xsl:value-of select="./@label"/>
+	<!--
 	<xsl:choose>
-		<xsl:when test="contains('S;VV;VC;VS;HFC;HFM;HFV',.)">   <!-- Standaard Scharnier, Vouwdeur vouwbeslag, Aventos HF (3x) -->
+		<xsl:when test="contains('S;VV;VC;VS;HFC;HFM;HFV',.)">   <!- - Standaard Scharnier, Vouwdeur vouwbeslag, Aventos HF (3x) - ->
 			positie<xsl:if test="count(parent::BESLAGPOS)!=1">s</xsl:if> :
 		</xsl:when>
-		<xsl:otherwise>   <!-- Select from list -->
+		<xsl:otherwise>
 			<xsl:value-of select="substring-before(substring-after(substring-after('\\VB=van bovenkant\VO=van onderkant\GA\GC=van links\GB\GD=van rechts\\',concat('\',.)),'='),'\')"/> :
 		</xsl:otherwise>
 	</xsl:choose>
+	-->
 </xsl:template>
 
 <xsl:template match="OPDEKX | OPDEKY">
-	<FONT color="#707070">&#160;&#160;&#160; (opdek : </FONT><xsl:value-of select="."/> <FONT color="#707070"><xsl:value-of select="@UNIT"/>)</FONT>
+	<FONT color="#707070">&#160;&#160;&#160; (<xsl:value-of select="./@label"/> : </FONT><xsl:value-of select="."/> <FONT color="#707070"><xsl:value-of select="@UNIT"/>)</FONT>
 </xsl:template>
 
 <xsl:template match="VOEGX | VOEGY">
-	<FONT color="#707070">&#160;&#160;&#160; (voeg : </FONT><xsl:value-of select="."/> <FONT color="#707070"><xsl:value-of select="@UNIT"/>)</FONT>
+	<FONT color="#707070">&#160;&#160;&#160; (<xsl:value-of select="./@label"/> : </FONT><xsl:value-of select="."/> <FONT color="#707070"><xsl:value-of select="@UNIT"/>)</FONT>
 </xsl:template>
 
 <xsl:template match="AFSTANDRAND">
 	<xsl:param name="StartNewLine" select="1"/>
 <xsl:if test="../../BESLAGREF != 'BLUMK'">
-	<xsl:if test="$StartNewLine=1"><BR/></xsl:if><FONT color="#707070"><xsl:if test="@OMS = ''">afstand rand</xsl:if><xsl:value-of select="@OMS"/> : </FONT>
+	<xsl:if test="$StartNewLine=1"><BR/></xsl:if><FONT color="#707070"><xsl:if test="@OMS = ''"><xsl:value-of select="./@label"/></xsl:if><xsl:value-of select="@OMS"/> : </FONT>
 	<xsl:value-of select="."/> <FONT color="#707070"><xsl:value-of select="@UNIT"/></FONT>
 </xsl:if>
 </xsl:template>
 
 <xsl:template match="TUSSENMATEN">
-	<BR/><FONT color="#707070">tussenmaten : </FONT>
+	<BR/><FONT color="#707070"><xsl:value-of select="./@label"/> : </FONT>
 	<xsl:value-of select="."/>
 </xsl:template>
 
 <xsl:template match="WANDDIKTE">
 <xsl:if test=". != ''">
-	<BR/><FONT color="#707070">Wanddikte : </FONT>
+	<BR/><FONT color="#707070"><xsl:value-of select="./@label"/> : </FONT>
 	<xsl:value-of select="."/><FONT color="#707070"><xsl:value-of select="@UNIT"/></FONT>
 </xsl:if>
 </xsl:template>
 
 
 <xsl:template match="BORING">
 	<TD align="CENTER">
+		<xsl:value-of select="BOORPLAATS/@OMSK"/>
+<!--
 	<xsl:choose>
 		<xsl:when test="BOORPLAATS='VUL'">VUL</xsl:when>
 		<xsl:when test="substring(BOORPLAATS,1,1)='P'"><xsl:value-of select="substring(BOORPLAATS,1,2)"/></xsl:when>
 		<xsl:otherwise><xsl:value-of select="BOORPLAATS"/></xsl:otherwise>
 	</xsl:choose>
+-->
 	</TD>
 	<TD align="CENTER">
 	<xsl:if test="(BOORTYPE='IN' or BOORTYPE='EX') and (BOORPLAATS='PL' or BOORPLAATS='PR')">
@@ -283,9 +292,9 @@
 	<xsl:if test="(BOORTYPE='IN' or BOORTYPE='EX') and (ZPOS!='')">
 		<xsl:apply-templates select="ZPOS"/>
 	</xsl:if>
-	<font color="#707070">D:</font>
+	<font color="#707070"><xsl:value-of select="DIAMETER/@label"/>:</font>
 	<xsl:value-of select="DIAMETER"/><font color="#707070"><xsl:value-of select="DIAMETER/@UNIT"/></font><xsl:apply-templates select="GLASDIAMETER"/><xsl:apply-templates select="AFSCHUINDIAMETER"/><xsl:apply-templates select="CNCID"/><xsl:text>, </xsl:text>
-	<xsl:value-of select="BOORTYPE/@OMS"/><xsl:text> </xsl:text><xsl:value-of select="BOORDIEPTE/@OMS"/> in <xsl:value-of select="BOORPLAATS/@OMS"/>
+	<xsl:value-of select="BOORTYPE/@OMS"/><xsl:text> </xsl:text><xsl:value-of select="BOORDIEPTE/@OMS"/><xsl:value-of select="BOORPLAATS/@label"/>
 	<xsl:apply-templates select="OPMERKING"/>
 	</TD>
 	<TD align="CENTER">
@@ -302,19 +311,19 @@
 </xsl:template>
 
 <xsl:template match="AFSCHUINDIAMETER">
-	<font color="#707070">, AD:</font>
+	<font color="#707070">, <xsl:value-of select="./@label"/>:</font>
 	<xsl:value-of select="."/>
 	<font color="#707070"><xsl:value-of select="@UNIT"/></font>
 </xsl:template>
 
 <xsl:template match="GLASDIAMETER">
-	<font color="#707070">, GD:</font>
+	<font color="#707070">, <xsl:value-of select="./@label"/>:</font>
 	<xsl:value-of select="."/>
 	<font color="#707070"><xsl:value-of select="@UNIT"/></font>
 </xsl:template>
 
 <xsl:template match="CNCID">
-	<font color="#707070">, CNC:</font>
+	<font color="#707070">, <xsl:value-of select="./@label"/>:</font>
 	<xsl:value-of select="."/>
 </xsl:template>
 
@@ -323,11 +332,11 @@
 </xsl:template>
 
 <xsl:template match="OPMERKING">
-	<xsl:if test=".!=''"> <LI>OPMERKING: <xsl:value-of select="."/></LI> </xsl:if>
+	<xsl:if test=".!=''"> <LI><xsl:value-of select="./@label"/>: <xsl:value-of select="."/></LI> </xsl:if>
 </xsl:template>
 
 <xsl:template match="OPMERKING" mode="BESLAG">
-	<xsl:if test=".!=''"> <U>OPMERKING</U>: <xsl:value-of select="."/> </xsl:if>
+	<xsl:if test=".!=''"><BR/> <U><xsl:value-of select="./@label"/></U>: <xsl:value-of select="."/> </xsl:if>
 </xsl:template>
 
 <xsl:template match="DRAW">

Plaats		X (mm)	Y (mm)	Andere gegevens	Lengte	Rand
Opties		- Vulling : + : @@ -110,18 +110,18 @@
Profiel		- : -
Vulling		- (H: - x B: + (: + x : ) @@ -135,10 +135,13 @@
- - Draairichting - Ophangplaats - + +	-
+ +	@@ -283,9 +292,9 @@ - D: + : , - in +	@@ -302,19 +311,19 @@ - , AD: + , : - , GD: + , : - , CNC: + , : @@ -323,11 +332,11 @@ - OPMERKING: + : - OPMERKING: + :