metanorma-iso 2.1.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece1ba1ab21e854c356cda66dc015f61a9b6ebdd93969e7144600093869a3775
-  data.tar.gz: 117895e15001e6a101dc4a255f6ce9380f10bf984edcd754203bf45ab6ab5445
+  metadata.gz: 5af2d1e84ef187d29c8adb59589006fe83a313db249d03f1b972f2c24f55026e
+  data.tar.gz: 24e56ffa73fb96734cfb1d9990bd97d404707119714cd4c95541d6b60022e6cb
 SHA512:
-  metadata.gz: 8fbd1971cc910147a7bf86d14a79157981e93054f92b8598c0fc85472c39d500808cf7c45b15f6e067d8866bff30873291f35eef7d7973e15496401f0b992a11
-  data.tar.gz: ce54b6ce2c17355ad428dfdf63142beb9e64f79446ff6793ac03a47ab39f79d8af218e2fe6d000869dbb52cc49dd4ce884a6bab145caad897350a5fb59bf5998
+  metadata.gz: 771062f88d67f10235c8d23df932c4ce0e55f75df7d090e411739729b5d28291f51b453efd0e0a16490d1fbf18d83d0d1cfea1e3308cdc36d137c30b80f1a141
+  data.tar.gz: 7a14ad2b9b71991608d0af4ba011c86f1f89bbde21f00e4ee62b6aa975d60c27a9db2cfcbf9701bedfde08f3aeda9b32072c8e39a2c08d4cc8bac8542cf651dc

data/lib/html2doc/lists.rb

@@ -4,17 +4,45 @@ class Html2Doc
       return if list.xpath("./li").empty?
 
       list.xpath("./li").each do |l|
-        l.name = "p"
-        if m = /level(\d) lfo/.match(l["style"])
-          l["class"] = list2para_style(list.name, m[1])
-          l.xpath("./p").each do |p|
-            p["class"] = list2para_style(list.name, m[1])
-          end
-        end
-        l&.first_element_child&.name == "p" and
-          l.first_element_child.replace(l.first_element_child.children)
+        list2para_level(l, list)
+      end
+    end
+
+    def list2para_level(item, list)
+      level = item["level"]
+      item.delete("level")
+      item.name = "p"
+      list2para_nest(item, level, list) if level
+    end
+
+    def list2para_nest(item, level, list)
+      item["class"] = list2para_style(list.name, level)
+      item.xpath("./p").each do |p|
+        p["class"] = list2para_style(list.name, level)
+      end
+      p1 = item.at("./p") or return
+      prev = p1.xpath("./preceding-sibling::* | ./preceding-sibling::text()")
+      if prev[-1].name == "span" && prev[-1]["style"] == "mso-tab-count:1" &&
+          prev.size == 2
+        p1.children.first.previous = prev[1]
+        p1.children.first.previous = prev[0]
+      end
+    end
+
+    def list2para_unnest_para(para, first_p, last_p)
+      return if last_p.xpath("./following-sibling::* | ./following-sibling::text()")
+        .any? do |x|
+                  !x.text.strip.empty?
+                end
+
+      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)
+      elsif prev.size == 2 && prev[-1].name == "span" &&
+          prev[-1]["style"] == "mso-tab-count:1"
+        first_p.replace(first_p.children)
       end
-      list.replace(list.children)
     end
 
     def list2para_style(listtype, depth)
@@ -33,5 +61,112 @@ class Html2Doc
         end
       end
     end
+
+    def lists(docxml, liststyles)
+      super
+      docxml.xpath("//p[ol | ul]").each do |p|
+        list2para_unnest_para(p, p.at("./ol | ./ul"),
+                              p.at("./*[name() = 'ul' or name() = 'ol'][last()]"))
+      end
+      docxml.xpath("//ol | //ul").each do |u|
+        u.replace(u.children)
+      end
+      unnest_list_paras(docxml)
+      indent_lists(docxml)
+    end
+
+    def unnest_list_paras(docxml)
+      docxml.xpath("//p[@class = 'ListContinue1' or @class = 'ListNumber1']"\
+                   "[.//p]").each do |p|
+                     p.at("./p") and
+                       list2para_unnest_para(p, p.at("./p"),
+                                             p.at("./p[last()]"))
+                     p.xpath(".//p[p]").each do |p1|
+                       list2para_unnest_para(p1, p1.at("./p"),
+                                             p1.at("./p[last()]"))
+                     end
+                   end
+    end
+
+    def indent_lists(docxml)
+      docxml.xpath("//div[@class = 'Note' or @class = 'Example' or "\
+                   "@class = 'Quote']").each do |d|
+        d.xpath(".//p").each do |p|
+          indent_lists1(p)
+        end
+      end
+    end
+
+    def indent_lists1(para)
+      m = /^(ListContinue|ListNumber|MsoListContinue|MsoListNumber)(\d)$/
+        .match(para["class"]) or return
+      base = m[1].sub(/^Mso/, "")
+      level = m[2].to_i + 1
+      level = 5 if level > 5
+      para["class"] = "#{base}#{level}-"
+    end
+
+    def list_add(xpath, liststyles, listtype, level)
+      xpath.each do |l|
+        l["seen"] = true if level == 1
+        l["id"] ||= UUIDTools::UUID.random_create
+        list_add_number(l, liststyles, listtype, level)
+        list_add_tail(l, liststyles, listtype, level)
+      end
+    end
+
+    def list_add_number(list, liststyles, listtype, level)
+      i = list["start"] ? list["start"].to_i - 1 : 0
+      (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |li|
+        i = style_list_iso(li, level, listtype, i)
+        list_add1(li, liststyles, listtype, level)
+      end
+    end
+
+    def list_add_tail(list, liststyles, listtype, level)
+      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)
+      end
+    end
+
+    def style_list_iso(elem, level, listtype, idx)
+      return idx if elem.at(".//ol | .//ul") && !elem.at("./p")
+
+      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>"
+      elem["level"] = level
+      idx
+    end
+
+    def listlabel(listtype, idx, level)
+      case listtype
+      when :ul then "&#x2014;"
+      when :ol then "#{listidx(idx, level)})"
+      end
+    end
+
+    def listidx(idx, level)
+      case level
+      when "a" then (96 + idx).chr.to_s
+      when "1" then idx.to_s
+      when "i" then RomanNumerals.to_roman(idx).downcase
+      when "A" then (64 + idx).chr.to_s
+      when "I" then RomanNumerals.to_roman(idx).upcase
+      end
+    end
+
+    def cleanup(docxml)
+      super
+      docxml.xpath("//div[@class = 'Quote' or @class = 'Example' or "\
+                   "@class = 'Note']").each do |d|
+        d.delete("class")
+      end
+      docxml
+    end
   end
 end

data/lib/isodoc/iso/base_convert.rb

@@ -112,6 +112,12 @@ module IsoDoc
         end
       end
 
+      def admonition_class(node)
+        if node["type"] == "editorial" then "zzHelp"
+        else super
+        end
+      end
+
       def admonition_parse1(node, div, name)
         div.p do |p|
           admonition_name_parse(node, p, name) if name
@@ -129,7 +135,7 @@ module IsoDoc
 
       def admonition_name_parse(_node, div, name)
         name.children.each { |n| parse(n, div) }
-        div << " &mdash; "
+        div << " &#x2014; "
       end
 
       def figure_name_parse(_node, div, name)
@@ -177,6 +183,10 @@ module IsoDoc
           clause_parse(i, out)
         end
       end
+
+      def ol_attrs(node)
+        super.merge(start: node["start"]).compact
+      end
     end
   end
 end

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -21,8 +21,10 @@
 
 <p class="coverpage_techcommittee">{{ agency }}/{{ editorialgroup | join: "/" }}</p>
 
+{% if secretariat %}
 <p class="coverpage_techcommittee"><a
    name="CVP_Secretariat_Loca">{{ labels["secretariat"] }}</a>: {{ secretariat }}</p>
+{% endif %}
 
 <div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash;{% endif %}</span>
   {% if doctitlepart %}