metanorma-un 0.6.6 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5c20da9a001c0acd4087934cf4f9cbc82a2120c3d2f5b3e7a5d5d044faa5cb
-  data.tar.gz: 4d454c978e7dd64bc99b623e7369f85c0217b77cca1e528de503fababdea145b
+  metadata.gz: 20d1e57f121c8608902a2faf38631a06035ddd820a11826977e2fc04bfbb36ca
+  data.tar.gz: 3991d1560ef4d9721da8033083e4b1f4e79323e2f382b80c6ba05c129d1aed24
 SHA512:
-  metadata.gz: 83bff8b909f59c56c86e1d1a034a0e5d637e7897ebd9578fe7a9d9202a366f7b59607fea61cd297bdd7c8d63697ebbf0db3bd3de888b662a59a15fadf62ad6b9
-  data.tar.gz: 8195c49d3f5ab27d550170f76f3047a0a48bc479f5f718a7482ca0a2c95f3e219b08463262be6c09056e0c7c6ba7e0d92975f4eb307797b1094ad8d06c5380fc
+  metadata.gz: 64f5c9d3de39a64d021a9afc081e6c9b931c0d9a5f707c102c86b2744949500a544386f7c99508d376cf76618a5ac942c720684075461e77f4d57929f353e85a
+  data.tar.gz: 0b5a23f6f9e0d88e255d24a5d3d597383106da1c8ef7f9b644ac3c893f57c8c33bae0ac022d9ddd312ac820a55c8227fe8980e8db574ead3ce6a8b8f08a2c581

data/Gemfile

@@ -6,6 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-if File.exist? 'Gemfile.devel'
-  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end

data/Rakefile

@@ -1,8 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/asciidoctor/un/converter.rb

@@ -17,13 +17,14 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         return unless node.attr("committee")
+
         xml.editorialgroup do |a|
           a.committee node.attr("committee"),
-            **attr_code(type: node.attr("committee-type"))
+                      **attr_code(type: node.attr("committee-type"))
           i = 2
-          while node.attr("committee_#{i}") do
+          while node.attr("committee_#{i}")
             a.committee node.attr("committee_#{i}"),
-              **attr_code(type: node.attr("committee-type_#{i}"))
+                        **attr_code(type: node.attr("committee-type_#{i}"))
             i += 1
           end
         end
@@ -66,13 +67,13 @@ module Asciidoctor
         xml.session do |session|
           session.number node.attr("session") if node.attr("session")
           session.date node.attr("session-date") if node.attr("session-date")
-          node&.attr("item-number")&.split(/,[ ]*/)&.each do |i|
+          node&.attr("item-number")&.split(/, */)&.each do |i|
             session.item_number i
           end
-          node&.attr("item-name")&.split(/,[ ]*/)&.each do |i|
+          node&.attr("item-name")&.split(/, */)&.each do |i|
             session.item_name i
           end
-          node&.attr("subitem-name")&.split(/,[ ]*/)&.each do |i|
+          node&.attr("subitem-name")&.split(/, */)&.each do |i|
             session.subitem_name i
           end
           node.attr("collaborator") and
@@ -84,13 +85,13 @@ module Asciidoctor
       end
 
       def metadata_language(node, xml)
-        languages = node&.attr("language")&.split(/,[ ]*/) ||
+        languages = node&.attr("language")&.split(/, */) ||
           %w(ar ru en fr zh es)
         languages.each { |l| xml.language l }
       end
 
       def metadata_submission_language(node, xml)
-        languages = node&.attr("submissionlanguage")&.split(/,[ ]*/) || []
+        languages = node&.attr("submissionlanguage")&.split(/, */) || []
         languages.each { |l| xml.submissionlanguage l }
       end
 
@@ -101,7 +102,7 @@ module Asciidoctor
         metadata_submission_language(node, xml)
       end
 
-      def title_validate(root)
+      def title_validate(_root)
         nil
       end
 
@@ -114,12 +115,11 @@ module Asciidoctor
 
       def doctype(node)
         d = super
-        unless %w{plenary recommendation addendum communication corrigendum 
-          reissue agenda budgetary sec-gen-notes expert-report resolution 
-          plenary-attachment}.include? d
-          @log.add(
-            "Document Attributes", nil,
-            "#{d} is not a legal document type: reverting to 'recommendation'")
+        unless %w{plenary recommendation addendum communication corrigendum
+                  reissue agenda budgetary sec-gen-notes expert-report
+                  resolution plenary-attachment}.include? d
+          @log.add("Document Attributes", nil,
+                   "#{d} is not a legal document type: reverting to 'recommendation'")
           d = "recommendation"
         end
         d
@@ -128,11 +128,11 @@ module Asciidoctor
       def outputs(node, ret)
         File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml", 
+        html_converter(node).convert(@filename + ".presentation.xml",
                                      nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", 
+        doc_converter(node).convert(@filename + ".presentation.xml",
                                     nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", 
+        pdf_converter(node)&.convert(@filename + ".presentation.xml",
                                      nil, false, "#{@filename}.pdf")
       end
 
@@ -142,8 +142,8 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "un.rng"))
       end
 
-      def style(n, t)
-        return
+      def style(_node, _text)
+        nil
       end
 
       def html_extract_attributes(node)
@@ -168,6 +168,7 @@ module Asciidoctor
 
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
+
         IsoDoc::UN::PdfConvert.new(doc_extract_attributes(node))
       end
 
@@ -196,25 +197,24 @@ module Asciidoctor
         xmldoc.xpath("//clause/p | //annex/p").each do |p|
           cl = Nokogiri::XML::Node.new("clause", xmldoc)
           cl["id"] = p["id"]
-          cl["inline-header"]="true" 
-          p["id"] = "_" + UUIDTools::UUID.random_create
+          cl["inline-header"] = "true"
+          p["id"] = "_#{UUIDTools::UUID.random_create}"
           p.replace(cl)
           p.parent = cl
-          while n = cl.next_element and !%w(p clause).include? n.name
+          while (n = cl.next_element) && !%w(p clause).include?(n.name)
             n.parent = cl
           end
         end
       end
 
       def admonition_attrs(node)
-        attr_code(super.merge("unnumbered": node.option?("unnumbered"),
-                              "subsequence": node.attr("subsequence")))
+        attr_code(super.merge(unnumbered: node.option?("unnumbered"),
+                              subsequence: node.attr("subsequence")))
       end
 
       def sectiontype_streamline(ret)
         case ret
-        when "foreword" then "donotrecognise-foreword"
-        when "introduction" then "donotrecognise-foreword"
+        when "foreword", "introduction" then "donotrecognise-foreword"
         else
           super
         end

data/lib/asciidoctor/un/isodoc.rng

@@ -32,6 +32,18 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="section-title">
+      <element name="title">
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+      <zeroOrMore>
+        <element name="variant-title">
+          <ref name="TypedTitleString"/>
+        </element>
+      </zeroOrMore>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -158,15 +170,17 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <attribute name="type">
-          <choice>
-            <value>roman</value>
-            <value>alphabet</value>
-            <value>arabic</value>
-            <value>roman_upper</value>
-            <value>alphabet_upper</value>
-          </choice>
-        </attribute>
+        <optional>
+          <attribute name="type">
+            <choice>
+              <value>roman</value>
+              <value>alphabet</value>
+              <value>arabic</value>
+              <value>roman_upper</value>
+              <value>alphabet_upper</value>
+            </choice>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -204,6 +218,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="dt">
+      <element name="dt">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -899,7 +925,7 @@
   </include>
   <!-- end overrides -->
   <define name="docsubtype">
-    <element name="docsubtype">
+    <element name="subdoctype">
       <ref name="DocumentSubtype"/>
     </element>
   </define>
@@ -954,6 +980,16 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="ital">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="ref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <element name="refterm">
           <zeroOrMore>
@@ -989,8 +1025,14 @@
       <ref name="imagemap"/>
       <ref name="svgmap"/>
       <ref name="inputform"/>
+      <ref name="toc"/>
     </choice>
   </define>
+  <define name="toc">
+    <element name="toc">
+      <ref name="ul"/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -998,6 +1040,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1229,6 +1274,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">
@@ -1490,26 +1541,26 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <group>
+    <choice>
       <choice>
         <group>
-          <zeroOrMore>
+          <oneOrMore>
             <ref name="BasicBlock"/>
-          </zeroOrMore>
+          </oneOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
         <ref name="amend"/>
       </choice>
-      <zeroOrMore>
+      <oneOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </zeroOrMore>
-    </group>
+      </oneOrMore>
+    </choice>
   </define>
   <define name="Annex-Section">
     <optional>

data/lib/asciidoctor/un/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>

data/lib/asciidoctor/un/validate.rb

@@ -13,11 +13,10 @@ module Asciidoctor
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(proposal working-draft committee-draft draft-standard final-draft
-        published withdrawn).include? stage or
-        @log.add("Document Attributes", nil, 
-                 "#{stage} is not a recognised status")
+           published withdrawn).include? stage or
+          @log.add("Document Attributes", nil,
+                   "#{stage} is not a recognised status")
       end
     end
   end
 end
-

data/lib/isodoc/un/i18n.rb

@@ -8,4 +8,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/un/init.rb

@@ -11,7 +11,7 @@ module IsoDoc
         @meta.set(:toc, @toc)
       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
@@ -26,4 +26,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/un/un.plenary-attachment.xsl

@@ -160,7 +160,7 @@
 							<fo:block>
 								<xsl:value-of select="translate(/un:un-standard/un:sections/un:clause[1]/un:ol[1]/un:li[1]/un:p[1], '.', '')"/>
 							</fo:block>
-							<fo:block><xsl:value-of select="$title"/></fo:block>
+							<fo:block role="H1"><xsl:value-of select="$title"/></fo:block>
 						</fo:block>
 					</fo:block-container>
 					
@@ -485,7 +485,10 @@
 	</xsl:template>
 	
 	<xsl:template match="un:title" mode="inline-header">
-		<fo:inline>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:inline role="H{$level}">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -715,8 +718,9 @@
 				<xsl:otherwise>11pt</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<fo:block font-size="{$font-size}" font-weight="bold" margin-top="3pt" margin-bottom="16pt" keep-with-next="always">
+		<fo:block font-size="{$font-size}" font-weight="bold" margin-top="3pt" margin-bottom="16pt" keep-with-next="always" role="H{$level}">
 			<xsl:apply-templates/>
+			<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 		</fo:block>
 	</xsl:template>
 	
@@ -734,15 +738,17 @@
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$level = 1">
-				<fo:block font-size="{$font-size}" font-weight="bold" space-before="3pt" keep-with-next="always">					
+				<fo:block font-size="{$font-size}" font-weight="bold" space-before="3pt" keep-with-next="always" role="H{$level}">					
 					<fo:block margin-bottom="12pt">
 						<xsl:apply-templates/>
+						<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 					</fo:block>
 				</fo:block>
 			</xsl:when>
 			<xsl:otherwise>			
-				<fo:block font-size="{$font-size}" font-weight="bold" margin-left="1mm" space-before="3pt" margin-bottom="6pt" keep-with-next="always">
+				<fo:block font-size="{$font-size}" font-weight="bold" margin-left="1mm" space-before="3pt" margin-bottom="6pt" keep-with-next="always" role="H{$level}">
 					<xsl:apply-templates/>
+					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -769,7 +775,7 @@
 		<xsl:choose>			
 			<xsl:when test="ancestor::un:sections and $level = 1">
 				<fo:block-container margin-left="-16mm">
-					<fo:block font-size="{$font-size}" font-weight="bold" margin-left="16mm" space-before="16pt" margin-bottom="13pt" keep-with-next="always">
+					<fo:block font-size="{$font-size}" font-weight="bold" margin-left="16mm" space-before="16pt" margin-bottom="13pt" keep-with-next="always" role="H{$level}">
 						<fo:table table-layout="fixed" width="100%">
 							<fo:table-column column-width="16mm"/>
 							<fo:table-column column-width="130mm"/>
@@ -788,6 +794,7 @@
 									<fo:table-cell>
 										<fo:block>
 											<xsl:call-template name="extractTitle"/>
+											<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -797,7 +804,7 @@
 				</fo:block-container>
 			</xsl:when>
 			<xsl:when test="ancestor::un:sections">
-				<fo:block font-size="{$font-size}" font-weight="bold" space-before="16pt" margin-bottom="13pt" text-indent="-8mm" keep-with-next="always">
+				<fo:block font-size="{$font-size}" font-weight="bold" space-before="16pt" margin-bottom="13pt" text-indent="-8mm" keep-with-next="always" role="H{$level}">
 					<xsl:if test="$level = 2">
 						<xsl:attribute name="margin-left">1mm</xsl:attribute>
 						<xsl:attribute name="space-before">12pt</xsl:attribute>
@@ -814,8 +821,9 @@
 				</fo:block>
 			</xsl:when>			
 			<xsl:otherwise>
-				<fo:block font-size="{$font-size}" font-weight="bold" text-align="left" keep-with-next="always">						
+				<fo:block font-size="{$font-size}" font-weight="bold" text-align="left" keep-with-next="always" role="H{$level}">						
 					<xsl:apply-templates/>
+					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1046,26 +1054,26 @@
 	<!-- ============================ -->	
 	
 	<xsl:template name="insertHeaderFooter">
-		<fo:static-content flow-name="header-odd">
+		<fo:static-content flow-name="header-odd" role="artifact">
 			<fo:block-container height="25mm" display-align="after" border-bottom="0.5pt solid black" margin-left="-20.5mm" margin-right="-20.5mm">
 				<fo:block font-size="9pt" font-weight="bold" text-align="right" margin-left="21mm" margin-right="21mm" padding-bottom="0.5mm">
 					<xsl:value-of select="$id"/>
 				</fo:block>
 			</fo:block-container>
 		</fo:static-content>
-		<fo:static-content flow-name="footer-odd">
+		<fo:static-content flow-name="footer-odd" role="artifact">
 			<fo:block-container height="40mm" margin-left="-20.5mm" margin-right="-20.5mm">
 				<fo:block font-size="9pt" font-weight="bold" text-align="right" margin-left="21mm" margin-right="21mm" padding-top="12mm"><fo:page-number/></fo:block>
 			</fo:block-container>
 		</fo:static-content>
-		<fo:static-content flow-name="header-even">
+		<fo:static-content flow-name="header-even" role="artifact">
 			<fo:block-container height="25mm" display-align="after" border-bottom="0.5pt solid black" margin-left="-20.5mm" margin-right="-20.5mm">
 				<fo:block font-size="9pt" font-weight="bold" margin-left="21mm" margin-right="21mm" padding-bottom="0.5mm">
 					<xsl:value-of select="$id"/>
 				</fo:block>
 			</fo:block-container>
 		</fo:static-content>
-		<fo:static-content flow-name="footer-even">
+		<fo:static-content flow-name="footer-even" role="artifact">
 			<fo:block-container height="40mm" margin-left="-20.5mm" margin-right="-20.5mm">
 				<fo:block font-size="9pt" font-weight="bold" margin-left="21mm" margin-right="21mm" padding-top="12mm"><fo:page-number/></fo:block>
 			</fo:block-container>
@@ -1073,103 +1081,6 @@
 	</xsl:template>
 
 
-	<xsl:template name="number-to-words">
-		<xsl:param name="number"/>
-		<xsl:param name="first"/>
-		<xsl:if test="$number != ''">
-			<xsl:variable name="words">
-				<words>
-					<word cardinal="1">one-</word>
-					<word ordinal="1">first </word>
-					<word cardinal="2">two-</word>
-					<word ordinal="2">second </word>
-					<word cardinal="3">three-</word>
-					<word ordinal="3">third </word>
-					<word cardinal="4">four-</word>
-					<word ordinal="4">fourth </word>
-					<word cardinal="5">five-</word>
-					<word ordinal="5">fifth </word>
-					<word cardinal="6">six-</word>
-					<word ordinal="6">sixth </word>
-					<word cardinal="7">seven-</word>
-					<word ordinal="7">seventh </word>
-					<word cardinal="8">eight-</word>
-					<word ordinal="8">eighth </word>
-					<word cardinal="9">nine-</word>
-					<word ordinal="9">ninth </word>
-					<word ordinal="10">tenth </word>
-					<word ordinal="11">eleventh </word>
-					<word ordinal="12">twelfth </word>
-					<word ordinal="13">thirteenth </word>
-					<word ordinal="14">fourteenth </word>
-					<word ordinal="15">fifteenth </word>
-					<word ordinal="16">sixteenth </word>
-					<word ordinal="17">seventeenth </word>
-					<word ordinal="18">eighteenth </word>
-					<word ordinal="19">nineteenth </word>
-					<word cardinal="20">twenty-</word>
-					<word ordinal="20">twentieth </word>				
-					<word cardinal="30">thirty-</word>
-					<word ordinal="30">thirtieth </word>
-					<word cardinal="40">forty-</word>
-					<word ordinal="40">fortieth </word>
-					<word cardinal="50">fifty-</word>
-					<word ordinal="50">fiftieth </word>
-					<word cardinal="60">sixty-</word>
-					<word ordinal="60">sixtieth </word>
-					<word cardinal="70">seventy-</word>
-					<word ordinal="70">seventieth </word>
-					<word cardinal="80">eighty-</word>
-					<word ordinal="80">eightieth </word>
-					<word cardinal="90">ninety-</word>
-					<word ordinal="90">ninetieth </word>
-					<word cardinal="100">hundred-</word>
-					<word ordinal="100">hundredth </word>
-				</words>
-			</xsl:variable>
-
-			<xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
-			
-			<xsl:variable name="value">
-				<xsl:choose>
-					<xsl:when test="$ordinal != ''">
-						<xsl:value-of select="$ordinal"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:choose>
-							<xsl:when test="$number &lt; 100">
-								<xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
-								<xsl:variable name="digit" select="substring($number,2)"/>
-								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
-								<xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<!-- more 100 -->
-								<xsl:variable name="hundred" select="substring($number,1,1)"/>
-								<xsl:variable name="digits" select="number(substring($number,2))"/>
-								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
-								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
-								<xsl:call-template name="number-to-words">
-									<xsl:with-param name="number" select="$digits"/>
-								</xsl:call-template>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			<xsl:choose>
-				<xsl:when test="$first = 'true'">					
-					<xsl:call-template name="capitalize">
-						<xsl:with-param name="str" select="$value"/>
-					</xsl:call-template>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$value"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:if>
-	</xsl:template>
-
 	<!-- convert YYYY-MM-DD to (Month YYYY) -->
 	<xsl:template name="formatDate">
 		<xsl:param name="date"/>
@@ -1368,12 +1279,13 @@
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
+		<xsl:attribute name="role">Code</xsl:attribute>
 		
 		
 		
 		
 		
-			<xsl:attribute name="font-family">Courier</xsl:attribute>			
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>			
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
@@ -1393,8 +1305,13 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
-	</xsl:attribute-set><xsl:attribute-set name="requirement-subject-style">
-	</xsl:attribute-set><xsl:attribute-set name="requirement-inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="subject-style">
+	</xsl:attribute-set><xsl:attribute-set name="inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="description-style">
+	</xsl:attribute-set><xsl:attribute-set name="specification-style">
+	</xsl:attribute-set><xsl:attribute-set name="measurement-target-style">
+	</xsl:attribute-set><xsl:attribute-set name="verification-style">
+	</xsl:attribute-set><xsl:attribute-set name="import-style">
 	</xsl:attribute-set><xsl:attribute-set name="recommendation-style">
 		
 		
@@ -1462,6 +1379,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -1476,7 +1394,9 @@
 		
 				
 				
-	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
+	</xsl:attribute-set><xsl:variable name="table-border_">
+		
+	</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			
 		
@@ -1591,7 +1511,8 @@
 				
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
+	</xsl:attribute-set><xsl:attribute-set name="quote-style">
+		<xsl:attribute name="role">BlockQuote</xsl:attribute>
 		
 		
 		
@@ -1776,11 +1697,15 @@
 				<fo:block>&#xA0;</fo:block>
 			</xsl:if> -->
 			
+			
+			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			
 				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
-					
+			
+			
+			
 			
 				<xsl:call-template name="fn_name_display"/>
 			
@@ -1854,6 +1779,12 @@
 				
 				
 				
+				
+				
+				
+				<!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
+				
+				
 				<xsl:variable name="table_width">
 					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
 					
@@ -1877,6 +1808,7 @@
 					
 					
 					
+					
 									
 									
 					
@@ -1902,6 +1834,8 @@
 						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 					</xsl:if>
 					
+					
+					
 					<xsl:choose>
 						<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
 							<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2186,9 +2120,9 @@
 				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
 					<xsl:with-param name="continued">true</xsl:with-param>
 				</xsl:apply-templates>
-				<xsl:for-each select="ancestor::*[local-name()='table'][1]">
-					<xsl:call-template name="fn_name_display"/>
-				</xsl:for-each>
+				
+				
+				
 				
 			</fo:table-cell>
 		</fo:table-row>
@@ -2270,7 +2204,11 @@
 		
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		
-		<xsl:if test="$isNoteOrFnExist = 'true'">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+			
+		</xsl:variable>
+		
+		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
 		
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -2299,6 +2237,8 @@
 					</xsl:choose>
 				</xsl:for-each>
 				
+				
+				
 				<xsl:choose>
 					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
 						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
@@ -2325,6 +2265,7 @@
 							
 							
 							
+							
 							<!-- fn will be processed inside 'note' processing -->
 							
 							
@@ -2333,6 +2274,11 @@
 							
 							
 							
+							
+							
+							<!-- for BSI (not PAS) display Notes before footnotes -->
+							
+							
 							<!-- except gb  -->
 							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
@@ -2358,6 +2304,10 @@
 							<!-- fn processing -->
 							<xsl:call-template name="fn_display"/>
 							
+							
+							<!-- for PAS display Notes after footnotes -->
+							
+							
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-body>
@@ -2399,6 +2349,19 @@
 		
 		</fo:table-body>
 		
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
+		<xsl:choose>
+			<xsl:when test="substring-after(., '—') != ''">
+				<xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
+		<xsl:apply-templates mode="presentation_name"/>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
+		<xsl:apply-templates select="."/>
 	</xsl:template><xsl:template match="*[local-name()='tr']">
 		<xsl:variable name="parent-name" select="local-name(..)"/>
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -2411,10 +2374,13 @@
 					
 					
 					
+					
+					
 				</xsl:if>
 				<xsl:if test="$parent-name = 'tfoot'">
 					
 					
+					
 				</xsl:if>
 				
 				
@@ -2428,6 +2394,8 @@
 				
 				
 				
+				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -2565,8 +2533,13 @@
 				
 				
 				
+				
+				<!-- Table's note name (NOTE, for example) -->
+
 				<fo:inline padding-right="2mm">
 					
+				
+					
 					
 					
 						<xsl:if test="@type = 'source' or @type = 'abbreviation'">
@@ -2584,6 +2557,8 @@
 						
 				</fo:inline>
 				
+				
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -2591,18 +2566,18 @@
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
+			
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
-				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
-					
-					
-					<xsl:apply-templates/>
-				</fn>
+				<xsl:call-template name="create_fn"/>
 			</xsl:for-each>
 		</xsl:variable>
+		
 		<xsl:for-each select="xalan:nodeset($references)//fn">
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 				<fo:block margin-bottom="12pt">
+				
+					
 					
 					
 					
@@ -2622,6 +2597,7 @@
 						<xsl:value-of select="@reference"/>
 						
 						
+						
 					</fo:inline>
 					<fo:inline>
 						
@@ -2631,6 +2607,12 @@
 				</fo:block>
 			</xsl:if>
 		</xsl:for-each>
+	</xsl:template><xsl:template name="create_fn">
+		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
+			
+			
+			<xsl:apply-templates/>
+		</fn>
 	</xsl:template><xsl:template name="fn_name_display">
 		<!-- <xsl:variable name="references">
 			<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -2771,6 +2753,7 @@
 				
 				<xsl:value-of select="@reference"/>
 				
+				
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -3609,16 +3592,68 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
+			
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
 				
 				
+				<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
+				<xsl:variable name="comment_text_">
+					<xsl:choose>
+						<xsl:when test="normalize-space($comment_text_following) != ''">
+							<xsl:value-of select="$comment_text_following"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable> 
+				<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+				
+				<xsl:if test="normalize-space($comment_text) != ''">
+				<!-- put Mathin Alternate Text -->
+					<xsl:attribute name="fox:alt-text">
+						<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
+					</xsl:attribute>
+				</xsl:if>
+				
+				<xsl:variable name="mathml_content">
+					<xsl:apply-templates select="." mode="mathml_actual_text"/>
+				</xsl:variable>
+				<!-- put MathML in Actual Text -->
+				<xsl:attribute name="fox:actual-text">
+					<xsl:value-of select="$mathml_content"/>
+				</xsl:attribute>
+				
+				
 				<!-- <xsl:copy-of select="."/> -->
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
 		</fo:inline>
+	</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
+		<!-- <xsl:text>a+b</xsl:text> -->
+		<xsl:text>&lt;</xsl:text>
+		<xsl:value-of select="local-name()"/>
+		<xsl:if test="local-name() = 'math'">
+			<xsl:text> xmlns="http://www.w3.org/1998/Math/MathML"</xsl:text>
+		</xsl:if>
+		<xsl:for-each select="@*">
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="local-name()"/>
+			<xsl:text>="</xsl:text>
+			<xsl:value-of select="."/>
+			<xsl:text>"</xsl:text>
+		</xsl:for-each>
+		<xsl:text>&gt;</xsl:text>		
+		<xsl:apply-templates mode="mathml_actual_text"/>		
+		<xsl:text>&lt;/</xsl:text>
+		<xsl:value-of select="local-name()"/>
+		<xsl:text>&gt;</xsl:text>
+	</xsl:template><xsl:template match="text()" mode="mathml_actual_text">
+		<xsl:value-of select="normalize-space()"/>
 	</xsl:template><xsl:template match="@*|node()" mode="mathml">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="mathml"/>
@@ -3628,19 +3663,6 @@
 			<!-- replace start and end spaces to non-break space -->
 			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
 		</xsl:copy>
-	</xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()" mode="mathml"/>
-		</xsl:copy>
-		<xsl:choose>
-			<!-- if in msub, then don't add space -->
-			<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
-			<!-- if next char in digit,  don't add space -->
-			<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
-			<xsl:otherwise>
-				<mathml:mspace width="0.5ex"/>
-			</xsl:otherwise>
-		</xsl:choose>
 	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
@@ -3693,7 +3715,10 @@
 		</fo:block>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -3728,9 +3753,10 @@
 			
 		</xsl:variable>
 		
+    <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
 		<xsl:choose>
-			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
-			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
+			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
+			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
 		</xsl:choose>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'xref']">
@@ -3774,6 +3800,7 @@
 			
 			
 			
+			
 			<fo:block-container margin-left="0mm">
 				
 				
@@ -3886,7 +3913,10 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">
-			<fo:inline>
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevelTermName"/>
+			</xsl:variable>
+			<fo:inline role="H{$level}">
 				<xsl:apply-templates/>
 				<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
 					<xsl:text>.</xsl:text>
@@ -3959,7 +3989,24 @@
 							</fo:instream-foreign-object>
 						</xsl:when>
 						<xsl:otherwise>
-							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
+								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
+										
+									<xsl:variable name="img_src">
+										<xsl:choose>
+											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+										</xsl:choose>
+									</xsl:variable>
+									
+									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $width_effective, $height_effective)"/>
+									<xsl:if test="number($scale) &lt; 100">
+										<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+									</xsl:if>
+								
+								</xsl:if>
+							
+							</fo:external-graphic>
 						</xsl:otherwise>
 					</xsl:choose>
 					
@@ -4130,11 +4177,13 @@
 						<xsl:attribute name="width">100%</xsl:attribute>
 						<xsl:attribute name="content-height">100%</xsl:attribute>
 						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+						<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
+						<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
 						<!-- effective height 297 - 27.4 - 13 =  256.6 -->
 						<!-- effective width 210 - 12.5 - 25 = 172.5 -->
 						<!-- effective height / width = 1.48, 1.4 - with title -->
-						<xsl:if test="@height &gt; (@width * 1.4)"> <!-- for images with big height -->
-							<xsl:variable name="width" select="((@width * 1.4) div @height) * 100"/>
+						<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
+							<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
 							<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
 						</xsl:if>
 						<xsl:attribute name="scaling">uniform</xsl:attribute>
@@ -4151,6 +4200,23 @@
 		<xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
 			<xsl:value-of select="."/>
 		</xsl:attribute>
+	</xsl:template><xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="svg_update"/>
+			<xsl:variable name="viewbox">
+				<xsl:call-template name="split">
+					<xsl:with-param name="pText" select="@viewBox"/>
+					<xsl:with-param name="sep" select="' '"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:attribute name="width">
+				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[3])"/>
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[4])"/>
+			</xsl:attribute>
+			<xsl:apply-templates mode="svg_update"/>
+		</xsl:copy>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
 		<xsl:variable name="svg_content" select="document(@src)"/>
 		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
@@ -4481,6 +4547,7 @@
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:apply-templates/>
+								<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 							</xsl:otherwise>
 						</xsl:choose>
 					</fo:block>
@@ -4621,14 +4688,6 @@
 			<fo:block>
 				<fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
 			</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
-		<fo:block xsl:use-attribute-sets="requirement-subject-style">
-			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
-		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'inherit']">
-		<fo:block xsl:use-attribute-sets="requirement-inherit-style">
-			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
-		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'recommendation']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -4645,6 +4704,38 @@
 		<fo:block xsl:use-attribute-sets="recommendation-label-style">
 			<xsl:apply-templates/>
 		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'subject']">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
+		<fo:block xsl:use-attribute-sets="inherit-style">
+			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
+		<fo:block xsl:use-attribute-sets="description-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
+		<fo:block xsl:use-attribute-sets="specification-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
+		<fo:block xsl:use-attribute-sets="measurement-target-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
+		<fo:block xsl:use-attribute-sets="verification-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
+		<fo:block xsl:use-attribute-sets="import-style">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
 			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
@@ -4796,7 +4887,19 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="element">inline
+			
+		</xsl:variable>		
+		<xsl:choose>			
+			<xsl:when test="contains($element, 'block')">
+				<fo:block xsl:use-attribute-sets="example-p-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline><xsl:apply-templates/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
@@ -4979,9 +5082,10 @@
 											
 						
 					</xsl:if>	
-											
+					
+					
+            
 					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-						
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
 						</xsl:if>
@@ -4989,6 +5093,7 @@
 							
 							
 							
+							
 								<xsl:attribute name="text-decoration">underline</xsl:attribute>
 							
 						</xsl:if>
@@ -5374,7 +5479,6 @@
 	</xsl:template><xsl:template name="processBibitem">
 		
 		
-		<!-- end BIPM bibitem processing-->
 		
 		 
 		
@@ -5504,6 +5608,9 @@
 		<fo:block-container border="1pt solid black" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
+		<fo:inline padding-right="5mm"> </fo:inline>
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -5742,6 +5849,26 @@
 				<xsl:value-of select="$level"/>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="getLevelTermName">
+		<xsl:choose>
+			<xsl:when test="normalize-space(../@depth) != ''">
+				<xsl:value-of select="../@depth"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="title_level_">
+					<xsl:for-each select="../preceding-sibling::*[local-name() = 'title'][1]">
+						<xsl:call-template name="getLevel"/>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="title_level" select="normalize-space($title_level_)"/>
+				<xsl:choose>
+					<xsl:when test="$title_level != ''"><xsl:value-of select="$title_level + 1"/></xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="getLevel"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
@@ -5839,20 +5966,40 @@
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getLocalizedString">
-		<xsl:param name="key"/>	
+		<xsl:param name="key"/>
+		<xsl:param name="formatted">false</xsl:param>
 		
 		<xsl:variable name="curr_lang">
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
 		
-		<xsl:variable name="data_value" select="normalize-space(xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang])"/>
+		<xsl:variable name="data_value">
+			<xsl:choose>
+				<xsl:when test="$formatted = 'true'">
+					<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang])"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		
 		<xsl:choose>
-			<xsl:when test="$data_value != ''">
-				<xsl:value-of select="$data_value"/>
+			<xsl:when test="normalize-space($data_value) != ''">
+				<xsl:choose>
+					<xsl:when test="$formatted = 'true'"><xsl:copy-of select="$data_value"/></xsl:when>
+					<xsl:otherwise><xsl:value-of select="$data_value"/></xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
-				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				<xsl:choose>
+					<xsl:when test="$formatted = 'true'">
+						<xsl:apply-templates select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:variable name="key_">
@@ -5863,7 +6010,7 @@
 				<xsl:value-of select="$key_"/>
 			</xsl:otherwise>
 		</xsl:choose>
-		
+			
 	</xsl:template><xsl:template name="setTrackChangesStyles">
 		<xsl:param name="isAdded"/>
 		<xsl:param name="isDeleted"/>
@@ -5914,4 +6061,100 @@
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+	</xsl:template><xsl:template name="number-to-words">
+		<xsl:param name="number"/>
+		<xsl:param name="first"/>
+		<xsl:if test="$number != ''">
+			<xsl:variable name="words">
+								<words>
+					<word cardinal="1">One-</word>
+					<word ordinal="1">First </word>
+					<word cardinal="2">Two-</word>
+					<word ordinal="2">Second </word>
+					<word cardinal="3">Three-</word>
+					<word ordinal="3">Third </word>
+					<word cardinal="4">Four-</word>
+					<word ordinal="4">Fourth </word>
+					<word cardinal="5">Five-</word>
+					<word ordinal="5">Fifth </word>
+					<word cardinal="6">Six-</word>
+					<word ordinal="6">Sixth </word>
+					<word cardinal="7">Seven-</word>
+					<word ordinal="7">Seventh </word>
+					<word cardinal="8">Eight-</word>
+					<word ordinal="8">Eighth </word>
+					<word cardinal="9">Nine-</word>
+					<word ordinal="9">Ninth </word>
+					<word ordinal="10">Tenth </word>
+					<word ordinal="11">Eleventh </word>
+					<word ordinal="12">Twelfth </word>
+					<word ordinal="13">Thirteenth </word>
+					<word ordinal="14">Fourteenth </word>
+					<word ordinal="15">Fifteenth </word>
+					<word ordinal="16">Sixteenth </word>
+					<word ordinal="17">Seventeenth </word>
+					<word ordinal="18">Eighteenth </word>
+					<word ordinal="19">Nineteenth </word>
+					<word cardinal="20">Twenty-</word>
+					<word ordinal="20">Twentieth </word>
+					<word cardinal="30">Thirty-</word>
+					<word ordinal="30">Thirtieth </word>
+					<word cardinal="40">Forty-</word>
+					<word ordinal="40">Fortieth </word>
+					<word cardinal="50">Fifty-</word>
+					<word ordinal="50">Fiftieth </word>
+					<word cardinal="60">Sixty-</word>
+					<word ordinal="60">Sixtieth </word>
+					<word cardinal="70">Seventy-</word>
+					<word ordinal="70">Seventieth </word>
+					<word cardinal="80">Eighty-</word>
+					<word ordinal="80">Eightieth </word>
+					<word cardinal="90">Ninety-</word>
+					<word ordinal="90">Ninetieth </word>
+					<word cardinal="100">Hundred-</word>
+					<word ordinal="100">Hundredth </word>
+				</words>
+			</xsl:variable>
+
+			<xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
+			
+			<xsl:variable name="value">
+				<xsl:choose>
+					<xsl:when test="$ordinal != ''">
+						<xsl:value-of select="$ordinal"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:choose>
+							<xsl:when test="$number &lt; 100">
+								<xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
+								<xsl:variable name="digit" select="substring($number,2)"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<!-- more 100 -->
+								<xsl:variable name="hundred" select="substring($number,1,1)"/>
+								<xsl:variable name="digits" select="number(substring($number,2))"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
+								<xsl:call-template name="number-to-words">
+									<xsl:with-param name="number" select="$digits"/>
+								</xsl:call-template>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:choose>
+				<xsl:when test="$first = 'true'">
+					<xsl:variable name="value_lc" select="java:toLowerCase(java:java.lang.String.new($value))"/>
+					<xsl:call-template name="capitalize">
+						<xsl:with-param name="str" select="$value_lc"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$value"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 	</xsl:template></xsl:stylesheet>