metanorma-un 0.6.6 → 0.6.10

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

@@ -127,7 +127,7 @@
 						</fo:block>
 					</fo:block>
 					<fo:block-container absolute-position="fixed" left="50mm" top="30mm" width="139mm" height="40mm" text-align="right" display-align="after">
-						<fo:block font-family="Arial" font-size="24.5pt" font-weight="bold" margin-right="3mm"> <!-- margin-top="19mm" -->
+						<fo:block font-family="Arial" font-size="24.5pt" font-weight="bold" margin-right="3mm" role="H1"> <!-- margin-top="19mm" -->
 							<xsl:if test="string-length($title) &gt; 70">
 								<xsl:attribute name="font-size">22pt</xsl:attribute>
 							</xsl:if>
@@ -142,7 +142,7 @@
 				<fo:flow flow-name="xsl-region-body" font-family="Arial">
 					<fo:block font-size="14pt" font-weight="bold" text-align="center">United Nations Economic Commission for Europe</fo:block>
 					<fo:block font-size="12pt" font-weight="normal" text-align="center" margin-top="46pt" margin-bottom="128pt" keep-together="always">United Nations Centre for Trade Facilitation and Electronic Business</fo:block>
-					<fo:block font-size="22pt" font-weight="bold" text-align="center">
+					<fo:block font-size="22pt" font-weight="bold" text-align="center" role="H1">
 						<xsl:value-of select="$title"/>
 						<xsl:value-of select="$linebreak"/>
 						<xsl:value-of select="$doctypenumber"/>
@@ -200,17 +200,17 @@
 							<xsl:with-param name="name" select="'title-toc'"/>
 						</xsl:call-template>
 					</xsl:variable>
-					<fo:block font-size="14pt" margin-top="4pt" margin-bottom="8pt"><xsl:value-of select="$title-toc"/></fo:block>
+					<fo:block font-size="14pt" margin-top="4pt" margin-bottom="8pt" role="H1"><xsl:value-of select="$title-toc"/></fo:block>
 					<xsl:variable name="title-page">
 						<xsl:call-template name="getTitle">
 							<xsl:with-param name="name" select="'title-page'"/>
 						</xsl:call-template>
 					</xsl:variable>
 					<fo:block font-size="9pt" text-align="right" font-style="italic" margin-bottom="6pt"><xsl:value-of select="$title-page"/></fo:block>
-					<fo:block>
+					<fo:block role="TOC">
 						<xsl:for-each select="xalan:nodeset($contents)//item[not (@type = 'annex' or @parent = 'annex') and @display = 'true']">
 							
-							<fo:block>
+							<fo:block role="TOCI">
 								
 								<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
 									<xsl:if test="@level = 2 and @section != ''">
@@ -249,7 +249,7 @@
 						<xsl:if test="xalan:nodeset($contents)//item[@type = 'annex' and @display = 'true']">
 							<fo:block text-align="center" margin-top="12pt" margin-bottom="12pt">ANNEXES</fo:block>
 							<xsl:for-each select="xalan:nodeset($contents)//item[@type = 'annex' and @display = 'true']">
-								<fo:block>
+								<fo:block role="TOCI">
 									<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
 										<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section}">
 											<xsl:if test="@section != ''">
@@ -423,7 +423,10 @@
 		
 		
 	<xsl:template match="un:legal-statement//un:clause/un:title">
-		<fo:block font-weight="bold">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:block font-weight="bold" role="H{$level}">
 			<xsl:choose>
 				<xsl:when test="text() = 'Note'">
 					<xsl:attribute name="font-size">14pt</xsl:attribute>
@@ -567,7 +570,10 @@
 	</xsl:template>
 	
 	<xsl:template match="un:title" mode="inline-header">
-		<fo:inline>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:inline role="H{$level}">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -739,8 +745,9 @@
 				<xsl:otherwise>12pt</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<fo:block font-size="{$font-size}" font-weight="bold" margin-top="30pt" margin-bottom="16pt" keep-with-next="always">
+		<fo:block font-size="{$font-size}" font-weight="bold" margin-top="30pt" margin-bottom="16pt" keep-with-next="always" role="H{$level}">
 			<xsl:apply-templates/>
+			<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 		</fo:block>
 	</xsl:template>
 	
@@ -758,12 +765,13 @@
 		
 		<xsl:choose>
 			<xsl:when test="$level = 1">
-				<fo:block font-size="{$font-size}" font-weight="bold" space-before="3pt" margin-top="12pt" margin-bottom="16pt" keep-with-next="always" line-height="18pt">					
+				<fo:block font-size="{$font-size}" font-weight="bold" space-before="3pt" margin-top="12pt" margin-bottom="16pt" keep-with-next="always" line-height="18pt" role="H{$level}">					
 					<xsl:apply-templates/>
+					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</fo:block>
 			</xsl:when>
 			<xsl:when test="$level &gt;= 2">
-				<fo:block font-size="{$font-size}" font-weight="bold" space-before="3pt" margin-bottom="12pt" margin-left="-9.5mm" line-height="108%" keep-with-next="always"> <!-- line-height="14.5pt" text-indent="-9.5mm" -->					
+				<fo:block font-size="{$font-size}" font-weight="bold" space-before="3pt" margin-bottom="12pt" margin-left="-9.5mm" line-height="108%" keep-with-next="always" role="H{$level}"> <!-- line-height="14.5pt" text-indent="-9.5mm" -->					
 					<xsl:if test="$level = 2">
 						<xsl:attribute name="margin-top">16pt</xsl:attribute>
 					</xsl:if>
@@ -796,7 +804,7 @@
 				
 		<xsl:choose>			
 			<xsl:when test="ancestor::un:sections">
-				<fo:block font-size="{$font-size}" font-weight="bold" space-before="3pt" margin-bottom="12pt" margin-left="-9.5mm" line-height="108%" keep-with-next="always"> <!-- line-height="14.5pt" text-indent="-9.5mm" -->
+				<fo:block font-size="{$font-size}" font-weight="bold" space-before="3pt" margin-bottom="12pt" margin-left="-9.5mm" line-height="108%" keep-with-next="always" role="H{$level}"> <!-- line-height="14.5pt" text-indent="-9.5mm" -->
 					<xsl:if test="$level = 1">
 						<!-- <xsl:attribute name="margin-left">-8.5mm</xsl:attribute> -->
 						<xsl:attribute name="margin-top">18pt</xsl:attribute>
@@ -813,8 +821,9 @@
 			</xsl:when>
 			
 			<xsl:otherwise>
-				<fo:block font-size="{$font-size}" font-weight="bold" text-align="left" keep-with-next="always">						
+				<fo:block font-size="{$font-size}" font-weight="bold" text-align="left" keep-with-next="always" role="H{$level}">						
 						<xsl:apply-templates/>
+						<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 					</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1017,7 +1026,7 @@
 	<!-- ============================ -->	
 	
 	<xsl:template name="insertHeaderPreface">
-		<fo:static-content flow-name="header">
+		<fo:static-content flow-name="header" role="artifact">
 			<fo:block-container height="25.5mm" display-align="before" border-bottom="0.5pt solid black">
 				<fo:block font-weight="bold" padding-top="20.5mm" text-align="center">
 					<!-- <xsl:text>UN/CEFACT </xsl:text> -->
@@ -1028,7 +1037,7 @@
 	</xsl:template>
 	
 	<xsl:template name="insertHeader">
-		<fo:static-content flow-name="header">
+		<fo:static-content flow-name="header" role="artifact">
 			<fo:block-container height="28.5mm" display-align="before" border-bottom="0.5pt solid black">
 				<fo:block font-weight="bold" padding-top="20.5mm" text-align="center">
 					<!-- <xsl:text>UN/CEFACT </xsl:text> -->
@@ -1039,7 +1048,7 @@
 	</xsl:template>
 	
 	<xsl:template name="insertFooter">
-		<fo:static-content flow-name="footer">
+		<fo:static-content flow-name="footer" role="artifact">
 			<fo:block-container height="29mm" display-align="after">
 				<fo:block font-size="9pt" font-weight="bold" text-align="center" padding-bottom="24mm"><fo:page-number/></fo:block>
 			</fo:block-container>
@@ -1227,12 +1236,13 @@
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
+		<xsl:attribute name="role">Code</xsl:attribute>
 		
 		
 		
 		
 		
-			<xsl:attribute name="font-family">Courier</xsl:attribute>			
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>			
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
@@ -1252,8 +1262,13 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
-	</xsl:attribute-set><xsl:attribute-set name="requirement-subject-style">
-	</xsl:attribute-set><xsl:attribute-set name="requirement-inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="subject-style">
+	</xsl:attribute-set><xsl:attribute-set name="inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="description-style">
+	</xsl:attribute-set><xsl:attribute-set name="specification-style">
+	</xsl:attribute-set><xsl:attribute-set name="measurement-target-style">
+	</xsl:attribute-set><xsl:attribute-set name="verification-style">
+	</xsl:attribute-set><xsl:attribute-set name="import-style">
 	</xsl:attribute-set><xsl:attribute-set name="recommendation-style">
 		
 		
@@ -1321,6 +1336,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -1335,7 +1351,9 @@
 		
 				
 				
-	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
+	</xsl:attribute-set><xsl:variable name="table-border_">
+		
+	</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			
 		
@@ -1451,7 +1469,8 @@
 				
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
+	</xsl:attribute-set><xsl:attribute-set name="quote-style">
+		<xsl:attribute name="role">BlockQuote</xsl:attribute>
 		
 		
 		
@@ -1636,11 +1655,15 @@
 				<fo:block>&#xA0;</fo:block>
 			</xsl:if> -->
 			
+			
+			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			
 				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
-					
+			
+			
+			
 			
 				<xsl:call-template name="fn_name_display"/>
 			
@@ -1716,6 +1739,12 @@
 				
 				
 				
+				
+				
+				
+				<!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
+				
+				
 				<xsl:variable name="table_width">
 					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
 					
@@ -1739,6 +1768,7 @@
 					
 					
 					
+					
 									
 					
 						<xsl:if test="ancestor::*[local-name()='sections']">
@@ -1767,6 +1797,8 @@
 						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 					</xsl:if>
 					
+					
+					
 					<xsl:choose>
 						<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
 							<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2051,9 +2083,9 @@
 				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
 					<xsl:with-param name="continued">true</xsl:with-param>
 				</xsl:apply-templates>
-				<xsl:for-each select="ancestor::*[local-name()='table'][1]">
-					<xsl:call-template name="fn_name_display"/>
-				</xsl:for-each>
+				
+				
+				
 				
 			</fo:table-cell>
 		</fo:table-row>
@@ -2135,7 +2167,11 @@
 		
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		
-		<xsl:if test="$isNoteOrFnExist = 'true'">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+			
+		</xsl:variable>
+		
+		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
 		
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -2164,6 +2200,8 @@
 					</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']">
@@ -2190,6 +2228,7 @@
 							
 							
 							
+							
 							<!-- fn will be processed inside 'note' processing -->
 							
 							
@@ -2198,6 +2237,11 @@
 							
 							
 							
+							
+							
+							<!-- for BSI (not PAS) display Notes before footnotes -->
+							
+							
 							<!-- except gb  -->
 							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
@@ -2223,6 +2267,10 @@
 							<!-- fn processing -->
 							<xsl:call-template name="fn_display"/>
 							
+							
+							<!-- for PAS display Notes after footnotes -->
+							
+							
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-body>
@@ -2264,6 +2312,19 @@
 		
 		</fo:table-body>
 		
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
+		<xsl:choose>
+			<xsl:when test="substring-after(., '—') != ''">
+				<xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
+		<xsl:apply-templates mode="presentation_name"/>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
+		<xsl:apply-templates select="."/>
 	</xsl:template><xsl:template match="*[local-name()='tr']">
 		<xsl:variable name="parent-name" select="local-name(..)"/>
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -2276,10 +2337,13 @@
 					
 					
 					
+					
+					
 				</xsl:if>
 				<xsl:if test="$parent-name = 'tfoot'">
 					
 					
+					
 				</xsl:if>
 				
 				
@@ -2289,6 +2353,8 @@
 				
 				
 				
+				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -2430,8 +2496,13 @@
 				
 				
 				
+				
+				<!-- Table's note name (NOTE, for example) -->
+
 				<fo:inline padding-right="2mm">
 					
+				
+					
 					
 					
 						<xsl:if test="@type = 'source' or @type = 'abbreviation'">
@@ -2449,6 +2520,8 @@
 						
 				</fo:inline>
 				
+				
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -2456,18 +2529,18 @@
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
+			
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
-				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
-					
-					
-					<xsl:apply-templates/>
-				</fn>
+				<xsl:call-template name="create_fn"/>
 			</xsl:for-each>
 		</xsl:variable>
+		
 		<xsl:for-each select="xalan:nodeset($references)//fn">
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 				<fo:block margin-bottom="12pt">
+				
+					
 					
 					
 					
@@ -2487,6 +2560,7 @@
 						<xsl:value-of select="@reference"/>
 						
 						
+						
 					</fo:inline>
 					<fo:inline>
 						
@@ -2496,6 +2570,12 @@
 				</fo:block>
 			</xsl:if>
 		</xsl:for-each>
+	</xsl:template><xsl:template name="create_fn">
+		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
+			
+			
+			<xsl:apply-templates/>
+		</fn>
 	</xsl:template><xsl:template name="fn_name_display">
 		<!-- <xsl:variable name="references">
 			<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -2636,6 +2716,7 @@
 				
 				<xsl:value-of select="@reference"/>
 				
+				
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -3474,16 +3555,68 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
+			
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
 				
 				
+				<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
+				<xsl:variable name="comment_text_">
+					<xsl:choose>
+						<xsl:when test="normalize-space($comment_text_following) != ''">
+							<xsl:value-of select="$comment_text_following"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable> 
+				<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+				
+				<xsl:if test="normalize-space($comment_text) != ''">
+				<!-- put Mathin Alternate Text -->
+					<xsl:attribute name="fox:alt-text">
+						<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
+					</xsl:attribute>
+				</xsl:if>
+				
+				<xsl:variable name="mathml_content">
+					<xsl:apply-templates select="." mode="mathml_actual_text"/>
+				</xsl:variable>
+				<!-- put MathML in Actual Text -->
+				<xsl:attribute name="fox:actual-text">
+					<xsl:value-of select="$mathml_content"/>
+				</xsl:attribute>
+				
+				
 				<!-- <xsl:copy-of select="."/> -->
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
 		</fo:inline>
+	</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
+		<!-- <xsl:text>a+b</xsl:text> -->
+		<xsl:text>&lt;</xsl:text>
+		<xsl:value-of select="local-name()"/>
+		<xsl:if test="local-name() = 'math'">
+			<xsl:text> xmlns="http://www.w3.org/1998/Math/MathML"</xsl:text>
+		</xsl:if>
+		<xsl:for-each select="@*">
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="local-name()"/>
+			<xsl:text>="</xsl:text>
+			<xsl:value-of select="."/>
+			<xsl:text>"</xsl:text>
+		</xsl:for-each>
+		<xsl:text>&gt;</xsl:text>		
+		<xsl:apply-templates mode="mathml_actual_text"/>		
+		<xsl:text>&lt;/</xsl:text>
+		<xsl:value-of select="local-name()"/>
+		<xsl:text>&gt;</xsl:text>
+	</xsl:template><xsl:template match="text()" mode="mathml_actual_text">
+		<xsl:value-of select="normalize-space()"/>
 	</xsl:template><xsl:template match="@*|node()" mode="mathml">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="mathml"/>
@@ -3493,19 +3626,6 @@
 			<!-- replace start and end spaces to non-break space -->
 			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
 		</xsl:copy>
-	</xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()" mode="mathml"/>
-		</xsl:copy>
-		<xsl:choose>
-			<!-- if in msub, then don't add space -->
-			<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
-			<!-- if next char in digit,  don't add space -->
-			<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
-			<xsl:otherwise>
-				<mathml:mspace width="0.5ex"/>
-			</xsl:otherwise>
-		</xsl:choose>
 	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
@@ -3558,7 +3678,10 @@
 		</fo:block>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -3593,9 +3716,10 @@
 			
 		</xsl:variable>
 		
+    <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
 		<xsl:choose>
-			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
-			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
+			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
+			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
 		</xsl:choose>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'xref']">
@@ -3643,6 +3767,7 @@
 			
 			
 			
+			
 			<fo:block-container margin-left="0mm">
 				
 				
@@ -3755,7 +3880,10 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">
-			<fo:inline>
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevelTermName"/>
+			</xsl:variable>
+			<fo:inline role="H{$level}">
 				<xsl:apply-templates/>
 				<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
 					<xsl:text>.</xsl:text>
@@ -3833,7 +3961,24 @@
 							</fo:instream-foreign-object>
 						</xsl:when>
 						<xsl:otherwise>
-							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
+								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
+										
+									<xsl:variable name="img_src">
+										<xsl:choose>
+											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+										</xsl:choose>
+									</xsl:variable>
+									
+									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $width_effective, $height_effective)"/>
+									<xsl:if test="number($scale) &lt; 100">
+										<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+									</xsl:if>
+								
+								</xsl:if>
+							
+							</fo:external-graphic>
 						</xsl:otherwise>
 					</xsl:choose>
 					
@@ -4004,11 +4149,13 @@
 						<xsl:attribute name="width">100%</xsl:attribute>
 						<xsl:attribute name="content-height">100%</xsl:attribute>
 						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+						<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
+						<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
 						<!-- effective height 297 - 27.4 - 13 =  256.6 -->
 						<!-- effective width 210 - 12.5 - 25 = 172.5 -->
 						<!-- effective height / width = 1.48, 1.4 - with title -->
-						<xsl:if test="@height &gt; (@width * 1.4)"> <!-- for images with big height -->
-							<xsl:variable name="width" select="((@width * 1.4) div @height) * 100"/>
+						<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
+							<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
 							<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
 						</xsl:if>
 						<xsl:attribute name="scaling">uniform</xsl:attribute>
@@ -4025,6 +4172,23 @@
 		<xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
 			<xsl:value-of select="."/>
 		</xsl:attribute>
+	</xsl:template><xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="svg_update"/>
+			<xsl:variable name="viewbox">
+				<xsl:call-template name="split">
+					<xsl:with-param name="pText" select="@viewBox"/>
+					<xsl:with-param name="sep" select="' '"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:attribute name="width">
+				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[3])"/>
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[4])"/>
+			</xsl:attribute>
+			<xsl:apply-templates mode="svg_update"/>
+		</xsl:copy>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
 		<xsl:variable name="svg_content" select="document(@src)"/>
 		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
@@ -4355,6 +4519,7 @@
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:apply-templates/>
+								<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 							</xsl:otherwise>
 						</xsl:choose>
 					</fo:block>
@@ -4495,14 +4660,6 @@
 			<fo:block>
 				<fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
 			</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
-		<fo:block xsl:use-attribute-sets="requirement-subject-style">
-			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
-		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'inherit']">
-		<fo:block xsl:use-attribute-sets="requirement-inherit-style">
-			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
-		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'recommendation']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -4519,6 +4676,38 @@
 		<fo:block xsl:use-attribute-sets="recommendation-label-style">
 			<xsl:apply-templates/>
 		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'subject']">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
+		<fo:block xsl:use-attribute-sets="inherit-style">
+			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
+		<fo:block xsl:use-attribute-sets="description-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
+		<fo:block xsl:use-attribute-sets="specification-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
+		<fo:block xsl:use-attribute-sets="measurement-target-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
+		<fo:block xsl:use-attribute-sets="verification-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
+		<fo:block xsl:use-attribute-sets="import-style">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
 			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
@@ -4670,7 +4859,19 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<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>
+			<xsl:otherwise>
+				<fo:inline><xsl:apply-templates/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
@@ -4853,9 +5054,10 @@
 											
 						
 					</xsl:if>	
-											
+					
+					
+            
 					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-						
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
 						</xsl:if>
@@ -4863,6 +5065,7 @@
 							
 							
 							
+							
 						</xsl:if>
 
 						<xsl:apply-templates/>
@@ -5248,7 +5451,6 @@
 	</xsl:template><xsl:template name="processBibitem">
 		
 		
-		<!-- end BIPM bibitem processing-->
 		
 		 
 		
@@ -5378,6 +5580,9 @@
 		<fo:block-container border="1pt solid black" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
+		<fo:inline padding-right="5mm"> </fo:inline>
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -5616,6 +5821,26 @@
 				<xsl:value-of select="$level"/>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="getLevelTermName">
+		<xsl:choose>
+			<xsl:when test="normalize-space(../@depth) != ''">
+				<xsl:value-of select="../@depth"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="title_level_">
+					<xsl:for-each select="../preceding-sibling::*[local-name() = 'title'][1]">
+						<xsl:call-template name="getLevel"/>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="title_level" select="normalize-space($title_level_)"/>
+				<xsl:choose>
+					<xsl:when test="$title_level != ''"><xsl:value-of select="$title_level + 1"/></xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="getLevel"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
@@ -5713,20 +5938,40 @@
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getLocalizedString">
-		<xsl:param name="key"/>	
+		<xsl:param name="key"/>
+		<xsl:param name="formatted">false</xsl:param>
 		
 		<xsl:variable name="curr_lang">
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
 		
-		<xsl:variable name="data_value" select="normalize-space(xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang])"/>
+		<xsl:variable name="data_value">
+			<xsl:choose>
+				<xsl:when test="$formatted = 'true'">
+					<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang])"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		
 		<xsl:choose>
-			<xsl:when test="$data_value != ''">
-				<xsl:value-of select="$data_value"/>
+			<xsl:when test="normalize-space($data_value) != ''">
+				<xsl:choose>
+					<xsl:when test="$formatted = 'true'"><xsl:copy-of select="$data_value"/></xsl:when>
+					<xsl:otherwise><xsl:value-of select="$data_value"/></xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
-				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				<xsl:choose>
+					<xsl:when test="$formatted = 'true'">
+						<xsl:apply-templates select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:variable name="key_">
@@ -5737,7 +5982,7 @@
 				<xsl:value-of select="$key_"/>
 			</xsl:otherwise>
 		</xsl:choose>
-		
+			
 	</xsl:template><xsl:template name="setTrackChangesStyles">
 		<xsl:param name="isAdded"/>
 		<xsl:param name="isDeleted"/>
@@ -5788,4 +6033,100 @@
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+	</xsl:template><xsl:template name="number-to-words">
+		<xsl:param name="number"/>
+		<xsl:param name="first"/>
+		<xsl:if test="$number != ''">
+			<xsl:variable name="words">
+								<words>
+					<word cardinal="1">One-</word>
+					<word ordinal="1">First </word>
+					<word cardinal="2">Two-</word>
+					<word ordinal="2">Second </word>
+					<word cardinal="3">Three-</word>
+					<word ordinal="3">Third </word>
+					<word cardinal="4">Four-</word>
+					<word ordinal="4">Fourth </word>
+					<word cardinal="5">Five-</word>
+					<word ordinal="5">Fifth </word>
+					<word cardinal="6">Six-</word>
+					<word ordinal="6">Sixth </word>
+					<word cardinal="7">Seven-</word>
+					<word ordinal="7">Seventh </word>
+					<word cardinal="8">Eight-</word>
+					<word ordinal="8">Eighth </word>
+					<word cardinal="9">Nine-</word>
+					<word ordinal="9">Ninth </word>
+					<word ordinal="10">Tenth </word>
+					<word ordinal="11">Eleventh </word>
+					<word ordinal="12">Twelfth </word>
+					<word ordinal="13">Thirteenth </word>
+					<word ordinal="14">Fourteenth </word>
+					<word ordinal="15">Fifteenth </word>
+					<word ordinal="16">Sixteenth </word>
+					<word ordinal="17">Seventeenth </word>
+					<word ordinal="18">Eighteenth </word>
+					<word ordinal="19">Nineteenth </word>
+					<word cardinal="20">Twenty-</word>
+					<word ordinal="20">Twentieth </word>
+					<word cardinal="30">Thirty-</word>
+					<word ordinal="30">Thirtieth </word>
+					<word cardinal="40">Forty-</word>
+					<word ordinal="40">Fortieth </word>
+					<word cardinal="50">Fifty-</word>
+					<word ordinal="50">Fiftieth </word>
+					<word cardinal="60">Sixty-</word>
+					<word ordinal="60">Sixtieth </word>
+					<word cardinal="70">Seventy-</word>
+					<word ordinal="70">Seventieth </word>
+					<word cardinal="80">Eighty-</word>
+					<word ordinal="80">Eightieth </word>
+					<word cardinal="90">Ninety-</word>
+					<word ordinal="90">Ninetieth </word>
+					<word cardinal="100">Hundred-</word>
+					<word ordinal="100">Hundredth </word>
+				</words>
+			</xsl:variable>
+
+			<xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
+			
+			<xsl:variable name="value">
+				<xsl:choose>
+					<xsl:when test="$ordinal != ''">
+						<xsl:value-of select="$ordinal"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:choose>
+							<xsl:when test="$number &lt; 100">
+								<xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
+								<xsl:variable name="digit" select="substring($number,2)"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<!-- more 100 -->
+								<xsl:variable name="hundred" select="substring($number,1,1)"/>
+								<xsl:variable name="digits" select="number(substring($number,2))"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
+								<xsl:call-template name="number-to-words">
+									<xsl:with-param name="number" select="$digits"/>
+								</xsl:call-template>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:choose>
+				<xsl:when test="$first = 'true'">
+					<xsl:variable name="value_lc" select="java:toLowerCase(java:java.lang.String.new($value))"/>
+					<xsl:call-template name="capitalize">
+						<xsl:with-param name="str" select="$value_lc"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$value"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 	</xsl:template></xsl:stylesheet>