metanorma-ieee 1.5.5 → 1.5.7

data/lib/isodoc/ieee/init.rb

@@ -22,8 +22,8 @@ module IsoDoc
       end
 
       def bibrenderer
-        ::Relaton::Render::Ieee::General.new(language: @lang,
-                                             i18nhash: @i18n.get)
+        ::Relaton::Render::Ieee::General
+          .new(language: @lang, script: @script, i18nhash: @i18n.get)
       end
 
       def fileloc(loc)

data/lib/isodoc/ieee/presentation_ref.rb

@@ -53,7 +53,7 @@ module IsoDoc
         node["style"] == "no-biblio-tag" or tag = bib[:ord]
         if !c1.empty?
           c2.each(&:remove)
-          c1.map(&:to_xml).join
+          [c1.map(&:to_xml).join, tag].compact.join(" ")
         elsif node.at(ns("./location"))
           linkend
         elsif node["citeas"] == bib[:ord] then node["citeas"]

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -81,38 +81,48 @@ module IsoDoc
         warn "Failure to convert MathML to LaTeX\n#{node.parent.to_xml}\n#{e}"
       end
 
-      def ol(docxml)
-        ol_numbering(docxml)
-        @xrefs.list_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
-        docxml.xpath(ns("//ol/li")).each { |f| ol_label(f) }
-      end
+      #def ol(docxml)
+        #ol_prep(docxml)
+      #  docxml.xpath(ns("//ol/li")).each { |f| ol_label(f) }
+      #end
 
-      def ol_numbering(docxml)
-        p = "//clause | //annex | //foreword | //acknowledgements | " \
+      def ol_numbering_containers
+        "//clause | //annex | //foreword | //acknowledgements | " \
             "//introduction | //preface/abstract | //appendix | //terms | " \
             "//term | //definitions | //references | //colophon"
-        docxml.xpath(ns(p)).each do |c|
+      end
+
+      def ol_numbering(docxml)
+        docxml.xpath(ns(ol_numbering_containers)).each do |c|
+          i = -1
           (c.xpath(ns(".//ol")) -
           c.xpath(ns("./clause//ol | ./appendix//ol | ./term//ol | " \
                      "./terms//ol | ./definitions//ol | " \
-                     "/references//ol | ./colophon//ol")))
-            .each_with_index do |o, i|
+                     "/references//ol | ./colophon//ol"))).each do |o|
+            (o.ancestors("ol").size + o.ancestors("ul").size).zero? and
+              i += 1 # ol root list
             ol_numbering1(o, i)
           end
         end
       end
 
       def ol_numbering1(elem, idx)
-        elem["type"] = ol_depth_rotate(elem, idx).to_s
+        ancestors = elem.ancestors.map(&:name).reverse
+        ul_loc = ancestors.index("ul")
+        ol_loc = ancestors.index("ol")
+        # is this a ul//ol list? if so, ignore idx of list in labelling
+        ul_root = ul_loc && (!ol_loc || ul_loc < ol_loc)
+        elem["type"] = ol_depth_rotate(elem, ul_root ? 0 : idx).to_s
       end
 
       # overrides IsoDoc:: XrefGen::OlTypeProvider: we trigger
       # @xrefs.list_anchor_names after this is called, with elem["type"] set
+      # use the order of the ol in the clause to rotate the labelling
       def ol_depth_rotate(node, idx)
-        depth = node.ancestors("ol").size + idx
+        depth = node.ancestors("ol").size + node.ancestors("ul").size + idx
         type = :alphabet
-        type = :arabic if [2, 5, 8].include? depth
-        type = :roman if [3, 6, 9].include? depth
+        type = :arabic if [1, 4, 7].include? depth
+        type = :roman if [2, 5, 8].include? depth
         type
       end
 
@@ -125,17 +135,6 @@ module IsoDoc
         end
       end
 
-      # KILL
-      def middle_title_body
-        ret = "<p class='zzSTDTitle1'>#{@meta.get[:full_doctitle]}"
-        @meta.get[:amd] || @meta.get[:corr] and ret += "<br/>"
-        @meta.get[:amd] and ret += "Amendment #{@meta.get[:amd]}"
-        @meta.get[:amd] && @meta.get[:corr] and ret += " "
-        @meta.get[:corr] and ret += "Corrigenda #{@meta.get[:corr]}"
-        ret += "</p>"
-        ret
-      end
-
       def middle_title_template
         <<~OUTPUT
           <p class='zzSTDTitle1'>{{ full_doctitle -}}

data/lib/isodoc/ieee/word_cleanup.rb

@@ -173,6 +173,7 @@ module IsoDoc
       end
 
       def abstract_header(dest)
+        dest.elements.empty? and return
         dest.elements.first.add_first_child <<~XML
           <span class='IEEEStdsAbstractHeader'><span lang='EN-US'>Abstract:</span></span>
         XML

data/lib/metanorma/ieee/biblio.rng

@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibItemType" combine="choice">
+  <define name="BibItemType">
     <a:documentation>Type of bibliographic item.
 The value list complies with the types provided in ISO 690:2021.
 NOTE: These values represent a strict superset to BibTeX

data/lib/metanorma/ieee/cleanup_ref.rb

@@ -147,21 +147,9 @@ module Metanorma
 
       def bibitem_cleanup(xmldoc)
         super
-        supply_designations(xmldoc)
         supply_withdrawn_notes(xmldoc)
       end
 
-      # force existence of a designation for standards
-      def supply_designations(xmldoc)
-        xmldoc.xpath("//references/bibitem[@type = 'standard']").each do |b|
-          b.at("./docidentifier[not(@type = 'metanorma' or @type = 'DOI' or " \
-            "@type = 'metanorma-ordinal')]") and next
-          t = b.at("./title") or next
-          b.at("./title[last()]").next =
-            "<docidentifier type='title' primary='true'>#{t.text}</docidentifier>"
-        end
-      end
-
       def supply_withdrawn_notes(xmldoc)
         f = File.join(File.dirname(__FILE__), "ieee-footnotes.yaml")
         @provenance_notes = YAML.safe_load(File.read(f))
@@ -178,9 +166,8 @@ module Metanorma
           .map(&:text)
       end
 
-      def reference_names(xmldoc)
-        #require "debug"; binding.b
-        super
+      def empty_docid_to_title?(bibitem)
+          bibitem["type"] == "standard"
       end
     end
   end

data/lib/metanorma/ieee/isodoc.rng

@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video"/>
         <ref name="audio"/>
-        <ref name="pre"/>
+        <ref name="pre">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
+          <ref name="paragraph-with-footnote">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure"/>
+          <ref name="figure">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image-no-id"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image-no-id">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video-no-id"/>
         <ref name="audio-no-id"/>
-        <ref name="pre-no-id"/>
+        <ref name="pre-no-id">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote-no-id"/>
+          <ref name="paragraph-with-footnote-no-id">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure-no-id"/>
+          <ref name="figure-no-id">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table-no-id">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
+      <ref name="LocalizedStringAttributes">
+        <a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
+      </ref>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.5.5".freeze
+    VERSION = "1.5.7".freeze
   end
 end

data/metanorma-ieee.gemspec

@@ -41,5 +41,5 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "canon"
+  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -224,16 +224,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 description: 'Metanorma for the ITU.
 
   '