metanorma-un 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a19302629920120d5bd3ef41ad5caf321914a49faf45ddff3646b8f5e2224e2
-  data.tar.gz: 7ffc87968fbd90b21ea9fdf3007f17db5695a48575284302bd79696b35ac0fce
+  metadata.gz: df3815b88029cc96a399f52d78b99f3beee7b1c520bd26c5701e5ad87886541b
+  data.tar.gz: 7fc79df9dcec92fed9716a91670d69ca9b0a90b4a324148ef58d789ffb762c88
 SHA512:
-  metadata.gz: 65dbc51a9c7d6d3c3c5f08d4cbeed51c56ca86fd95a65f08ecf6a7a33baf6f2869ed7410c8820248d3aac77eeac40f84c26dec6a4e6823dde1e5af096611b470
-  data.tar.gz: 84051bf8dce10c80c15a6fbf2bf7eeaf156264b8692a72316ec1a7684d6b48aabc73f35a3427bf0d3f7b7f6d32e1c7310d29aa8f60e7d91aca5f968d53edf873
+  metadata.gz: d5b31dad2389adc30a7e7b5f3c07afd1d86d606cbe066e28e0f37dd4ab89720b7379c683e524b09a72d8ba7a3f25ea049a7b364a93d4ee6978fec2e62af8b69f
+  data.tar.gz: 663176c19ae386e3a973e23c734c7152e5f4528d9226224664dd07aca227739054513d74a079556402ffb838d5958d8190786b88f4a2c4a53e5a90e6209df866

data/lib/isodoc/un/un.plenary-attachment.xsl

@@ -1080,7 +1080,10 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
@@ -1179,6 +1182,7 @@
 		
 		
 		
+		
 				
 				
 	</xsl:attribute-set><xsl:variable name="table-border_">
@@ -1525,7 +1529,8 @@
 		
 		
 		
-				
+		
+		
 		
 		
 		
@@ -1541,6 +1546,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="termnote-style">
 		
 		
+				
 		
 		
 					
@@ -1980,7 +1986,10 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'ieee'">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
+		</xsl:if> -->
 		
 		
 		
@@ -3167,80 +3176,88 @@
 				</xsl:choose>
 			</xsl:variable>
 			
-			<fo:table keep-with-previous="always">
-				<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
-					<xsl:variable name="name" select="local-name()"/>
+			
+			<xsl:variable name="tableWithNotesAndFootnotes">
+			
+				<fo:table keep-with-previous="always">
+					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
+						<xsl:variable name="name" select="local-name()"/>
+						<xsl:choose>
+							<xsl:when test="$name = 'border-top'">
+								<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:when test="$name = 'border'">
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+								<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+					
+					
+					
 					<xsl:choose>
-						<xsl:when test="$name = 'border-top'">
-							<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
-						</xsl:when>
-						<xsl:when test="$name = 'border'">
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
-							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+						<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+							<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
+								<fo:table-column column-width="{@width}"/>
+							</xsl:for-each>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
+							<xsl:call-template name="insertTableColumnWidth">
+								<xsl:with-param name="colwidths" select="$colwidths"/>
+							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
-				</xsl:for-each>
-				
-				
-				
-				<xsl:choose>
-					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
-						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
-							<fo:table-column column-width="{@width}"/>
-						</xsl:for-each>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
-						<xsl:call-template name="insertTableColumnWidth">
-							<xsl:with-param name="colwidths" select="$colwidths"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-				
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
-							
-							
+					
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
+								
+								
 
-							
-							
-							<!-- fn will be processed inside 'note' processing -->
-							
-							
-							
-							
-							
-							
-							<!-- for BSI (not PAS) display Notes before footnotes -->
-							
-							
-							<!-- except gb and bsi  -->
-							
-									<xsl:apply-templates select="../*[local-name()='note']"/>
 								
-							
-							
-							<!-- horizontal row separator -->
-							
-							
-							<!-- fn processing -->
-							
-									<xsl:call-template name="table_fn_display"/>
 								
-							
-							
-							<!-- for PAS display Notes after footnotes -->
-							
-							
-						</fo:table-cell>
-					</fo:table-row>
-				</fo:table-body>
-				
-			</fo:table>
+								<!-- fn will be processed inside 'note' processing -->
+								
+								
+								
+								
+								
+								
+								<!-- for BSI (not PAS) display Notes before footnotes -->
+								
+								
+								<!-- except gb and bsi  -->
+								
+										<xsl:apply-templates select="../*[local-name()='note']"/>
+									
+								
+								
+								<!-- horizontal row separator -->
+								
+								
+								<!-- fn processing -->
+								
+										<xsl:call-template name="table_fn_display"/>
+									
+								
+								
+								<!-- for PAS display Notes after footnotes -->
+								
+								
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+					
+				</fo:table>
+			</xsl:variable>
+			
+			<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
+				<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
+			</xsl:if>
 			
 			
 			
@@ -3542,6 +3559,7 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 				
+				
 				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
 					<xsl:value-of select="$current_fn_number_text"/>
 				</fo:basic-link>
@@ -3563,8 +3581,12 @@
 							<fo:block xsl:use-attribute-sets="fn-body-style">
 								
 								
+								
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
 									
+									
+									
+									
 									<xsl:value-of select="$current_fn_number_text"/>
 								</fo:inline>
 								<xsl:apply-templates/>
@@ -5249,6 +5271,8 @@
 			
 			
 			
+			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -5470,6 +5494,7 @@
 				
 
 				
+				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 				<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5491,6 +5516,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -5510,6 +5536,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 									
 						<xsl:text> – </xsl:text>
 					
@@ -6288,6 +6315,9 @@
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
 				
+				
+				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -6348,7 +6378,7 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
@@ -6424,6 +6454,9 @@
 						<!-- 9 -->
 						
 						
+						<!-- <xsl:if test="$namespace = 'ieee'">							
+							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+						</xsl:if> -->
 						
 								
 						
@@ -6868,10 +6901,14 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
 		<xsl:variable name="element">inline
 			
+			
 		</xsl:variable>		
 		<xsl:choose>			
 			<xsl:when test="contains($element, 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
+				
+					
+						
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -6979,6 +7016,7 @@
 					</xsl:if>
 					<fo:block xsl:use-attribute-sets="example-p-style">
 						
+						
 							<xsl:if test="$num = 1">
 								<xsl:attribute name="margin-left">5mm</xsl:attribute>
 							</xsl:if>
@@ -7139,6 +7177,8 @@
 					
 					
 					
+					
+					
 					<fo:basic-link fox:alt-text="{@citeas}">
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -7562,6 +7602,8 @@
 				
 					
 				
+					
+				
 					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
 						<xsl:call-template name="append_add-style"/>
@@ -7817,7 +7859,7 @@
 				</fo:block>
 			
 
-	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
 		
 		
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
@@ -8557,7 +8599,7 @@
 					<dc:description>
 						<xsl:variable name="abstract">
 							
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>									
 								
 						</xsl:variable>
 						<xsl:value-of select="normalize-space($abstract)"/>

data/lib/isodoc/un/un.plenary.xsl

@@ -1080,7 +1080,10 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
@@ -1179,6 +1182,7 @@
 		
 		
 		
+		
 				
 				
 	</xsl:attribute-set><xsl:variable name="table-border_">
@@ -1525,7 +1529,8 @@
 		
 		
 		
-				
+		
+		
 		
 		
 		
@@ -1541,6 +1546,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="termnote-style">
 		
 		
+				
 		
 		
 					
@@ -1980,7 +1986,10 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'ieee'">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
+		</xsl:if> -->
 		
 		
 		
@@ -3167,80 +3176,88 @@
 				</xsl:choose>
 			</xsl:variable>
 			
-			<fo:table keep-with-previous="always">
-				<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
-					<xsl:variable name="name" select="local-name()"/>
+			
+			<xsl:variable name="tableWithNotesAndFootnotes">
+			
+				<fo:table keep-with-previous="always">
+					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
+						<xsl:variable name="name" select="local-name()"/>
+						<xsl:choose>
+							<xsl:when test="$name = 'border-top'">
+								<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:when test="$name = 'border'">
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+								<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+					
+					
+					
 					<xsl:choose>
-						<xsl:when test="$name = 'border-top'">
-							<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
-						</xsl:when>
-						<xsl:when test="$name = 'border'">
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
-							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+						<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+							<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
+								<fo:table-column column-width="{@width}"/>
+							</xsl:for-each>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
+							<xsl:call-template name="insertTableColumnWidth">
+								<xsl:with-param name="colwidths" select="$colwidths"/>
+							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
-				</xsl:for-each>
-				
-				
-				
-				<xsl:choose>
-					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
-						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
-							<fo:table-column column-width="{@width}"/>
-						</xsl:for-each>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
-						<xsl:call-template name="insertTableColumnWidth">
-							<xsl:with-param name="colwidths" select="$colwidths"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-				
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
-							
-							
+					
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
+								
+								
 
-							
-							
-							<!-- fn will be processed inside 'note' processing -->
-							
-							
-							
-							
-							
-							
-							<!-- for BSI (not PAS) display Notes before footnotes -->
-							
-							
-							<!-- except gb and bsi  -->
-							
-									<xsl:apply-templates select="../*[local-name()='note']"/>
 								
-							
-							
-							<!-- horizontal row separator -->
-							
-							
-							<!-- fn processing -->
-							
-									<xsl:call-template name="table_fn_display"/>
 								
-							
-							
-							<!-- for PAS display Notes after footnotes -->
-							
-							
-						</fo:table-cell>
-					</fo:table-row>
-				</fo:table-body>
-				
-			</fo:table>
+								<!-- fn will be processed inside 'note' processing -->
+								
+								
+								
+								
+								
+								
+								<!-- for BSI (not PAS) display Notes before footnotes -->
+								
+								
+								<!-- except gb and bsi  -->
+								
+										<xsl:apply-templates select="../*[local-name()='note']"/>
+									
+								
+								
+								<!-- horizontal row separator -->
+								
+								
+								<!-- fn processing -->
+								
+										<xsl:call-template name="table_fn_display"/>
+									
+								
+								
+								<!-- for PAS display Notes after footnotes -->
+								
+								
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+					
+				</fo:table>
+			</xsl:variable>
+			
+			<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
+				<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
+			</xsl:if>
 			
 			
 			
@@ -3542,6 +3559,7 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 				
+				
 				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
 					<xsl:value-of select="$current_fn_number_text"/>
 				</fo:basic-link>
@@ -3563,8 +3581,12 @@
 							<fo:block xsl:use-attribute-sets="fn-body-style">
 								
 								
+								
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
 									
+									
+									
+									
 									<xsl:value-of select="$current_fn_number_text"/>
 								</fo:inline>
 								<xsl:apply-templates/>
@@ -5249,6 +5271,8 @@
 			
 			
 			
+			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -5470,6 +5494,7 @@
 				
 
 				
+				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 				<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5491,6 +5516,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -5510,6 +5536,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 									
 						<xsl:text> – </xsl:text>
 					
@@ -6288,6 +6315,9 @@
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
 				
+				
+				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -6348,7 +6378,7 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
@@ -6424,6 +6454,9 @@
 						<!-- 9 -->
 						
 						
+						<!-- <xsl:if test="$namespace = 'ieee'">							
+							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+						</xsl:if> -->
 						
 								
 						
@@ -6868,10 +6901,14 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
 		<xsl:variable name="element">inline
 			
+			
 		</xsl:variable>		
 		<xsl:choose>			
 			<xsl:when test="contains($element, 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
+				
+					
+						
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -6979,6 +7016,7 @@
 					</xsl:if>
 					<fo:block xsl:use-attribute-sets="example-p-style">
 						
+						
 							<xsl:if test="$num = 1">
 								<xsl:attribute name="margin-left">5mm</xsl:attribute>
 							</xsl:if>
@@ -7139,6 +7177,8 @@
 					
 					
 					
+					
+					
 					<fo:basic-link fox:alt-text="{@citeas}">
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -7562,6 +7602,8 @@
 				
 					
 				
+					
+				
 					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
 						<xsl:call-template name="append_add-style"/>
@@ -7817,7 +7859,7 @@
 				</fo:block>
 			
 
-	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
 		
 		
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
@@ -8557,7 +8599,7 @@
 					<dc:description>
 						<xsl:variable name="abstract">
 							
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>									
 								
 						</xsl:variable>
 						<xsl:value-of select="normalize-space($abstract)"/>

data/lib/isodoc/un/un.recommendation.xsl

@@ -1150,7 +1150,10 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
@@ -1249,6 +1252,7 @@
 		
 		
 		
+		
 				
 				
 	</xsl:attribute-set><xsl:variable name="table-border_">
@@ -1577,7 +1581,8 @@
 		
 		
 		
-				
+		
+		
 		
 		
 		
@@ -1596,6 +1601,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="termnote-style">
 		
 		
+				
 		
 		
 					
@@ -2039,7 +2045,10 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'ieee'">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
+		</xsl:if> -->
 		
 		
 		
@@ -3235,80 +3244,88 @@
 				</xsl:choose>
 			</xsl:variable>
 			
-			<fo:table keep-with-previous="always">
-				<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
-					<xsl:variable name="name" select="local-name()"/>
+			
+			<xsl:variable name="tableWithNotesAndFootnotes">
+			
+				<fo:table keep-with-previous="always">
+					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
+						<xsl:variable name="name" select="local-name()"/>
+						<xsl:choose>
+							<xsl:when test="$name = 'border-top'">
+								<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:when test="$name = 'border'">
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+								<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+					
+					
+					
 					<xsl:choose>
-						<xsl:when test="$name = 'border-top'">
-							<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
-						</xsl:when>
-						<xsl:when test="$name = 'border'">
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
-							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+						<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+							<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
+								<fo:table-column column-width="{@width}"/>
+							</xsl:for-each>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
+							<xsl:call-template name="insertTableColumnWidth">
+								<xsl:with-param name="colwidths" select="$colwidths"/>
+							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
-				</xsl:for-each>
-				
-				
-				
-				<xsl:choose>
-					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
-						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
-							<fo:table-column column-width="{@width}"/>
-						</xsl:for-each>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
-						<xsl:call-template name="insertTableColumnWidth">
-							<xsl:with-param name="colwidths" select="$colwidths"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-				
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
-							
-							
+					
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
+								
+								
 
-							
-							
-							<!-- fn will be processed inside 'note' processing -->
-							
-							
-							
-							
-							
-							
-							<!-- for BSI (not PAS) display Notes before footnotes -->
-							
-							
-							<!-- except gb and bsi  -->
-							
-									<xsl:apply-templates select="../*[local-name()='note']"/>
 								
-							
-							
-							<!-- horizontal row separator -->
-							
-							
-							<!-- fn processing -->
-							
-									<xsl:call-template name="table_fn_display"/>
 								
-							
-							
-							<!-- for PAS display Notes after footnotes -->
-							
-							
-						</fo:table-cell>
-					</fo:table-row>
-				</fo:table-body>
-				
-			</fo:table>
+								<!-- fn will be processed inside 'note' processing -->
+								
+								
+								
+								
+								
+								
+								<!-- for BSI (not PAS) display Notes before footnotes -->
+								
+								
+								<!-- except gb and bsi  -->
+								
+										<xsl:apply-templates select="../*[local-name()='note']"/>
+									
+								
+								
+								<!-- horizontal row separator -->
+								
+								
+								<!-- fn processing -->
+								
+										<xsl:call-template name="table_fn_display"/>
+									
+								
+								
+								<!-- for PAS display Notes after footnotes -->
+								
+								
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+					
+				</fo:table>
+			</xsl:variable>
+			
+			<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
+				<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
+			</xsl:if>
 			
 			
 			
@@ -3626,6 +3643,7 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 				
+				
 				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
 					<xsl:value-of select="$current_fn_number_text"/>
 				</fo:basic-link>
@@ -3647,8 +3665,12 @@
 							<fo:block xsl:use-attribute-sets="fn-body-style">
 								
 								
+								
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
 									
+									
+									
+									
 									<xsl:value-of select="$current_fn_number_text"/>
 								</fo:inline>
 								<xsl:apply-templates/>
@@ -5333,6 +5355,8 @@
 			
 			
 			
+			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -5558,6 +5582,7 @@
 				
 
 				
+				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 				<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5579,6 +5604,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -5598,6 +5624,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 									
 						<xsl:text> – </xsl:text>
 					
@@ -6381,6 +6408,9 @@
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
 				
+				
+				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -6441,7 +6471,7 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
@@ -6517,6 +6547,9 @@
 						<!-- 9 -->
 						
 						
+						<!-- <xsl:if test="$namespace = 'ieee'">							
+							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+						</xsl:if> -->
 						
 								
 						
@@ -6961,10 +6994,14 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
 		<xsl:variable name="element">inline
 			
+			
 		</xsl:variable>		
 		<xsl:choose>			
 			<xsl:when test="contains($element, 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
+				
+					
+						
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -7072,6 +7109,7 @@
 					</xsl:if>
 					<fo:block xsl:use-attribute-sets="example-p-style">
 						
+						
 							<xsl:if test="$num = 1">
 								<xsl:attribute name="margin-left">5mm</xsl:attribute>
 							</xsl:if>
@@ -7232,6 +7270,8 @@
 					
 					
 					
+					
+					
 					<fo:basic-link fox:alt-text="{@citeas}">
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -7655,6 +7695,8 @@
 				
 					
 				
+					
+				
 					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
 						<xsl:call-template name="append_add-style"/>
@@ -7910,7 +7952,7 @@
 				</fo:block>
 			
 
-	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
 		
 		
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
@@ -8652,7 +8694,7 @@
 					<dc:description>
 						<xsl:variable name="abstract">
 							
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>									
 								
 						</xsl:variable>
 						<xsl:value-of select="normalize-space($abstract)"/>

data/lib/metanorma/un/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -116,6 +127,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.9.3".freeze
+    VERSION = "0.9.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639