updated for metanorma/annotated-express#124

metanorma · Oct 26, 2023 · 8b29ca8 · 8b29ca8
1 parent df189fb
commit 8b29ca8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl b/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl
@@ -4516,13 +4516,25 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre
 				<xsl:apply-templates select="$map_file_xml//img.area[@href]" mode="svg"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="concat('ERROR: Image map file ', @file, '(', $map_file, ') does not exist or empty!')"/>
+				<!-- <xsl:value-of select="concat('ERROR: Image map file ', @file, '(', $map_file, ') does not exist or empty!')"/> -->
 			</xsl:otherwise>
 		</xsl:choose>
 
 		<xsl:text>====</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
+
+		<xsl:choose>
+			<xsl:when test="$map_file_node">
+				<!-- <xsl:apply-templates select="$map_file_xml//img.area[@href]" mode="svg"/> -->
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="concat('ERROR: Image map file ', @file, '(', $map_file, ') does not exist or empty!')"/>
+				<xsl:text>&#xa;</xsl:text>
+				<xsl:text>&#xa;</xsl:text>
+			</xsl:otherwise>
+		</xsl:choose>
+
 	</xsl:template>
 
 	<xsl:template match="imgfile | img" mode="svg_start">
@@ -4580,12 +4592,23 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre
 				<xsl:apply-templates select="$map_file_xml//img.area[@href]" mode="svg"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="concat('ERROR: Image map file ', @file, '(', $map_file, ') does not exist or empty!')"/>
+				<!-- <xsl:value-of select="concat('ERROR: Image map file ', @file, '(', $map_file, ') does not exist or empty!')"/> -->
 			</xsl:otherwise>
 		</xsl:choose>
 
 		<xsl:text>====</xsl:text>
 		<!-- <xsl:text>&#xa;&#xa;</xsl:text> -->
+
+		<xsl:choose>
+			<xsl:when test="$map_file_node">
+				<!-- <xsl:apply-templates select="$map_file_xml//img.area[@href]" mode="svg"/> -->
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="concat('ERROR: Image map file ', @file, '(', $map_file, ') does not exist or empty!')"/>
+				<xsl:text>&#xa;&#xa;</xsl:text>
+			</xsl:otherwise>
+		</xsl:choose>
+
 	</xsl:template>
 
 

diff --git a/src/main/resources/stepmod2mn.adoc.xsl b/src/main/resources/stepmod2mn.adoc.xsl
@@ -985,7 +985,7 @@
 				<!-- Step2: calculate relative path to '../../resources/',@name,'/',@name,'_annotated.exp' from output path -->
 
 				<xsl:variable name="schema_annotated_exp_relative_path" select="concat('../../resources/',@name,'/',@name,'_annotated.exp')"/>
-				<xsl:variable name="schema_annotated_exp_path">
+				<!-- <xsl:variable name="schema_annotated_exp_path">
 					<xsl:choose>
 						<xsl:when test="$outpath_schemas != ''">
 							<xsl:value-of select="concat($outpath_schemas,'/',@name,'/',@name,'_annotated.exp')"/>
@@ -994,7 +994,9 @@
 							<xsl:value-of select="concat($path, '/', $schema_annotated_exp_relative_path)"/>
 						</xsl:otherwise>
 					</xsl:choose>
-				</xsl:variable>
+				</xsl:variable> -->
+				<xsl:variable name="schema_annotated_exp_path" select="concat($path, '/', $schema_annotated_exp_relative_path)"/>
+
 				<xsl:variable name="schema_annotated_exp_relative_path_new" select="java:org.metanorma.Util.getRelativePath($schema_annotated_exp_path, $outpath)"/>
 				<xsl:value-of select="$schema_annotated_exp_relative_path_new"/>
 				<xsl:text>&#xa;</xsl:text>