metanorma-ieee 0.1.3 → 1.0.1

data/lib/isodoc/ieee/metadata.rb

@@ -94,7 +94,7 @@ module IsoDoc
         set(:full_doctitle, fulltitle(@metadata[:doctype], draft))
         set(:abbrev_doctitle, fulltitle(@metadata[:doctype_abbrev], draft))
         prov = isoxml&.at(ns("//bibdata/title[@type='provenance']")) and
-          set(:provenance_doctitle, prov.children.to_xml)
+          set(:provenance_doctitle, Common::to_xml(prov.children))
       end
 
       def fulltitle(type, draft)

data/lib/isodoc/ieee/presentation_ref.rb

@@ -14,7 +14,7 @@ module IsoDoc
 
       def biblio_anchor_linkend(node, bib)
         if %w(techreport standard).include?(bib[:type])
-          node["citeas"] + " #{bib[:ord]}"
+          [node["citeas"], bib[:ord]].compact.join(" ")
         else
           "#{bib[:author]} " + node["citeas"]
         end
@@ -30,7 +30,7 @@ module IsoDoc
               author: @author[b["id"]] || (b.at(ns("./title")) ||
                      b.at(ns("./formattedref")))&.text,
               ord: b.at(ns("./docidentifier[@type = 'metanorma' or "\
-                           "@type = 'metanorma-ordinal']")).text }
+                           "@type = 'metanorma-ordinal']"))&.text }
         end
       end
 

data/lib/isodoc/ieee/presentation_terms.rb

@@ -26,19 +26,19 @@ module IsoDoc
         if coll.all? do |c|
              c.elements.size == 1 && c.elements.first.name == "p"
            end
-          ret = coll.map { |c| c.elements.first.children.to_xml }
+          ret = coll.map { |c| to_xml(c.elements.first.children) }
           return "<p>#{ret.join}</p>"
         end
-        coll.map { |c| c.children.to_xml }.join
+        coll.map { |c| to_xml(c.children) }.join
       end
 
       def unwrap_definition(docxml)
-        docxml.xpath(ns("//definition/verbal-definition")).each do |v|
+        docxml.xpath(ns(".//definition/verbal-definition")).each do |v|
           next unless v.elements.all? { |e| %w(termsource p).include?(e.name) }
 
           p = v.xpath(ns("./p"))
           v.children =
-            "<p>#{p.map(&:children).map(&:to_xml).join("\n")}</p>" \
+            "<p>#{p.map(&:children).map { |x| to_xml(x) }.join("\n")}</p>" \
             "#{v.xpath(ns('./termsource')).to_xml}"
         end
         super
@@ -60,8 +60,8 @@ module IsoDoc
             prev = i and next
           end
 
-          coll[prev].at(ns("./preferred")) << "; #{r.at(ns('./preferred'))
-              .children.to_xml}"
+          coll[prev].at(ns("./preferred")) << "; #{to_xml(r.at(ns('./preferred'))
+              .children)}"
           r.remove
         end
       end
@@ -129,10 +129,10 @@ module IsoDoc
         new = adm.dup
         adm["type"] = "equivalent"
         adm.name = "related"
-        adm.children = "<preferred>#{adm.children.to_xml}</preferred>"
+        adm.children = "<preferred>#{to_xml(adm.children)}</preferred>"
         adm.parent.next = <<~TERM
-          <term><preferred>#{new.children.to_xml}</preferred>
-          <related type='see'><preferred>#{pref.children.to_xml}</preferred></related></term>
+          <term><preferred>#{to_xml(new.children)}</preferred>
+          <related type='see'><preferred>#{to_xml(pref.children)}</preferred></related></term>
         TERM
       end
 
@@ -172,8 +172,8 @@ module IsoDoc
       def collapse_term_related(rels)
         ret = rels.map do |r|
           p = r.at(ns("./preferred"))
-          "<em>#{@i18n.relatedterms[r['type']]}:</em> " \
-            "#{p&.children&.to_xml || '**RELATED TERM NOT FOUND**'}"
+          rel = p ? to_xml(p.children) : "**RELATED TERM NOT FOUND**"
+          "<em>#{@i18n.relatedterms[r['type']]}:</em> #{rel}"
         end.join(". ")
         ret += "." unless ret.empty?
         ret
@@ -182,10 +182,10 @@ module IsoDoc
       def collapse_term_template(opt)
         defn = collapse_unwrap_definition(opt[:def])
         src = nil
-        opt[:source] and src = "(#{opt[:source].remove.children.to_xml.strip})"
+        opt[:source] and src = "(#{to_xml(opt[:source].remove.children).strip})"
+        t = opt[:pref] ? to_xml(opt[:pref].children) : "**TERM NOT FOUND**"
         <<~TERM
-          <p>#{opt[:pref]&.children&.to_xml || '**TERM NOT FOUND**'}: #{defn}
-          #{collapse_term_related(opt[:rels])} #{src}</p>
+          <p>#{t}: #{defn} #{collapse_term_related(opt[:rels])} #{src}</p>
         TERM
       end
 
@@ -194,7 +194,8 @@ module IsoDoc
 
         s = defn.remove.xpath(ns("./termsource"))
         p = defn.at(ns("./p"))
-        !s.empty? && p and p << s.map(&:remove).map(&:children).map(&:to_xml).join
+        !s.empty? && p and p << s.map(&:remove).map(&:children)
+          .map { |x| to_xml(x) }.join
         if defn.elements.size == 1 && defn.elements.first.name == "p"
           defn.elements.first.children
         else defn.elements
@@ -203,10 +204,10 @@ module IsoDoc
 
       def termsource1(elem)
         while elem&.next_element&.name == "termsource"
-          elem << "; #{elem.next_element.remove.children.to_xml}"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
         end
         adapt = termsource_adapt(elem["status"]) and
-          elem.children = l10n("#{adapt}#{elem.children.to_xml.strip}")
+          elem.children = l10n("#{adapt}#{to_xml(elem.children).strip}")
       end
 
       def termsource_adapt(status)
@@ -218,7 +219,7 @@ module IsoDoc
       def designation_field(desgn, name)
         if desgn.name == "preferred"
           f = desgn.xpath(ns("./../domain | ./../subject")).map(&:remove)
-            .map { |u| u.children.to_xml }.join(", ")
+            .map { |u| to_xml(u.children) }.join(", ")
           name << ", &#x3c;#{f}&#x3e;" unless f.empty?
         end
         super
@@ -231,7 +232,7 @@ module IsoDoc
                           "./admitted[expression/name][abbreviation-type]"))
         (pref && !x.empty?) or return
         tail = x.map do |p|
-          p.remove.at(ns("./expression/name")).children.to_xml.strip
+          to_xml(p.remove.at(ns("./expression/name")).children).strip
         end.join(", ")
         pref << " (#{tail})"
       end
@@ -244,7 +245,7 @@ module IsoDoc
       def term(docxml); end
 
       def concept1(node)
-        concept_render(node, ital: "false", ref: "false",
+        concept_render(node, ital: "false", ref: "false", bold: "false",
                              linkref: "false", linkmention: "false")
       end
     end

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -17,9 +17,10 @@ module IsoDoc
         ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
                                                             node))
         node["droploc"] = droploc
-        eref_localities1(target,
-                         prefix_clause(target, refs.first.at(ns("./locality"))),
-                         l10n(ret[1..-1].join), nil, node, @lang)
+        eref_localities1({ target: target, number: "pl",
+                           type: prefix_clause(target, refs.first.at(ns("./locality"))),
+                           from: l10n(ret[1..-1].join), node: node,
+                           lang: @lang })
       end
 
       def prefix_clause(target, loc)
@@ -37,20 +38,18 @@ module IsoDoc
           target&.gsub(/<[^>]+>/, "")&.match(/^IEV$|^IEC 60050-/)
       end
 
-      def eref_localities1(target, type, from, upto, node, lang = "en")
-        return nil if type == "anchor"
+      def eref_localities1(opt)
+        return nil if opt[:type] == "anchor"
 
-        type = type.downcase
-        lang == "zh" and
-          return l10n(eref_localities1_zh(target, type, from, upto,
-                                          node))
+        opt[:type] = opt[:type].downcase
+        opt[:lang] == "zh" and return l10n(eref_localities1_zh(opt))
         ret = ""
-        node["droploc"] != "true" && !subclause?(target, type,
-                                                 from) and
-          ret = eref_locality_populate(type, node)
-        ret += " #{from}" if from
-        ret += "&#x2013;#{upto}" if upto
-        ret += ")" if type == "list"
+        opt[:node]["droploc"] != "true" &&
+          !subclause?(opt[:target], opt[:type], opt[:from]) and
+          ret = eref_locality_populate(opt[:type], opt[:node], opt[:number])
+        ret += " #{opt[:from]}" if opt[:from]
+        ret += "&#x2013;#{opt[:upto]}" if opt[:upto]
+        ret += ")" if opt[:type] == "list"
         l10n(ret)
       end
 
@@ -85,7 +84,7 @@ module IsoDoc
         i = display_order_xpath(docxml, "//preface/*", i)
         i = display_order_at(docxml, "//clause[@type = 'overview']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        i = display_order_at(docxml, "//sections/terms | "\
+        i = display_order_at(docxml, "//sections/terms | " \
                                      "//sections/clause[descendant::terms]", i)
         i = display_order_at(docxml, "//sections/definitions", i)
         i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
@@ -97,7 +96,7 @@ module IsoDoc
       def annex1(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         if t = elem.at(ns("./title"))
-          t.children = "<strong>#{t.children.to_xml}</strong>"
+          t.children = "<strong>#{to_xml(t.children)}</strong>"
         end
         prefix_name(elem, "<br/>", lbl, "title")
       end
@@ -132,7 +131,7 @@ module IsoDoc
 
       def amend1(elem)
         elem.xpath(ns("./description/p")).each do |p|
-          p.children = p.children.to_xml.strip
+          p.children = to_xml(p.children).strip
           amend_format(p)
         end
         super
@@ -144,7 +143,7 @@ module IsoDoc
             %(em strong).include?(para.children.first.name) and
             para.children = para.elements.first.children
         end
-        para.children = "<strong><em>#{para.children.to_xml}</em></strong>"
+        para.children = "<strong><em>#{to_xml(para.children)}</em></strong>"
       end
 
       def section(docxml)
@@ -153,7 +152,7 @@ module IsoDoc
       end
 
       def boilerplate(docxml)
-        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/"\
+        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/" \
                         "clause/title")).each(&:remove)
         docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/clause"))
           .each do |clause|
@@ -211,7 +210,7 @@ module IsoDoc
       def participant_officeholder_para(map, name, idx)
         name = "<strong>#{name}</strong>" if idx.zero?
         br = map["role"].size > 30 ? "<br/>" : ""
-        "<p type='officeholder' align='center'>#{name}, #{br}"\
+        "<p type='officeholder' align='center'>#{name}, #{br}" \
           "<em>#{map['role']}</em></p>"
       end
 

data/lib/isodoc/ieee/word_authority.rb

@@ -15,7 +15,7 @@ module IsoDoc
         feedback_table(docxml)
         f = docxml.at("//div[@class = 'boilerplate-feedback']") or return
         docxml.at("//aside").previous = <<~FN
-          <aside id="ftn0">#{f.remove.to_xml}</aside>
+          <aside id="ftn0">#{to_xml(f.remove)}</aside>
         FN
       end
 
@@ -103,7 +103,7 @@ module IsoDoc
         div.xpath(".//div").each { |d| d.replace(d.children) }
         div.elements.each_with_object([[]]) do |e, m|
           member = e.name == "p" && e["type"] == "officemember"
-          (prev == member and m[-1] << e.to_xml) or m << [e.to_xml]
+          (prev == member and m[-1] << to_xml(e)) or m << [to_xml(e)]
           prev = member
         end.map(&:join)
       end
@@ -143,7 +143,7 @@ module IsoDoc
           i.zero? or div.elements.first.previous = "<p>&#xa0;</p>"
           i == 4 and
             div.xpath(".//p[br]").each do |p|
-              p.replace(p.to_xml.gsub(%r{<br/>}, "</p><p>"))
+              p.replace(to_xml(p).gsub(%r{<br/>}, "</p><p>"))
             end
           feedback_style1(div, i)
         end

data/lib/isodoc/ieee/word_cleanup.rb

@@ -17,6 +17,10 @@ module IsoDoc
         @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
       end
 
+      def sourcecode_style
+        "IEEEStdsComputerCode"
+      end
+
       def word_cleanup(docxml)
         super
         abstract_cleanup(docxml)

data/lib/isodoc/ieee/word_cleanup_blocks.rb

@@ -28,7 +28,7 @@ module IsoDoc
               end
             else
               t.children =
-                "<p class='IEEEStdsTableColumnHead'>#{t.children.to_xml}</p>"
+                "<p class='IEEEStdsTableColumnHead'>#{to_xml(t.children)}</p>"
             end
           end
         end
@@ -45,9 +45,9 @@ module IsoDoc
 
       def tbody_head_cleanup(cell)
         cell.at("./p") or
-          cell.children = "<p>#{cell.children.to_xml}</p>"
+          cell.children = "<p>#{to_xml(cell.children)}</p>"
         cell.xpath("./p").each do |p|
-          p.replace p.to_xml.gsub(%r{<br/>}, "</p><p>")
+          p.replace to_xml(p).gsub(%r{<br/>}, "</p><p>")
         end
       end
 
@@ -58,7 +58,7 @@ module IsoDoc
           end
         else
           cell.children =
-            "<p class='#{td_style(cell, 0)}'>#{cell.children.to_xml}</p>"
+            "<p class='#{td_style(cell, 0)}'>#{to_xml(cell.children)}</p>"
         end
       end
 
@@ -80,28 +80,28 @@ module IsoDoc
 
       def table_caption(docxml)
         docxml.xpath("//p[@class = 'TableTitle']").each do |s|
-          s.children = s.children.to_xml
+          s.children = to_xml(s.children)
             .sub(/^#{@i18n.table}(\s+[A-Z0-9.]+)?/, "")
         end
       end
 
       def figure_caption(docxml)
         docxml.xpath("//p[@class = 'FigureTitle']").each do |s|
-          s.children = s.children.to_xml
+          s.children = to_xml(s.children)
             .sub(/^#{@i18n.figure}(\s+[A-Z0-9.]+)?/, "")
         end
       end
 
       def example_caption(docxml)
         docxml.xpath("//p[@class = 'example-title']").each do |s|
-          s.children = "<em>#{s.children.to_xml}</em>"
+          s.children = "<em>#{to_xml(s.children)}</em>"
           s["class"] = "IEEEStdsParagraph"
         end
       end
 
       def sourcecode_cleanup(docxml)
         docxml.xpath("//p[@class = 'Sourcecode']").each do |s|
-          s.replace(s.to_xml.gsub(%r{<br/>}, "</p><p class='Sourcecode'>"))
+          s.replace(to_xml(s).gsub(%r{<br/>}, "</p><p class='Sourcecode'>"))
         end
       end
 

data/lib/metanorma/ieee/basicdoc.rng

@@ -683,6 +683,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/ieee/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/ieee/isodoc.rng

@@ -571,6 +571,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1238,6 +1243,11 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="bold">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="ital">
           <data type="boolean"/>
@@ -2653,6 +2663,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <text/>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "0.1.3".freeze
+    VERSION = "1.0.1".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -2,6 +2,8 @@ nametemplate:
   one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} ,_{{initials[0] | join: '. '}} {% endif %}"
   two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} ,_{{initials[0] | join: '. '}}.{% endif %} , {{ labels['and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{initials[1] | join: '. '}}. {{surname[1] }}{% endif %}"
   more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} ,_{{initials[0] | join: '. '}}.{% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{initials[1] | join: '. '}}. {{surname[1] }}{% endif %} , {{ labels['and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{initials[2] | join: '. '}}. {{surname[2] }}{% endif %}"
+  etal_count: 10
+  etal_render: 7
 extenttemplate:
   misc: "{{ volume }}, {{issue}}, {{ page }}, {{ duration }}"
 template:

data/metanorma-ieee.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.3.0"
   spec.add_dependency "mnconvert", "~> 1.20"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Metanorma for the IEEE