metanorma-iso 2.3.6 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a1965b8adf5207ea4a7c1d65561a0c8762b2b9f939aefb88594bb5995441ad
-  data.tar.gz: 4388b4df33214b2fe2ec7823951a711dd13dfe4d6d426dfd4455c098f7996060
+  metadata.gz: 933e6aa82c5ca8cef1a5ead9829cb1b754fd96a4ca96e9949bd3159bb314ae63
+  data.tar.gz: f39b54e13cbcd0f15c31808a8d3a94bafbb6d9834e0e6bd7cb73851643b590e7
 SHA512:
-  metadata.gz: 1ee61e3f2e61001ce759bbf13b274d63191595549e31189a8fcda25b8d6edad351df426aaa77b6187adb99ca742d39be6b8ad883a7336e3029ed80fedd25397b
-  data.tar.gz: 13b953974daeeaf1f88696a36f752218bdb9034a653d2f13404d9667ee1a91ef58f466ac58a84ffa9acb379f90231499249c9a178e05b4e1fff90eec1a21b953
+  metadata.gz: 8f46dc0381b71de56114fa2749729ee78a9a7c3f02d5a11d9c8ac97cead706d7e96a4ebeda77fc4f05843c44585f9c014447c954e519b34ba4337cf00c6af2f3
+  data.tar.gz: 4564b27b84fe80c5e15c817f3bb8d33daffb0e0fb0fa590983da1abf11c5fc8e97eff593a3ab3191c589c28f1c34fd5cd26818070d202dfc2f4f1ab96ad14ff8

data/lib/isodoc/iso/base_convert.rb

@@ -86,20 +86,6 @@ module IsoDoc
         end
       end
 
-      def formula_where(dlist, out)
-        return if dlist.nil?
-        return super unless dlist.xpath(ns("./dt"))&.size == 1 &&
-          dlist.at(ns("./dd"))&.elements&.size == 1 &&
-          dlist.at(ns("./dd/p"))
-
-        out.span class: "zzMoveToFollowing" do |s|
-          s << "#{@i18n.where} "
-          dlist.at(ns("./dt")).children.each { |n| parse(n, s) }
-          s << " "
-        end
-        parse(dlist.at(ns("./dd/p")), out)
-      end
-
       def admonition_parse(node, out)
         type = node["type"]
         name = admonition_name(node, type)
@@ -168,7 +154,7 @@ module IsoDoc
           class: clause.name == "definitions" ? "Symbols" : nil,
         ) do |div|
           num = num + 1
-          clause_name(num, clause&.at(ns("./title")), div, nil)
+          clause_name(clause, clause&.at(ns("./title")), div, nil)
           clause.elements.each do |e|
             parse(e, div) unless %w{title source}.include? e.name
           end

data/lib/isodoc/iso/html/style-human.css

@@ -124,6 +124,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef + a.TableFootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

data/lib/isodoc/iso/html/style-iso.css

@@ -124,6 +124,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef + a.TableFootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

data/lib/isodoc/iso/html_convert.rb

@@ -61,6 +61,7 @@ module IsoDoc
         content = header.at("./following-sibling::p" \
                             "[@class = 'variant-title-toc']") || header
         if level == "h1" &&
+            header.parent.name != "main" &&
             header.parent.at(".//h2#{toc_exclude_class}")
           <<~HDR
             <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a>
@@ -83,9 +84,9 @@ module IsoDoc
       def middle(isoxml, out)
         middle_title(isoxml, out)
         middle_admonitions(isoxml, out)
-        i = scope isoxml, out, 0
-        i = norm_ref isoxml, out, i
-        clause_etc isoxml, out, i
+        scope isoxml, out, 0
+        norm_ref isoxml, out, 0
+        clause_etc isoxml, out, 0
         annex isoxml, out
         bibliography isoxml, out
         indexsect isoxml, out