metanorma-jis 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7202e095e949d4def144db9e549bfaa78fc453096fb6607d83024924da0bd0b8
-  data.tar.gz: 765d9791c6428d6e8f55db74d14c6fbea884502ae78b8590c0435d4370f91ea9
+  metadata.gz: 6bf51e10fbc568a6c14c9e8b4192e16f90b5dd093aff54cdc0fbdb9ef11566bb
+  data.tar.gz: 060bddc60dd35141b7143e36a1cd66bc4ef89b9db9fc0b5d385ea9171d3baa8b
 SHA512:
-  metadata.gz: 331443ed139aa8c3c6024781d1723d2965ef45a4714eba88294898bbffa2bab14ab6af52963da9e6b98f07389b582362a3fe637bec13da2c95bb9de30c3109bb
-  data.tar.gz: 71d1aeacef86ad9a9113f28327ac88a4acb56f1ffdad9a2c98a7a9233e235b50446f1fb314bbd05665644dc12beb418e4bbbe43f89d6d6d9708d95ade43a1f03
+  metadata.gz: fa5e35fcdff0101c14bd5f3d713560aa8e5236e055288e328b4024268bc9e62b1fbd399d75a388b337a7779be50939fc96438cedf691106f6ef77aca56921dd6
+  data.tar.gz: 55665ed144401a91526a924d27a8b2134b818581627663e371fec91fe1ccf60afb384838364dfd3986798f093e03818cd9e0e9983f6371227d9b427f9b1aab5d

data/lib/html2doc/lists.rb

@@ -9,7 +9,7 @@ class Html2Doc
     end
 
     def style_list(elem, level, liststyle, listnumber)
-      return unless liststyle
+      liststyle or return
       elem["level"] = level
       super
     end
@@ -32,14 +32,6 @@ class Html2Doc
       end
       item.at("./p") or return
       item.replace(item.children)
-=begin
-      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
     end
 
     def list2para_unnest_para(para, first_p, last_p)
@@ -74,29 +66,29 @@ class Html2Doc
       case listtype
       when "ol"
         ret = case depth
-        when "1" then "margin-left: 36.0pt;"
-        when "2" then "margin-left: 54.0pt;"
-        when "3" then "margin-left: 72.0pt;"
-        when "4" then "margin-left: 90.0pt;"
-        when "5" then "margin-left: 108.0pt;"
-        when "6" then "margin-left: 126.0pt;"
-        when "7" then "margin-left: 144.0pt;"
-        when "8" then "margin-left: 162.0pt;"
-        else "margin-left: 180.0pt;"
-        end
+              when "1" then "margin-left: 36.0pt;"
+              when "2" then "margin-left: 54.0pt;"
+              when "3" then "margin-left: 72.0pt;"
+              when "4" then "margin-left: 90.0pt;"
+              when "5" then "margin-left: 108.0pt;"
+              when "6" then "margin-left: 126.0pt;"
+              when "7" then "margin-left: 144.0pt;"
+              when "8" then "margin-left: 162.0pt;"
+              else "margin-left: 180.0pt;"
+              end
         "#{ret}text-indent:-18.0pt;"
       when "ul"
         ret = case depth
-       when "1" then "margin-left: 36.0pt;"
-        when "2" then "margin-left: 45.95pt;"
-        when "3" then "margin-left: 72.0pt;"
-        when "4" then "margin-left: 90.0pt;"
-        when "5" then "margin-left: 108.0pt;"
-        when "6" then "margin-left: 126.0pt;"
-        when "7" then "margin-left: 144.0pt;"
-        when "8" then "margin-left: 162.0pt;"
-        else "margin-left: 180.0pt;"
-        end
+              when "1" then "margin-left: 36.0pt;"
+              when "2" then "margin-left: 45.95pt;"
+              when "3" then "margin-left: 72.0pt;"
+              when "4" then "margin-left: 90.0pt;"
+              when "5" then "margin-left: 108.0pt;"
+              when "6" then "margin-left: 126.0pt;"
+              when "7" then "margin-left: 144.0pt;"
+              when "8" then "margin-left: 162.0pt;"
+              else "margin-left: 180.0pt;"
+              end
         "#{ret}text-indent:-18.0pt;"
 
       end
@@ -112,11 +104,10 @@ class Html2Doc
         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']" \
+      docxml.xpath("//p[@class = 'MsoList' or @class = 'MsoListBullet']" \
                    "[.//p]").each do |p|
                      p.at("./p") and
                        list2para_unnest_para(p, p.at("./p"),
@@ -128,24 +119,6 @@ class Html2Doc
                    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|
         level == 1 and l["seen"] = true and @listnumber += 1
@@ -172,23 +145,6 @@ class Html2Doc
       end
     end
 
-    def listlabel(listtype, idx, level)
-      case listtype
-      when :ul then "—"
-      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 " \

data/lib/isodoc/jis/base_convert.rb

@@ -5,13 +5,32 @@ module IsoDoc
   module JIS
     module BaseConvert
       def middle_title(_isoxml, out)
-        middle_title_main(out)
+        middle_title_hdr(out)
+        middle_title_main(out, "zzSTDTitle1")
         middle_subtitle_main(out)
         # middle_title_amd(out)
       end
 
-      def middle_title_main(out)
-        out.p(class: "zzSTDTitle1") do |p|
+      def middle_title_hdr(out)
+        out.p(class: "JapaneseIndustrialStandard") do |p|
+          p << @i18n.jis
+          @meta.get[:unpublished] and p << @i18n.l10n("(#{@i18n.draft_label})")
+          insert_tab(p, 7)
+          p << "<span class='JIS'>JIS</span>"
+        end
+        out.p(class: "StandardNumber") do |p|
+          insert_tab(p, 1)
+          p << @meta.get[:docnumber_undated]
+          if yr = @meta.get[:docyear]
+            p << ": "
+            p << "<span class='EffectiveYear'>#{yr}</span>"
+          end
+        end
+        out.p(class: "IDT")
+      end
+
+      def middle_title_main(out, style)
+        out.p(class: style) do |p|
           p << @meta.get[:doctitleintro]
           p << " &#x2014; " if @meta.get[:doctitleintro] && @meta.get[:doctitlemain]
           p << @meta.get[:doctitlemain]
@@ -37,8 +56,23 @@ module IsoDoc
         end
       end
 
+      def commentary_title(_isoxml, out)
+        commentary_title_hdr(out)
+        middle_title_main(out, "CommentaryStandardName")
+      end
+
+      def commentary_title_hdr(out)
+        out.p(class: "CommentaryStandardNumber") do |p|
+          p << "JIS #{@meta.get[:docnumber_undated]}"
+          if yr = @meta.get[:docyear]
+            p << ": "
+            p << "<span class='CommentaryEffectiveYear'>#{yr}</span>"
+          end
+        end
+      end
+
       def termnote_parse(node, out)
-        name = node&.at(ns("./name"))&.remove
+        name = node.at(ns("./name"))&.remove
         out.div **note_attrs(node) do |div|
           div.p do |p|
             if name
@@ -59,13 +93,6 @@ module IsoDoc
         end
       end
 
-      def admitted_term_parse(node, out)
-        out.p class: "Terms", style: "text-align:left;" do |p|
-          p << l10n("#{@i18n.alternative}: ")
-          node.children.each { |c| parse(c, p) }
-        end
-      end
-
       def para_class(node)
         super || node["class"]
       end
@@ -74,6 +101,46 @@ module IsoDoc
         cell["border"] == "0" and bordered = false
         super
       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
+        commentary isoxml, out
+        indexsect isoxml, out
+      end
+
+      def annex(isoxml, out)
+        amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
+        isoxml.xpath(ns("//annex[not(@commentary = 'true')]")).each do |c|
+          page_break(out)
+          out.div **attr_code(annex_attrs(c)) do |s|
+            c.elements.each do |c1|
+              if c1.name == "title" then annex_name(c, c1, s)
+              else parse(c1, s)
+              end
+            end
+          end
+        end
+        amd(isoxml) and @suppressheadingnumbers = true
+      end
+
+      def commentary(isoxml, out)
+        isoxml.xpath(ns("//annex[@commentary = 'true']")).each do |c|
+          page_break(out)
+          out.div **attr_code(annex_attrs(c)) do |s|
+            c.elements.each do |c1|
+              if c1.name == "title" then annex_name(c, c1, s)
+              else parse(c1, s)
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/isodoc/jis/figure.rb

@@ -0,0 +1,99 @@
+module IsoDoc
+  module JIS
+    class WordConvert < IsoDoc::Iso::WordConvert
+      def figure_attrs(node)
+        attr_code(id: node["id"], class: "MsoTableGrid",
+                  style: "border-collapse:collapse;" \
+                         "border:none;mso-padding-alt: " \
+                         "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
+                         "mso-border-insidev:none;#{keep_style(node)}",
+                  border: 0, cellspacing: 0, cellpadding: 0)
+      end
+
+      def figure_components(node)
+        { units: node.at(ns("./note[@type = 'units']")),
+          notes_etc: figure_notes_examples_paras(node
+          .xpath(ns("./note[not(@type = 'units')] | ./example | ./p"))),
+          name: node.at(ns("./name")),
+          key: node.xpath(ns("./p[@class = 'ListTitle' or @class = 'dl']")),
+          img: node.at(ns("./image")),
+          aside: node.at(ns("./aside")),
+          source: node.at(ns("./source")),
+          subfigs: node.xpath(ns("./figure")).map { |n| figure_components(n) } }
+      end
+
+      def figure_notes_examples_paras(xpath)
+        xpath.empty? and return nil
+        curr = ""
+        xpath.each_with_object([]) do |e, m|
+          e.name == curr or m << []
+          curr = e.name
+          m[-1] << e
+        end
+      end
+
+      def figure_parse1(node, out)
+        c = figure_components(node)
+        out.table **figure_attrs(node) do |div|
+          %i(units img subfigs key notes_etc aside source name).each do |key|
+            case key
+            when :subfigs then figure_subfigs(node, div, c[key])
+            when :notes_etc, :key
+              c[key]&.each { |n| figure_row(node, div, n, key) }
+            else figure_row(node, div, c, key) end
+          end
+        end
+      end
+
+      def figure_subfigs(node, div, elem)
+        elem.each do |n|
+          n[:subname] = n[:name]
+          figure_row(node, div, n, :img)
+          figure_row(node, div, n, :subname)
+        end
+      end
+
+      def figure_name_parse(_node, div, name)
+        name.nil? and return
+        div.p class: "Tabletitle", style: "text-align:center;" do |p|
+          name.children.each { |n| parse(n, p) }
+        end
+      end
+
+      def figure_row(node, table, hash, key)
+        key != :notes_etc && (
+        hash[key].nil? || (hash[key].is_a?(Array) && hash[key].empty?)) and
+          return
+        table.tr do |r|
+          r.td valign: "top", style: "padding:0cm 5.4pt 0cm 5.4pt" do |d|
+            figure_row1(node, d, hash, key)
+          end
+        end
+      end
+
+      def figure_row1(node, cell, hash, key)
+        case key
+        when :units then units_render(hash[key], cell)
+        when :notes_etc, :aside, :key then hash.each { |n| parse(n, cell) }
+        when :source then parse(hash[key], cell)
+        when :name then figure_name_parse(node, cell, hash[key])
+        when :img
+          cell.p class: "Figure" do |p|
+            parse(hash[key], p)
+          end
+        when :subname
+          cell.p class: "SubfigureCaption" do |p|
+            hash[key].children.each { |n| parse(n, p) }
+          end
+        end
+      end
+
+      def units_render(note, cell)
+        para = note.at(ns("./p")) and note = para
+        cell.p class: "UnitStatement" do |p|
+          note.children.each { |n| parse(n, p) }
+        end
+      end
+    end
+  end
+end