metanorma-iso 2.3.5 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec56973b9086f25dbaeeb4ec2561b59357fb180a912b7b4a81870c5432e81fb8
-  data.tar.gz: 9828d23dd60b3ea444e9a23c2ef7caf7e6d819e42090812e5ab22384339794a4
+  metadata.gz: 933e6aa82c5ca8cef1a5ead9829cb1b754fd96a4ca96e9949bd3159bb314ae63
+  data.tar.gz: f39b54e13cbcd0f15c31808a8d3a94bafbb6d9834e0e6bd7cb73851643b590e7
 SHA512:
-  metadata.gz: cff4f259add1f02c6915c4b013150529523a5f4e9b3c6e285061a1e8ae1205d183cc00fdadfb90ecddde9446b29f5350b8d1f1c02c4bef1106111de6065e35c4
-  data.tar.gz: df7ca4b80cfad19b2171dc8eab675ebd8fb19b244ffdcb889325e9c31f835cd375d3cd2b849ca68e578078a2a80a54b7fc0eb485aff9c6fcc4d221eebfce7580
+  metadata.gz: 8f46dc0381b71de56114fa2749729ee78a9a7c3f02d5a11d9c8ac97cead706d7e96a4ebeda77fc4f05843c44585f9c014447c954e519b34ba4337cf00c6af2f3
+  data.tar.gz: 4564b27b84fe80c5e15c817f3bb8d33daffb0e0fb0fa590983da1abf11c5fc8e97eff593a3ab3191c589c28f1c34fd5cd26818070d202dfc2f4f1ab96ad14ff8

data/lib/html2doc/lists.rb

@@ -35,7 +35,7 @@ class Html2Doc
                   !x.text.strip.empty?
                 end
 
-      prev = first_p.xpath("./preceding-sibling::* | "\
+      prev = first_p.xpath("./preceding-sibling::* | " \
                            "./preceding-sibling::text()[normalize-space()]")
       # bullet, tab, paragraph: ignore bullet, tab
       if prev.empty? then para.replace(para.children)
@@ -76,7 +76,7 @@ class Html2Doc
     end
 
     def unnest_list_paras(docxml)
-      docxml.xpath("//p[@class = 'ListContinue1' or @class = 'ListNumber1']"\
+      docxml.xpath("//p[@class = 'ListContinue1' or @class = 'ListNumber1']" \
                    "[.//p]").each do |p|
                      p.at("./p") and
                        list2para_unnest_para(p, p.at("./p"),
@@ -89,7 +89,7 @@ class Html2Doc
     end
 
     def indent_lists(docxml)
-      docxml.xpath("//div[@class = 'Note' or @class = 'Example' or "\
+      docxml.xpath("//div[@class = 'Note' or @class = 'Example' or " \
                    "@class = 'Quote']").each do |d|
         d.xpath(".//p").each do |p|
           indent_lists1(p)
@@ -124,7 +124,7 @@ class Html2Doc
     end
 
     def list_add_tail(list, liststyles, listtype, level)
-      list.xpath(".//ul[not(ancestor::li/ancestor::*/@id = '#{list['id']}')] | "\
+      list.xpath(".//ul[not(ancestor::li/ancestor::*/@id = '#{list['id']}')] | " \
                  ".//ol[not(ancestor::li/ancestor::*/@id = '#{list['id']}')]")
         .each do |li|
         list_add1(li.parent, liststyles, listtype, level - 1)
@@ -137,8 +137,10 @@ class Html2Doc
       idx += 1
       ol = elem.xpath("./ancestor::ol")&.last
       label = listlabel(listtype, idx, ol ? ol["type"] : nil)
-      elem.children.first.previous =
-        "#{label}<span style='mso-tab-count:1'>&#xa0;</span>"
+      unless elem.at("./ancestor::div[@class = 'index']") # indexsect
+        elem.children.first.previous =
+          "#{label}<span style='mso-tab-count:1'>&#xa0;</span>"
+      end
       elem["level"] = level
       idx
     end
@@ -162,7 +164,7 @@ class Html2Doc
 
     def cleanup(docxml)
       super
-      docxml.xpath("//div[@class = 'Quote' or @class = 'Example' or "\
+      docxml.xpath("//div[@class = 'Quote' or @class = 'Example' or " \
                    "@class = 'Note']").each do |d|
         d.delete("class")
       end

data/lib/isodoc/iso/base_convert.rb

@@ -31,7 +31,7 @@ module IsoDoc
       def example_span_label(_node, div, name)
         return if name.nil?
 
-        div.span **{ class: "example_label" } do |p|
+        div.span class: "example_label" do |p|
           name.children.each { |n| parse(n, p) }
         end
       end
@@ -64,7 +64,7 @@ module IsoDoc
       end
 
       def example_parse(node, out)
-        out.div **{ id: node["id"], class: "example" } do |div|
+        out.div id: node["id"], class: "example" do |div|
           if node_begins_with_para(node)
             example_p_parse(node, div)
           else
@@ -86,24 +86,10 @@ 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)
-        out.div **{ id: node["id"], class: admonition_class(node) } do |div|
+        out.div id: node["id"], class: admonition_class(node) do |div|
           if node.first_element_child.name == "p"
             admonition_p_parse(node, div, name)
           else
@@ -139,7 +125,7 @@ module IsoDoc
       end
 
       def figure_name_parse(_node, div, name)
-        div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
+        div.p class: "FigureTitle", style: "text-align:center;" do |p|
           name&.children&.each { |n| parse(n, p) }
         end
       end
@@ -149,16 +135,13 @@ module IsoDoc
         middle_admonitions(isoxml, out)
         i = scope isoxml, out, 0
         i = norm_ref isoxml, out, i
-        # i = terms_defs isoxml, out, i
-        # symbols_abbrevs isoxml, out, i
         clause_etc isoxml, out, i
         annex isoxml, out
         bibliography isoxml, out
-        indexsect isoxml, out
       end
 
       def clause_etc(isoxml, out, num)
-        isoxml.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
+        isoxml.xpath(ns("//sections/clause[not(@type = 'scope')] | " \
                         "//sections/terms | //sections/definitions"))
           .each do |f|
             clause_etc1(f, out, num)
@@ -171,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
@@ -180,7 +163,6 @@ module IsoDoc
 
       def indexsect(isoxml, out)
         isoxml.xpath(ns("//indexsect")).each do |i|
-          page_break(out)
           clause_parse(i, out)
         end
       end
@@ -194,6 +176,42 @@ module IsoDoc
         ret[:sdo] = std_docid_semantic(ret[:sdo])
         ret
       end
+
+      def table_parse(node, out)
+        @in_table = true
+        table_title_parse(node, out)
+        measurement_units(node, out)
+        out.table **table_attrs(node) do |t|
+          table_parse_core(node, t)
+          (dl = node.at(ns("./dl"))) && parse(dl, out)
+          node.xpath(ns("./note[not(@type = 'units')]"))
+            .each { |n| parse(n, out) }
+        end
+        @in_table = false
+      end
+
+      def figure_parse1(node, out)
+        measurement_units(node, out)
+        out.div **figure_attrs(node) do |div|
+          node.children.each do |n|
+            figure_key(out) if n.name == "dl"
+            next if n.name == "note" && n["type"] == "units"
+
+            parse(n, div) unless n.name == "name"
+          end
+          figure_name_parse(node, div, node.at(ns("./name")))
+        end
+      end
+
+      def measurement_units(node, out)
+        node.xpath(ns("./note[@type = 'units']")).each do |n|
+          out.div align: "right" do |p|
+            p.b do |b|
+              n.children.each { |e| parse(e, b) }
+            end
+          end
+        end
+      end
     end
   end
 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; }
 
@@ -623,6 +627,10 @@ div.figure {
     max-width: 100%;
     height: auto; }
 
+table div.figure {
+  padding: 0;
+  margin: 0; }
+
 /*
     Document types + stages
 */

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

@@ -341,6 +341,12 @@ div.figure {
     @include figureBlock();
 }
 
+table div.figure {
+  padding: 0;
+  margin: 0;
+}
+
+
 /*
     Document types + stages
 */

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; }
 
@@ -575,6 +579,10 @@ div.figure {
     max-width: 100%;
     height: auto; }
 
+table div.figure {
+  padding: 0;
+  margin: 0; }
+
 /*
     Document types + stages
 */

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

@@ -281,6 +281,13 @@ div.figure {
     @include figureBlock();
 }
 
+table div.figure {
+  padding: 0;
+  margin: 0;
+}
+
+
+
 /*
     Document types + stages
 */

data/lib/isodoc/iso/html/wordstyle-dis.css

@@ -2015,6 +2015,22 @@ div.WordSection3 {
 div.colophon {
   page: WordSection4; }
 
+@page WordSection5 {
+  size: 595.3pt 841.9pt;
+  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
+  mso-header-margin: 35.45pt;
+  mso-footer-margin: 14.2pt;
+  mso-page-numbers: 1;
+  mso-columns: 2 even 36.0pt;
+  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
+  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") f4;
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f4;
+  mso-paper-source: 0; }
+
+div.index {
+  page: WordSection5; }
+
 /* List Definitions */
 @list l11 {
   mso-list-id: 145051656;

data/lib/isodoc/iso/html/wordstyle-dis.scss

@@ -1902,6 +1902,20 @@ div.WordSection3
         mso-paper-source:0;}
 div.colophon
         {page:WordSection4;}
+@page WordSection5
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-page-numbers:1;
+        mso-columns:2 even 36.0pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") f4;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f4;
+        mso-paper-source:0;}
+div.index
+        {page:WordSection5;}
 
   /* List Definitions */
 @list l11

data/lib/isodoc/iso/html/wordstyle.css

@@ -1457,6 +1457,22 @@ div.WordSection3 {
 div.colophon {
   page: WordSection4; }
 
+@page WordSection5 {
+  size: 595.3pt 841.9pt;
+  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
+  mso-header-margin: 35.45pt;
+  mso-footer-margin: 14.2pt;
+  mso-page-numbers: 1;
+  mso-columns: 2 even 36.0pt;
+  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
+  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") f4;
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f4;
+  mso-paper-source: 0; }
+
+div.index {
+  page: WordSection5; }
+
 /* List Definitions */
 @list l0 {
   mso-list-id: 145051656;

data/lib/isodoc/iso/html/wordstyle.scss

@@ -1372,6 +1372,20 @@ div.WordSection3
         mso-paper-source:0;}
 div.colophon
         {page:WordSection4;}
+@page WordSection5
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-page-numbers:1;
+        mso-columns:2 even 36.0pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") f4;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f4;
+        mso-paper-source:0;}
+div.index
+        {page:WordSection5;}
 
   /* List Definitions */
 @list l0

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>
@@ -80,6 +81,18 @@ module IsoDoc
         docxml
       end
 
+      def middle(isoxml, out)
+        middle_title(isoxml, out)
+        middle_admonitions(isoxml, out)
+        scope isoxml, out, 0
+        norm_ref isoxml, out, 0
+        clause_etc isoxml, out, 0
+        annex isoxml, out
+        bibliography isoxml, out
+        indexsect isoxml, out
+      end
+
+
       def html_toc1(ulist)
         u2 = nil
         ulist.xpath("./li").each do |l|