isodoc 1.6.2 → 1.6.7

data/lib/isodoc/function/references.rb

@@ -10,9 +10,9 @@ module IsoDoc::Function
     end
 
     # TODO generate formatted ref if not present
-    def nonstd_bibitem(list, b, ordinal, biblio)
-      list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-        ids = bibitem_ref_code(b)
+    def nonstd_bibitem(list, bib, ordinal, biblio)
+      list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
+        ids = bibitem_ref_code(bib)
         identifiers = render_identifier(ids)
         if biblio then ref_entry_code(ref, ordinal, identifiers, ids)
         else
@@ -20,21 +20,21 @@ module IsoDoc::Function
           ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
         end
         ref << ", " unless biblio && !identifiers[1]
-        reference_format(b, ref)
+        reference_format(bib, ref)
       end
     end
 
-    def std_bibitem_entry(list, b, ordinal, biblio)
-      list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-        identifiers = render_identifier(bibitem_ref_code(b))
+    def std_bibitem_entry(list, bib, ordinal, biblio)
+      list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
+        identifiers = render_identifier(bibitem_ref_code(bib))
         if biblio then ref_entry_code(ref, ordinal, identifiers, nil)
         else
           ref << (identifiers[0] || identifiers[1]).to_s
           ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
         end
-        date_note_process(b, ref)
+        date_note_process(bib, ref)
         ref << ", " unless biblio && !identifiers[1]
-        reference_format(b, ref)
+        reference_format(bib, ref)
       end
     end
 
@@ -45,16 +45,16 @@ module IsoDoc::Function
       t[1] and r << (t[1]).to_s
     end
 
-    def pref_ref_code(b)
-      b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
+    def pref_ref_code(bib)
+      bib.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
               "or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"))
     end
 
     # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
-    def bibitem_ref_code(b)
-      id = b.at(ns("./docidentifier[@type = 'metanorma']"))
-      id1 = pref_ref_code(b)
-      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or "\
+    def bibitem_ref_code(bib)
+      id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
+      id1 = pref_ref_code(bib)
+      id2 = bib.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or "\
                     "@type = 'ISBN']"))
       return [id, id1, id2] if id || id1 || id2
 
@@ -72,20 +72,10 @@ module IsoDoc::Function
       num
     end
 
-    def render_identifier(id)
-      [
-        bracket_if_num(id[0]),
-        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,
-      ]
+    def render_identifier(ident)
+      [bracket_if_num(ident[0]),
+       ident[1].nil? ? nil : ident[1].text.sub(/^\[/, "").sub(/\]$/, ""),
+       ident[2].nil? ? nil : ident[2].text.sub(/^\[/, "").sub(/\]$/, "")]
     end
 
     def docid_prefix(prefix, docid)
@@ -97,19 +87,20 @@ module IsoDoc::Function
     def omit_docid_prefix(prefix)
       return true if prefix.nil? || prefix.empty?
 
-      %w(ISO IEC IEV ITU W3C csd metanorma rfc-anchor).include? prefix
+      %w(ISO IEC IEV ITU W3C csd metanorma repository rfc-anchor)
+        .include? prefix
     end
 
-    def date_note_process(b, ref)
-      date_note = b.at(ns("./note[@type = 'Unpublished-Status']"))
+    def date_note_process(bib, ref)
+      date_note = bib.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
 
-    def iso_bibitem_entry_attrs(b, biblio)
-      { id: b["id"], class: biblio ? "Biblio" : "NormRef" }
+    def iso_bibitem_entry_attrs(bib, biblio)
+      { id: bib["id"], class: biblio ? "Biblio" : "NormRef" }
     end
 
     def iso_title(bib)
@@ -130,22 +121,21 @@ module IsoDoc::Function
       insert_tab(ref, 1)
     end
 
-    def reference_format(bib, r)
+    def reference_format(bib, out)
       if ftitle = bib.at(ns("./formattedref"))
-        ftitle&.children&.each { |n| parse(n, r) }
+        ftitle&.children&.each { |n| parse(n, out) }
       else
-        title = iso_title(bib)
-        r.i do |i|
-          title&.children&.each { |n| parse(n, i) }
+        out.i do |i|
+          iso_title(bib)&.children&.each { |n| parse(n, i) }
         end
       end
     end
 
     def is_standard(bib)
       ret = false
+      drop = %w(metanorma DOI ISSN ISBN)
       bib.xpath(ns("./docidentifier")).each do |id|
-        next if id["type"].nil? ||
-          %w(metanorma DOI ISSN ISBN).include?(id["type"])
+        next if id["type"].nil? || drop.include?(id["type"])
 
         ret = true
       end
@@ -180,8 +170,7 @@ module IsoDoc::Function
         clause_name(num, f.at(ns("./title")), div, nil)
         if f.name == "clause"
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
-        else
-          biblio_list(f, div, false)
+        else biblio_list(f, div, false)
         end
       end
       num
@@ -212,13 +201,5 @@ module IsoDoc::Function
         biblio_list(node, div, true)
       end
     end
-
-    def format_ref(ref, prefix, _isopub, _date, _allparts)
-      ref = docid_prefix(prefix, ref)
-      return "[#{ref}]" if ref && /^\d+$/.match(ref) && !prefix &&
-        !/^\[.*\]$/.match(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,6 @@ 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 }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end
@@ -187,12 +191,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 +205,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

data/lib/isodoc/function/table.rb

@@ -1,17 +1,16 @@
 module IsoDoc::Function
   module Table
-
     def table_title_parse(node, out)
       name = node.at(ns("./name")) or return
       out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
-        name and name.children.each { |n| parse(n, p) }
+        name&.children&.each { |n| parse(n, p) }
       end
     end
 
-    def thead_parse(node, t)
+    def thead_parse(node, table)
       thead = node.at(ns("./thead"))
       if thead
-        t.thead do |h|
+        table.thead do |h|
           thead.element_children.each_with_index do |n, i|
             tr_parse(n, h, i, thead.element_children.size, true)
           end
@@ -19,19 +18,19 @@ module IsoDoc::Function
       end
     end
 
-    def tbody_parse(node, t)
+    def tbody_parse(node, table)
       tbody = node.at(ns("./tbody")) || return
-      t.tbody do |h|
+      table.tbody do |h|
         tbody.element_children.each_with_index do |n, i|
           tr_parse(n, h, i, tbody.element_children.size, false)
         end
       end
     end
 
-    def tfoot_parse(node, t)
+    def tfoot_parse(node, table)
       tfoot = node.at(ns("./tfoot"))
       if tfoot
-        t.tfoot do |h|
+        table.tfoot do |h|
           tfoot.element_children.each_with_index do |n, i|
             tr_parse(n, h, i, tfoot.element_children.size, false)
           end
@@ -45,23 +44,23 @@ module IsoDoc::Function
         id: node["id"],
         class: "MsoISOTable",
         style: "border-width:1px;border-spacing:0;#{width}#{keep_style(node)}",
-        title: node["alt"]
+        title: node["alt"],
       )
     end
 
-    def tcaption(node, t)
+    def tcaption(node, table)
       return unless node["summary"]
 
-      t.caption do |c|
+      table.caption do |c|
         c.span **{ style: "display:none" } do |s|
           s << node["summary"]
         end
       end
     end
 
-    def colgroup(node, t)
+    def colgroup(node, table)
       colgroup = node.at(ns("./colgroup")) or return
-      t.colgroup do |cg|
+      table.colgroup do |cg|
         colgroup.xpath(ns("./col")).each do |c|
           cg.col **{ style: "width: #{c['width']};" }
         end
@@ -90,19 +89,19 @@ module IsoDoc::Function
     # border-left:#{col.zero? ? "#{SW} 1.5pt;" : "none;"}
     # border-right:#{SW} #{col == totalcols && !header ? "1.5" : "1.0"}pt;
 
-    def make_tr_attr(td, row, totalrows, header)
-      style = td.name == "th" ? "font-weight:bold;" : ""
-      td["align"] and style += "text-align:#{td['align']};"
-      td["valign"] and style += "vertical-align:#{td['valign']};"
-      rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
+    def make_tr_attr(cell, row, totalrows, header)
+      style = cell.name == "th" ? "font-weight:bold;" : ""
+      cell["align"] and style += "text-align:#{cell['align']};"
+      cell["valign"] and style += "vertical-align:#{cell['valign']};"
+      rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
       style += <<~STYLE
         border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
         border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
       STYLE
-      header and scope = (td["colspan"] ? "colgroup" : "col")
-      !header and td.name == "th" and scope =
-        (td["rowspan"] ? "rowgroup" : "row")
-      { rowspan: td["rowspan"], colspan: td["colspan"],
+      header and scope = (cell["colspan"] ? "colgroup" : "col")
+      !header and cell.name == "th" and scope =
+                                          (cell["rowspan"] ? "rowgroup" : "row")
+      { rowspan: cell["rowspan"], colspan: cell["colspan"],
         style: style.gsub(/\n/, ""), scope: scope }
     end
 

data/lib/isodoc/function/terms.rb

@@ -11,27 +11,27 @@ module IsoDoc::Function
     end
 
     def deprecated_term_parse(node, out)
-      out.p **{ class: "DeprecatedTerms", style:"text-align:left;" } do |p|
+      out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
         p << l10n("#{@i18n.deprecated}: ")
         node.children.each { |c| parse(c, p) }
       end
     end
 
     def admitted_term_parse(node, out)
-      out.p **{ class: "AltTerms", style:"text-align:left;" } do |p|
+      out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
         node.children.each { |c| parse(c, p) }
       end
     end
 
     def term_parse(node, out)
-      out.p **{ class: "Terms", style:"text-align:left;" } do |p|
+      out.p **{ class: "Terms", style: "text-align:left;" } do |p|
         node.children.each { |c| parse(c, p) }
       end
     end
 
-    def para_then_remainder(first, node, p, div)
+    def para_then_remainder(first, node, para, div)
       if first.name == "p"
-        first.children.each { |n| parse(n, p) }
+        first.children.each { |n| parse(n, para) }
         node.elements.drop(1).each { |n| parse(n, div) }
       else
         node.elements.each { |n| parse(n, div) }
@@ -72,7 +72,6 @@ module IsoDoc::Function
       node.children.each { |n| parse(n, out) }
     end
 
-    def termdocsource_parse(_node, _out)
-    end
+    def termdocsource_parse(_node, _out); end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -21,9 +21,10 @@ module IsoDoc::Function
       filename = filepath.sub_ext("").sub(/\.presentation$/, "").to_s
       dir = init_dir(filename, debug)
       @filename = filename
-      @localdir = filepath.parent.to_s + "/"
+      @localdir = "#{filepath.parent}/"
       @sourcedir = @localdir
-      @sourcefilename and @sourcedir = Pathname.new(@sourcefilename).parent.to_s + "/"
+      @sourcefilename and
+        @sourcedir = "#{Pathname.new(@sourcefilename).parent}/"
       [filename, dir]
     end
 
@@ -47,7 +48,7 @@ module IsoDoc::Function
 
     # isodoc.css overrides any CSS injected by Html2Doc, which
     # is inserted before this CSS.
-    def define_head(head, filename, _dir)
+    def define_head(head, _filename, _dir)
       if @standardstylesheet
         head.style do |style|
           @standardstylesheet.open
@@ -128,6 +129,8 @@ module IsoDoc::Function
     end
 
     def boilerplate(node, out)
+      return if @bare
+
       boilerplate = node.at(ns("//boilerplate")) or return
       out.div **{ class: "authority" } do |s|
         boilerplate.children.each do |n|