metanorma-bipm 1.1.7 → 1.1.8

data/lib/isodoc/bipm/bipm.rapport.xsl

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:bipm="https://www.metanorma.org/ns/bipm" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:bipm="https://www.metanorma.org/ns/bipm" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0">
 
 	<xsl:output version="1.0" method="xml" encoding="UTF-8" indent="no"/>
 	
@@ -13,6 +13,10 @@
 	<!-- param for second pass -->
 	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	
+	<xsl:param name="add_math_as_text">true</xsl:param>
+  
+	<xsl:param name="add_math_as_attachment">true</xsl:param>
+	
 	<xsl:variable name="first_pass" select="count($index//item) = 0"/>
 	
 	<xsl:variable name="pageWidth" select="210"/>
@@ -206,6 +210,37 @@
 	</xsl:template>
 	
 	
+	<xsl:variable name="mathml_attachments">
+		<xsl:if test="$add_math_as_attachment = 'true'">
+			<xsl:for-each select="//mathml:math">
+						
+				<xsl:variable name="sequence_number"><xsl:number level="any" format="00001"/></xsl:variable>
+				
+				<xsl:variable name="clause_title_number" select="ancestor-or-self::bipm:clause[bipm:title[bipm:tab]][1]/bipm:title/node()[1]"/>
+				
+				<xsl:variable name="mathml_filename">
+					<xsl:text>math</xsl:text>
+					<xsl:if test="$clause_title_number != '' and translate($clause_title_number, '.123456789', '') = ''">
+						<xsl:text>_</xsl:text>
+						<xsl:value-of select="$clause_title_number"/>
+						<xsl:text>_</xsl:text>
+					</xsl:if>
+					<xsl:value-of select="$sequence_number"/>
+					<xsl:text>.mml</xsl:text>
+				</xsl:variable>
+				
+				<xsl:variable name="mathml_content">
+					<xsl:apply-templates select="." mode="mathml_actual_text"/>
+				</xsl:variable>
+				
+				<attachment filename="{$mathml_filename}">
+					<xsl:value-of select="$mathml_content"/>
+				</attachment>
+				
+			</xsl:for-each>
+		</xsl:if>
+	</xsl:variable>
+	
 	
 	<xsl:template match="/">
 		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
@@ -308,6 +343,23 @@
 			
 			<fo:declarations>
 				<xsl:call-template name="addPDFUAmeta"/>
+				
+				<xsl:if test="$add_math_as_attachment = 'true'">
+					<xsl:for-each select="xalan:nodeset($mathml_attachments)//attachment">
+						
+						<xsl:variable name="mathml_filename" select="@filename"/>
+						<xsl:variable name="mathml_content" select="."/>
+						
+						<xsl:variable name="basepath" select="java:org.metanorma.fop.Util.saveFileToDisk($mathml_filename,$mathml_content)"/>
+						
+						<xsl:variable name="url" select="concat('url(file:',$basepath, ')')"/>
+						
+						<xsl:if test="normalize-space($url) != ''">
+							<pdf:embedded-file src="{$url}" filename="{$mathml_filename}"/>
+						</xsl:if>
+					</xsl:for-each>
+				</xsl:if>
+        
 			</fo:declarations>
 			
 			<xsl:call-template name="addBookmarks">
@@ -1066,7 +1118,7 @@
 						</fo:block-container>
 						
 						<fo:block-container font-size="18pt" font-weight="bold" text-align="center">
-							<fo:block>						
+							<fo:block role="H1">						
 								<xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='cover']"/>
 							</fo:block>	
 						</fo:block-container>
@@ -1165,7 +1217,7 @@
 					
 						<fo:block-container margin-left="-14mm" margin-right="0mm">
 							<fo:block-container margin-left="0mm" margin-right="0mm">							
-								<fo:block font-family="Arial" font-size="16pt" font-weight="bold" text-align-last="justify" margin-bottom="82pt">									
+								<fo:block font-family="Arial" font-size="16pt" font-weight="bold" text-align-last="justify" margin-bottom="82pt" role="H1">									
 									<!-- <fo:marker marker-class-name="header-title"><xsl:value-of select="$title-toc"/></fo:marker> -->
 									<fo:inline><xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='main']"/></fo:inline>
 									<fo:inline keep-together.within-line="always">
@@ -1179,7 +1231,7 @@
 						</fo:block-container>
 					
 						<fo:block-container line-height="135%">
-							<fo:block>
+							<fo:block role="TOC">
 								<!-- <xsl:copy-of select="$contents"/> -->
 								
 								<xsl:if test="xalan:nodeset($contents)/doc[@id = $docid]//item[@display='true']">
@@ -1280,7 +1332,7 @@
 						</fo:block-container>
 						
 						<fo:block-container font-size="18pt" font-weight="bold" text-align="center">
-							<fo:block>
+							<fo:block role="H1">
 								
 								<!-- <xsl:variable name="title"> -->
 								<xsl:choose>
@@ -1315,7 +1367,7 @@
 							
 							<xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
 							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']">
-								<fo:block>
+								<fo:block role="H2">
 									<xsl:if test="$part_num != ''">
 										<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part_num)"/>
 									</xsl:if>
@@ -1325,7 +1377,7 @@
 							</xsl:if>
 							<xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
 							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']">
-								<fo:block>
+								<fo:block role="H3">
 									<xsl:if test="$subpart_num != ''">
 										<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
 									</xsl:if>
@@ -1464,7 +1516,7 @@
 									<xsl:otherwise>400</xsl:otherwise>
 								</xsl:choose>
 							</xsl:variable>
-							<fo:block>
+							<fo:block role="H1">
 								<xsl:if test="$title_num != 1">
 									<xsl:attribute name="text-align">right</xsl:attribute>
 								</xsl:if>
@@ -1504,8 +1556,8 @@
 				
 				<fo:block-container absolute-position="fixed" left="12.5mm" top="60mm">
 					
-					<fo:block font-size="22.2pt" font-weight="{$weight-normal}"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'main']"/></fo:block>
-					<fo:block font-size="22.2pt" font-weight="{$weight-bold}" margin-top="1mm"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'main']"/></fo:block>
+					<fo:block font-size="22.2pt" font-weight="{$weight-normal}" role="H1"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'main']"/></fo:block>
+					<fo:block font-size="22.2pt" font-weight="{$weight-bold}" margin-top="1mm" role="H1"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'main']"/></fo:block>
 					
 					<xsl:variable name="edition_str">édition</xsl:variable>
 						<!-- <xsl:choose>
@@ -1518,7 +1570,7 @@
 				
 				<!-- <fo:block-container height="98%" display-align="center"> -->
 				<fo:block-container absolute-position="fixed" left="12.5mm" top="92mm" height="170mm" width="144mm" display-align="center">
-					<fo:block>
+					<fo:block role="H1">
 					
 						<xsl:variable name="title_appendix_fr">
 							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'appendix']" mode="title"/>
@@ -1823,7 +1875,7 @@
 										</xsl:call-template>
 									</fo:block>
 									<fo:block-container font-size="12pt" font-weight="bold" border-top="0.5pt solid black" padding-top="2mm" width="45mm">						
-										<fo:block>										
+										<fo:block role="H1">										
 											<xsl:call-template name="add-letter-spacing">
 												<xsl:with-param name="text" select="$title"/>
 												<xsl:with-param name="letter-spacing" select="0.09"/>
@@ -1932,7 +1984,7 @@
 				<xsl:if test="normalize-space($space-after) != ''">
 					<xsl:attribute name="padding-bottom"><xsl:value-of select="normalize-space($space-after)"/></xsl:attribute>
 				</xsl:if>				
-				<fo:block>
+				<fo:block role="TOCI">
 					<xsl:if test="@level = 1">
 						<!-- <xsl:attribute name="space-after">6pt</xsl:attribute> -->
 						<xsl:attribute name="font-family">Arial</xsl:attribute>
@@ -2247,7 +2299,10 @@
 	</xsl:template>
 
 	<xsl:template match="bipm:license-statement//bipm:title">
-		<fo:block text-decoration="underline" margin-bottom="6pt">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:block text-decoration="underline" margin-bottom="6pt" role="H{$level}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -2378,19 +2433,20 @@
 				
 				<xsl:choose>
 					<xsl:when test="*[local-name() = 'tab'] and not(ancestor::bipm:annex) "><!-- split number and title -->					<!-- and $independentAppendix = '' -->
-						<fo:table table-layout="fixed" width="100%">
+						<fo:table table-layout="fixed" width="100%" role="H{$level}">
 							<fo:table-column column-width="14mm"/>
 							<fo:table-column column-width="136mm"/>
 							<fo:table-body>
 								<fo:table-row>
 									<fo:table-cell>
-										<fo:block>
+										<fo:block role="H{$level}">
 											<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
 										</fo:block>
 									</fo:table-cell>
 									<fo:table-cell>
-										<fo:block line-height-shift-adjustment="disregard-shifts">
+										<fo:block line-height-shift-adjustment="disregard-shifts" role="H{$level}">
 											<xsl:call-template name="extractTitle"/>
+											<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -2398,7 +2454,7 @@
 						</fo:table>
 					</xsl:when>
 					<xsl:otherwise>
-						<fo:block>
+						<fo:block role="H{$level}">
 							<!-- <xsl:if test="$independentAppendix != ''">
 								<xsl:attribute name="margin-left">14mm</xsl:attribute>
 							</xsl:if> -->
@@ -2420,11 +2476,13 @@
 										<xsl:attribute name="text-align">center</xsl:attribute>
 									</xsl:if>
 									<xsl:call-template name="extractTitle"/>
+									<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 								</xsl:when>
 								<xsl:otherwise>
 									<!-- <xsl:choose>
 										<xsl:when test="$independentAppendix = ''"> -->
 											<xsl:apply-templates/>
+											<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 										<!-- </xsl:when>
 										<xsl:otherwise>
 											<xsl:variable name="section" select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
@@ -3039,6 +3097,7 @@
 				<xsl:attribute name="font-family">Arial</xsl:attribute>
 				<xsl:attribute name="font-size">9pt</xsl:attribute>
 				<xsl:attribute name="line-height">130%</xsl:attribute>
+				<xsl:attribute name="role">BlockQuote</xsl:attribute>
 			</xsl:if>
 			<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 			<xsl:apply-templates/>
@@ -3083,6 +3142,7 @@
 				<xsl:attribute name="font-family">Arial</xsl:attribute>
 				<xsl:attribute name="font-size">9pt</xsl:attribute>
 				<xsl:attribute name="line-height">130%</xsl:attribute>
+				<xsl:attribute name="role">BlockQuote</xsl:attribute>
 			</xsl:if>
 			
 			<!-- last item -->		
@@ -3240,16 +3300,19 @@
 		</fo:block>
 	</xsl:template>
 
-  <xsl:template match="bipm:preferred">		
-    <fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
-      <xsl:if test="ancestor::bipm:term/bipm:name">
-        <fo:inline>
-          <xsl:attribute name="padding-right">2mm</xsl:attribute>
-          <xsl:apply-templates select="ancestor::bipm:term/bipm:name" mode="presentation"/>				
-        </fo:inline>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
+	<xsl:template match="bipm:preferred">		
+		<fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
+			<xsl:if test="ancestor::bipm:term/bipm:name">
+				<xsl:variable name="level">
+					<xsl:call-template name="getLevelTermName"/>
+				</xsl:variable>
+				<fo:inline role="H{$level}">
+					<xsl:attribute name="padding-right">2mm</xsl:attribute>
+					<xsl:apply-templates select="ancestor::bipm:term/bipm:name" mode="presentation"/>				
+				</fo:inline>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="bipm:bibitem">
@@ -3647,10 +3710,116 @@
 		<xsl:value-of select="translate(., ' ', ' ')"/>
 	</xsl:template>
 
+	<xsl:template match="mathml:math" priority="2">
+		<xsl:variable name="isAdded" select="@added"/>
+		<xsl:variable name="isDeleted" select="@deleted"/>
+		
+		<fo:inline xsl:use-attribute-sets="mathml-style">
+			
+			<xsl:if test="ancestor::*[local-name()='table']">
+				<xsl:attribute name="font-size">95%</xsl:attribute> <!-- base font in table is 10pt -->
+			</xsl:if>
+			
+			<xsl:call-template name="setTrackChangesStyles">
+				<xsl:with-param name="isAdded" select="$isAdded"/>
+				<xsl:with-param name="isDeleted" select="$isDeleted"/>
+			</xsl:call-template>
+			
+			<xsl:if test="$add_math_as_text = 'true'">
+				<!-- set unique font-size (fiction) -->
+				<xsl:variable name="font-size_sfx"><xsl:number level="any"/></xsl:variable>
+				<fo:inline color="white" font-size="1.{$font-size_sfx}pt" font-style="normal" font-weight="normal">​</fo:inline> <!-- zero width space -->
+			</xsl:if>
+			
+			<!-- <fo:wrapper role="artifact"> -->
+			
+			<xsl:variable name="mathml_content">
+				<xsl:apply-templates select="." mode="mathml_actual_text"/>
+			</xsl:variable>
+			
+			<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:choose>
+				<xsl:when test="$add_math_as_attachment = 'true'">
+					
+					<xsl:variable name="filename" select="xalan:nodeset($mathml_attachments)//attachment[. = $mathml_content]/@filename"/>
+					<xsl:if test="$filename != ''">
+						<xsl:variable name="url" select="concat('url(embedded-file:', $filename, ')')"/>
+						<fo:basic-link external-destination="{$url}" fox:alt-text="MathLink">
+							<xsl:if test="normalize-space($comment_text) != ''">
+							<!-- put Mathin Alternate Text -->
+								<xsl:attribute name="fox:alt-text">
+									<xsl:value-of select="$comment_text"/>
+								</xsl:attribute>
+							</xsl:if>
+							<xsl:call-template name="mathml_instream_object">
+								<xsl:with-param name="mathml_content" select="$mathml_content"/>
+								<xsl:with-param name="comment_text" select="$comment_text"/>
+							</xsl:call-template>
+						</fo:basic-link>
+					</xsl:if>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="mathml_instream_object">
+						<xsl:with-param name="mathml_content" select="$mathml_content"/>
+						<xsl:with-param name="comment_text" select="$comment_text"/>
+					</xsl:call-template>
+				</xsl:otherwise>
+			</xsl:choose>
+			<!-- </fo:wrapper> -->
+		</fo:inline>
+	</xsl:template>
+
+	<xsl:template name="mathml_instream_object">
+		<xsl:param name="mathml_content"/>
+		<xsl:param name="comment_text"/>
+	
+		<xsl:variable name="mathml">
+			<xsl:apply-templates select="." mode="mathml"/>
+		</xsl:variable>
+			
+		<fo:instream-foreign-object fox:alt-text="Math">
+					
+			<xsl:if test="local-name(../..) = 'formula'">
+				<xsl:attribute name="width">95%</xsl:attribute>
+				<xsl:attribute name="content-height">100%</xsl:attribute>
+				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+				<xsl:attribute name="scaling">uniform</xsl:attribute>
+			</xsl:if>
+			
+			<!-- put MathML in Actual Text -->
+			<xsl:attribute name="fox:actual-text">
+				<xsl:value-of select="$mathml_content"/>
+			</xsl:attribute>
+			
+			<xsl:if test="$add_math_as_text = 'true'">
+				<xsl:if test="normalize-space($comment_text) != ''">
+				<!-- put Mathin Alternate Text -->
+					<xsl:attribute name="fox:alt-text">
+						<xsl:value-of select="$comment_text"/>
+					</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+		
+		<xsl:copy-of select="xalan:nodeset($mathml)"/>
+	</fo:instream-foreign-object>
+	</xsl:template>
+
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="header-title"/>
 		<xsl:param name="orientation"/>
-		<fo:static-content flow-name="header-odd">			
+		<fo:static-content flow-name="header-odd" role="artifact">
 			<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
 				<fo:block text-align="right">
 					<xsl:copy-of select="$header-title"/>
@@ -3670,7 +3839,7 @@
 				<fo:block> </fo:block>
 			</fo:block-container>
 		</fo:static-content>		
-		<fo:static-content flow-name="header-even">
+		<fo:static-content flow-name="header-even" role="artifact">
 			<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
 				<fo:block>
 					<fo:inline font-weight="bold"><fo:page-number/></fo:inline>
@@ -3851,7 +4020,7 @@
 				<fo:block id="{@id}" span="all">
 					<xsl:apply-templates select="bipm:title"/>
 				</fo:block>
-				<fo:block>
+				<fo:block role="Index">
 					<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
 					
 					<!-- TEST <xsl:variable name="alphabet" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
@@ -3877,7 +4046,7 @@
 	
 	<!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4"> -->
 	<xsl:template match="bipm:indexsect/bipm:title" priority="4">
-		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" margin-left="-18mm">
+		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" margin-left="-18mm" role="H1">
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
@@ -4470,6 +4639,7 @@
 	</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>
 		
 		
 		
@@ -4491,8 +4661,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">
 		
 		
@@ -4682,7 +4857,8 @@
 			<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		
 		
-	</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>
 		
 		
 		
@@ -4870,7 +5046,9 @@
 			
 				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
-					
+			
+			
+			
 			
 				<xsl:call-template name="fn_name_display"/>
 			
@@ -6856,6 +7034,12 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
+			 <!-- insert helper tag -->
+				<xsl:if test="$add_math_as_text = 'true'">
+					<fo:inline color="white" font-size="1pt" font-style="normal" font-weight="normal">​</fo:inline> <!-- zero width space -->
+				</xsl:if>
+			
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
@@ -6867,15 +7051,75 @@
 						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 						<xsl:attribute name="scaling">uniform</xsl:attribute>
 					</xsl:if>
-					<!-- <xsl:attribute name="fox:alt-text">
-						put AsciiMath/LaTeX math
-					</xsl:attribute> -->
+					
+					<xsl:if test="$add_math_as_text = 'true'">
+						<!-- <xsl:variable name="comment_text" select="following-sibling::node()[1][self::comment()]"/> -->
+						<xsl:variable name="comment_text" select="normalize-space(translate(.,' ⁢','  '))"/>
+						<!-- <xsl:variable name="comment_text" select="normalize-space(.)"/> -->
+						<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:value-of select="$comment_text"/> -->
+							</xsl:attribute>
+						</xsl:if>
+					</xsl:if>
+				
+				
+				<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"/>
@@ -6937,7 +7181,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"/>
@@ -6972,9 +7219,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']">
@@ -7134,7 +7382,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>
@@ -7783,6 +8034,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>
@@ -7923,14 +8175,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"/>
@@ -7947,6 +8191,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']">
@@ -8857,6 +9133,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'"/>
@@ -8976,7 +9255,7 @@
 		<xsl:variable name="lang">
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
-		<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
+		<pdf:catalog>
 				<pdf:dictionary type="normal" key="ViewerPreferences">
 					<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
 				</pdf:dictionary>
@@ -9095,6 +9374,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="','"/>