From e52f855d7828c342e9458f26249669969fc828a5 Mon Sep 17 00:00:00 2001
From: Nicolas Pavie <pavie.nicolas@gmail.com>
Date: Thu, 26 Sep 2024 14:56:57 +0200
Subject: [PATCH] [modules] word-to-dtbook: fix empty sequence error when
 building unordered list

see https://github.com/daisy/pipeline-modules/pull/113
---
 .../src/main/resources/xml/Common2.xsl        | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/modules/scripts/word-to-dtbook/src/main/resources/xml/Common2.xsl b/modules/scripts/word-to-dtbook/src/main/resources/xml/Common2.xsl
index e20094298e..0c91cb8703 100644
--- a/modules/scripts/word-to-dtbook/src/main/resources/xml/Common2.xsl
+++ b/modules/scripts/word-to-dtbook/src/main/resources/xml/Common2.xsl
@@ -694,35 +694,22 @@
 	<xsl:template name="recStart">
 		<xsl:param name="abstLevel" as="xs:string"/>
 		<xsl:param name="level" as="xs:integer"/>
+		<xsl:variable name="levelNumberingScheme" select="$numberingXml//w:numbering/w:abstractNum[@w:abstractNumId=$abstLevel]/w:lvl[@w:ilvl=$level]" />
 		<xsl:choose>
-			<xsl:when test="$level=0">
-				<xsl:variable name="strStart" as="xs:string" select="$numberingXml//w:numbering/w:abstractNum[@w:abstractNumId=$abstLevel]/w:lvl[@w:ilvl=$level]/w:start/@w:val"/>
-				<xsl:choose>
-					<xsl:when test="$strStart=''">
-						<xsl:sequence select="d:sink(d:StartString($myObj,$level,'0'))"/> <!-- empty -->
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:sequence select="d:sink(d:StartString($myObj,$level,$strStart))"/> <!-- empty -->
-					</xsl:otherwise>
-				</xsl:choose>
+			<xsl:when test="$levelNumberingScheme/w:start/@w:val">
+				<xsl:sequence select="d:sink(d:StartString($myObj,$level,$levelNumberingScheme/w:start/@w:val))"/>
 			</xsl:when>
-			<xsl:otherwise>
-				<xsl:variable name="strStart" as="xs:string" select="$numberingXml//w:numbering/w:abstractNum[@w:abstractNumId=$abstLevel]/w:lvl[@w:ilvl=$level]/w:start/@w:val"/>
-				<xsl:choose>
-					<xsl:when test="$strStart=''">
-						<xsl:sequence select="d:sink(d:StartString($myObj,$level,'0'))"/> <!-- empty -->
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:sequence select="d:sink(d:StartString($myObj,$level,$strStart))"/> <!-- empty -->
-					</xsl:otherwise>
-				</xsl:choose>
-				<xsl:variable name="dec" as="xs:integer" select="$level - 1"/>
-				<xsl:call-template name="recStart">
-					<xsl:with-param name="abstLevel" select="$abstLevel"/>
-					<xsl:with-param name="level" select="$dec"/>
-				</xsl:call-template>
+			<xsl:otherwise> <!-- Non incrementable lists -->
+				<xsl:sequence select="d:sink(d:StartString($myObj,$level,'0'))"/>
 			</xsl:otherwise>
 		</xsl:choose>
+		<xsl:if test="$level &gt; 0">
+			<xsl:variable name="dec" as="xs:integer" select="$level - 1"/>
+			<xsl:call-template name="recStart">
+				<xsl:with-param name="abstLevel" select="$abstLevel"/>
+				<xsl:with-param name="level" select="$dec"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template>
 	
 	<!--Template to Close Complex List-->