From 0c5e2db7d7e10dc4753bcf34646649259c54324f Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 12 Jan 2025 20:49:39 +0200
Subject: [PATCH] Fix shorthand expansion

---
 src/generator/com/elovirta/pdf/merge.xsl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/merge.xsl b/src/generator/com/elovirta/pdf/merge.xsl
index 26d96c4..1f9dee0 100644
--- a/src/generator/com/elovirta/pdf/merge.xsl
+++ b/src/generator/com/elovirta/pdf/merge.xsl
@@ -234,9 +234,9 @@
   </xsl:function>
 
   <xsl:function name="x:expandShorthand" as="item()*" visibility="public">
-    <xsl:param name="base" as="item()*"/>
+    <xsl:param name="base" as="map(*)"/>
 
-    <xsl:map>
+    <xsl:variable name="maps" as="map(*)*">
       <xsl:for-each select="map:keys($base)">
         <xsl:variable name="key" select="."/>
         <xsl:variable name="value" select="map:get($base, $key)"/>
@@ -284,7 +284,9 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:for-each>
-    </xsl:map>
+    </xsl:variable>
+
+    <xsl:sequence select="map:merge($maps, map{ 'duplicates': 'use-first' }) "/>
   </xsl:function>
 
   <xsl:function name="x:exclude">