metanorma-iso 1.8.0 → 1.8.5

data/lib/isodoc/iso/iso.amendment.xsl

@@ -948,22 +948,24 @@
 																																				/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:workgroup/@type, ' ',
 																																				/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:workgroup/@number)"/>
 								 -->
-								<!-- ISO/TC 34/SC 4/WG 3 -->
-								<fo:block margin-bottom="12pt">
-									<xsl:text>ISO</xsl:text>
-									<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:technical-committee[@number]">
-										<xsl:text>/TC </xsl:text><xsl:value-of select="@number"/>
-									</xsl:for-each>
-									<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:subcommittee[@number]">
-										<xsl:text>/SC </xsl:text>
-										<xsl:value-of select="@number"/>
-									</xsl:for-each>
-									<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:workgroup[@number]">
-										<xsl:text>/WG </xsl:text>
-										<xsl:value-of select="@number"/>
-									</xsl:for-each>
-								</fo:block>
-								
+								 
+								 <xsl:if test="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:technical-committee[normalize-space(@number) != ''] or                   /iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:subcommittee[normalize-space(@number) != ''] or                  /iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:workgroup[normalize-space(@number) != '']">
+									<!-- ISO/TC 34/SC 4/WG 3 -->
+									<fo:block margin-bottom="12pt">
+										<xsl:text>ISO</xsl:text>
+										<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:technical-committee[normalize-space(@number) != '']">
+											<xsl:text>/TC </xsl:text><xsl:value-of select="@number"/>
+										</xsl:for-each>
+										<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:subcommittee[normalize-space(@number) != '']">
+											<xsl:text>/SC </xsl:text>
+											<xsl:value-of select="@number"/>
+										</xsl:for-each>
+										<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:workgroup[normalize-space(@number) != '']">
+											<xsl:text>/WG </xsl:text>
+											<xsl:value-of select="@number"/>
+										</xsl:for-each>
+									</fo:block>
+								</xsl:if>
 								<!-- Secretariat: AFNOR  -->
 								
 								<fo:block margin-bottom="100pt">
@@ -1025,7 +1027,15 @@
 							<fo:block font-size="11pt" margin-bottom="8pt"><xsl:value-of select="$linebreak"/></fo:block>
 							<fo:block-container font-size="40pt" text-align="center" margin-bottom="12pt" border="0.5pt solid black">
 								<xsl:variable name="stage-title" select="substring-after(substring-before($docidentifierISO, ' '), '/')"/>
-								<fo:block padding-top="2mm"><xsl:value-of select="$stage-title"/><xsl:text> stage</xsl:text></fo:block>
+								<xsl:choose>
+									<xsl:when test="normalize-space($stage-title) != ''">
+										<fo:block padding-top="2mm"><xsl:value-of select="$stage-title"/><xsl:text> stage</xsl:text></fo:block>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:attribute name="border">0pt solid white</xsl:attribute>
+										<fo:block> </fo:block>
+									</xsl:otherwise>
+								</xsl:choose>
 							</fo:block-container>
 							<fo:block><xsl:value-of select="$linebreak"/></fo:block>
 							
@@ -1415,7 +1425,7 @@
 		</xsl:if>
 	</xsl:template>
 	
-
+	<xsl:template match="iso:p | iso:termsource | iso:termnote" mode="contents"/>
 
 	<xsl:template name="getListItemFormat">
 		<xsl:choose>
@@ -1742,61 +1752,7 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 	
-	
-	
-	<xsl:template match="iso:bibitem">
-		<fo:block id="{@id}" margin-bottom="6pt"> <!-- 12 pt -->
-			<xsl:variable name="docidentifier">
-				<xsl:if test="iso:docidentifier">
-					<xsl:choose>
-						<xsl:when test="iso:docidentifier/@type = 'metanorma'"/>
-						<xsl:otherwise><xsl:value-of select="iso:docidentifier"/></xsl:otherwise>
-					</xsl:choose>
-				</xsl:if>
-			</xsl:variable>
-			<xsl:value-of select="$docidentifier"/>
-			<xsl:apply-templates select="iso:note"/>			
-			<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
-			<fo:inline font-style="italic">
-				<xsl:choose>
-					<xsl:when test="iso:title[@type = 'main' and @language = $lang]">
-						<xsl:value-of select="iso:title[@type = 'main' and @language = $lang]"/>
-					</xsl:when>
-					<xsl:when test="iso:title[@type = 'main' and @language = 'en']">
-						<xsl:value-of select="iso:title[@type = 'main' and @language = 'en']"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="iso:title"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</fo:inline>
-		</fo:block>
-	</xsl:template>
-	
-	
-	<xsl:template match="iso:bibitem/iso:note" priority="2">
-		<fo:footnote>
-			<xsl:variable name="number">
-				<xsl:number level="any" count="iso:bibitem/iso:note"/>
-			</xsl:variable>
-			<fo:inline font-size="8pt" keep-with-previous.within-line="always" baseline-shift="30%"> <!--85% vertical-align="super"-->
-				<fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
-					<xsl:value-of select="$number"/><xsl:text>)</xsl:text>
-				</fo:basic-link>
-			</fo:inline>
-			<fo:footnote-body>
-				<fo:block font-size="10pt" margin-bottom="4pt" start-indent="0pt">
-					<fo:inline id="{generate-id()}" keep-with-next.within-line="always" alignment-baseline="hanging" padding-right="3mm"><!-- font-size="60%"  -->
-						<xsl:value-of select="$number"/><xsl:text>)</xsl:text>
-					</fo:inline>
-					<xsl:apply-templates/>
-				</fo:block>
-			</fo:footnote-body>
-		</fo:footnote>
-	</xsl:template>
-	
-	
-	
+		
 	<xsl:template match="iso:ul | iso:ol" mode="ul_ol">
 		<fo:list-block provisional-distance-between-starts="7mm" margin-top="8pt"> <!-- margin-bottom="8pt" -->
 			<xsl:apply-templates/>
@@ -1806,7 +1762,7 @@
 		</xsl:for-each>
 	</xsl:template>
 	
-	<xsl:template match="iso:ul//iso:note |  iso:ol//iso:note" priority="2"/>
+	<xsl:template match="iso:ul/iso:note |  iso:ol/iso:note | iso:ul/iso:li/iso:note |  iso:ol/iso:li/iso:note" priority="2"/>
 	
 	<xsl:template match="iso:li">
 		<fo:list-item id="{@id}">
@@ -1818,7 +1774,10 @@
 			<fo:list-item-body start-indent="body-start()">
 				<fo:block>
 					<xsl:apply-templates/>
-					<xsl:apply-templates select=".//iso:note" mode="process"/>
+					<!-- <xsl:apply-templates select=".//iso:note" mode="process"/> -->
+					<xsl:for-each select="./iso:note">
+						<xsl:call-template name="note"/>
+					</xsl:for-each>
 				</fo:block>
 			</fo:list-item-body>
 		</fo:list-item>
@@ -1828,6 +1787,10 @@
 		<xsl:call-template name="note"/>
 	</xsl:template>
 	
+	<xsl:template match="*" mode="process">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
+	
 	<xsl:template match="iso:preferred">		
 		<fo:block line-height="1.1">
 			<fo:block font-weight="bold" keep-with-next="always">
@@ -1855,6 +1818,34 @@
 	</xsl:template>
 
 
+	<xsl:template match="iso:bibitem">
+		<fo:block id="{@id}" margin-bottom="6pt">
+			<xsl:call-template name="processBibitem"/>
+		</fo:block>
+	</xsl:template>
+	
+	
+	<xsl:template match="iso:bibitem/iso:note" priority="2">
+		<fo:footnote>
+			<xsl:variable name="number">
+				<xsl:number level="any" count="iso:bibitem/iso:note"/>
+			</xsl:variable>
+			<fo:inline font-size="8pt" keep-with-previous.within-line="always" baseline-shift="30%"> <!--85% vertical-align="super"-->
+				<fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
+					<xsl:value-of select="$number"/><xsl:text>)</xsl:text>
+				</fo:basic-link>
+			</fo:inline>
+			<fo:footnote-body>
+				<fo:block font-size="10pt" margin-bottom="4pt" start-indent="0pt">
+					<fo:inline id="{generate-id()}" keep-with-next.within-line="always" alignment-baseline="hanging" padding-right="3mm"><!-- font-size="60%"  -->
+						<xsl:value-of select="$number"/><xsl:text>)</xsl:text>
+					</fo:inline>
+					<xsl:apply-templates/>
+				</fo:block>
+			</fo:footnote-body>
+		</fo:footnote>
+	</xsl:template>
+
 	<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 	<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem"> -->
 	<xsl:template match="iso:references[not(@normative='true')]/iso:bibitem">
@@ -1869,60 +1860,24 @@
 				</fo:list-item-label>
 				<fo:list-item-body start-indent="body-start()">
 					<fo:block>
-						<xsl:variable name="docidentifier">
-							<xsl:if test="iso:docidentifier">
-								<xsl:choose>
-									<xsl:when test="iso:docidentifier/@type = 'metanorma'"/>
-									<xsl:otherwise><xsl:value-of select="iso:docidentifier"/></xsl:otherwise>
-								</xsl:choose>
-							</xsl:if>
-						</xsl:variable>
-						<xsl:value-of select="$docidentifier"/>
-						<xsl:apply-templates select="iso:note"/>
-						<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
-						<xsl:choose>
-							<xsl:when test="iso:title[@type = 'main' and @language = $lang]">
-								<xsl:apply-templates select="iso:title[@type = 'main' and @language = $lang]"/>
-							</xsl:when>
-							<xsl:when test="iso:title[@type = 'main' and @language = 'en']">
-								<xsl:apply-templates select="iso:title[@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="iso:title"/>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:apply-templates select="iso:formattedref"/>
+						<xsl:call-template name="processBibitem"/>
 					</fo:block>
 				</fo:list-item-body>
 			</fo:list-item>
 		</fo:list-block>
 	</xsl:template>
 	
-	<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem" mode="contents"/> -->
-	<xsl:template match="iso:references[not(@normative='true')]/iso:bibitem" mode="contents"/>
+	<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem" mode="contents"/> [not(@normative='true')] -->
+	<xsl:template match="iso:references/iso:bibitem" mode="contents"/>
 	
-	<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem/iso:title"> -->
-	<xsl:template match="iso:references[not(@normative='true')]/iso:bibitem/iso:title">
+	<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem/iso:title"> iso:references[not(@normative='true')]/ -->
+	<xsl:template match="iso:bibitem/iso:title">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
 	
-	<xsl:template match="mathml:math" priority="2">
-		<fo:inline font-family="Cambria Math">
-			<xsl:variable name="mathml">
-				<xsl:apply-templates select="." mode="mathml"/>
-			</xsl:variable>
-			<fo:instream-foreign-object fox:alt-text="Math">
-				<!-- <xsl:copy-of select="."/> -->
-				<xsl:copy-of select="xalan:nodeset($mathml)"/>
-			</fo:instream-foreign-object>
-		</fo:inline>
-	</xsl:template>
-	
-
-	
 	<xsl:template match="iso:admonition">
 		<fo:block margin-bottom="12pt" font-weight="bold"> <!-- text-align="center"  -->			
 			<xsl:variable name="type">
@@ -2670,6 +2625,9 @@
 		<title-continued lang="en">(continued)</title-continued>
 		<title-continued lang="fr">(continué)</title-continued>
 		
+	</xsl:variable><xsl:variable name="bibdata">
+		<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
+		<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
 	</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
 		<xsl:param name="name"/>
 		<xsl:param name="lang"/>
@@ -2695,13 +2653,16 @@
 		</xsl:choose>
 	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="link-style">
 		
+		
 			<xsl:attribute name="color">blue</xsl:attribute>
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
 		
 		
 		
+		
 	</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>
@@ -2751,7 +2712,7 @@
 		
 		
 		
-		
+
 	</xsl:attribute-set><xsl:attribute-set name="example-style">
 		
 		
@@ -2768,6 +2729,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
 		
 		
@@ -2777,6 +2739,7 @@
 		
 		
 			 <xsl:attribute name="padding-right">5mm</xsl:attribute>
+			 <xsl:attribute name="keep-with-next">always</xsl:attribute>
 		
 		
 		
@@ -2786,9 +2749,7 @@
 		
 		
 		
-		
-		
-		
+				
 				
 		
 		
@@ -2821,8 +2782,10 @@
 			<xsl:attribute name="padding-right">5mm</xsl:attribute>
 		
 				
+				
 	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			
 		
 		
 		
@@ -2841,6 +2804,9 @@
 		
 		
 		
+		
+	</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 				
 			<xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -2861,19 +2827,23 @@
 	</xsl:attribute-set><xsl:attribute-set name="xref-style">
 		
 		
+		
 			<xsl:attribute name="color">blue</xsl:attribute>
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="eref-style">
 		
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-style">
 		
 		
 		
+		
 				
 		
 		
@@ -2890,6 +2860,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
 		
 		
@@ -2897,6 +2868,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="padding-right">6mm</xsl:attribute>
 		
 		
@@ -2926,6 +2898,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 			<xsl:attribute name="margin-top">8pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
@@ -2933,9 +2906,12 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
+		
 				
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -2960,18 +2936,22 @@
 		
 		
 		
+		
 			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="origin-style">
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
 		
+		
 				
 		
 		
@@ -2991,6 +2971,7 @@
 		
 		
 		
+
 		
 		
 		
@@ -3004,10 +2985,12 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
 		
+		
 			<xsl:attribute name="width">100%</xsl:attribute>
 			<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
 			<xsl:attribute name="scaling">uniform</xsl:attribute>
@@ -3034,20 +3017,39 @@
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="definition-style">
 		
 		
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
-	</xsl:attribute-set><xsl:attribute-set name="add-style">
+		
+	</xsl:attribute-set><xsl:variable name="color-added-text">
+		<xsl:text>rgb(0, 255, 0)</xsl:text>
+	</xsl:variable><xsl:attribute-set name="add-style">
 		<xsl:attribute name="color">red</xsl:attribute>
 		<xsl:attribute name="text-decoration">underline</xsl:attribute>
-	</xsl:attribute-set><xsl:attribute-set name="del-style">
-		<xsl:attribute name="color">red</xsl:attribute>
+		<!-- <xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
+		<xsl:attribute name="padding-top">1mm</xsl:attribute>
+		<xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
+	</xsl:attribute-set><xsl:variable name="color-deleted-text">
+		<xsl:text>red</xsl:text>
+	</xsl:variable><xsl:attribute-set name="del-style">
+		<xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
 		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
-	</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
+	</xsl:attribute-set><xsl:attribute-set name="mathml-style">
+		<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
+		
+			<xsl:attribute name="font-family">Cambria Math</xsl:attribute>
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="list-style">
+		
+	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
@@ -3092,18 +3094,19 @@
 		<xsl:call-template name="add-zero-spaces-java"/>
 	</xsl:template><xsl:template match="*[local-name()='table']" name="table">
 	
+		<xsl:variable name="table-preamble">
+			
+			
+		</xsl:variable>
+		
 		<xsl:variable name="table">
 	
 			<xsl:variable name="simple-table">	
-				<xsl:call-template name="getSimpleTable"/>			
+				<xsl:call-template name="getSimpleTable"/>
 			</xsl:variable>
 		
-			
-			
-			
-			
 			<!-- <xsl:if test="$namespace = 'bipm'">
-				<fo:block>&#xA0;</fo:block>				
+				<fo:block>&#xA0;</fo:block>
 			</xsl:if> -->
 			
 			<!-- $namespace = 'iso' or  -->
@@ -3112,7 +3115,7 @@
 			
 				
 			
-			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
+			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
 			
 			<!-- <xsl:variable name="cols-count">
 				<xsl:choose>
@@ -3131,8 +3134,6 @@
 			<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
 			<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
 			
-			
-			
 			<xsl:variable name="colwidths">
 				<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
 					<xsl:call-template name="calculate-column-widths">
@@ -3160,8 +3161,10 @@
 				</xsl:choose>
 			</xsl:variable>
 			
+			
 			<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
 				
+				
 					<xsl:attribute name="font-size">10pt</xsl:attribute>
 				
 				
@@ -3173,6 +3176,7 @@
 										
 				
 				
+				
 					<xsl:attribute name="margin-top">12pt</xsl:attribute>
 					<xsl:attribute name="margin-left">0mm</xsl:attribute>
 					<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -3182,6 +3186,7 @@
 				
 				
 				
+				
 				<xsl:variable name="table_width">
 					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
 					100%
@@ -3195,12 +3200,19 @@
 					<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
 					<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
 					
+					
 						<attribute name="border">1.5pt solid black</attribute>
 						<xsl:if test="*[local-name()='thead']">
 							<attribute name="border-top">1pt solid black</attribute>
 						</xsl:if>
 					
 					
+						<xsl:if test="ancestor::*[local-name() = 'table']">
+							<!-- for internal table in table cell -->
+							<attribute name="border">0.5pt solid black</attribute>
+						</xsl:if>
+					
+					
 					
 					
 						<attribute name="margin-left">0mm</attribute>
@@ -3212,6 +3224,7 @@
 					
 									
 					
+					
 				</xsl:variable>
 				
 				
@@ -3295,7 +3308,8 @@
 			</fo:block-container>
 		</xsl:variable>
 		
-		
+		<xsl:variable name="isAdded" select="@added"/>
+		<xsl:variable name="isDeleted" select="@deleted"/>
 		
 		<xsl:choose>
 			<xsl:when test="@width">
@@ -3309,7 +3323,14 @@
 						<fo:table-body>
 							<fo:table-row>
 								<fo:table-cell column-number="2">
-									<fo:block><xsl:copy-of select="$table"/></fo:block>
+									<xsl:copy-of select="$table-preamble"/>
+									<fo:block>
+										<xsl:call-template name="setTrackChangesStyles">
+											<xsl:with-param name="isAdded" select="$isAdded"/>
+											<xsl:with-param name="isDeleted" select="$isDeleted"/>
+										</xsl:call-template>
+										<xsl:copy-of select="$table"/>
+									</fo:block>
 								</fo:table-cell>
 							</fo:table-row>
 						</fo:table-body>
@@ -3320,18 +3341,49 @@
 				
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:copy-of select="$table"/>
+				<xsl:choose>
+					<xsl:when test="$isAdded = 'true' or $isDeleted = 'true'">
+						<xsl:copy-of select="$table-preamble"/>
+						<fo:block>
+							<xsl:call-template name="setTrackChangesStyles">
+								<xsl:with-param name="isAdded" select="$isAdded"/>
+								<xsl:with-param name="isDeleted" select="$isDeleted"/>
+							</xsl:call-template>
+							<xsl:copy-of select="$table"/>
+						</fo:block>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:copy-of select="$table-preamble"/>
+						<xsl:copy-of select="$table"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
 		
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
+		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
 					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 				
 				
-				<xsl:apply-templates/>				
+				
+				
+				
+				<xsl:choose>
+					<xsl:when test="$continued = 'true'"> 
+						<!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
+						
+							<xsl:apply-templates/>
+						
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates/>
+					</xsl:otherwise>
+				</xsl:choose>
+				
+				
 			</fo:block>
 		</xsl:if>
 	</xsl:template><xsl:template name="calculate-columns-numbers">
@@ -3383,7 +3435,7 @@
 						</xsl:for-each>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:for-each select="xalan:nodeset($table)//tr">
+						<xsl:for-each select="xalan:nodeset($table)/*/tr">
 							<xsl:variable name="td_text">
 								<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
 								
@@ -3472,21 +3524,27 @@
 					<xsl:with-param name="cols-count" select="$cols-count"/>
 				</xsl:call-template>				
 			
+			
 			<xsl:apply-templates/>
 		</fo:table-header>
 	</xsl:template><xsl:template name="table-header-title">
-		<xsl:param name="cols-count"/>		
+		<xsl:param name="cols-count"/>
 		<!-- row for title -->
 		<fo:table-row>
 			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
-				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation"/>
+				
+				<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:block text-align="right" font-style="italic">
-					<xsl:text> </xsl:text>
-					<fo:retrieve-table-marker retrieve-class-name="table_continued"/>
-				</fo:block>
+				</xsl:for-each>
+				
+					<fo:block text-align="right" font-style="italic">
+						<xsl:text> </xsl:text>
+						<fo:retrieve-table-marker retrieve-class-name="table_continued"/>
+					</fo:block>
+				
 			</fo:table-cell>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">		
@@ -3707,20 +3765,26 @@
 					<xsl:call-template name="getTitle">
 						<xsl:with-param name="name" select="'title-continued'"/>
 					</xsl:call-template>
-				</xsl:variable>				
+				</xsl:variable>
+				
+				<xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
+				<xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
+				
 				<fo:table-row height="0" keep-with-next.within-page="always">
 					<fo:table-cell>
-						<fo:marker marker-class-name="table_continued"/>							
+						
+						
+							<fo:marker marker-class-name="table_continued"/>
+						
 						<fo:block/>
 					</fo:table-cell>
 				</fo:table-row>
 				<fo:table-row height="0" keep-with-next.within-page="always">
 					<fo:table-cell>
-						 <fo:marker marker-class-name="table_continued">
-								<!-- <fo:inline font-style="italic" font-weight="normal"> -->
-									<xsl:value-of select="$title_continued"/>
-							 <!-- </fo:inline> -->
-						 </fo:marker>
+						
+						<fo:marker marker-class-name="table_continued">
+							<xsl:value-of select="$title_continued"/>
+						</fo:marker>
 						 <fo:block/>
 					</fo:table-cell>
 				</fo:table-row>
@@ -3757,6 +3821,7 @@
 					
 					
 					
+					
 				</xsl:if>
 				<xsl:if test="$parent-name = 'tfoot'">
 					
@@ -3770,6 +3835,10 @@
 				
 				
 				
+				
+				
+				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -3781,12 +3850,14 @@
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<xsl:when test="@align">
-						<xsl:value-of select="@align"/>
+						<xsl:call-template name="setAlignment"/>
+						<!-- <xsl:value-of select="@align"/> -->
 					</xsl:when>
 					<xsl:otherwise>center</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
 			
+			
 				<xsl:attribute name="padding-top">1mm</xsl:attribute>
 			
 			
@@ -3799,6 +3870,10 @@
 			
 			
 			
+			
+			<xsl:if test="$lang = 'ar'">
+				<xsl:attribute name="padding-right">1mm</xsl:attribute>
+			</xsl:if>
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -3830,16 +3905,21 @@
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<xsl:when test="@align">
-						<xsl:value-of select="@align"/>
+						<xsl:call-template name="setAlignment"/>
+						<!-- <xsl:value-of select="@align"/> -->
 					</xsl:when>
 					<xsl:otherwise>left</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
+			<xsl:if test="$lang = 'ar'">
+				<xsl:attribute name="padding-right">1mm</xsl:attribute>
+			</xsl:if>
 			 <!--  and ancestor::*[local-name() = 'thead'] -->
 				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
 			
 			
 			
+			
 				<xsl:if test="ancestor::*[local-name() = 'tfoot']">
 					<xsl:attribute name="border">solid black 0</xsl:attribute>
 				</xsl:if>
@@ -3852,6 +3932,12 @@
 			
 			
 			
+			
+			
+			
+			<xsl:if test=".//*[local-name() = 'table']">
+				<xsl:attribute name="padding-right">1mm</xsl:attribute>
+			</xsl:if>
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -3985,13 +4071,13 @@
 						</xsl:choose>
 					</xsl:variable>
 					<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
-					<xsl:element name="{$ns}:table">
+					<!-- <xsl:element name="{$ns}:table"> -->
 						<xsl:for-each select="*[local-name() = 'dl'][1]">
 							<tbody>
 								<xsl:apply-templates mode="dl"/>
 							</tbody>
 						</xsl:for-each>
-					</xsl:element>
+					<!-- </xsl:element> -->
 				</xsl:variable>
 				
 				<xsl:call-template name="calculate-column-widths">
@@ -4076,6 +4162,7 @@
 			
 			
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 				
@@ -4088,6 +4175,8 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='dl']">
+		<xsl:variable name="isAdded" select="@added"/>
+		<xsl:variable name="isDeleted" select="@deleted"/>
 		<fo:block-container>
 			
 				<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
@@ -4104,6 +4193,12 @@
 				</xsl:attribute>
 				
 			</xsl:if>
+			
+			<xsl:call-template name="setTrackChangesStyles">
+				<xsl:with-param name="isAdded" select="$isAdded"/>
+				<xsl:with-param name="isDeleted" select="$isDeleted"/>
+			</xsl:call-template>
+			
 			<fo:block-container>
 				
 					<xsl:attribute name="margin-left">0mm</xsl:attribute>
@@ -4168,6 +4263,7 @@
 							
 							
 							
+							
 							<xsl:variable name="title-key">
 								
 									<xsl:call-template name="getLocalizedString">
@@ -4225,11 +4321,11 @@
 										</xsl:choose>
 									</xsl:variable>
 									<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
-									<xsl:element name="{$ns}:table">
+									<!-- <xsl:element name="{$ns}:table"> -->
 										<tbody>
 											<xsl:apply-templates mode="dl"/>
 										</tbody>
-									</xsl:element>
+									<!-- </xsl:element> -->
 								</xsl:variable>
 								<!-- html-table<xsl:copy-of select="$html-table"/> -->
 								<xsl:variable name="colwidths">
@@ -4383,6 +4479,7 @@
 		
 		<fo:table-row>
 			
+			
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
@@ -4400,6 +4497,7 @@
 					
 					
 					
+					
 					<xsl:apply-templates/>
 					<!-- <xsl:if test="$namespace = 'gb'">
 						<xsl:if test="ancestor::*[local-name()='formula']">
@@ -4456,6 +4554,8 @@
 			
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='padding']">
+		<fo:inline padding-right="{@value}"> </fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
 		<fo:inline font-size="80%" vertical-align="super">
 			<xsl:apply-templates/>
@@ -4481,6 +4581,7 @@
 				
 				
 				
+				
 						
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>		
@@ -4499,9 +4600,71 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='add']">
-		<fo:inline xsl:use-attribute-sets="add-style">
-			<xsl:apply-templates/>
-		</fo:inline>
+		<xsl:choose>
+			<xsl:when test="@amendment">
+				<fo:inline>
+					<xsl:call-template name="insertTag">
+						<xsl:with-param name="kind">A</xsl:with-param>
+						<xsl:with-param name="value"><xsl:value-of select="@amendment"/></xsl:with-param>
+					</xsl:call-template>
+					<xsl:apply-templates/>
+					<xsl:call-template name="insertTag">
+						<xsl:with-param name="type">closing</xsl:with-param>
+						<xsl:with-param name="kind">A</xsl:with-param>
+						<xsl:with-param name="value"><xsl:value-of select="@amendment"/></xsl:with-param>
+					</xsl:call-template>
+				</fo:inline>
+			</xsl:when>
+			<xsl:when test="@corrigenda">
+				<fo:inline>
+					<xsl:call-template name="insertTag">
+						<xsl:with-param name="kind">C</xsl:with-param>
+						<xsl:with-param name="value"><xsl:value-of select="@corrigenda"/></xsl:with-param>
+					</xsl:call-template>
+					<xsl:apply-templates/>
+					<xsl:call-template name="insertTag">
+						<xsl:with-param name="type">closing</xsl:with-param>
+						<xsl:with-param name="kind">C</xsl:with-param>
+						<xsl:with-param name="value"><xsl:value-of select="@corrigenda"/></xsl:with-param>
+					</xsl:call-template>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline xsl:use-attribute-sets="add-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
+		
+	</xsl:template><xsl:template name="insertTag">
+		<xsl:param name="type"/>
+		<xsl:param name="kind"/>
+		<xsl:param name="value"/>
+		<xsl:variable name="add_width" select="string-length($value) * 20"/>
+		<xsl:variable name="maxwidth" select="60 + $add_width"/>
+			<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" -->
+				<!-- <xsl:attribute name="width">7mm</xsl:attribute>
+				<xsl:attribute name="content-height">100%</xsl:attribute> -->
+				<xsl:attribute name="height">5mm</xsl:attribute>
+				<xsl:attribute name="content-width">100%</xsl:attribute>
+				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+				<xsl:attribute name="scaling">uniform</xsl:attribute>
+				<svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
+					<g>
+						<xsl:if test="$type = 'closing'">
+							<xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
+						</xsl:if>
+						<polyline points="0,0 {$maxwidth},0 {$maxwidth + 30},40 {$maxwidth},80 0,80 " stroke="black" stroke-width="5" fill="white"/>
+						<line x1="0" y1="0" x2="0" y2="80" stroke="black" stroke-width="20"/>
+					</g>
+					<text font-family="Arial" x="15" y="57" font-size="40pt">
+						<xsl:if test="$type = 'closing'">
+							<xsl:attribute name="x">25</xsl:attribute>
+						</xsl:if>
+						<xsl:value-of select="$kind"/><tspan dy="10" font-size="30pt"><xsl:value-of select="$value"/></tspan>
+					</text>
+				</svg>
+			</fo:instream-foreign-object>
 	</xsl:template><xsl:template match="*[local-name()='del']">
 		<fo:inline xsl:use-attribute-sets="del-style">
 			<xsl:apply-templates/>
@@ -4800,11 +4963,15 @@
 		</xsl:apply-templates>
 	</xsl:template><xsl:template name="getLang">
 		<xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
+		<xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
 		<xsl:variable name="language">
 			<xsl:choose>
 				<xsl:when test="$language_current != ''">
 					<xsl:value-of select="$language_current"/>
 				</xsl:when>
+				<xsl:when test="$language_current_2 != ''">
+					<xsl:value-of select="$language_current_2"/>
+				</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
 				</xsl:otherwise>
@@ -4844,13 +5011,30 @@
 		<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
 		<xsl:value-of select="substring($str, 2)"/>		
 	</xsl:template><xsl:template match="mathml:math">
-		<fo:inline font-family="STIX Two Math"> <!--  -->
+		<xsl:variable name="isAdded" select="@added"/>
+		<xsl:variable name="isDeleted" select="@deleted"/>
+		
+		<fo:inline xsl:use-attribute-sets="mathml-style">
+			
+			
+			<xsl:call-template name="setTrackChangesStyles">
+				<xsl:with-param name="isAdded" select="$isAdded"/>
+				<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:if test="count(ancestor::*[local-name() = 'table']) &gt; 1">
+						<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>
+				
 				<!-- <xsl:copy-of select="."/> -->
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
@@ -4868,9 +5052,27 @@
 		<xsl:copy>
 			<xsl:apply-templates select="@*|node()" mode="mathml"/>
 		</xsl:copy>
-		<mathml:mspace width="0.5ex"/>
+		<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>
+				<xsl:when test="@updatetype = 'true'">
+					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(@target)"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="target_text">
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
 					<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
@@ -4882,20 +5084,21 @@
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
 			
+			
 			<xsl:choose>
-				<xsl:when test="$target = ''">
+				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
 				</xsl:when>
 				<xsl:otherwise>
-					<fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
+					<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
 						<xsl:choose>
 							<xsl:when test="normalize-space(.) = ''">
-								<!-- <xsl:value-of select="$target"/> -->
 								<xsl:call-template name="add-zero-spaces-link-java">
-									<xsl:with-param name="text" select="$target"/>
+									<xsl:with-param name="text" select="$target_text"/>
 								</xsl:call-template>
 							</xsl:when>
 							<xsl:otherwise>
+								<!-- output text from <link>text</link> -->
 								<xsl:apply-templates/>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -5007,6 +5210,7 @@
 						
 						
 						<fo:inline xsl:use-attribute-sets="note-name-style">
+							
 							<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						</fo:inline>
 						<xsl:apply-templates/>
@@ -5032,7 +5236,9 @@
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">			
+			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
+				
 				<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 			</fo:inline>
 			<xsl:apply-templates/>
@@ -5096,16 +5302,27 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
+		<xsl:variable name="isAdded" select="@added"/>
+		<xsl:variable name="isDeleted" select="@deleted"/>
 		<fo:block-container id="{@id}">			
 			
+			<xsl:call-template name="setTrackChangesStyles">
+				<xsl:with-param name="isAdded" select="$isAdded"/>
+				<xsl:with-param name="isDeleted" select="$isDeleted"/>
+			</xsl:call-template>
+			
 			<fo:block>
+				
 				<xsl:apply-templates/>
 			</fo:block>
 			<xsl:call-template name="fn_display_figure"/>
 			<xsl:for-each select="*[local-name() = 'note']">
 				<xsl:call-template name="note"/>
 			</xsl:for-each>
-			<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+			
+			
+				<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+			
 		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
 		<fo:block id="{@id}">
@@ -5117,6 +5334,8 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'image']">
+		<xsl:variable name="isAdded" select="../@added"/>
+		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name() = 'title']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
@@ -5132,7 +5351,26 @@
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
-					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+					
+					<xsl:choose>
+						<xsl:when test="$isDeleted = 'true'">
+							<!-- enclose in svg -->
+							<fo:instream-foreign-object fox:alt-text="Image {@alt}">
+								<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:attribute name="scaling">uniform</xsl:attribute>
+								
+								
+									<xsl:apply-templates select="." mode="cross_image"/>
+									
+							</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"/>
+						</xsl:otherwise>
+					</xsl:choose>
+					
 				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -5148,21 +5386,70 @@
 				<xsl:value-of select="@src"/>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name() = 'image']" mode="cross_image">
+		<xsl:choose>
+			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+				<xsl:variable name="src">
+					<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+				</xsl:variable>
+				<xsl:variable name="width" select="document($src)/@width"/>
+				<xsl:variable name="height" select="document($src)/@height"/>
+				<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1">
+					<image xlink:href="{$src}" style="overflow:visible;"/>
+				</svg>
+			</xsl:when>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:variable name="src">
+					<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+				</xsl:variable>
+				<xsl:variable name="file" select="java:java.io.File.new(@src)"/>
+				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
+				<xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
+				<xsl:variable name="height" select="java:getHeight($bufferedImage)"/>
+				<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1">
+					<image xlink:href="{$src}" style="overflow:visible;"/>
+				</svg>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="base64String" select="substring-after(@src, 'base64,')"/>
+				<xsl:variable name="decoder" select="java:java.util.Base64.getDecoder()"/>
+				<xsl:variable name="fileContent" select="java:decode($decoder, $base64String)"/>
+				<xsl:variable name="bis" select="java:java.io.ByteArrayInputStream.new($fileContent)"/>
+				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($bis)"/>
+				<xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
+				<!-- width=<xsl:value-of select="$width"/> -->
+				<xsl:variable name="height" select="java:getHeight($bufferedImage)"/>
+				<!-- height=<xsl:value-of select="$height"/> -->
+				<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1">
+					<image xlink:href="{@src}" height="{$height}" width="{$width}" style="overflow:visible;"/>
+					<xsl:call-template name="svg_cross">
+						<xsl:with-param name="width" select="$width"/>
+						<xsl:with-param name="height" select="$height"/>
+					</xsl:call-template>
+				</svg>
+			</xsl:otherwise>
+		</xsl:choose>
+		
+	</xsl:template><xsl:template name="svg_cross">
+		<xsl:param name="width"/>
+		<xsl:param name="height"/>
+		<line xmlns="http://www.w3.org/2000/svg" x1="0" y1="0" x2="{$width}" y2="{$height}" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/>
+		<line xmlns="http://www.w3.org/2000/svg" x1="0" y1="{$height}" x2="{$width}" y2="0" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">		
 		<xsl:apply-templates mode="bookmarks"/>
 		<xsl:text> </xsl:text>
-	</xsl:template><xsl:template match="*[local-name() = 'name']/text()" mode="contents" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 	</xsl:template><xsl:template match="node()" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
@@ -5310,6 +5597,7 @@
 		<xsl:if test="normalize-space() != ''">			
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -5361,6 +5649,8 @@
 				</fo:list-item-body>
 			</fo:list-item>
 		</fo:list-block>
+	</xsl:template><xsl:template name="extractSection">
+		<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
 	</xsl:template><xsl:template name="extractTitle">
 		<xsl:choose>
 				<xsl:when test="*[local-name() = 'tab']">
@@ -5387,6 +5677,8 @@
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 	
 		<fo:block-container margin-left="0mm">
+			<xsl:copy-of select="@id"/>
+			
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -5397,7 +5689,9 @@
 				
 			</xsl:if>
 			<fo:block-container margin-left="0mm">
-	
+		
+				
+				
 				<fo:block xsl:use-attribute-sets="sourcecode-style">
 					<xsl:variable name="_font-size">
 						
@@ -5408,6 +5702,7 @@
 						9
 						
 						
+						
 								
 						
 						
@@ -5425,10 +5720,14 @@
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
-					<xsl:apply-templates/>			
-				</fo:block>
+				
+				<xsl:apply-templates/>			
+			</fo:block>
+				
+			
 				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 				
+				
 			</fo:block-container>
 		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -5663,6 +5962,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
+			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
 			<xsl:variable name="element">
@@ -5690,6 +5990,7 @@
 		<xsl:variable name="element">
 			
 			inline
+			<xsl:if test="following-sibling::*[1][local-name() = 'table']">block</xsl:if> 
 		</xsl:variable>		
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name() = 'appendix']">
@@ -5697,7 +5998,7 @@
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
-			<xsl:when test="normalize-space($element) = 'block'">
+			<xsl:when test="contains(normalize-space($element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-name-style">
 					<xsl:apply-templates/>
 				</fo:block>
@@ -5734,7 +6035,7 @@
 				</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>	
-	</xsl:template><xsl:template match="*[local-name() = 'termsource']">
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
@@ -5743,13 +6044,15 @@
 			
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space($termsource_text), '[')">
-					<xsl:apply-templates/>
+					<!-- <xsl:apply-templates /> -->
+					<xsl:copy-of select="$termsource_text"/>
 				</xsl:when>
 				<xsl:otherwise>					
 					
 						<xsl:text>[</xsl:text>
 					
-					<xsl:apply-templates/>					
+					<!-- <xsl:apply-templates />					 -->
+					<xsl:copy-of select="$termsource_text"/>
 					
 						<xsl:text>]</xsl:text>
 					
@@ -5760,20 +6063,27 @@
 		<xsl:if test="normalize-space() != ''">
 			<xsl:value-of select="."/>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'origin']">
+	</xsl:template><xsl:variable name="localized.source">
+		<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">source</xsl:with-param>
+			</xsl:call-template>
+	</xsl:variable><xsl:template match="*[local-name() = 'origin']">
 		<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="@bibitemid"/></xsl:attribute>
+			</xsl:if>
 			
 				<fo:inline>
 					
 					
 					
-						<xsl:call-template name="getLocalizedString">
-							<xsl:with-param name="key">source</xsl:with-param>
-						</xsl:call-template>
+					
+						<xsl:value-of select="$localized.source"/>
+						<xsl:text>: </xsl:text>
+					
 					
 					
 					
-					<xsl:text>: </xsl:text>
 				</fo:inline>
 			
 			<fo:inline xsl:use-attribute-sets="origin-style">
@@ -5879,6 +6189,7 @@
 			
 			
 			
+			
 				<xsl:choose>
 					<xsl:when test="$depth = 2">3</xsl:when>
 					<xsl:otherwise>4</xsl:otherwise>
@@ -5921,7 +6232,8 @@
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:inline padding-right="{$padding-right}mm">​</fo:inline>
+				<xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
+				<fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/>​</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
 		
@@ -5980,7 +6292,6 @@
 						
 			
 			
-			
 			<xsl:apply-templates/>
 		</fo:block>
 		
@@ -5997,6 +6308,7 @@
 			<xsl:call-template name="setId"/>
 			
 			
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'definitions']">
@@ -6023,7 +6335,7 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
-			<xsl:when test="parent::*[local-name() = 'note']">
+			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
 				<fo:block-container>
 					<xsl:attribute name="margin-left">
 						<xsl:choose>
@@ -6033,6 +6345,7 @@
 					</xsl:attribute>
 					
 					
+					
 					<fo:block-container margin-left="0mm">
 						<fo:block>
 							<xsl:apply-templates select="." mode="ul_ol"/>
@@ -6234,21 +6547,51 @@
 		
 		
 		 
+		
+		
+			<!-- start ISO bibtem processing -->
+			<xsl:variable name="docidentifier">
+				<xsl:if test="*[local-name() = 'docidentifier']">
+					<xsl:choose>
+						<xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/>
+						<xsl:otherwise><xsl:value-of select="*[local-name() = 'docidentifier']"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:if>
+			</xsl:variable>
+			<xsl:value-of select="$docidentifier"/>
+			<xsl:apply-templates select="*[local-name() = 'note']"/>			
+			<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
+			<xsl:choose>
+				<xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = $lang]">
+					<xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = $lang]"/>
+				</xsl:when>
+				<xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = 'en']">
+					<xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = 'en']"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="*[local-name() = 'title']"/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
+			<!-- end ISO bibitem processing -->
+		
+		
+		
 	</xsl:template><xsl:template name="processBibitemDocId">
 		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
 		<xsl:choose>
 			<xsl:when test="normalize-space($_doc_ident) != ''">
-				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
+				<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
 				<xsl:if test="$type != '' and not(contains($_doc_ident, $type))">
 					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
-				</xsl:if>
+				</xsl:if> -->
 				<xsl:value-of select="$_doc_ident"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
+				<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
 				<xsl:if test="$type != ''">
 					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
-				</xsl:if>
+				</xsl:if> -->
 				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -6290,6 +6633,70 @@
 		<xsl:value-of select="substring(.,1,1)"/>
 	</xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
 		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'form']">
+		<fo:block>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'form']//*[local-name() = 'label']">
+		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'text' or @type = 'date' or @type = 'file' or @type = 'password']">
+		<fo:inline>
+			<xsl:call-template name="text_input"/>
+		</fo:inline>
+	</xsl:template><xsl:template name="text_input">
+		<xsl:variable name="count">
+			<xsl:choose>
+				<xsl:when test="normalize-space(@maxlength) != ''"><xsl:value-of select="@maxlength"/></xsl:when>
+				<xsl:when test="normalize-space(@size) != ''"><xsl:value-of select="@size"/></xsl:when>
+				<xsl:otherwise>10</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:call-template name="repeat">
+			<xsl:with-param name="char" select="'_'"/>
+			<xsl:with-param name="count" select="$count"/>
+		</xsl:call-template>
+		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'button']">
+		<xsl:variable name="caption">
+			<xsl:choose>
+				<xsl:when test="normalize-space(@value) != ''"><xsl:value-of select="@value"/></xsl:when>
+				<xsl:otherwise>BUTTON</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<fo:inline>[<xsl:value-of select="$caption"/>]</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'checkbox']">
+		<fo:inline padding-right="1mm">
+			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
+				<xsl:attribute name="height">3.5mm</xsl:attribute>
+				<xsl:attribute name="content-width">100%</xsl:attribute>
+				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+				<xsl:attribute name="scaling">uniform</xsl:attribute>
+				<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80">
+					<polyline points="0,0 80,0 80,80 0,80 0,0" stroke="black" stroke-width="5" fill="white"/>
+				</svg>
+			</fo:instream-foreign-object>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'radio']">
+		<fo:inline padding-right="1mm">
+			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
+				<xsl:attribute name="height">3.5mm</xsl:attribute>
+				<xsl:attribute name="content-width">100%</xsl:attribute>
+				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+				<xsl:attribute name="scaling">uniform</xsl:attribute>
+				<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80">
+					<circle cx="40" cy="40" r="30" stroke="black" stroke-width="5" fill="white"/>
+					<circle cx="40" cy="40" r="15" stroke="black" stroke-width="5" fill="white"/>
+				</svg>
+			</fo:instream-foreign-object>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'form']//*[local-name() = 'select']">
+		<fo:inline>
+			<xsl:call-template name="text_input"/>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'form']//*[local-name() = 'textarea']">
+		<fo:block-container border="1pt solid black" width="50%">
+			<fo:block> </fo:block>
+		</fo:block-container>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -6497,6 +6904,9 @@
 						<xsl:when test="parent::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 1"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'preface'] and not(ancestor::*[local-name() = 'foreword']) and not(ancestor::*[local-name() = 'introduction'])"> <!-- for preface/clause -->
+							<xsl:value-of select="$level_total - 1"/>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 2"/>
 						</xsl:when>
@@ -6552,6 +6962,7 @@
 		<xsl:variable name="documentNS" select="namespace-uri(/*)"/>
 		<xsl:variable name="XSLNS">			
 			
+			
 				<xsl:value-of select="document('')//*/namespace::iso"/>
 			
 			
@@ -6621,17 +7032,79 @@
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getLocalizedString">
-		<xsl:param name="key"/>		
+		<xsl:param name="key"/>	
 		
 		<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:choose>
+			<xsl:when test="$data_value != ''">
+				<xsl:value-of select="$data_value"/>
+			</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:when>
-			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+			<xsl:otherwise>
+				<xsl:variable name="key_">
+					<xsl:call-template name="capitalize">
+						<xsl:with-param name="str" select="translate($key, '_', ' ')"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$key_"/>
+			</xsl:otherwise>
 		</xsl:choose>
 		
+	</xsl:template><xsl:template name="setTrackChangesStyles">
+		<xsl:param name="isAdded"/>
+		<xsl:param name="isDeleted"/>
+		<xsl:choose>
+			<xsl:when test="local-name() = 'math'">
+				<xsl:if test="$isAdded = 'true'">
+					<xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
+				</xsl:if>
+				<xsl:if test="$isDeleted = 'true'">
+					<xsl:attribute name="background-color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
+				</xsl:if>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:if test="$isAdded = 'true'">
+					<xsl:attribute name="border"><xsl:value-of select="$border-block-added"/></xsl:attribute>
+					<xsl:attribute name="padding">2mm</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="$isDeleted = 'true'">
+					<xsl:attribute name="border"><xsl:value-of select="$border-block-deleted"/></xsl:attribute>
+					<xsl:if test="local-name() = 'table'">
+						<xsl:attribute name="background-color">rgb(255, 185, 185)</xsl:attribute>
+					</xsl:if>
+					<!-- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute> -->
+					<xsl:attribute name="padding">2mm</xsl:attribute>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:variable name="LRM" select="'‎'"/><xsl:variable name="RLM" select="'‏'"/><xsl:template name="setWritingMode">
+		<xsl:if test="$lang = 'ar'">
+			<xsl:attribute name="writing-mode">rl-tb</xsl:attribute>
+		</xsl:if>
+	</xsl:template><xsl:template name="setAlignment">
+		<xsl:param name="align" select="normalize-space(@align)"/>
+		<xsl:choose>
+			<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
+			<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
+			<xsl:when test="$align != ''">
+				<xsl:value-of select="$align"/>
+			</xsl:when>
+		</xsl:choose>
+	</xsl:template><xsl:template name="setTextAlignment">
+		<xsl:param name="default">left</xsl:param>
+		<xsl:attribute name="text-align">
+			<xsl:choose>
+				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
 	</xsl:template></xsl:stylesheet>