isodoc 0.10.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff26a46515c9caa6709eb70ba69b508b9e6456fe7de7cbdfdab4ce527fae84f2
-  data.tar.gz: f4d04374cc39f376d15fb569a6591657e89a6b5958fd6f000af8ecb77187c255
+  metadata.gz: d11b5b991f38839676489ade5b30d9369d21bbeb27950a4e5fcf573f4b521179
+  data.tar.gz: 05de6af9b9f493f3d71dd81684e267a81c8db31c07d55189503af75296d73f10
 SHA512:
-  metadata.gz: b7bccfa7a9ca41e9f018e3d8456ffbdcca4461e2354110ce44f9157263805b94b5351dc4aab5c699c071f3f286adadbd3717a6bd6c6a09b2cb33ff8f122e66db
-  data.tar.gz: 245f9927c1e1d83ce6ecf62a58f857c4e7887476dd80b7f712060ba9220a4bba8d9d5eec00dc28865702b6b7fe8da3c3de2252a8bc2753c95f8ea9847a2eebdd
+  metadata.gz: cdf155b3bb0b87a6ee716414c50613b76113e619a107a7eff90dc3af287c94150f322cbfd30a2a96923d580853549a0b6065ea72316b794e568237219e8da879
+  data.tar.gz: e863371fe9dde7d63d72d83c6835de6b64e93d0c2a1a6c739adba2b7c74539f10ccea6aa6c93a62ed79d111444f0ad3647dfaaf15ad7f7afac2973cba5786def

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.10.4)
+    isodoc (1.0.0)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -68,7 +68,7 @@ GEM
     mime-types-data (3.2019.0331)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -108,9 +108,8 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
-    sassc (2.0.1)
+    sassc (2.1.0)
       ffi (~> 1.9)
-      rake
     shellany (0.0.1)
     simplecov (0.17.0)
       docile (~> 1.1)

data/lib/isodoc/common.rb

@@ -11,6 +11,7 @@ require_relative "./function/to_word_html"
 require_relative "./function/utils"
 require_relative "./function/xref_gen"
 require_relative "./function/xref_sect_gen"
+require_relative "./function/reqt"
 require_relative "./class_utils"
 
 module IsoDoc

data/lib/isodoc/function/blocks.rb

@@ -43,16 +43,10 @@ module IsoDoc::Function
 
     def figure_name_parse(node, div, name)
       return if name.nil? && node.at(ns("./figure"))
-      div.p **{ class: "FigureTitle", align: "center" } do |p|
+      div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
         lbl = anchor(node['id'], :label, false)
         lbl.nil? or p << l10n("#{@figure_lbl} #{lbl}")
         name and !lbl.nil? and p << "&nbsp;&mdash; "
-=begin
-        get_anchors[node['id']][:label].nil? or
-          p << l10n("#{@figure_lbl} #{get_anchors[node['id']][:label]}")
-        name and !get_anchors[node['id']][:label].nil? and
-          p << "&nbsp;&mdash; "
-=end
         name and name.children.each { |n| parse(n, div) }
       end
     end
@@ -83,8 +77,9 @@ module IsoDoc::Function
     end
 
     EXAMPLE_TBL_ATTR =
-      { valign: "top", class: "example_label",
-        style: "width:82.8pt;padding:0 0 0 0;margin-left:0pt" }.freeze
+      #{ valign: "top", 
+      { class: "example_label", style: "width:82.8pt;padding:0 0 0 0;\
+        margin-left:0pt;vertical-align:top;" }.freeze
 
     # used if we are boxing examples
     def example_div_parse(node, out)
@@ -100,8 +95,7 @@ module IsoDoc::Function
 
     def example_table_attr(node)
       attr_code(id: node["id"], class: "example",
-                cellspacing: 0, cellpadding: 0,
-                style: "border-collapse:collapse" )
+                style: "border-collapse:collapse;border-spacing:0;" )
     end
 
     def example_table_parse(node, out)
@@ -110,7 +104,7 @@ module IsoDoc::Function
           tr.td **EXAMPLE_TBL_ATTR do |td|
             td << example_label(node)
           end
-          tr.td **{ valign: "top", class: "example" } do |td|
+          tr.td **{ style: "vertical-align:top;padding:0;", class: "example" } do |td|
             node.children.each { |n| parse(n, td) }
           end
         end
@@ -122,13 +116,13 @@ module IsoDoc::Function
     end
 
     def sourcecode_name_parse(_node, div, name)
-      div.p **{ class: "SourceTitle", align: "center" } do |p|
+      div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
         name.children.each { |n| parse(n, p) }
       end
     end
 
     def admonition_name_parse(_node, div, name)
-      div.p **{ class: "AdmonitionTitle", align: "center" } do |p|
+      div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
         name.children.each { |n| parse(n, p) }
       end
     end
@@ -152,10 +146,14 @@ module IsoDoc::Function
     def annotation_parse(node, out)
       @sourcecode = false
       @annotation = true
-      out.span **{ class: "zzMoveToFollowing" } do |s|
-        s  << "&lt;#{node.at(ns("//callout[@target='#{node['id']}']")).text}&gt; "
-      end
-      node.children.each { |n| parse(n, out) }
+      node.at("./preceding-sibling::*[local-name() = 'annotation']") or
+        out << "<br/>"
+      out << "<br/>"
+      #out.span **{ class: "zzMoveToFollowing" } do |s|
+      out  << "&lt;#{node.at(ns("//callout[@target='#{node['id']}']")).text}&gt; "
+      #end
+      #node.children.each { |n| parse(n, out) }
+      out << node&.children&.text&.strip
       @annotation = false
     end
 
@@ -193,10 +191,8 @@ module IsoDoc::Function
         div.p do |p|
           parse(node.at(ns("./stem")), div)
           lbl = anchor(node['id'], :label, false)
-          #unless get_anchors[node['id']][:label].nil?
           unless lbl.nil?
             insert_tab(div, 1)
-            #div << "(#{get_anchors[node['id']][:label]})"
             div << "(#{lbl})"
           end
         end
@@ -222,8 +218,8 @@ module IsoDoc::Function
     def para_attrs(node)
       attrs = { class: para_class(node), id: node["id"] }
       unless node["align"].nil?
-        attrs[:align] = node["align"] unless node["align"] == "justify"
-        attrs[:style] = "text-align:#{node['align']}"
+        #attrs[:align] = node["align"] unless node["align"] == "justify"
+        attrs[:style] = "text-align:#{node['align']};"
       end
       attrs
     end
@@ -261,7 +257,7 @@ module IsoDoc::Function
 
     def image_title_parse(out, caption)
       unless caption.nil?
-        out.p **{ class: "FigureTitle", align: "center" } do |p|
+        out.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
           p.b { |b| b << caption.to_s }
         end
       end
@@ -275,59 +271,5 @@ module IsoDoc::Function
       out.img **attr_code(attrs)
       image_title_parse(out, caption)
     end
-
-    def recommendation_name(node, out, type)
-      label = node.at(ns("./label"))
-      title = node.at(ns("./title"))
-      out.p **{ class: "AdmonitionTitle" }  do |b|
-        lbl = anchor(node['id'], :label, false)
-        b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
-        if label || title
-          b.br
-          label and label.children.each { |n| parse(n,b) }
-          b << "#{clausedelim} " if label && title
-          title and title.children.each { |n| parse(n,b) }
-        end
-      end
-    end
-
-    def recommendation_parse(node, out)
-      out.div **{ class: "recommend" } do |t|
-        recommendation_name(node, t, @recommendation_lbl)
-        node.children.each do |n|
-          parse(n, t) unless %w(label title).include? n.name
-        end
-      end
-    end
-
-    def requirement_parse(node, out)
-      out.div **{ class: "require" } do |t|
-        recommendation_name(node, t, @requirement_lbl)
-        node.children.each do |n|
-          parse(n, t) unless %w(label title).include? n.name
-        end
-      end
-    end
-
-    def permission_parse(node, out)
-      out.div **{ class: "permission" } do |t|
-        recommendation_name(node, t, @permission_lbl)
-        node.children.each do |n|
-          parse(n, t) unless %w(label title).include? n.name
-        end
-      end
-    end
-
-    def requirement_component_parse(node, out)
-      return if node["exclude"] == "true"
-      out.div **{ class: "requirement-" + node.name } do |div|
-        node.children.each do |n|
-          parse(n, div)
-        end
-      end
-    end
-
-    def requirement_skip_parse(node, out)
-    end
   end
 end

data/lib/isodoc/function/references.rb

@@ -8,21 +8,55 @@ module IsoDoc::Function
       x.gsub(/All Parts/i, @all_parts_lbl.downcase)
     end
 
-    def iso_bibitem_ref_code(b)
-      isocode = b.at(ns("./docidentifier")).text
-      prefix = b&.at(ns("./docidentifier/@type"))&.text
-      reference = docid_l10n(isocode)
-      docid_prefix(prefix, reference)
+    # TODO generate formatted ref if not present
+    def nonstd_bibitem(list, b, ordinal, bibliography)
+      list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
+        id = bibitem_ref_code(b)
+        if bibliography
+          ref_entry_code(r, ordinal, id)
+        else
+          r << "#{id}, "
+        end
+        reference_format(b, r)
+      end
+    end
+
+    def std_bibitem_entry(list, b, ordinal, biblio)
+      list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+        prefix_bracketed_ref(ref, ordinal) if biblio
+        ref << bibitem_ref_code(b)
+        date_note_process(b, ref)
+        ref << ", "
+        reference_format(b, ref)
+      end
+    end
+
+    # if t is just a number, only use that ([1] Non-Standard)
+    # else, use both ordinal, as prefix, and t
+    def ref_entry_code(r, ordinal, t)
+      if /^\d+$/.match(t)
+        prefix_bracketed_ref(r, t)
+      else
+        prefix_bracketed_ref(r, ordinal)
+        r << "#{t}, "
+      end
+    end
+
+    def bibitem_ref_code(b)
+      id = b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma')]"))
+      id ||= b.at(ns("./docidentifier[not(@type = 'DOI')]"))
+      id ||= b.at(ns("./docidentifier")) or return "(NO ID)"
+      docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
     end
 
     def docid_prefix(prefix, docid)
-      docid = "#{prefix} #{docid}" unless omit_docid_prefix(prefix)
-      docid
+      docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix)
+      docid_l10n(docid)
     end
 
     def omit_docid_prefix(prefix)
       return true if prefix.nil? || prefix.empty?
-      return ["ISO", "IEC"].include? prefix
+      return ["ISO", "IEC", "metanorma"].include? prefix
     end
 
     def date_note_process(b, ref)
@@ -56,27 +90,6 @@ module IsoDoc::Function
       insert_tab(ref, 1)
     end
 
-    def iso_bibitem_entry(list, b, ordinal, biblio)
-      return if implicit_reference(b)
-      list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-        prefix_bracketed_ref(ref, ordinal) if biblio
-        ref << iso_bibitem_ref_code(b)
-        date_note_process(b, ref)
-        ref << ", "
-        ref.i { |i| i << " #{iso_title(b).text}" }
-      end
-    end
-
-    def ref_entry_code(r, ordinal, prefix, t)
-      t = docid_prefix(prefix, t)
-      if /^\d+$/.match(t) && !prefix
-        prefix_bracketed_ref(r, t)
-      else
-        prefix_bracketed_ref(r, ordinal)
-        r << "#{t}, "
-      end
-    end
-
     def reference_format(b, r)
       if ftitle = b.at(ns("./formattedref"))
         ftitle&.children&.each { |n| parse(n, r) }
@@ -88,46 +101,29 @@ module IsoDoc::Function
       end
     end
 
-    # TODO generate formatted ref if not present
-    def noniso_bibitem(list, b, ordinal, bibliography)
-      list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
-        if bibliography
-          id = docid_l10n(b.at(ns("./docidentifier")).text.gsub(/[\[\]]/, ""))
-          prefix = b&.at(ns("./docidentifier/@type"))&.text
-          ref_entry_code(r, ordinal, prefix, id)
-        else
-          r << "#{iso_bibitem_ref_code(b)}, "
-        end
-        reference_format(b, r)
-      end
-    end
-
     ISO_PUBLISHER_XPATH =
       "./contributor[xmlns:role/@type = 'publisher']/"\
       "organization[abbreviation = 'ISO' or xmlns:abbreviation = 'IEC' or "\
       "xmlns:name = 'International Organization for Standardization' or "\
       "xmlns:name = 'International Electrotechnical Commission']".freeze
 
-    def split_bibitems(f)
-      iso_bibitem = []
-      non_iso_bibitem = []
-      f.xpath(ns("./bibitem")).each do |x|
-        if x.at(ns(ISO_PUBLISHER_XPATH)).nil?
-          non_iso_bibitem << x
-        else
-          iso_bibitem << x
-        end
+    def is_standard(b)
+      ret = false
+      b.xpath(ns("./docidentifier")).each do |id|
+        next if id["type"].nil? || %w(metanorma DOI).include?(id["type"])
+        ret = true
       end
-      { iso: iso_bibitem, noniso: non_iso_bibitem }
+      ret
     end
 
     def biblio_list(f, div, bibliography)
-      bibitems = split_bibitems(f)
-      bibitems[:iso].each_with_index do |b, i|
-        iso_bibitem_entry(div, b, (i + 1), bibliography)
-      end
-      bibitems[:noniso].each_with_index do |b, i|
-        noniso_bibitem(div, b, (i + 1 + bibitems[:iso].size), bibliography)
+      f.xpath(ns("./bibitem")).each_with_index do |b, i|
+        next if implicit_reference(b)
+        if(is_standard(b))
+          std_bibitem_entry(div, b, i + 1, bibliography)
+        else
+          nonstd_bibitem(div, b, i + 1, bibliography)
+        end
       end
     end
 
@@ -135,10 +131,7 @@ module IsoDoc::Function
       refs = f.elements.select do |e|
         ["reference", "bibitem"].include? e.name
       end
-      pref = if refs.empty? then @norm_empty_pref
-             else
-               @norm_with_refs_pref
-             end
+      pref = refs.empty? ? @norm_empty_pref : @norm_with_refs_pref
       div.p pref
     end
 

data/lib/isodoc/function/reqt.rb

@@ -0,0 +1,89 @@
+module IsoDoc::Function
+  module Blocks
+    def recommendation_labels(node)
+      [node.at(ns("./label")), node.at(ns("./title")), 
+       anchor(node['id'], :label, false)]
+    end
+
+    def recommendation_name(node, out, type)
+      label, title, lbl = recommendation_labels(node)
+      #label = node.at(ns("./label"))
+      #title = node.at(ns("./title"))
+      out.p **{ class: "AdmonitionTitle" }  do |b|
+        #lbl = anchor(node['id'], :label, false)
+        b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
+        if label || title
+          b.br
+          label and label.children.each { |n| parse(n,b) }
+          b << "#{clausedelim} " if label && title
+          title and title.children.each { |n| parse(n,b) }
+        end
+      end
+    end
+
+    def recommendation_attributes1(node) 
+      out = [] 
+      oblig = node["obligation"] and out << "Obligation: #{oblig}" 
+      subj = node&.at(ns("./subject"))&.text and out << "Subject: #{subj}" 
+      node.xpath(ns("./classification")).each do |c|
+        tag = c.at(ns("./tag"))
+        value = c.at(ns("./value"))
+        tag && value or next
+        out << "#{tag.text.capitalize}: #{value.text}"
+      end
+      out
+    end
+
+    def recommendation_attributes(node, out)
+      ret = recommendation_attributes1(node)
+      return if ret.empty?
+      out.p do |p|
+        p.i do |i|
+          i << ret.join("<br/>")
+        end
+      end
+    end
+
+    def recommendation_parse(node, out)
+      out.div **{ class: "recommend" } do |t|
+        recommendation_name(node, t, @recommendation_lbl)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, t) unless %w(label title).include? n.name
+        end
+      end
+    end
+
+    def requirement_parse(node, out)
+      out.div **{ class: "require" } do |t|
+        recommendation_name(node, t, @requirement_lbl)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, t) unless %w(label title).include? n.name
+        end
+      end
+    end
+
+    def permission_parse(node, out)
+      out.div **{ class: "permission" } do |t|
+        recommendation_name(node, t, @permission_lbl)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, t) unless %w(label title).include? n.name
+        end
+      end
+    end
+
+    def requirement_component_parse(node, out)
+      return if node["exclude"] == "true"
+      out.div **{ class: "requirement-" + node.name } do |div|
+        node.children.each do |n|
+          parse(n, div)
+        end
+      end
+    end
+
+    def requirement_skip_parse(node, out)
+    end
+  end
+end