metanorma-iso 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67209d73be23ff04c3933a086c5e9de18463c17472b535305642a81df58820c
-  data.tar.gz: e13a27804003551fd7da54476f27b61d98f7a23234a3e5eafc6900fe22265a8a
+  metadata.gz: ac1798683a3c7ca060a86feb2617005c4e642740a8d65c6221a65c1920799590
+  data.tar.gz: 6e3935f47c7d2b9458c0c0768c336477a32ff263e1f6cba0d57cdaad47151e60
 SHA512:
-  metadata.gz: 73714b546a1f6a7680400be13c4672e33c38f897688409258085972dc593c0dd45c8327b4340c4d9b535c4f32d0c8b0ea4d58db1855659162b7b9a6eb26d9dca
-  data.tar.gz: 3289bacc2f84c35c53f98e6950aafa0530189293340be023eff84a81b917c6287a7f9df48295bad57e617e0de610a54f14b5c8aff394680abfdb41d7e5f29a46
+  metadata.gz: c9619fe733adeddd4064d3531a6cdca00f1c841234729c24db198c88f24e7cce87ae9b4e847c7df5f52f0414b8392c3c581c88cb19f0a2ad2affc2f1693508f5
+  data.tar.gz: c745a76c0834e67c582649c7676d8fa140e1c5a89f20d67fea317e1fb37251a339155a17e980250e96f54d2da0b0e6d05bcd382743bd91b8979571ba030cec6b

data/lib/asciidoctor/iso/cleanup.rb

@@ -137,10 +137,9 @@ module Asciidoctor
         xmldoc.xpath("//bibitem/note[@type = 'Unpublished-Status']").each do |n|
           id = n.parent["id"]
           e = xmldoc.at("//eref[@bibitemid = '#{id}']") or next
-          e.next = n.dup
-          e.next.name = "fn"
-          e.next.delete("format")
-          e.next.delete("type")
+          fn = n.children.to_xml
+          n&.elements&.first&.name == "p" or fn = "<p>#{fn}</p>"
+          e.next = "<fn>#{fn}</fn>"
         end
       end
 

data/lib/asciidoctor/iso/front_id.rb

@@ -193,12 +193,17 @@ module Asciidoctor
       end
 
       def get_stage(node)
-        node.attr("status") || node.attr("docstage") || "60"
+        a = node.attr("status")
+        a = node.attr("docstage") if a.nil? || a.empty?
+        a = "60" if a.nil? || a.empty?
+        a
       end
 
       def get_substage(node)
         stage = get_stage(node)
-        node.attr("docsubstage") || (stage == "60" ? "60" : "00")
+        ret = node.attr("docsubstage")
+        ret = (stage == "60" ? "60" : "00") if ret.nil? || ret.empty?
+        ret
       end
 
       def get_typeabbr(node, amd = false)

data/lib/asciidoctor/iso/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>

data/lib/asciidoctor/iso/isostandard.rng

@@ -184,6 +184,9 @@
         <zeroOrMore>
           <ref name="termsource"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="term"/>
+        </zeroOrMore>
       </element>
     </define>
     <define name="annex">

data/lib/asciidoctor/iso/section.rb

@@ -15,7 +15,7 @@ module Asciidoctor
       end
 
       def appendix_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:"inline-header"] = node.option? "inline-header"
         set_obligation(attrs, node)
         xml.appendix **attr_code(attrs) do |xml_section|
           xml_section.title { |name| name << node.title }
@@ -38,6 +38,12 @@ module Asciidoctor
 
         super
       end
+
+      def term_def_subclause_parse(attrs, xml, node)
+        node.role == "term" and
+          return term_def_subclause_parse1(attrs, xml, node)
+        super
+      end
     end
   end
 end

data/lib/asciidoctor/iso/validate_section.rb

@@ -32,10 +32,10 @@ module Asciidoctor
       end
 
       ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated "\
-        "Terms section in the standard".freeze
+                            "Terms section in the standard".freeze
 
       NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can "\
-        "only contain a definition list".freeze
+                               "only contain a definition list".freeze
 
       def symbols_validate(root)
         f = root.xpath("//definitions")
@@ -87,7 +87,7 @@ module Asciidoctor
           },
           {
             msg: "Normative References must be followed by "\
-            "Terms and Definitions",
+                 "Terms and Definitions",
             val: ["./self::terms | .//terms"],
           },
         ].freeze
@@ -127,17 +127,20 @@ module Asciidoctor
         end
         elem&.at("./self::clause") ||
           @log.add("Style", elem, "Document must contain clause after "\
-                   "Terms and Definitions")
+                                  "Terms and Definitions")
         elem&.at("./self::clause[@type = 'scope']") &&
-          @log.add("Style", elem, "Scope must occur before Terms and Definitions")
+          @log.add("Style", elem,
+                   "Scope must occur before Terms and Definitions")
         elem = names.shift
         while elem&.name == "clause"
           elem&.at("./self::clause[@type = 'scope']")
-          @log.add("Style", elem, "Scope must occur before Terms and Definitions")
+          @log.add("Style", elem,
+                   "Scope must occur before Terms and Definitions")
           elem = names.shift
         end
         %w(annex references).include? elem&.name or
-          @log.add("Style", elem, "Only annexes and references can follow clauses")
+          @log.add("Style", elem,
+                   "Only annexes and references can follow clauses")
         [names, elem]
       end
 
@@ -146,7 +149,8 @@ module Asciidoctor
           elem = names.shift
         end
         %w(annex references).include? elem&.name or
-          @log.add("Style", elem, "Only annexes and references can follow terms and clauses")
+          @log.add("Style", elem,
+                   "Only annexes and references can follow terms and clauses")
         [names, elem]
       end
 
@@ -155,25 +159,19 @@ module Asciidoctor
           elem = names.shift
           if elem.nil?
             @log.add("Style", nil, "Document must include (references) "\
-                     "Normative References")
+                                   "Normative References")
           end
         end
         elem&.at("./self::references[@normative = 'true']") ||
           @log.add("Style", nil, "Document must include (references) "\
-                   "Normative References")
+                                 "Normative References")
         elem = names&.shift
         elem&.at("./self::references[@normative = 'false']") ||
-          @log.add("Style", elem, "Final section must be (references) Bibliography")
+          @log.add("Style", elem,
+                   "Final section must be (references) Bibliography")
         names.empty? ||
-          @log.add("Style", elem, "There are sections after the final Bibliography")
-      end
-
-      def style_warning(node, msg, text = nil)
-        return if @novalid
-
-        w = msg
-        w += ": #{text}" if text
-        @log.add("Style", node, w)
+          @log.add("Style", elem,
+                   "There are sections after the final Bibliography")
       end
 
       NORM_ISO_WARN = "non-ISO/IEC reference not expected as normative".freeze

data/lib/asciidoctor/iso/validate_style.rb

@@ -70,18 +70,18 @@ module Asciidoctor
         style(node, extract_text(node))
       end
 
-      def style_regex(re, warning, n, text)
-        (m = re.match(text)) && style_warning(n, warning, m[:num])
+      def style_regex(regex, warning, n, text)
+        (m = regex.match(text)) && style_warning(n, warning, m[:num])
       end
 
       # style check with a regex on a token
       # and a negative match on its preceding token
-      def style_two_regex_not_prev(n, text, re, re_prev, warning)
+      def style_two_regex_not_prev(n, text, regex, re_prev, warning)
         return if text.nil?
 
         arr = Tokenizer::WhitespaceTokenizer.new.tokenize(text)
         arr.each_index do |i|
-          m = re.match arr[i]
+          m = regex.match arr[i]
           m_prev = i.zero? ? nil : re_prev.match(arr[i - 1])
           if !m.nil? && m_prev.nil?
             style_warning(n, warning, m[:num])
@@ -132,22 +132,22 @@ module Asciidoctor
 
       # leaving out as problematic: N J K C S T H h d B o E
       SI_UNIT = "(m|cm|mm|km|μm|nm|g|kg|mgmol|cd|rad|sr|Hz|Hz|MHz|Pa|hPa|kJ|"\
-        "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|"\
-        "bit|kB|MB|Hart|nat|Sh|var)".freeze
+                "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|"\
+                "bit|kB|MB|Hart|nat|Sh|var)".freeze
 
       # ISO/IEC DIR 2, 9.3
       def style_units(node, text)
         style_regex(/\b(?<num>[0-9][0-9,]*\s+[\u00b0\u2032\u2033])/,
                     "space between number and degrees/minutes/seconds",
                     node, text)
-        style_regex(/\b(?<num>[0-9][0-9,]*#{SI_UNIT})\b/,
+        style_regex(/\b(?<num>[0-9][0-9,]*#{SI_UNIT})\b/o,
                     "no space between number and SI unit", node, text)
         style_non_std_units(node, text)
       end
 
       NONSTD_UNITS = {
-        "sec": "s", "mins": "min", "hrs": "h", "hr": "h", "cc": "cm^3",
-        "lit": "l", "amp": "A", "amps": "A", "rpm": "r/min"
+        sec: "s", mins: "min", hrs: "h", hr: "h", cc: "cm^3",
+        lit: "l", amp: "A", amps: "A", rpm: "r/min"
       }.freeze
 
       # ISO/IEC DIR 2, 9.3
@@ -157,6 +157,14 @@ module Asciidoctor
                       "non-standard unit (should be #{v})", node, text)
         end
       end
+
+      def style_warning(node, msg, text = nil)
+        return if @novalid
+
+        w = msg
+        w += ": #{text}" if text
+        @log.add("Style", node, w)
+      end
     end
   end
 end

data/lib/isodoc/iso/index.rb

@@ -7,12 +7,13 @@ module IsoDoc
 
       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']")),
+        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
@@ -20,10 +21,12 @@ module IsoDoc
       def index1(docxml, i, index)
         c = i.add_child("<ul></ul>").first
         index.keys.sort.each do |k|
-          #c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
-          words = index[k].keys.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
+          # c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
+          words = index[k].keys.each_with_object({}) do |w, v|
+            v[sortable(w).downcase] = w
+          end
           words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            #c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
+            # c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
             c.add_child index_entries(words, index[k], w)
           end
         end
@@ -31,8 +34,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
@@ -40,8 +43,12 @@ 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&.reject do |k|
+                   k.nil?
+                 end&.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|
@@ -53,12 +60,18 @@ module IsoDoc
       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 do |k|
+                   k.nil?
+                 end&.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|
-            ret += (index_entries_head(words3[w], index[words[secondary]][words3[w]], index_entries_opt) + "</li>")
+            ret += (index_entries_head(words3[w],
+                                       index[words[secondary]][words3[w]],
+                                       index_entries_opt) + "</li>")
           end
           ret += "</ul>"
         end
@@ -68,10 +81,18 @@ module IsoDoc
       def index_entries_head(head, entries, opt)
         ret = "<li>#{head}"
         xref = entries&.dig(:xref)&.join(", ")
-        see_sort = entries&.dig(:see)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
-        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| see_sort[k] }&.join(", ")
-        also_sort = entries&.dig(:also)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
-        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| also_sort[k] }&.join(", ")
+        see_sort = entries&.dig(:see)&.each_with_object({}) do |w, v|
+          v[sortable(w).downcase] = w
+        end
+        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
+                see_sort[k]
+              end&.join(", ")
+        also_sort = entries&.dig(:also)&.each_with_object({}) do |w, v|
+          v[sortable(w).downcase] = w
+        end
+        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
+                 also_sort[k]
+               end&.join(", ")
         ret += "#{opt[:xref_lbl]} #{xref}" if xref
         ret += "#{opt[:see_lbl]} #{see}" if see
         ret += "#{opt[:also_lbl]} #{also}" if also
@@ -96,8 +117,8 @@ module IsoDoc
         end
       end
 
-      def extract_indexsee(v, terms, label)
-        terms.each_with_object(v) do |t, v|
+      def extract_indexsee(val, terms, label)
+        terms.each_with_object(val) do |t, v|
           term = t&.at(ns("./primary"))&.children&.to_xml
           term2 = t&.at(ns("./secondary"))&.children&.to_xml
           term3 = t&.at(ns("./tertiary"))&.children&.to_xml
@@ -110,8 +131,11 @@ 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([^;]+);/) do |_x|
+          "&#x#{$1.upcase};"
+        end
       end
 
       # attributes are decoded into UTF-8, elements in extract_indexsee are still in entities
@@ -130,10 +154,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/iso/iso.amendment.xsl

@@ -529,7 +529,7 @@
 										
 										<fo:block-container border-top="1mm double black" line-height="1.1" margin-top="3mm">
 											<fo:block margin-right="5mm">
-												<fo:block font-size="18pt" font-weight="bold" margin-top="6pt">
+												<fo:block font-size="18pt" font-weight="bold" margin-top="6pt" role="H1">
 													<xsl:if test="normalize-space($title-intro) != ''">
 														<xsl:value-of select="$title-intro"/>
 														<xsl:text> — </xsl:text>
@@ -541,7 +541,7 @@
 													
 													<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-amd']"/>
 													<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-														<fo:block margin-top="12pt">
+														<fo:block margin-top="12pt" role="H1">
 															<xsl:call-template name="printAmendmentTitle"/>
 														</fo:block>
 													</xsl:if>
@@ -549,7 +549,7 @@
 												</fo:block>
 															
 												<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
-												<fo:block font-size="11pt" font-style="italic" line-height="1.5">
+												<fo:block font-size="11pt" font-style="italic" line-height="1.5" role="H1">
 													
 													<xsl:if test="normalize-space($title-intro-fr) != ''">
 														<xsl:value-of select="$title-intro-fr"/>
@@ -562,7 +562,7 @@
 													
 													<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-amd']"/>
 														<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-															<fo:block margin-top="6pt">
+															<fo:block margin-top="6pt" role="H1">
 																<xsl:call-template name="printAmendmentTitle">
 																	<xsl:with-param name="lang" select="'fr'"/>
 																</xsl:call-template>
@@ -654,7 +654,7 @@
 														<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
 														<xsl:if test="$doctype = 'amendment'">
 															<fo:block text-align="right" margin-right="0.5mm">
-																<fo:block font-weight="bold" margin-top="4pt">
+																<fo:block font-weight="bold" margin-top="4pt" role="H1">
 																	<xsl:variable name="title-amendment">
 																		<xsl:call-template name="getTitle">
 																			<xsl:with-param name="name" select="'title-amendment'"/>
@@ -724,7 +724,7 @@
 													<fo:table-cell>
 														<fo:block-container border-top="1mm double black" line-height="1.1">
 															<fo:block margin-right="5mm">
-																<fo:block font-size="18pt" font-weight="bold" margin-top="12pt">
+																<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
 																	
 																	<xsl:if test="normalize-space($title-intro) != ''">
 																		<xsl:value-of select="$title-intro"/>
@@ -746,14 +746,14 @@
 																	</xsl:if> -->
 																	<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-amd']"/>
 																	<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-																		<fo:block margin-right="-5mm" margin-top="12pt">
+																		<fo:block margin-right="-5mm" margin-top="12pt" role="H1">
 																			<xsl:call-template name="printAmendmentTitle"/>
 																		</fo:block>
 																	</xsl:if>
 																</fo:block>
 																			
 																<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
-																<fo:block font-size="11pt" font-style="italic" line-height="1.5">
+																<fo:block font-size="11pt" font-style="italic" line-height="1.5" role="H1">
 																	
 																	<xsl:if test="normalize-space($title-intro-fr) != ''">
 																		<xsl:value-of select="$title-intro-fr"/>
@@ -766,7 +766,7 @@
 																	
 																	<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-amd']"/>
 																	<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-																		<fo:block margin-right="-5mm" margin-top="6pt">
+																		<fo:block margin-right="-5mm" margin-top="6pt" role="H1">
 																			<xsl:call-template name="printAmendmentTitle">
 																				<xsl:with-param name="lang" select="'fr'"/>
 																			</xsl:call-template>
@@ -857,7 +857,7 @@
 								
 								<fo:block-container border-top="1mm double black" line-height="1.1">
 									<fo:block margin-right="40mm">
-									<fo:block font-size="18pt" font-weight="bold" margin-top="12pt">
+									<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
 									
 										<xsl:if test="normalize-space($title-intro) != ''">
 											<xsl:value-of select="$title-intro"/>
@@ -880,7 +880,7 @@
 									</fo:block>
 												
 									<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
-									<fo:block font-size="11pt" font-style="italic" line-height="1.5">
+									<fo:block font-size="11pt" font-style="italic" line-height="1.5" role="H1">
 										
 										<xsl:if test="normalize-space($title-intro-fr) != ''">
 											<xsl:value-of select="$title-intro-fr"/>
@@ -972,7 +972,7 @@
 								</fo:block-container>
 							<fo:block-container font-size="16pt">
 								<!-- Information and documentation — Codes for transcription systems  -->
-									<fo:block font-weight="bold">
+									<fo:block font-weight="bold" role="H1">
 									
 										<xsl:if test="normalize-space($title-intro) != ''">
 											<xsl:value-of select="$title-intro"/>
@@ -995,7 +995,7 @@
 									</fo:block>
 									
 									<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
-									<fo:block>
+									<fo:block role="H1">
 										<xsl:if test="normalize-space($title-intro-fr) != ''">
 											<xsl:value-of select="$title-intro-fr"/>
 											<xsl:text> — </xsl:text>
@@ -1073,79 +1073,80 @@
 								<fo:block break-after="page"/>
 							</xsl:if>
 							<fo:block-container font-weight="bold">
-								
-								<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
-									<fo:inline font-size="16pt" font-weight="bold">
-										<!-- Contents -->
-										<xsl:call-template name="getLocalizedString">
-											<xsl:with-param name="key">table_of_contents</xsl:with-param>
-										</xsl:call-template>
-									</fo:inline>
-									<fo:inline keep-together.within-line="always">
-										<fo:leader leader-pattern="space"/>
-										<fo:inline font-weight="normal" font-size="10pt">
-											<!-- Page -->
+								<fo:block role="TOC">
+									<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
+										<fo:inline font-size="16pt" font-weight="bold" role="H1">
+											<!-- Contents -->
 											<xsl:call-template name="getLocalizedString">
-											<xsl:with-param name="key">locality.page</xsl:with-param>
-										</xsl:call-template>
+												<xsl:with-param name="key">table_of_contents</xsl:with-param>
+											</xsl:call-template>
 										</fo:inline>
-									</fo:inline>
-								</fo:block>
-								
-								<xsl:if test="$debug = 'true'">
-									<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
-										DEBUG
-										contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
-									<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
-								</xsl:if>
-								
-								<xsl:variable name="margin-left">12</xsl:variable>
-								<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
+										<fo:inline keep-together.within-line="always">
+											<fo:leader leader-pattern="space"/>
+											<fo:inline font-weight="normal" font-size="10pt">
+												<!-- Page -->
+												<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">locality.page</xsl:with-param>
+											</xsl:call-template>
+											</fo:inline>
+										</fo:inline>
+									</fo:block>
 									
-									<fo:block>
-										<xsl:if test="@level = 1">
-											<xsl:attribute name="margin-top">5pt</xsl:attribute>
-										</xsl:if>
-										<xsl:if test="@level = 3">
-											<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
-										</xsl:if>
-										<fo:list-block>
-											<xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
-											<xsl:if test="@level &gt;= 2 or @type = 'annex'">
-												<xsl:attribute name="font-weight">normal</xsl:attribute>
+									<xsl:if test="$debug = 'true'">
+										<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
+											DEBUG
+											contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
+										<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
+									</xsl:if>
+									
+									<xsl:variable name="margin-left">12</xsl:variable>
+									<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
+										
+										<fo:block role="TOCI">
+											<xsl:if test="@level = 1">
+												<xsl:attribute name="margin-top">5pt</xsl:attribute>
 											</xsl:if>
-											<xsl:attribute name="provisional-distance-between-starts">
-												<xsl:choose>
-													<!-- skip 0 section without subsections -->
-													<xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.2"/>mm</xsl:when>
-													<xsl:when test="@section != ''"><xsl:value-of select="$margin-left"/>mm</xsl:when>
-													<xsl:otherwise>0mm</xsl:otherwise>
-												</xsl:choose>
-											</xsl:attribute>
-											<fo:list-item>
-												<fo:list-item-label end-indent="label-end()">
-													<fo:block>														
-															<xsl:value-of select="@section"/>														
-													</fo:block>
-												</fo:list-item-label>
-												<fo:list-item-body start-indent="body-start()">
-													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
-														<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
-														
-															<xsl:apply-templates select="title"/>
+											<xsl:if test="@level = 3">
+												<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
+											</xsl:if>
+											<fo:list-block>
+												<xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
+												<xsl:if test="@level &gt;= 2 or @type = 'annex'">
+													<xsl:attribute name="font-weight">normal</xsl:attribute>
+												</xsl:if>
+												<xsl:attribute name="provisional-distance-between-starts">
+													<xsl:choose>
+														<!-- skip 0 section without subsections -->
+														<xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.2"/>mm</xsl:when>
+														<xsl:when test="@section != ''"><xsl:value-of select="$margin-left"/>mm</xsl:when>
+														<xsl:otherwise>0mm</xsl:otherwise>
+													</xsl:choose>
+												</xsl:attribute>
+												<fo:list-item>
+													<fo:list-item-label end-indent="label-end()">
+														<fo:block>														
+																<xsl:value-of select="@section"/>														
+														</fo:block>
+													</fo:list-item-label>
+													<fo:list-item-body start-indent="body-start()">
+														<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+															<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
 															
-															<fo:inline keep-together.within-line="always">
-																<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
-																<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-															</fo:inline>
-														</fo:basic-link>
-													</fo:block>
-												</fo:list-item-body>
-											</fo:list-item>
-										</fo:list-block>
-									</fo:block>
-									
-								</xsl:for-each>
+																<xsl:apply-templates select="title"/>
+																
+																<fo:inline keep-together.within-line="always">
+																	<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
+																	<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+																</fo:inline>
+															</fo:basic-link>
+														</fo:block>
+													</fo:list-item-body>
+												</fo:list-item>
+											</fo:list-block>
+										</fo:block>
+										
+									</xsl:for-each>
+								</fo:block>
 							</fo:block-container>
 						</xsl:otherwise>
 					</xsl:choose>
@@ -1179,7 +1180,7 @@
 							
 							<xsl:variable name="title-intro-doc-lang" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
 							
-							<fo:block>
+							<fo:block role="H1">
 								<xsl:if test="normalize-space($title-intro-doc-lang) != ''">
 									<xsl:value-of select="$title-intro-doc-lang"/>
 									<xsl:text> — </xsl:text>
@@ -1201,13 +1202,13 @@
 									</xsl:if>
 								</xsl:if>
 							</fo:block>
-							<fo:block>
+							<fo:block role="H1">
 								<xsl:value-of select="$title-part-doc-lang"/>
 							</fo:block>
 							
 							<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-amd']"/>
 							<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-								<fo:block margin-top="12pt">
+								<fo:block margin-top="12pt" role="H1">
 									<xsl:call-template name="printAmendmentTitle"/>
 								</fo:block>
 							</xsl:if>
@@ -1454,7 +1455,10 @@
 	
 	
 	<xsl:template match="iso:license-statement//iso:title">
-		<fo:block text-align="center" font-weight="bold">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:block text-align="center" font-weight="bold" role="H{$level}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -1482,7 +1486,7 @@
 			</fo:block> -->
 	
 	<xsl:template match="iso:copyright-statement/iso:clause[1]/iso:title">
-		<fo:block margin-bottom="3mm">
+		<fo:block margin-bottom="3mm" role="H1">
 				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
 				<!-- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline> -->
 				<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"><xsl:apply-templates/></fo:inline>
@@ -1519,8 +1523,9 @@
 				<xsl:call-template name="titleAmendment"/>				
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always">
+				<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always" role="H1">
 					<xsl:apply-templates/>
+					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1533,7 +1538,7 @@
 				<xsl:call-template name="titleAmendment"/>				
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block font-size="16pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="36pt" keep-with-next="always">
+				<fo:block font-size="16pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="36pt" keep-with-next="always" role="H1">
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -1566,8 +1571,9 @@
 		
 		<xsl:choose>
 			<xsl:when test="$doctype = 'amendment' and not(ancestor::iso:preface)">
-				<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
+				<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always" role="H{$level}">
 					<xsl:apply-templates/>
+					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</fo:block>
 			</xsl:when>
 			
@@ -1593,6 +1599,7 @@
 						</xsl:choose>
 					</xsl:attribute>
 					<xsl:attribute name="keep-with-next">always</xsl:attribute>		
+					<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 					<xsl:if test="$element-name = 'fo:inline'">
 						<xsl:choose>
 							<xsl:when test="$lang = 'zh'">
@@ -1604,6 +1611,7 @@
 						</xsl:choose>						
 					</xsl:if>
 					<xsl:apply-templates/>
+					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</xsl:element>
 				
 				<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iso:p)">
@@ -1784,8 +1792,11 @@
 		<xsl:apply-templates select="."/>
 	</xsl:template>
 	
-	<xsl:template match="iso:preferred">		
-		<fo:block line-height="1.1">
+	<xsl:template match="iso:preferred">	
+		<xsl:variable name="levelTerm">
+			<xsl:call-template name="getLevelTermName"/>
+		</xsl:variable>
+		<fo:block line-height="1.1" role="H{$levelTerm}">
 			<fo:block font-weight="bold" keep-with-next="always">
 				<xsl:apply-templates select="ancestor::iso:term/iso:name" mode="presentation"/>				
 			</fo:block>
@@ -1949,7 +1960,7 @@
 				<fo:block id="{@id}" span="all">
 					<xsl:apply-templates select="iso:title"/>
 				</fo:block>
-				<fo:block>
+				<fo:block role="Index">
 					<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
 				</fo:block>
 			</fo:flow>
@@ -1958,7 +1969,7 @@
 	
 	<!-- <xsl:template match="iso:clause[@type = 'index']/iso:title" priority="4"> -->
 	<xsl:template match="iso:indexsect/iso:title" priority="4">
-		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt">
+		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" role="H1">
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
@@ -2003,7 +2014,7 @@
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="font-weight" select="'bold'"/>
 		<xsl:call-template name="insertHeaderEven"/>
-		<fo:static-content flow-name="footer-even">
+		<fo:static-content flow-name="footer-even" role="artifact">
 			<fo:block-container> <!--  display-align="after" -->
 				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column column-width="33%"/>
@@ -2042,12 +2053,12 @@
 				</fo:block>
 			</fo:block-container>
 		</fo:static-content>
-		<fo:static-content flow-name="header-odd">
+		<fo:static-content flow-name="header-odd" role="artifact">
 			<fo:block-container height="24mm" display-align="before">
 				<fo:block font-size="12pt" font-weight="bold" text-align="right" padding-top="12.5mm"><xsl:value-of select="$ISOname"/></fo:block>
 			</fo:block-container>
 		</fo:static-content>
-		<fo:static-content flow-name="footer-odd">
+		<fo:static-content flow-name="footer-odd" role="artifact">
 			<fo:block-container> <!--  display-align="after" -->
 				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column column-width="33%"/>
@@ -2075,7 +2086,7 @@
 		</fo:static-content>
 	</xsl:template>
 	<xsl:template name="insertHeaderEven">
-		<fo:static-content flow-name="header-even">
+		<fo:static-content flow-name="header-even" role="artifact">
 			<fo:block-container height="24mm" display-align="before">
 				<fo:block font-size="12pt" font-weight="bold" padding-top="12.5mm"><xsl:value-of select="$ISOname"/></fo:block>
 			</fo:block-container>
@@ -2326,6 +2337,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
+		<xsl:attribute name="role">Code</xsl:attribute>
 		
 			<xsl:attribute name="font-family">Courier New</xsl:attribute>			
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -2350,8 +2362,13 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
-	</xsl:attribute-set><xsl:attribute-set name="requirement-subject-style">
-	</xsl:attribute-set><xsl:attribute-set name="requirement-inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="subject-style">
+	</xsl:attribute-set><xsl:attribute-set name="inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="description-style">
+	</xsl:attribute-set><xsl:attribute-set name="specification-style">
+	</xsl:attribute-set><xsl:attribute-set name="measurement-target-style">
+	</xsl:attribute-set><xsl:attribute-set name="verification-style">
+	</xsl:attribute-set><xsl:attribute-set name="import-style">
 	</xsl:attribute-set><xsl:attribute-set name="recommendation-style">
 		
 		
@@ -2576,7 +2593,8 @@
 				
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
+	</xsl:attribute-set><xsl:attribute-set name="quote-style">
+		<xsl:attribute name="role">BlockQuote</xsl:attribute>
 		
 		
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -2778,7 +2796,9 @@
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			
-					
+			
+			
+			
 			
 				
 			
@@ -4765,12 +4785,43 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
+			
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
 				
 				
+				<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
+				<xsl:variable name="comment_text_">
+					<xsl:choose>
+						<xsl:when test="normalize-space($comment_text_following) != ''">
+							<xsl:value-of select="$comment_text_following"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable> 
+				<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+				
+				<xsl:if test="normalize-space($comment_text) != ''">
+				<!-- put Mathin Alternate Text -->
+					<xsl:attribute name="fox:alt-text">
+						<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
+					</xsl:attribute>
+				</xsl:if>
+				
+				<xsl:variable name="mathml_content">
+					<xsl:apply-templates select="." mode="mathml_actual_text"/>
+				</xsl:variable>
+				<!-- put MathML in Actual Text -->
+				<xsl:attribute name="fox:actual-text">
+					<xsl:value-of select="$mathml_content"/>
+				</xsl:attribute>
+				
+				
 					<xsl:if test="count(ancestor::*[local-name() = 'table']) &gt; 1">
 						<xsl:attribute name="width">95%</xsl:attribute>
 						<xsl:attribute name="content-height">100%</xsl:attribute>
@@ -4782,6 +4833,27 @@
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
 		</fo:inline>
+	</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
+		<!-- <xsl:text>a+b</xsl:text> -->
+		<xsl:text>&lt;</xsl:text>
+		<xsl:value-of select="local-name()"/>
+		<xsl:if test="local-name() = 'math'">
+			<xsl:text> xmlns="http://www.w3.org/1998/Math/MathML"</xsl:text>
+		</xsl:if>
+		<xsl:for-each select="@*">
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="local-name()"/>
+			<xsl:text>="</xsl:text>
+			<xsl:value-of select="."/>
+			<xsl:text>"</xsl:text>
+		</xsl:for-each>
+		<xsl:text>&gt;</xsl:text>		
+		<xsl:apply-templates mode="mathml_actual_text"/>		
+		<xsl:text>&lt;/</xsl:text>
+		<xsl:value-of select="local-name()"/>
+		<xsl:text>&gt;</xsl:text>
+	</xsl:template><xsl:template match="text()" mode="mathml_actual_text">
+		<xsl:value-of select="normalize-space()"/>
 	</xsl:template><xsl:template match="@*|node()" mode="mathml">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="mathml"/>
@@ -4843,7 +4915,10 @@
 		</fo:block>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -4878,9 +4953,10 @@
 			
 		</xsl:variable>
 		
+    <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
 		<xsl:choose>
-			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
-			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
+			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
+			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
 		</xsl:choose>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'xref']">
@@ -5026,7 +5102,10 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">
-			<fo:inline>
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevelTermName"/>
+			</xsl:variable>
+			<fo:inline role="H{$level}">
 				<xsl:apply-templates/>
 				<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
 					<xsl:text>.</xsl:text>
@@ -5657,6 +5736,7 @@
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:apply-templates/>
+								<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 							</xsl:otherwise>
 						</xsl:choose>
 					</fo:block>
@@ -5797,14 +5877,6 @@
 			<fo:block>
 				<fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
 			</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
-		<fo:block xsl:use-attribute-sets="requirement-subject-style">
-			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
-		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'inherit']">
-		<fo:block xsl:use-attribute-sets="requirement-inherit-style">
-			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
-		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'recommendation']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -5821,6 +5893,38 @@
 		<fo:block xsl:use-attribute-sets="recommendation-label-style">
 			<xsl:apply-templates/>
 		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'subject']">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
+		<fo:block xsl:use-attribute-sets="inherit-style">
+			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
+		<fo:block xsl:use-attribute-sets="description-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
+		<fo:block xsl:use-attribute-sets="specification-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
+		<fo:block xsl:use-attribute-sets="measurement-target-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
+		<fo:block xsl:use-attribute-sets="verification-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
+		<fo:block xsl:use-attribute-sets="import-style">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
 			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
@@ -6725,6 +6829,9 @@
 		<fo:block-container border="1pt solid black" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
+		<fo:inline padding-right="5mm"> </fo:inline>
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -6963,6 +7070,26 @@
 				<xsl:value-of select="$level"/>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="getLevelTermName">
+		<xsl:choose>
+			<xsl:when test="normalize-space(../@depth) != ''">
+				<xsl:value-of select="../@depth"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="title_level_">
+					<xsl:for-each select="../preceding-sibling::*[local-name() = 'title'][1]">
+						<xsl:call-template name="getLevel"/>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="title_level" select="normalize-space($title_level_)"/>
+				<xsl:choose>
+					<xsl:when test="$title_level != ''"><xsl:value-of select="$title_level + 1"/></xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="getLevel"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>