itu.resolution.xsl in metanorma-itu-1.2.6

- old
+ new

@@ -61,12 +61,12 @@
 
 	<xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
 	</xsl:variable>
 	
-	<xsl:variable name="isAmendment" select="normalize-space(/itu:itu-standard/itu:local_bibdata/itu:ext/itu:structuredidentifier/itu:amendment)"/>
-	<xsl:variable name="isCorrigendum" select="normalize-space(/itu:itu-standard/itu:local_bibdata/itu:ext/itu:structuredidentifier/itu:corrigendum)"/>
+	<xsl:variable name="isAmendment" select="normalize-space(/itu:itu-standard/itu:local_bibdata/itu:ext/itu:structuredidentifier/itu:amendment[@language = $lang])"/>
+	<xsl:variable name="isCorrigendum" select="normalize-space(/itu:itu-standard/itu:local_bibdata/itu:ext/itu:structuredidentifier/itu:corrigendum[@language = $lang])"/>
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
 		<fo:root font-family="Times New Roman, STIX Two Math" font-size="12pt" xml:lang="{$lang}">
 			<fo:layout-master-set>
@@ -1570,10 +1570,11 @@
 		
 		
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
 		
 		
 		
 		
@@ -2128,18 +2129,32 @@
 							
 							<!-- fn will be processed inside 'note' processing -->
 							
 							
 							
-							<!-- except gb and bipm -->
 							
-								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
 							
 							
+							<!-- except gb -->
 							
+								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
 							
 							
+							<!-- show Note under table in preface (ex. abstract) sections -->
+							<!-- empty, because notes show at page side in main sections -->
+							<!-- <xsl:if test="$namespace = 'bipm'">
+								<xsl:choose>
+									<xsl:when test="ancestor::*[local-name()='preface']">										
+										<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
+									</xsl:when>
+									<xsl:otherwise>										
+									<fo:block/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:if> -->
+							
+							
 							<!-- horizontal row separator -->
 							
 							
 							<!-- fn processing -->
 							<xsl:call-template name="fn_display"/>
@@ -2200,12 +2215,16 @@
 							
 							<!-- fn will be processed inside 'note' processing -->
 							
 							
 							
-							<!-- except gb and bipm -->
 							
+							
+							
+							
+							<!-- except gb  -->
+							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
 							
 							
 							<!-- <xsl:if test="$namespace = 'bipm'">
 								<xsl:choose>
@@ -2285,10 +2304,13 @@
 					
 				</xsl:if>
 				
 				
 				
+				<!-- <xsl:if test="$namespace = 'bipm'">
+					<xsl:attribute name="height">8mm</xsl:attribute>
+				</xsl:if> -->
 				
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='th']">
 		<fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
@@ -3436,9 +3458,11 @@
 					<fo:block>
 						
 							<xsl:if test="ancestor::itu:figure">
 								<xsl:attribute name="keep-with-previous">always</xsl:attribute>
 							</xsl:if>
+						
+						
 						
 						
 						
 						
 						<fo:inline xsl:use-attribute-sets="note-name-style">
\ No newline at end of file