metanorma-iso 1.9.2 → 1.9.3

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -529,7 +529,7 @@
 										
 										<fo:block-container border-top="1mm double black" line-height="1.1" margin-top="3mm">
 											<fo:block margin-right="5mm">
-												<fo:block font-size="18pt" font-weight="bold" margin-top="6pt">
+												<fo:block font-size="18pt" font-weight="bold" margin-top="6pt" role="H1">
 													<xsl:if test="normalize-space($title-intro) != ''">
 														<xsl:value-of select="$title-intro"/>
 														<xsl:text> — </xsl:text>
@@ -541,7 +541,7 @@
 													
 													<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-amd']"/>
 													<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-														<fo:block margin-top="12pt">
+														<fo:block margin-top="12pt" role="H1">
 															<xsl:call-template name="printAmendmentTitle"/>
 														</fo:block>
 													</xsl:if>
@@ -549,7 +549,7 @@
 												</fo:block>
 															
 												<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
-												<fo:block font-size="11pt" font-style="italic" line-height="1.5">
+												<fo:block font-size="11pt" font-style="italic" line-height="1.5" role="H1">
 													
 													<xsl:if test="normalize-space($title-intro-fr) != ''">
 														<xsl:value-of select="$title-intro-fr"/>
@@ -562,7 +562,7 @@
 													
 													<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-amd']"/>
 														<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-															<fo:block margin-top="6pt">
+															<fo:block margin-top="6pt" role="H1">
 																<xsl:call-template name="printAmendmentTitle">
 																	<xsl:with-param name="lang" select="'fr'"/>
 																</xsl:call-template>
@@ -654,7 +654,7 @@
 														<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
 														<xsl:if test="$doctype = 'amendment'">
 															<fo:block text-align="right" margin-right="0.5mm">
-																<fo:block font-weight="bold" margin-top="4pt">
+																<fo:block font-weight="bold" margin-top="4pt" role="H1">
 																	<xsl:variable name="title-amendment">
 																		<xsl:call-template name="getTitle">
 																			<xsl:with-param name="name" select="'title-amendment'"/>
@@ -724,7 +724,7 @@
 													<fo:table-cell>
 														<fo:block-container border-top="1mm double black" line-height="1.1">
 															<fo:block margin-right="5mm">
-																<fo:block font-size="18pt" font-weight="bold" margin-top="12pt">
+																<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
 																	
 																	<xsl:if test="normalize-space($title-intro) != ''">
 																		<xsl:value-of select="$title-intro"/>
@@ -746,14 +746,14 @@
 																	</xsl:if> -->
 																	<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-amd']"/>
 																	<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-																		<fo:block margin-right="-5mm" margin-top="12pt">
+																		<fo:block margin-right="-5mm" margin-top="12pt" role="H1">
 																			<xsl:call-template name="printAmendmentTitle"/>
 																		</fo:block>
 																	</xsl:if>
 																</fo:block>
 																			
 																<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
-																<fo:block font-size="11pt" font-style="italic" line-height="1.5">
+																<fo:block font-size="11pt" font-style="italic" line-height="1.5" role="H1">
 																	
 																	<xsl:if test="normalize-space($title-intro-fr) != ''">
 																		<xsl:value-of select="$title-intro-fr"/>
@@ -766,7 +766,7 @@
 																	
 																	<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-amd']"/>
 																	<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-																		<fo:block margin-right="-5mm" margin-top="6pt">
+																		<fo:block margin-right="-5mm" margin-top="6pt" role="H1">
 																			<xsl:call-template name="printAmendmentTitle">
 																				<xsl:with-param name="lang" select="'fr'"/>
 																			</xsl:call-template>
@@ -857,7 +857,7 @@
 								
 								<fo:block-container border-top="1mm double black" line-height="1.1">
 									<fo:block margin-right="40mm">
-									<fo:block font-size="18pt" font-weight="bold" margin-top="12pt">
+									<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
 									
 										<xsl:if test="normalize-space($title-intro) != ''">
 											<xsl:value-of select="$title-intro"/>
@@ -880,7 +880,7 @@
 									</fo:block>
 												
 									<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
-									<fo:block font-size="11pt" font-style="italic" line-height="1.5">
+									<fo:block font-size="11pt" font-style="italic" line-height="1.5" role="H1">
 										
 										<xsl:if test="normalize-space($title-intro-fr) != ''">
 											<xsl:value-of select="$title-intro-fr"/>
@@ -972,7 +972,7 @@
 								</fo:block-container>
 							<fo:block-container font-size="16pt">
 								<!-- Information and documentation — Codes for transcription systems  -->
-									<fo:block font-weight="bold">
+									<fo:block font-weight="bold" role="H1">
 									
 										<xsl:if test="normalize-space($title-intro) != ''">
 											<xsl:value-of select="$title-intro"/>
@@ -995,7 +995,7 @@
 									</fo:block>
 									
 									<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
-									<fo:block>
+									<fo:block role="H1">
 										<xsl:if test="normalize-space($title-intro-fr) != ''">
 											<xsl:value-of select="$title-intro-fr"/>
 											<xsl:text> — </xsl:text>
@@ -1073,79 +1073,80 @@
 								<fo:block break-after="page"/>
 							</xsl:if>
 							<fo:block-container font-weight="bold">
-								
-								<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
-									<fo:inline font-size="16pt" font-weight="bold">
-										<!-- Contents -->
-										<xsl:call-template name="getLocalizedString">
-											<xsl:with-param name="key">table_of_contents</xsl:with-param>
-										</xsl:call-template>
-									</fo:inline>
-									<fo:inline keep-together.within-line="always">
-										<fo:leader leader-pattern="space"/>
-										<fo:inline font-weight="normal" font-size="10pt">
-											<!-- Page -->
+								<fo:block role="TOC">
+									<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
+										<fo:inline font-size="16pt" font-weight="bold" role="H1">
+											<!-- Contents -->
 											<xsl:call-template name="getLocalizedString">
-											<xsl:with-param name="key">locality.page</xsl:with-param>
-										</xsl:call-template>
+												<xsl:with-param name="key">table_of_contents</xsl:with-param>
+											</xsl:call-template>
 										</fo:inline>
-									</fo:inline>
-								</fo:block>
-								
-								<xsl:if test="$debug = 'true'">
-									<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
-										DEBUG
-										contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
-									<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
-								</xsl:if>
-								
-								<xsl:variable name="margin-left">12</xsl:variable>
-								<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
+										<fo:inline keep-together.within-line="always">
+											<fo:leader leader-pattern="space"/>
+											<fo:inline font-weight="normal" font-size="10pt">
+												<!-- Page -->
+												<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">locality.page</xsl:with-param>
+											</xsl:call-template>
+											</fo:inline>
+										</fo:inline>
+									</fo:block>
 									
-									<fo:block>
-										<xsl:if test="@level = 1">
-											<xsl:attribute name="margin-top">5pt</xsl:attribute>
-										</xsl:if>
-										<xsl:if test="@level = 3">
-											<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
-										</xsl:if>
-										<fo:list-block>
-											<xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
-											<xsl:if test="@level &gt;= 2 or @type = 'annex'">
-												<xsl:attribute name="font-weight">normal</xsl:attribute>
+									<xsl:if test="$debug = 'true'">
+										<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
+											DEBUG
+											contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
+										<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
+									</xsl:if>
+									
+									<xsl:variable name="margin-left">12</xsl:variable>
+									<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
+										
+										<fo:block role="TOCI">
+											<xsl:if test="@level = 1">
+												<xsl:attribute name="margin-top">5pt</xsl:attribute>
 											</xsl:if>
-											<xsl:attribute name="provisional-distance-between-starts">
-												<xsl:choose>
-													<!-- skip 0 section without subsections -->
-													<xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.2"/>mm</xsl:when>
-													<xsl:when test="@section != ''"><xsl:value-of select="$margin-left"/>mm</xsl:when>
-													<xsl:otherwise>0mm</xsl:otherwise>
-												</xsl:choose>
-											</xsl:attribute>
-											<fo:list-item>
-												<fo:list-item-label end-indent="label-end()">
-													<fo:block>														
-															<xsl:value-of select="@section"/>														
-													</fo:block>
-												</fo:list-item-label>
-												<fo:list-item-body start-indent="body-start()">
-													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
-														<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
-														
-															<xsl:apply-templates select="title"/>
+											<xsl:if test="@level = 3">
+												<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
+											</xsl:if>
+											<fo:list-block>
+												<xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
+												<xsl:if test="@level &gt;= 2 or @type = 'annex'">
+													<xsl:attribute name="font-weight">normal</xsl:attribute>
+												</xsl:if>
+												<xsl:attribute name="provisional-distance-between-starts">
+													<xsl:choose>
+														<!-- skip 0 section without subsections -->
+														<xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.2"/>mm</xsl:when>
+														<xsl:when test="@section != ''"><xsl:value-of select="$margin-left"/>mm</xsl:when>
+														<xsl:otherwise>0mm</xsl:otherwise>
+													</xsl:choose>
+												</xsl:attribute>
+												<fo:list-item>
+													<fo:list-item-label end-indent="label-end()">
+														<fo:block>														
+																<xsl:value-of select="@section"/>														
+														</fo:block>
+													</fo:list-item-label>
+													<fo:list-item-body start-indent="body-start()">
+														<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+															<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
 															
-															<fo:inline keep-together.within-line="always">
-																<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
-																<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-															</fo:inline>
-														</fo:basic-link>
-													</fo:block>
-												</fo:list-item-body>
-											</fo:list-item>
-										</fo:list-block>
-									</fo:block>
-									
-								</xsl:for-each>
+																<xsl:apply-templates select="title"/>
+																
+																<fo:inline keep-together.within-line="always">
+																	<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
+																	<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+																</fo:inline>
+															</fo:basic-link>
+														</fo:block>
+													</fo:list-item-body>
+												</fo:list-item>
+											</fo:list-block>
+										</fo:block>
+										
+									</xsl:for-each>
+								</fo:block>
 							</fo:block-container>
 						</xsl:otherwise>
 					</xsl:choose>
@@ -1179,7 +1180,7 @@
 							
 							<xsl:variable name="title-intro-doc-lang" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
 							
-							<fo:block>
+							<fo:block role="H1">
 								<xsl:if test="normalize-space($title-intro-doc-lang) != ''">
 									<xsl:value-of select="$title-intro-doc-lang"/>
 									<xsl:text> — </xsl:text>
@@ -1201,13 +1202,13 @@
 									</xsl:if>
 								</xsl:if>
 							</fo:block>
-							<fo:block>
+							<fo:block role="H1">
 								<xsl:value-of select="$title-part-doc-lang"/>
 							</fo:block>
 							
 							<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-amd']"/>
 							<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-								<fo:block margin-top="12pt">
+								<fo:block margin-top="12pt" role="H1">
 									<xsl:call-template name="printAmendmentTitle"/>
 								</fo:block>
 							</xsl:if>
@@ -1454,7 +1455,10 @@
 	
 	
 	<xsl:template match="iso:license-statement//iso:title">
-		<fo:block text-align="center" font-weight="bold">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:block text-align="center" font-weight="bold" role="H{$level}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -1482,7 +1486,7 @@
 			</fo:block> -->
 	
 	<xsl:template match="iso:copyright-statement/iso:clause[1]/iso:title">
-		<fo:block margin-bottom="3mm">
+		<fo:block margin-bottom="3mm" role="H1">
 				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
 				<!-- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline> -->
 				<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"><xsl:apply-templates/></fo:inline>
@@ -1519,8 +1523,9 @@
 				<xsl:call-template name="titleAmendment"/>				
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always">
+				<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always" role="H1">
 					<xsl:apply-templates/>
+					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1533,7 +1538,7 @@
 				<xsl:call-template name="titleAmendment"/>				
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block font-size="16pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="36pt" keep-with-next="always">
+				<fo:block font-size="16pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="36pt" keep-with-next="always" role="H1">
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -1566,8 +1571,9 @@
 		
 		<xsl:choose>
 			<xsl:when test="$doctype = 'amendment' and not(ancestor::iso:preface)">
-				<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
+				<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" 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:when>
 			
@@ -1593,6 +1599,7 @@
 						</xsl:choose>
 					</xsl:attribute>
 					<xsl:attribute name="keep-with-next">always</xsl:attribute>		
+					<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 					<xsl:if test="$element-name = 'fo:inline'">
 						<xsl:choose>
 							<xsl:when test="$lang = 'zh'">
@@ -1604,6 +1611,7 @@
 						</xsl:choose>						
 					</xsl:if>
 					<xsl:apply-templates/>
+					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</xsl:element>
 				
 				<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iso:p)">
@@ -1784,8 +1792,11 @@
 		<xsl:apply-templates select="."/>
 	</xsl:template>
 	
-	<xsl:template match="iso:preferred">		
-		<fo:block line-height="1.1">
+	<xsl:template match="iso:preferred">	
+		<xsl:variable name="levelTerm">
+			<xsl:call-template name="getLevelTermName"/>
+		</xsl:variable>
+		<fo:block line-height="1.1" role="H{$levelTerm}">
 			<fo:block font-weight="bold" keep-with-next="always">
 				<xsl:apply-templates select="ancestor::iso:term/iso:name" mode="presentation"/>				
 			</fo:block>
@@ -1949,7 +1960,7 @@
 				<fo:block id="{@id}" span="all">
 					<xsl:apply-templates select="iso:title"/>
 				</fo:block>
-				<fo:block>
+				<fo:block role="Index">
 					<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
 				</fo:block>
 			</fo:flow>
@@ -1958,7 +1969,7 @@
 	
 	<!-- <xsl:template match="iso:clause[@type = 'index']/iso:title" priority="4"> -->
 	<xsl:template match="iso:indexsect/iso:title" priority="4">
-		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt">
+		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" role="H1">
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
@@ -2003,7 +2014,7 @@
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="font-weight" select="'bold'"/>
 		<xsl:call-template name="insertHeaderEven"/>
-		<fo:static-content flow-name="footer-even">
+		<fo:static-content flow-name="footer-even" role="artifact">
 			<fo:block-container> <!--  display-align="after" -->
 				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column column-width="33%"/>
@@ -2042,12 +2053,12 @@
 				</fo:block>
 			</fo:block-container>
 		</fo:static-content>
-		<fo:static-content flow-name="header-odd">
+		<fo:static-content flow-name="header-odd" role="artifact">
 			<fo:block-container height="24mm" display-align="before">
 				<fo:block font-size="12pt" font-weight="bold" text-align="right" padding-top="12.5mm"><xsl:value-of select="$ISOname"/></fo:block>
 			</fo:block-container>
 		</fo:static-content>
-		<fo:static-content flow-name="footer-odd">
+		<fo:static-content flow-name="footer-odd" role="artifact">
 			<fo:block-container> <!--  display-align="after" -->
 				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column column-width="33%"/>
@@ -2075,7 +2086,7 @@
 		</fo:static-content>
 	</xsl:template>
 	<xsl:template name="insertHeaderEven">
-		<fo:static-content flow-name="header-even">
+		<fo:static-content flow-name="header-even" role="artifact">
 			<fo:block-container height="24mm" display-align="before">
 				<fo:block font-size="12pt" font-weight="bold" padding-top="12.5mm"><xsl:value-of select="$ISOname"/></fo:block>
 			</fo:block-container>
@@ -2326,6 +2337,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>
 		
 			<xsl:attribute name="font-family">Courier New</xsl:attribute>			
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -2350,8 +2362,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">
 		
 		
@@ -2576,7 +2593,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>
 		
 		
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -2778,7 +2796,9 @@
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			
-					
+			
+			
+			
 			
 				
 			
@@ -4765,12 +4785,43 @@
 				<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:if test="count(ancestor::*[local-name() = 'table']) &gt; 1">
 						<xsl:attribute name="width">95%</xsl:attribute>
 						<xsl:attribute name="content-height">100%</xsl:attribute>
@@ -4782,6 +4833,27 @@
 				<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"/>
@@ -4843,7 +4915,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"/>
@@ -4878,9 +4953,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']">
@@ -5026,7 +5102,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>
@@ -5657,6 +5736,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>
@@ -5797,14 +5877,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"/>
@@ -5821,6 +5893,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']">
@@ -6725,6 +6829,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'"/>
@@ -6963,6 +7070,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="','"/>