Brackets and commas for colocations

view.xsl

@@ -45,7 +45,7 @@
             <div style="float: left; margin-left: 0.5em; color: #999999; font-weight: bold;">
                 <xsl:choose>
                     <xsl:when test="count(../pomen)&gt;1">
-                        <xsl:value-of select="position()"/>                        
+                        <xsl:value-of select="position()"/>
                     </xsl:when>
                     <xsl:otherwise>
                         •
@@ -110,10 +110,16 @@
         </span>
         <xsl:text xml:space="preserve"> </xsl:text>
     </xsl:template>
+
+    <xsl:template match="kolokacije//ks">
+        <xsl:text xml:space="preserve">(</xsl:text>
+        <xsl:apply-templates/>
+        <xsl:text xml:space="preserve">) </xsl:text>
+    </xsl:template>
     
-    <xsl:template match="kolokacija//* | r_kolokacija//*">
-        <xsl:text xml:space="preserve"> </xsl:text>
+    <xsl:template match="k[not(position()=last())]">
         <xsl:apply-templates/>
+        <xsl:text xml:space="preserve">, </xsl:text>
     </xsl:template>
     
     <xsl:template match="enota | stalna_zveza//zveza">