metanorma-ieee 1.6.9 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 891fa8a910ea2585f10fed401ac0662350ee90f815466239e87b47ee3c955e49
-  data.tar.gz: 376447bafc1e0c02c2766d6d13380d0bce718d4b0a8cd900534d77666676d5d9
+  metadata.gz: 7ae3dc5271b5b6922a7c4d5c97a069467a8abe8b932eebe915288b3919bb570a
+  data.tar.gz: 2813a9169b01737e54bb8bd30b3efc67f313f3b737390434293a8a636611c76a
 SHA512:
-  metadata.gz: cbe1087ab6d2474b1badda0e313e69242f52e2f976ed0634e9a67a1af11dde1f6b2450ca340d8d74dda6df3a377e6b2e3a9e1a5d783f700b0fd136e903692a94
-  data.tar.gz: e25c7274895abd556694df517be356ec3552563934ac096b79ef091479799cd1ccea8c64cd5c2c5f34c96f022b8163852da194a10811d6fc0e63f223fe4bdc86
+  metadata.gz: 9ae22a0ab171d82c4f62c00ecb21acbd527830595f2742f6f0c56ab1472d9b5a217f1c9c22a3b9aeb555718ee45493127300338e708d150dec61696ddb3c2812
+  data.tar.gz: 1f82da62388754f1e997341350d05f26eb71f662520475734f4f689dce1c6e8ba3076671f807d9e08db24953ff60bdc2b5d31308d77dcba990754107d47ecdd6

data/.rubocop.yml

@@ -1,10 +1,10 @@
 # Auto-generated by Cimas: Do not edit it manually!
 # See https://github.com/metanorma/cimas
 inherit_from:
-  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
 # local repo-specific modifications
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.4

data/lib/isodoc/ieee/html_convert.rb

@@ -83,7 +83,7 @@ module IsoDoc
         else super
         end
       end
-      
+
       def ol_attrs(node)
         ret = super
         ret.merge(class: OL_STYLE.invert[ret[:type]])

data/lib/isodoc/ieee/metadata.rb

@@ -23,12 +23,12 @@ module IsoDoc
 
       def bibdate(isoxml, _out)
         isoxml.xpath(ns("//bibdata/date[@format = 'ddMMMyyyy']")).each do |d|
-          set("#{d['type'].tr('-', '_')}date".to_sym, Common::date_range(d))
+          set(:"#{d['type'].tr('-', '_')}date", Common::date_range(d))
         end
         draft = isoxml.at(ns("//bibdata/date[@type = 'issued']")) ||
           isoxml.at(ns("//bibdata/date[@type = 'circulated']")) ||
           isoxml.at(ns("//bibdata/date[@type = 'created']")) ||
-          isoxml.at(ns("//bibdata/version/revision-date")) or return
+          isoxml.at(ns("//bibdata/date[@type = 'updated']")) or return
         date = DateTime.parse(draft.text)
         set(:draft_month, date.strftime("%B"))
         set(:draft_year, date.strftime("%Y"))
@@ -59,7 +59,7 @@ module IsoDoc
       def agency(xml)
         super
         logos = xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'author']/" \
-                   "organization/logo/image/@src"))
+                             "organization/logo/image/@src"))
         set(:corporate_author_logos, logos.map { |l| to_datauri(l.value) })
         set(:corporate_author_logo_attrs, contrib_logo_attrs(xml, "author"))
       end
@@ -78,27 +78,27 @@ module IsoDoc
 
       def society(xml)
         society = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
-        "organization/subdivision[@type='Society']/name"))&.text ||
+                            "organization/subdivision[@type='Society']/name"))&.text ||
           "<Society>"
         set(:society, society)
       end
 
       def tc(xml)
         tc = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
-          "organization/subdivision[@type='Committee']/name"))&.text ||
+                       "organization/subdivision[@type='Committee']/name"))&.text ||
           "<Committee Name>"
         set(:technical_committee, tc)
       end
 
       def wg(xml)
         wg = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
-         "organization/subdivision[@type='Working group']/name")) or return nil
+                       "organization/subdivision[@type='Working group']/name")) or return nil
         set(:working_group, wg.text)
       end
 
       def bg(xml)
         bg = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
-         "organization/subdivision[@type='Balloting group']/name")) or return nil
+                       "organization/subdivision[@type='Balloting group']/name")) or return nil
         set(:balloting_group, bg.text)
         set(:balloting_group_type, bg.parent["subtype"])
       end
@@ -146,15 +146,13 @@ module IsoDoc
       end
 
       def ddMMMyyyy(isodate)
-        isodate.nil? and return nil
-        arr = isodate.split("-")
-        if arr.size == 1 && (/^\d+$/.match isodate)
-          Date.new(*arr.map(&:to_i)).strftime("%Y")
-        elsif arr.size == 2
-          Date.new(*arr.map(&:to_i)).strftime("%b %Y")
-        else
-          Date.parse(isodate).strftime("%d %b %Y")
-        end
+        IsoDoc::ExtendedDateFormatter.format_iso_date(
+          isodate,
+          lang: @lang,
+          year: "%Y",
+          year_month: "%b %Y",
+          full: "%d %b %Y",
+        )
       end
     end
   end

data/lib/isodoc/ieee/presentation_bibdata.rb

@@ -34,15 +34,13 @@ module IsoDoc
       end
 
       def ddMMMyyyy(isodate)
-        isodate.nil? and return nil
-        arr = isodate.split("-")
-        if arr.size == 1 && (/^\d+$/.match isodate)
-          Date.new(*arr.map(&:to_i)).strftime("%Y")
-        elsif arr.size == 2
-          Date.new(*arr.map(&:to_i)).strftime("%b %Y")
-        else
-          Date.parse(isodate).strftime("%d %b %Y")
-        end
+        IsoDoc::ExtendedDateFormatter.format_iso_date(
+          isodate,
+          lang: @lang,
+          year: "%Y",
+          year_month: "%b %Y",
+          full: "%d %b %Y",
+        )
       end
 
       def boilerplate(docxml)

data/lib/isodoc/ieee/word_cleanup.rb

@@ -27,6 +27,7 @@ module IsoDoc
         headings_cleanup(docxml)
         caption_cleanup(docxml)
         table_cleanup(docxml)
+        p_div_cleanup(docxml)
         style_cleanup(docxml)
         para_type_cleanup(docxml)
         docxml

data/lib/isodoc/ieee/word_cleanup_blocks.rb

@@ -131,18 +131,26 @@ module IsoDoc
       def note_style_cleanup1(multi, div, seq)
         div.xpath(".//p[@class = 'Note' or not(@class)]")
           .each_with_index do |p, i|
-            p["class"] =
-              i.zero? && multi ? "IEEEStdsMultipleNotes" : "IEEEStdsSingleNote"
-            if multi
-              p["style"] ||= ""
-              p["style"] += "mso-list:l17 level1 lfo#{seq};"
-            end
+          p["class"] =
+            i.zero? && multi ? "IEEEStdsMultipleNotes" : "IEEEStdsSingleNote"
+          if multi
+            p["style"] ||= ""
+            p["style"] += "mso-list:l17 level1 lfo#{seq};"
+          end
         end
       end
 
       # override indent via <div class="ListContLevel-n">
       def list_add(xlist, lvl); end
 
+      def p_div_cleanup(docxml)
+        docxml.xpath("//p[div]").each do |p|
+          p.xpath("./div").reverse_each do |div|
+            p.next = div
+          end
+        end
+      end
+
       private
 
       def split_para_at_breaks(para)

data/lib/isodoc/ieee/word_convert.rb

@@ -175,8 +175,7 @@ module IsoDoc
       end
 
       def termnote_parse(node, out)
-        name = node.at(ns("./fmt-name"))
-        para = node.at(ns("./p"))
+        name, para = termnote_parse_prep(node)
         out.div **note_attrs(node) do |div|
           div.p do |p|
             name and termnote_label(p, name)
@@ -186,6 +185,12 @@ module IsoDoc
         end
       end
 
+      def termnote_parse_prep(node)
+        name = node.at(ns("./fmt-name"))
+        para = node.at(ns("./p"))
+        [name, para]
+      end
+
       def termnote_label(para, name)
         para.span class: "note_label" do |s|
           name.children.each { |n| parse(n, s) }

data/lib/isodoc/ieee/word_wp_cleanup.rb

@@ -95,6 +95,20 @@ module IsoDoc
         end
       end
 
+      # Whitepaper figure_parse1 emits caption-before-image, so the upstream
+      # wrap (img-before-caption) never fires. Wrap the trailing img so it
+      # carries Body Text + Centered. https://github.com/metanorma/metanorma-ieee/issues/739
+      def word_image_caption(docxml)
+        super
+        docxml.xpath("//p[@class = 'FigureTitle' or @class = 'SourceTitle']")
+          .each do |t|
+          n = t.next_element
+          n&.name == "img" or next
+          n.swap("<p class='figure' style='text-align:center;'>" \
+                 "#{n.to_xml}</p>")
+        end
+      end
+
       def authority_cleanup(docxml)
         %w(copyright disclaimers tm participants).each do |t|
           authority_cleanup1(docxml, t)

data/lib/metanorma/ieee/validate_style.rb

@@ -114,7 +114,7 @@ module Metanorma
       # Style Manual 11.3
       def title_validate_type(xml)
         title = xml.at("//bibdata/title") or return
-        draft = xml.at("//bibdata//draft")
+        draft = xml.at("//bibdata//version")
         trial = xml.at("//bibdata/ext/trial-use[text() = 'true']")
         target = draft ? "Draft " : ""
         target += trial ? "Trial-Use " : ""

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.6.9".freeze
+    VERSION = "1.6.10".freeze
   end
 end

data/metanorma-ieee.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 3.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.4.2"
   spec.add_dependency "mnconvert", "~> 1.20"
   spec.add_dependency "pubid"
 
@@ -42,5 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "canon", "= 0.2.3"
+  spec.add_development_dependency "canon" # , "= 0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -238,16 +238,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
 description: 'Metanorma for the ITU.
 
   '