metanorma-bipm 1.0.7 → 1.1.4

data/lib/isodoc/bipm/html/html_bipm_titlepage.html

@@ -35,6 +35,8 @@
       {% if partid_alt %}<span class="title-second">{{ partid_alt}}: {{ partsubtitle }}</span>{% endif %}       
       {% if subparttitle %}<span class="title-first">{{ subparttitle }}</span><br/>{% endif %}
       {% if subpartsubtitle %}<span class="title-second">{{ subpartsubtitle }}</span><br/>{% endif %}
+      {% if provenancetitle %}<span class="title-first">{{ provenancetitle }}</span><br/>{% endif %}
+      {% if provenancesubtitle %}<span class="title-second">{{ provenancesubtitle }}</span><br/>{% endif %}
       {% if appendixid %}<span class="title-first">{{ appendixid}}: {{ appendixtitle }}</span><br/>{% endif %} 
       {% if appendixid_alt %}<span class="title-second">{{ appendixid_alt}}: {{ appendixsubtitle }}</span>{% endif %}
       {% if annexid %}<span class="title-first">{{ annexid}}: {{ annextitle }}</span><br/>{% endif %} 

data/lib/isodoc/bipm/html/htmlstyle.css

@@ -116,6 +116,13 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+.addition {
+  color: blue; }
+
+.deletion {
+  color: red;
+  text-decoration: line-through; }
+
 #brochure-band {
   background-color: #0AC442; }
 

data/lib/isodoc/bipm/i18n-en.yaml

@@ -1,10 +1,21 @@
 annex: Appendix
 appendix: Annex
+iso_annex: Annex
 see: see
 see_also: see also
 clause: Chapter
 subclause: Section
+clause_jcgm: Clause
+subclause_jcgm: Clause
 formula: Equation
 inequality: Inequality
 bibliography: References
 index: Index
+norm_with_refs_pref:
+      The following referenced documents are indispensable for the application of this document. 
+      For dated references, only the edition cited applies.
+      For undated references, the latest edition of the referenced
+      document (including any amendments) applies.
+all_rights_reserved: All rights reserved
+table_of_contents: Contents
+source: Adapted from

data/lib/isodoc/bipm/i18n-fr.yaml

@@ -1,9 +1,12 @@
 annex: Annexe
 appendix: Appendice
+iso_annex: Annexe
 see: voir
 see_also: voir aussi
 clause: chapître
 subclause: section
+clause_jcgm: Article
+subclause_jcgm: Article
 formula: équation
 inequality: inégalité
 bibliography: Références
@@ -34,3 +37,8 @@ stage_dict:
   draft-development: projet-de-développement
   in-force: en-vigeur
   retired: retiré
+norm_with_refs_pref:
+     Les documents suivants cités dans le texte sont indispensables pour l'application de ce document. Pour les références datées, seule l’édition citée s’applique. Pour les références non datées, la dernière édition du document de référence s’applique (y compris les éventuels amendements).
+all_rights_reserved: Tous droits réservés
+table_of_contents: Table des matières
+source: Adapté de

data/lib/isodoc/bipm/index.rb

@@ -4,19 +4,23 @@ require "sterile"
 module IsoDoc
   module BIPM
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
-       def add_id
+      def add_id
         %(id="_#{UUIDTools::UUID.random_create}")
       end
 
       def index(docxml)
         unless docxml.at(ns("//index"))
-          docxml.xpath(ns("//indexsect")).each { |i| i.remove }
+          docxml.xpath(ns("//indexsect")).each(&:remove)
           return
         end
         i = docxml.at(ns("//indexsect")) ||
-          docxml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}</title></indexsect>").first
-        index = sort_indexterms(docxml.xpath(ns("//index")), docxml.xpath(ns("//index-xref[@also = 'false']")),
-                                docxml.xpath(ns("//index-xref[@also = 'true']")))
+          docxml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}"\
+                                "</title></indexsect>").first
+        index = sort_indexterms(
+          docxml.xpath(ns("//index")),
+          docxml.xpath(ns("//index-xref[@also = 'false']")),
+          docxml.xpath(ns("//index-xref[@also = 'true']"))
+        )
         index1(docxml, i, index)
       end
 
@@ -32,8 +36,8 @@ module IsoDoc
         @xrefs.bookmark_anchor_names(docxml)
       end
 
-      def sortable(s)
-        HTMLEntities.new.decode(Nokogiri::XML.fragment(s).text)
+      def sortable(str)
+        HTMLEntities.new.decode(Nokogiri::XML.fragment(str).text)
       end
 
       def index_entries_opt
@@ -41,8 +45,11 @@ module IsoDoc
       end
 
       def index_entries(words, index, primary)
-        ret = index_entries_head(words[primary], index.dig(words[primary], nil, nil), index_entries_opt)
-        words2 = index[words[primary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        ret = index_entries_head(words[primary],
+                                 index.dig(words[primary], nil, nil),
+                                 index_entries_opt)
+        words2 = index[words[primary]]&.keys&.compact
+          &.each_with_object({}) { |w, v| v[w.downcase] = w }
         unless words2.empty?
           ret += "<ul>"
           words2.keys.localize(@lang.to_sym).sort.to_a.each do |w|
@@ -50,12 +57,15 @@ module IsoDoc
           end
           ret += "</ul>"
         end
-        ret + "</li>"
+        "#{ret}</li>"
       end
 
       def index_entries2(words, index, secondary)
-        ret = index_entries_head(words[secondary], index.dig(words[secondary], nil), index_entries_opt)
-        words3 = index[words[secondary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        ret = index_entries_head(words[secondary],
+                                 index.dig(words[secondary], nil),
+                                 index_entries_opt)
+        words3 = index[words[secondary]]&.keys&.reject { |k| k.nil? }
+          &.each_with_object({}) { |w, v| v[w.downcase] = w }
         unless words3.empty?
           ret += "<ul>"
           words3.keys.localize(@lang.to_sym).sort.to_a.each do |w|
@@ -63,7 +73,7 @@ module IsoDoc
           end
           ret += "</ul>"
         end
-        ret + "</li>"
+        "#{ret}</li>"
       end
 
       def index_entries_head(head, entries, opt)
@@ -111,8 +121,9 @@ module IsoDoc
         end
       end
 
-      def xml_encode_attr(s)
-        HTMLEntities.new.encode(s, :basic, :hexadecimal).gsub(/\&#x([^;]+);/) { |x| "&#x#{$1.upcase};" }
+      def xml_encode_attr(str)
+        HTMLEntities.new.encode(str, :basic, :hexadecimal)
+          .gsub(/&#x([^;]+);/) { |_x| "&#x#{$1.upcase};" }
       end
 
       # attributes are decoded into UTF-8, elements in extract_indexsee are still in entities
@@ -131,10 +142,10 @@ module IsoDoc
         end
       end
 
-      def index2bookmark(t)
-        t.name = "bookmark"
-        t.children.each { |x| x.remove }
-        t["id"] = "_#{UUIDTools::UUID.random_create}"
+      def index2bookmark(node)
+        node.name = "bookmark"
+        node.children.each(&:remove)
+        node["id"] = "_#{UUIDTools::UUID.random_create}"
       end
     end
   end

data/lib/isodoc/bipm/init.rb

@@ -10,7 +10,7 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def xref_init(lang, script, klass, labels, options)
+      def xref_init(lang, script, _klass, labels, options)
         html = HtmlConvert.new(language: lang, script: script)
         @xrefs = Xref.new(lang, script, html, labels, options)
       end
@@ -21,4 +21,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/bipm/jcgm.standard.xsl

@@ -4,6 +4,7 @@
 	
 	<xsl:param name="svg_images"/>
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 
 	<!-- <item id="#">N_page</item> -->
 	<!-- param for second pass -->
@@ -213,7 +214,7 @@
 						<xsl:call-template name="printEdition"/>
 						<xsl:text>  </xsl:text>
 						<xsl:call-template name="convertDate">
-							<xsl:with-param name="date" select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:version/jcgm:revision-date"/>
+							<xsl:with-param name="date" select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:date[@type = 'published']/jcgm:on"/>
 						</xsl:call-template>
 					</fo:block>
 					<!-- Example © JCGM 2009 -->
@@ -227,13 +228,16 @@
 				<fo:flow flow-name="xsl-region-body">
 					<xsl:call-template name="insert_Logo-BIPM-Metro"/>
 					<fo:block-container font-weight="bold">
-						<fo:block font-size="16.5pt" space-after="24.5mm">
+						<fo:block font-size="16.5pt">
 							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:ext/jcgm:editorialgroup/jcgm:committee/@acronym"/>
 							<xsl:text> </xsl:text>
 							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:docnumber"/>
 							<fo:inline font-weight="normal">:</fo:inline>
 							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:copyright/jcgm:from"/>
 						</fo:block>
+						<fo:block font-size="13pt" font-weight="normal" space-after="19.5mm">
+							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@type = 'provenance']"/>
+						</fo:block>
 						<fo:block border-bottom="1pt solid black"> </fo:block>
 						<fo:block font-size="16.5pt" margin-left="-0.5mm" padding-top="3.5mm" space-after="7mm" margin-right="7mm" line-height="105%">
 							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'main']" mode="title"/>
@@ -597,7 +601,7 @@
 
 	<xsl:template name="getListItemFormat">
 		<xsl:choose>
-			<xsl:when test="local-name(..) = 'ul' and ../ancestor::bipm:ul">−</xsl:when> <!-- &#x2212; - minus sign.  &#x2014; - dash -->
+			<xsl:when test="local-name(..) = 'ul' and ../ancestor::jcgm:ul">−</xsl:when> <!-- &#x2212; - minus sign.  &#x2014; - dash -->
 			<xsl:when test="local-name(..) = 'ul'">—</xsl:when> <!-- &#x2014; dash -->
 			<xsl:otherwise> <!-- for ordered lists -->
 				<xsl:variable name="start_value">
@@ -807,6 +811,42 @@
 		</fo:footnote>
 	</xsl:template>
 	
+  
+  <!--
+	<fn reference="1">
+			<p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p>
+		</fn>
+	-->
+	<xsl:template match="jcgm:title//jcgm:fn |                  jcgm:name//jcgm:fn |                  jcgm:p/jcgm:fn[not(ancestor::jcgm:table)] |                  jcgm:p/*/jcgm:fn[not(ancestor::jcgm:table)] |                 jcgm:sourcecode/jcgm:fn[not(ancestor::jcgm:table)]" priority="2" name="fn">
+		<fo:footnote keep-with-previous.within-line="always">
+			<xsl:variable name="number">
+				<xsl:number count="jcgm:fn[not(ancestor::jcgm:table)]" level="any"/>
+			</xsl:variable>
+			<xsl:variable name="gen_id" select="generate-id()"/>
+			<xsl:variable name="lang" select="ancestor::jcgm:bipm-standard/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
+			<fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
+				<fo:basic-link internal-destination="{$lang}_footnote_{@reference}_{$number}_{$gen_id}" fox:alt-text="footnote {@reference}">
+					<xsl:value-of select="$number"/>
+				</fo:basic-link>
+			</fo:inline>
+			<fo:footnote-body>
+				<fo:block font-size="9pt" margin-bottom="12pt" font-weight="normal" text-indent="0" start-indent="0" line-height="124%" text-align="justify">
+					<fo:inline id="{$lang}_footnote_{@reference}_{$number}_{$gen_id}" keep-with-next.within-line="always" font-size="60%" vertical-align="super" padding-right="1mm"> <!-- baseline-shift="30%" padding-right="3mm" font-size="60%"  alignment-baseline="hanging" -->
+						<xsl:value-of select="$number "/>
+					</fo:inline>
+					<xsl:for-each select="jcgm:p">
+							<xsl:apply-templates/>
+					</xsl:for-each>
+				</fo:block>
+			</fo:footnote-body>
+		</fo:footnote>
+	</xsl:template>
+
+	<xsl:template match="jcgm:fn/jcgm:p">
+		<fo:block>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
 	
 	
 	<xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="ul_ol">
@@ -982,6 +1022,12 @@
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
+				<xsl:if test="local-name(../..) = 'formula' or (local-name(../..) = 'td' and count(../../*) = 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>
@@ -1082,6 +1128,17 @@
 	</xsl:template>
 	
 
+	<xsl:template match="*[local-name()='td' or local-name()='th']/*[local-name()='formula']/*[local-name()='stem']" priority="2">
+		<fo:block>
+			<xsl:if test="ancestor::*[local-name()='td' or local-name()='th'][1][@align]">
+				<xsl:attribute name="text-align">
+					<xsl:value-of select="ancestor::*[local-name()='td' or local-name()='th'][1]/@align"/>
+				</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+  
 	<xsl:template match="*[local-name()='formula']/*[local-name()='stem']">
 		<fo:block margin-top="6pt" margin-bottom="12pt">
 			<fo:table table-layout="fixed" width="100%">
@@ -1320,6 +1377,7 @@
 		<xsl:variable name="font-size">
 			<xsl:choose>
 				<xsl:when test="ancestor::jcgm:preface">15pt</xsl:when>
+				<xsl:when test="parent::jcgm:annex">15pt</xsl:when>
 				<xsl:when test="../@inline-header = 'true'  or @inline-header = 'true'">10.5pt</xsl:when>
 				<xsl:when test="$level = 2">11.5pt</xsl:when>
 				<xsl:when test="$level &gt;= 3">10.5pt</xsl:when>
@@ -1351,6 +1409,8 @@
 				<xsl:attribute name="space-after">
 					<xsl:choose>
 						<xsl:when test="ancestor::jcgm:preface">12pt</xsl:when>
+						<xsl:when test="parent::jcgm:annex">30pt</xsl:when>
+						<xsl:when test="following-sibling::*[1][local-name() = 'admitted']">0pt</xsl:when>
 						<!-- <xsl:otherwise>12pt</xsl:otherwise> -->
 						<xsl:otherwise>12pt</xsl:otherwise>
 					</xsl:choose>
@@ -1364,6 +1424,10 @@
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
+				<xsl:if test="parent::jcgm:annex">
+					<xsl:attribute name="text-align">center</xsl:attribute>
+					<xsl:attribute name="line-height">130%</xsl:attribute>
+				</xsl:if>
 				<xsl:apply-templates/>
 			</xsl:element>
 			
@@ -1380,41 +1444,43 @@
 		<xsl:param name="font-size" select="'65%'"/>
 		<xsl:param name="baseline-shift" select="'30%'"/>
 		<xsl:param name="curr_lang" select="'fr'"/>
-		<fo:inline>
-			<xsl:variable name="title-edition">
-				<xsl:call-template name="getTitle">
-					<xsl:with-param name="name" select="'title-edition'"/>
-					<xsl:with-param name="lang" select="$curr_lang"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:value-of select="."/>
-			<fo:inline font-size="{$font-size}" baseline-shift="{$baseline-shift}">
-				<xsl:if test="$curr_lang = 'en'">
-					<xsl:attribute name="baseline-shift">0%</xsl:attribute>
-					<xsl:attribute name="font-size">100%</xsl:attribute>
-				</xsl:if>
-				<xsl:choose>
-					<xsl:when test="$curr_lang = 'fr'">
-						<xsl:choose>					
-							<xsl:when test=". = '1'">re</xsl:when>
-							<xsl:otherwise>e</xsl:otherwise>
-						</xsl:choose>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:choose>					
-							<xsl:when test=". = '1'">st</xsl:when>
-							<xsl:when test=". = '2'">nd</xsl:when>
-							<xsl:when test=". = '3'">rd</xsl:when>
-							<xsl:otherwise>th</xsl:otherwise>
-						</xsl:choose>
-					</xsl:otherwise>
-				</xsl:choose>
-				
+		<xsl:if test="normalize-space (.) != '1'">
+			<fo:inline>
+				<xsl:variable name="title-edition">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-edition'"/>
+						<xsl:with-param name="lang" select="$curr_lang"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="."/>
+				<fo:inline font-size="{$font-size}" baseline-shift="{$baseline-shift}">
+					<xsl:if test="$curr_lang = 'en'">
+						<xsl:attribute name="baseline-shift">0%</xsl:attribute>
+						<xsl:attribute name="font-size">100%</xsl:attribute>
+					</xsl:if>
+					<xsl:choose>
+						<xsl:when test="$curr_lang = 'fr'">
+							<xsl:choose>					
+								<xsl:when test=". = '1'">re</xsl:when>
+								<xsl:otherwise>e</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:choose>					
+								<xsl:when test=". = '1'">st</xsl:when>
+								<xsl:when test=". = '2'">nd</xsl:when>
+								<xsl:when test=". = '3'">rd</xsl:when>
+								<xsl:otherwise>th</xsl:otherwise>
+							</xsl:choose>
+						</xsl:otherwise>
+					</xsl:choose>
+					
+				</fo:inline>
+				<xsl:text> </xsl:text>			
+				<xsl:value-of select="java:toLowerCase(java:java.lang.String.new($title-edition))"/>
+				<xsl:text/>
 			</fo:inline>
-			<xsl:text> </xsl:text>			
-			<xsl:value-of select="java:toLowerCase(java:java.lang.String.new($title-edition))"/>
-			<xsl:text/>
-		</fo:inline>
+		</xsl:if>
 	</xsl:template>
 
 
@@ -1443,7 +1509,7 @@
 			
 			<fo:flow flow-name="xsl-region-body">
 				<fo:block id="{@id}" span="all">
-					<xsl:apply-templates select="bipm:title"/>
+					<xsl:apply-templates select="jcgm:title"/>
 				</fo:block>
 				<fo:block>
 					<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
@@ -2145,6 +2211,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"/>
@@ -2173,13 +2242,16 @@
 			<xsl:attribute name="font-family">Times New Roman, STIX Two Math, Source Han Sans</xsl:attribute>
 			<xsl:attribute name="font-size">10.5pt</xsl:attribute>
 		
+		
 	</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>
@@ -2229,7 +2301,7 @@
 		
 		
 		
-		
+
 	</xsl:attribute-set><xsl:attribute-set name="example-style">
 		
 		
@@ -2246,6 +2318,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
 		
 		
@@ -2255,9 +2328,7 @@
 		
 		
 			 <xsl:attribute name="padding-right">5mm</xsl:attribute>
-		
-		
-		
+			 <xsl:attribute name="keep-with-next">always</xsl:attribute>
 		
 		
 		
@@ -2268,6 +2339,7 @@
 		
 		
 				
+				
 		
 		
 		
@@ -2297,8 +2369,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>
+			
 		
 		
 		
@@ -2317,6 +2391,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>
@@ -2337,19 +2414,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">
 		
 		
 		
+		
 				
 		
 		
@@ -2366,6 +2447,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">
 		
 		
@@ -2373,6 +2455,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="padding-right">6mm</xsl:attribute>
 		
 		
@@ -2402,6 +2485,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>
@@ -2409,9 +2493,12 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
+		
 				
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -2438,18 +2525,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">
 		
+		
 				
 		
 		
@@ -2469,6 +2560,7 @@
 		
 		
 		
+
 		
 		
 		
@@ -2482,10 +2574,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>
@@ -2511,15 +2605,40 @@
 				
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
-	
+		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		
+		
 	</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:template name="processPrefaceSectionsDefault_Contents">
+		
+	</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 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:attribute-set name="mathml-style">
+		<xsl:attribute name="font-family">STIX Two 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"/>
@@ -2564,18 +2683,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  -->
@@ -2584,7 +2704,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>
@@ -2603,8 +2723,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">
@@ -2632,8 +2750,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>
 				
 				
@@ -2645,6 +2765,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>
@@ -2654,6 +2775,7 @@
 				
 				
 				
+				
 				<xsl:variable name="table_width">
 					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
 					100%
@@ -2667,6 +2789,7 @@
 					<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>
@@ -2675,6 +2798,7 @@
 					
 					
 					
+					
 						<attribute name="margin-left">0mm</attribute>
 						<attribute name="margin-right">0mm</attribute>
 					
@@ -2684,6 +2808,7 @@
 					
 									
 					
+					
 				</xsl:variable>
 				
 				
@@ -2767,7 +2892,8 @@
 			</fo:block-container>
 		</xsl:variable>
 		
-		
+		<xsl:variable name="isAdded" select="@added"/>
+		<xsl:variable name="isDeleted" select="@deleted"/>
 		
 		<xsl:choose>
 			<xsl:when test="@width">
@@ -2781,7 +2907,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>
@@ -2792,18 +2925,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">
@@ -2855,7 +3019,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"/>
 								
@@ -2944,21 +3108,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">		
@@ -3179,20 +3349,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>
@@ -3229,6 +3405,7 @@
 					
 					
 					
+					
 				</xsl:if>
 				<xsl:if test="$parent-name = 'tfoot'">
 					
@@ -3242,6 +3419,10 @@
 				
 				
 				
+				
+				
+				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -3253,12 +3434,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>
 			
 			
@@ -3271,6 +3454,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"/>
@@ -3302,15 +3489,24 @@
 			<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="count(*) = 1 and (local-name(*[1]) = 'stem' or local-name(*[1]) = 'figure')">
+					<xsl:attribute name="padding-left">0mm</xsl:attribute>
+				</xsl:if>
+			
+			
 			
 				<xsl:if test="ancestor::*[local-name() = 'tfoot']">
 					<xsl:attribute name="border">solid black 0</xsl:attribute>
@@ -3324,6 +3520,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"/>
@@ -3457,13 +3659,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">
@@ -3548,6 +3750,7 @@
 			
 			
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 				
@@ -3560,6 +3763,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'])">
@@ -3576,6 +3781,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>
@@ -3640,6 +3851,7 @@
 							
 							
 							
+							
 							<xsl:variable name="title-key">
 								
 									<xsl:call-template name="getLocalizedString">
@@ -3697,11 +3909,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">
@@ -3855,6 +4067,7 @@
 		
 		<fo:table-row>
 			
+			
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
@@ -3872,6 +4085,7 @@
 					
 					
 					
+					
 					<xsl:apply-templates/>
 					<!-- <xsl:if test="$namespace = 'gb'">
 						<xsl:if test="ancestor::*[local-name()='formula']">
@@ -3928,6 +4142,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/>
@@ -3945,6 +4161,7 @@
 				
 				
 				
+				
 				10
 				
 				
@@ -3970,8 +4187,74 @@
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='add']">
+		<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 font-size="10pt" color="red" text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="del-style">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='hi']">
@@ -4268,11 +4551,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>
@@ -4312,13 +4599,23 @@
 		<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:copy-of select="."/> -->
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
@@ -4336,9 +4633,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:'))"/>
@@ -4350,20 +4665,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>
@@ -4475,6 +4791,7 @@
 						
 						
 						<fo:inline xsl:use-attribute-sets="note-name-style">
+							
 							<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						</fo:inline>
 						<xsl:apply-templates/>
@@ -4500,7 +4817,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/>
@@ -4564,16 +4883,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}">
@@ -4585,37 +4915,122 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'image']">
-		<fo:block xsl:use-attribute-sets="image-style">
-			
-			
-			<xsl:variable name="src">
-				<xsl:choose>
-					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
-						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@src"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			
-			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
-		</fo:block>
+		<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">
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					
+					<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>
+	</xsl:template><xsl:template name="image_src">
+		<xsl:choose>
+			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+			</xsl:when>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<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 xmlns:xlink="http://www.w3.org/1999/xlink" 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 xmlns:xlink="http://www.w3.org/1999/xlink" 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 xmlns:xlink="http://www.w3.org/1999/xlink" 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"/>
@@ -4763,6 +5178,7 @@
 		<xsl:if test="normalize-space() != ''">			
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -4814,6 +5230,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']">
@@ -4840,6 +5258,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>
@@ -4850,7 +5270,9 @@
 				
 			</xsl:if>
 			<fo:block-container margin-left="0mm">
-	
+		
+				
+				
 				<fo:block xsl:use-attribute-sets="sourcecode-style">
 					<xsl:variable name="_font-size">
 						
@@ -4859,6 +5281,7 @@
 						
 						
 						
+						
 						9
 						
 								
@@ -4878,10 +5301,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">
@@ -5116,11 +5543,12 @@
 	</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">
-				block				
-				
+								
+				inline
 				<xsl:if test=".//*[local-name() = 'table']">block</xsl:if> 
 			</xsl:variable>
 			
@@ -5143,6 +5571,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']">
@@ -5150,7 +5579,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>
@@ -5165,7 +5594,12 @@
 	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:variable name="element">
-			block
+			
+			
+				<xsl:choose>
+					<xsl:when test="$num = 1">inline</xsl:when>
+					<xsl:otherwise>block</xsl:otherwise>
+				</xsl:choose>
 			
 			
 		</xsl:variable>		
@@ -5182,7 +5616,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">
@@ -5191,13 +5625,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>
 					
@@ -5208,20 +5644,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">
@@ -5337,6 +5780,7 @@
 			
 			
 			
+			
 				<xsl:choose>
 					<xsl:when test="$depth = 2">3</xsl:when>
 					<xsl:otherwise>4</xsl:otherwise>
@@ -5379,7 +5823,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>
 		
@@ -5438,7 +5883,6 @@
 						
 			
 			
-			
 			<xsl:apply-templates/>
 		</fo:block>
 		
@@ -5455,6 +5899,11 @@
 			<xsl:call-template name="setId"/>
 			
 			
+			
+				<xsl:if test="@inline-header='true'">
+					<xsl:attribute name="text-align">justify</xsl:attribute>
+				</xsl:if>
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'definitions']">
@@ -5481,7 +5930,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>
@@ -5491,6 +5940,7 @@
 					</xsl:attribute>
 					
 					
+					
 					<fo:block-container margin-left="0mm">
 						<fo:block>
 							<xsl:apply-templates select="." mode="ul_ol"/>
@@ -5692,21 +6142,25 @@
 		
 		
 		 
+		
+		
+		
+		
 	</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>
@@ -5748,6 +6202,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'"/>
@@ -5952,6 +6470,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>
@@ -6016,6 +6537,7 @@
 			
 			
 			
+			
 						
 			
 			
@@ -6076,17 +6598,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>