metanorma-ieee 1.3.2 → 1.3.4

data/lib/isodoc/ieee/presentation_terms.rb

@@ -10,8 +10,7 @@ module IsoDoc
         c = IsoDoc::XrefGen::Counter.new("@")
         elem.xpath(ns("./definition")).each do |d|
           c.increment(d)
-          d.elements.first.children.first.previous =
-            "<strong>(#{c.print})</strong>&#xa0;"
+          d.elements.first.add_first_child "<strong>(#{c.print})</strong>&#xa0;"
         end
       end
 
@@ -214,6 +213,13 @@ module IsoDoc
         end
       end
 
+      # domain is rendered in designation_field instead
+      def termdomain(elem)
+        d = elem.at(ns(".//domain")) or return
+        d["hidden"] = "true"
+      end
+
+      # TODO wrap domain not in <domain>, but <span class="domain"> or equivalent
       def designation_field(desgn, name)
         if desgn.name == "preferred"
           f = desgn.xpath(ns("./../domain | ./../subject")).map(&:remove)
@@ -235,11 +241,20 @@ module IsoDoc
         pref << " (#{tail})"
       end
 
+      def termnote_delim(_elem)
+        "&#x2014;"
+      end
+
       def termnote1(elem)
-        lbl = l10n(@xrefs.anchor(elem["id"], :label)&.strip || "???")
+        lbl = termnote_label(elem)
         prefix_name(elem, block_delim, lower2cap(lbl), "name")
       end
 
+      def termnote_label(elem)
+        lbl = l10n(@xrefs.anchor(elem["id"], :label)&.strip || "???")
+        l10n "#{lbl}#{termnote_delim(elem)}"
+      end
+
       def term(docxml); end
 
       def concept1(node)

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -18,8 +18,9 @@ module IsoDoc
         ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
                                                             node))
         node["droploc"] = droploc
+        p = prefix_clause(target, refs.first.at(ns("./locality")))
         eref_localities1({ target: target, number: "pl",
-                           type: prefix_clause(target, refs.first.at(ns("./locality"))),
+                           type: p,
                            from: l10n(ret[1..-1].join), node: node,
                            lang: @lang })
       end
@@ -72,13 +73,8 @@ module IsoDoc
         "—"
       end
 
-      def note1(elem)
-        elem.parent.name == "bibitem" || elem["notag"] == "true" and return
-        n = @xrefs.get[elem["id"]]
-        lbl = if n.nil? || n[:label].nil? || n[:label].empty? then @i18n.note
-              else l10n("#{@i18n.note} #{n[:label]}")
-              end
-        prefix_name(elem, block_delim, lbl, "name")
+      def note_delim(_elem)
+        "—"
       end
 
       def annex1(elem)
@@ -95,7 +91,7 @@ module IsoDoc
           t.name = "variant-title"
           t["type"] = "sub"
         end
-        elem.children.first.previous = "<title>#{lbl}</title>"
+        elem.add_first_child "<title>#{lbl}</title>"
       end
 
       def annex1_default(elem)
@@ -216,6 +212,13 @@ module IsoDoc
         dest.children.first.next = source
       end
 
+      def example1(elem)
+        super
+        n = elem.at(ns("./name")) or return
+        n << l10n(":")
+        n.children.wrap("<em></em>")
+      end
+
       include Init
     end
   end

data/lib/isodoc/ieee/word_authority.rb

@@ -153,9 +153,9 @@ module IsoDoc
       def feedback_style1(div, idx)
         div.xpath(".//p").each_with_index do |p, j|
           p["class"] = idx == 4 ? "IEEEStdsCRTextItal" : "IEEEStdsCRTextReg"
-          j.zero? && idx.zero? and
-            p.children.first.previous =
-              '<a style="mso-footnote-id:ftn0" href="#_ftnref0" name="_ftn0" title=""/>'
+          j.zero? && idx.zero? and p.add_first_child <<~XML
+            <a style="mso-footnote-id:ftn0" href="#_ftnref0" name="_ftn0" title=""/>
+          XML
         end
       end
 
@@ -203,9 +203,9 @@ module IsoDoc
       end
 
       def abstract_header(dest)
-        dest.elements.first.children.first.previous =
-          "<span class='IEEEStdsAbstractHeader'><span lang='EN-US'>" \
-          "Abstract:</span></span> "
+        dest.elements.first.add_first_child <<~XML
+          <span class='IEEEStdsAbstractHeader'><span lang='EN-US'>Abstract:</span></span>
+        XML
       end
 
       def introduction_cleanup(docxml)

data/lib/isodoc/ieee/word_cleanup_blocks.rb

@@ -99,7 +99,6 @@ module IsoDoc
 
       def example_caption(docxml)
         docxml.xpath("//p[@class = 'example-title']").each do |s|
-          s.children = "<em>#{to_xml(s.children)}</em>"
           s["class"] = stylesmap[:MsoNormal]
         end
       end

data/lib/isodoc/ieee/word_convert.rb

@@ -191,7 +191,6 @@ module IsoDoc
       def termnote_label(para, name)
         para.span class: "note_label" do |s|
           name.children.each { |n| parse(n, s) }
-          s << termnote_delim
         end
       end
 

data/lib/isodoc/ieee/word_wp_convert.rb

@@ -100,7 +100,6 @@ module IsoDoc
         out.div **figure_attrs(node) do |div|
           figure_name_parse(node, div, node.at(ns("./name")))
           node.children.each do |n|
-            figure_key(out) if n.name == "dl"
             parse(n, div) unless n.name == "name"
           end
         end

data/lib/metanorma/ieee/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.3.2".freeze
+    VERSION = "1.3.4".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", "~> 2.9.6"
+  spec.add_dependency "metanorma-standoc", "~> 2.10.0"
   spec.add_dependency "mnconvert", "~> 1.20"
   spec.add_dependency "pubid"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-11 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.9.6
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement