isodoc 1.5.5 → 1.6.4

data/lib/isodoc/function/form.rb

@@ -0,0 +1,51 @@
+module IsoDoc::Function
+  module Form
+    def form_parse(node, out)
+      node.children.each do |n|
+        parse(n, out)
+      end
+    end
+
+    def input_parse(node, out)
+      case node["type"]
+      when "button" then out << "[#{node['value'] || 'BUTTON'}]"
+      when "checkbox" then out << "&#x2610; "
+      when "date" then text_input(out)
+      when "file" then text_input(out)
+      when "password" then text_input(out)
+      when "radio" then out << "&#x25CE; "
+      when "submit" # nop
+      when "text" then text_input(out, node["maxlength"])
+      end
+    end
+
+    def text_input(out, length = 10)
+      length ||= 10
+      length = length.to_i
+      length.zero? and length = 10
+      out << "_" * length
+      out << " "
+    end
+
+    def select_parse(node, out)
+      text_input(out, node["size"] || 10)
+    end
+
+    def label_parse(node, out)
+      node.children.each do |n|
+        parse(n, out)
+      end
+    end
+
+    def option_parse(node, out); end
+
+    def textarea_parse(_node, out)
+      out.table **{ border: 1, width: "50%" } do |t|
+        t.tr do |tr|
+          tr.td do |td|
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/function/inline.rb

@@ -3,11 +3,12 @@ require_relative "inline_simple"
 module IsoDoc::Function
   module Inline
     def link_parse(node, out)
-      out.a **attr_code(href: node["target"], title: node["alt"]) do |l|
+      url = node["target"]
+      node["updatetype"] == "true" and url = suffix_url(url)
+      out.a **attr_code(href: url, title: node["alt"]) do |l|
         if node.text.empty?
           l << node["target"].sub(/^mailto:/, "")
-        else
-          node.children.each { |n| parse(n, l) }
+        else node.children.each { |n| parse(n, l) }
         end
       end
     end
@@ -23,21 +24,27 @@ module IsoDoc::Function
     end
 
     def xref_parse(node, out)
-      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".html#") :
-        "##{node["target"]}"
-        out.a(**{ "href": target }) { |l| no_locality_parse(node, l) }
+      target = if /#/.match?(node["target"])
+                 node["target"].sub(/#/, ".html#")
+               else
+                 "##{node['target']}"
+               end
+      out.a(**{ "href": target }) { |l| no_locality_parse(node, l) }
     end
 
     def suffix_url(url)
-      return url if %r{^http[s]?://}.match(url)
+      return url if %r{^https?://}.match?(url)
+      return url unless File.extname(url).empty?
+
       url.sub(/#{File.extname(url)}$/, ".html")
     end
 
     def eref_target(node)
-      href = "#" + node["bibitemid"]
+      href = "##{node['bibitemid']}"
       url = node.at(ns("//bibitem[@id = '#{node['bibitemid']}']/"\
                        "uri[@type = 'citation']"))
       return href unless url
+
       href = suffix_url(url.text)
       anchor = node&.at(ns(".//locality[@type = 'anchor']"))&.text&.strip
       anchor and href += "##{anchor}"
@@ -68,12 +75,12 @@ module IsoDoc::Function
     end
 
     def stem_parse(node, out)
-      ooml = if node["type"] == "AsciiMath"
+      ooml = case node["type"]
+             when "AsciiMath"
                "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}"\
                  "#{@closemathdelim}"
-             elsif node["type"] == "MathML" then node.first_element_child.to_s
-             else
-               HTMLEntities.new.encode(node.text)
+             when "MathML" then node.first_element_child.to_s
+             else HTMLEntities.new.encode(node.text)
              end
       out.span **{ class: "stem" } do |span|
         span.parent.add_child ooml
@@ -93,7 +100,7 @@ module IsoDoc::Function
                 height: node["height"] || "auto",
                 width: node["width"] || "auto",
                 title: node["title"],
-                alt: node["alt"]  }
+                alt: node["alt"] }
       out.img **attr_code(attrs)
       image_title_parse(out, caption)
     end
@@ -106,12 +113,27 @@ module IsoDoc::Function
 
     def text_parse(node, out)
       return if node.nil? || node.text.nil?
+
       text = node.to_s
-      text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&nbsp;").
-        gsub(/[ ](?=[ ])/, "&nbsp;") if in_sourcecode
+      if in_sourcecode
+        text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&nbsp;")
+          .gsub(/ (?= )/, "&nbsp;")
+      end
       out << text
     end
 
+    def add_parse(node, out)
+      out.span **{ class: "addition" } do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def del_parse(node, out)
+      out.span **{ class: "deletion" } do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
     def error_parse(node, out)
       text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       out.para do |p|

data/lib/isodoc/function/references.rb

@@ -1,12 +1,12 @@
 module IsoDoc::Function
   module References
-
     # This is highly specific to ISO, but it's not a bad precedent for
     # references anyway; keeping here instead of in IsoDoc::Iso for now
-    def docid_l10n(x)
-      return x if x.nil?
-      x.gsub(/All Parts/i, @i18n.all_parts.downcase) if @i18n.all_parts
-      x
+    def docid_l10n(text)
+      return text if text.nil?
+
+      text.gsub(/All Parts/i, @i18n.all_parts.downcase) if @i18n.all_parts
+      text
     end
 
     # TODO generate formatted ref if not present
@@ -16,7 +16,7 @@ module IsoDoc::Function
         identifiers = render_identifier(ids)
         if biblio then ref_entry_code(ref, ordinal, identifiers, ids)
         else
-          ref << "#{identifiers[0] || identifiers[1]}"
+          ref << (identifiers[0] || identifiers[1]).to_s
           ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
         end
         ref << ", " unless biblio && !identifiers[1]
@@ -29,7 +29,7 @@ module IsoDoc::Function
         identifiers = render_identifier(bibitem_ref_code(b))
         if biblio then ref_entry_code(ref, ordinal, identifiers, nil)
         else
-          ref << "#{identifiers[0] || identifiers[1]}"
+          ref << (identifiers[0] || identifiers[1]).to_s
           ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
         end
         date_note_process(b, ref)
@@ -40,9 +40,9 @@ module IsoDoc::Function
 
     # 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, id)
+    def ref_entry_code(r, ordinal, t, _id)
       prefix_bracketed_ref(r, t[0] || "[#{ordinal}]")
-      t[1] and r << "#{t[1]}"
+      t[1] and r << (t[1]).to_s
     end
 
     def pref_ref_code(b)
@@ -55,27 +55,36 @@ module IsoDoc::Function
       id = b.at(ns("./docidentifier[@type = 'metanorma']"))
       id1 = pref_ref_code(b)
       id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or "\
-                    "@type = 'ISBN']")) 
+                    "@type = 'ISBN']"))
       return [id, id1, id2] if id || id1 || id2
+
       id = Nokogiri::XML::Node.new("docidentifier", b.document)
       id << "(NO ID)"
       [nil, id, nil]
     end
 
-    def bracket_if_num(x)
-      return nil if x.nil?
-      x = x.text.sub(/^\[/, "").sub(/\]$/, "")
-      return "[#{x}]" if /^\d+$/.match(x)
-      x
+    def bracket_if_num(num)
+      return nil if num.nil?
+
+      num = num.text.sub(/^\[/, "").sub(/\]$/, "")
+      return "[#{num}]" if /^\d+$/.match?(num)
+
+      num
     end
 
     def render_identifier(id)
       [
         bracket_if_num(id[0]),
-        id[1].nil? ? nil :
-        docid_prefix(id[1]["type"], id[1].text.sub(/^\[/, "").sub(/\]$/, "")),
-        id[2].nil? ? nil :
-        docid_prefix(id[2]["type"], id[2].text.sub(/^\[/, "").sub(/\]$/, "")),
+        if id[1].nil?
+          nil
+        else
+          docid_prefix(id[1]["type"], id[1].text.sub(/^\[/, "").sub(/\]$/, ""))
+        end,
+        if id[2].nil?
+          nil
+        else
+          docid_prefix(id[2]["type"], id[2].text.sub(/^\[/, "").sub(/\]$/, ""))
+        end,
       ]
     end
 
@@ -87,12 +96,14 @@ module IsoDoc::Function
 
     def omit_docid_prefix(prefix)
       return true if prefix.nil? || prefix.empty?
-      return %w(ISO IEC IEV ITU W3C csd metanorma rfc-anchor).include? prefix
+
+      %w(ISO IEC IEV ITU W3C csd metanorma rfc-anchor).include? prefix
     end
 
     def date_note_process(b, ref)
       date_note = b.at(ns("./note[@type = 'Unpublished-Status']"))
       return if date_note.nil?
+
       date_note.children.first.replace("<p>#{date_note.content}</p>")
       footnote_parse(date_note, ref)
     end
@@ -101,18 +112,17 @@ module IsoDoc::Function
       { id: b["id"], class: biblio ? "Biblio" : "NormRef" }
     end
 
-    def iso_title(b)
-      title = b.at(ns("./title[@language = '#{@lang}' and @type = 'main']")) ||
-        b.at(ns("./title[@language = '#{@lang}']")) ||
-        b.at(ns("./title[@type = 'main']")) ||
-        b.at(ns("./title"))
-      title
+    def iso_title(bib)
+      bib.at(ns("./title[@language = '#{@lang}' and @type = 'main']")) ||
+        bib.at(ns("./title[@language = '#{@lang}']")) ||
+        bib.at(ns("./title[@type = 'main']")) ||
+        bib.at(ns("./title"))
     end
 
     # reference not to be rendered because it is deemed implicit
     # in the standards environment
-    def implicit_reference(b)
-      b["hidden"] == "true"
+    def implicit_reference(bib)
+      bib["hidden"] == "true"
     end
 
     def prefix_bracketed_ref(ref, text)
@@ -120,35 +130,38 @@ module IsoDoc::Function
       insert_tab(ref, 1)
     end
 
-    def reference_format(b, r)
-      if ftitle = b.at(ns("./formattedref"))
+    def reference_format(bib, r)
+      if ftitle = bib.at(ns("./formattedref"))
         ftitle&.children&.each { |n| parse(n, r) }
       else
-        title = iso_title(b)
+        title = iso_title(bib)
         r.i do |i|
           title&.children&.each { |n| parse(n, i) }
         end
       end
     end
 
-    def is_standard(b)
+    def is_standard(bib)
       ret = false
-      b.xpath(ns("./docidentifier")).each do |id|
+      bib.xpath(ns("./docidentifier")).each do |id|
         next if id["type"].nil? ||
           %w(metanorma DOI ISSN ISBN).include?(id["type"])
+
         ret = true
       end
       ret
     end
 
-    def biblio_list(f, div, biblio)
+    def biblio_list(refs, div, biblio)
       i = 0
-      f.children.each do |b|
+      refs.children.each do |b|
         if b.name == "bibitem"
           next if implicit_reference(b)
+
           i += 1
-          (is_standard(b)) ? std_bibitem_entry(div, b, i, biblio) :
-            nonstd_bibitem(div, b, i, biblio)
+          if is_standard(b) then std_bibitem_entry(div, b, i, biblio)
+          else nonstd_bibitem(div, b, i, biblio)
+          end
         else
           parse(b, div) unless %w(title).include? b.name
         end
@@ -174,7 +187,7 @@ module IsoDoc::Function
       num
     end
 
-    def bibliography_xpath 
+    def bibliography_xpath
       "//bibliography/clause[.//references]"\
         "[not(.//references[@normative = 'true'])] | "\
         "//bibliography/references[@normative = 'false']"
@@ -184,7 +197,7 @@ module IsoDoc::Function
       f = isoxml.at(ns(bibliography_xpath)) and f["hidden"] != "true" or return
       page_break(out)
       out.div do |div|
-        div.h1 **{class: "Section3"} do |h1|
+        div.h1 **{ class: "Section3" } do |h1|
           f&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
         end
         biblio_list(f, div, true)
@@ -193,7 +206,6 @@ module IsoDoc::Function
 
     def bibliography_parse(node, out)
       node["hidden"] != true or return
-      title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
         clause_parse_title(node, div, node.at(ns("./title")), out,
                            { class: "Section3" })
@@ -201,11 +213,12 @@ module IsoDoc::Function
       end
     end
 
-    def format_ref(ref, prefix, isopub, date, allparts)
+    def format_ref(ref, prefix, _isopub, _date, _allparts)
       ref = docid_prefix(prefix, ref)
       return "[#{ref}]" if ref && /^\d+$/.match(ref) && !prefix &&
         !/^\[.*\]$/.match(ref)
-        ref
+
+      ref
     end
   end
 end

data/lib/isodoc/function/section.rb

@@ -8,11 +8,11 @@ module IsoDoc::Function
       insert_tab(out, 1)
     end
 
-    def inline_header_title(out, node, title)
+    def inline_header_title(out, _node, title)
       out.span **{ class: "zzMoveToFollowing" } do |s|
         s.b do |b|
           title&.children&.each { |c2| parse(c2, b) }
-          clausedelimspace(out) if /\S/.match(title&.text)
+          clausedelimspace(out) if /\S/.match?(title&.text)
         end
       end
     end
@@ -20,12 +20,14 @@ module IsoDoc::Function
     # used for subclauses
     def clause_parse_title(node, div, title, out, header_class = {})
       return if title.nil?
+
       if node["inline-header"] == "true"
         inline_header_title(out, node, title)
       else
-        depth = (title && title["depth"]) ? title["depth"] :
-          node.ancestors("clause, annex, terms, references, definitions, "\
-                        "acknowledgements, introduction, foreword").size + 1
+        depth = if title && title["depth"] then title["depth"]
+                else node.ancestors("clause, annex, terms, references, definitions, "\
+                                    "acknowledgements, introduction, foreword").size + 1
+                end
         div.send "h#{depth}", **attr_code(header_class) do |h|
           title&.children&.each { |c2| parse(c2, h) }
         end
@@ -49,8 +51,11 @@ module IsoDoc::Function
     def clause_name(_num, title, div, header_class)
       header_class = {} if header_class.nil?
       div.h1 **attr_code(header_class) do |h1|
-        title.is_a?(String) ? h1 << title :
+        if title.is_a?(String)
+          h1 << title
+        else
           title&.children&.each { |c2| parse(c2, h1) }
+        end
       end
       div.parent.at(".//h1")
     end
@@ -66,8 +71,9 @@ module IsoDoc::Function
       end
     end
 
-    def annex_name(annex, name, div)
+    def annex_name(_annex, name, div)
       return if name.nil?
+
       div.h1 **{ class: "Annex" } do |t|
         name.children.each { |c2| parse(c2, t) }
       end
@@ -144,7 +150,6 @@ module IsoDoc::Function
 
     def introduction(isoxml, out)
       f = isoxml.at(ns("//introduction")) || return
-      title_attr = { class: "IntroTitle" }
       page_break(out)
       out.div **{ class: "Section3", id: f["id"] } do |div|
         clause_name(nil, f.at(ns("./title")), div, { class: "IntroTitle" })
@@ -160,7 +165,7 @@ module IsoDoc::Function
       out.div **attr_code(id: f["id"]) do |s|
         clause_name(nil, f.at(ns("./title")) || @i18n.foreword, s,
                     { class: "ForewordTitle" })
-        #s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
+        # s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end
@@ -187,12 +192,11 @@ module IsoDoc::Function
     end
 
     def preface(isoxml, out)
-      title_attr = { class: "IntroTitle" }
       isoxml.xpath(ns("//preface/clause | //preface/references | "\
                       "//preface/definitions | //preface/terms")).each do |f|
         page_break(out)
         out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(nil, f&.at(ns("./title")), div, title_attr)
+          clause_name(nil, f&.at(ns("./title")), div, { class: "IntroTitle" })
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -202,37 +206,46 @@ module IsoDoc::Function
 
     def is_clause?(name)
       %w(clause references definitions terms foreword introduction abstract
-      acknowledgements).include? name
+         acknowledgements).include? name
     end
 
     def preface_block(isoxml, out)
       p = isoxml.at(ns("//preface")) or return
       p.elements.each do |e|
         next if is_clause?(e.name)
+
         parse(e, out)
       end
     end
 
     def copyright_parse(node, out)
-      out.div **{class: "boilerplate-copyright"} do |div|
+      return if @bare
+
+      out.div **{ class: "boilerplate-copyright" } do |div|
         node.children.each { |n| parse(n, div) }
       end
     end
 
     def license_parse(node, out)
-      out.div **{class: "boilerplate-license"} do |div|
+      return if @bare
+
+      out.div **{ class: "boilerplate-license" } do |div|
         node.children.each { |n| parse(n, div) }
       end
     end
 
     def legal_parse(node, out)
-      out.div **{class: "boilerplate-legal"} do |div|
+      return if @bare
+
+      out.div **{ class: "boilerplate-legal" } do |div|
         node.children.each { |n| parse(n, div) }
       end
     end
 
     def feedback_parse(node, out)
-      out.div **{class: "boilerplate-feedback"} do |div|
+      return if @bare
+
+      out.div **{ class: "boilerplate-feedback" } do |div|
         node.children.each { |n| parse(n, div) }
       end
     end