metanorma-ieee 1.4.9 → 1.5.1

data/lib/isodoc/ieee/presentation_concepts.rb

@@ -38,15 +38,13 @@ module IsoDoc
         ret = [[coll[0]]]
         coll[1..-1].each do |r|
           if ret[-1][0]["type"] != r["type"]
-            ret << [r]
-            next
+            ret << [r] and next
           end
+
           ret[-1] << r
         end
         ret.map do |x|
-          x.map do |y|
-            to_xml(y)
-          end.join("; ")
+          x.map { |y| to_xml(y) }.join("; ")
         end.map { |x| "<p>#{x}</p>" }.join("\n")
       end
 
@@ -86,11 +84,13 @@ module IsoDoc
 
       def admitted_to_related(docxml)
         docxml.xpath(ns("//term")).each do |t|
-          t.xpath(ns("./fmt-admitted/semx | ./fmt-preferred/semx")).each_with_index do |a, i|
+          t.xpath(ns("./fmt-admitted/semx | ./fmt-preferred/semx"))
+            .each_with_index do |a, i|
             orig = semx_orig(a)
             (i.zero? ||
              orig.at(ns("./abbreviation-type | ./graphical-symbol"))) and next
-            out = t.at(ns("./fmt-related")) || t.at(ns("./definition")).before("<fmt-related/>").previous
+            out = t.at(ns("./fmt-related")) || t.at(ns("./definition"))
+              .before("<fmt-related/>").previous
             admitted_to_related1(a, t.at(ns("./fmt-preferred/semx")), out)
             a.parent.name == "fmt-preferred" and a.remove
           end
@@ -133,7 +133,8 @@ module IsoDoc
         if desgn["element"] == "preferred"
           f = orig.parent.xpath(ns("./domain | ./subject"))
             .map { |u| to_xml(semx_fmt_dup(u)) }.join(", ")
-          name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>" unless f.empty?
+          f.empty? or
+            name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>"
         end
         super
       end

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -143,11 +143,6 @@ module IsoDoc
         warn "Failure to convert MathML to LaTeX\n#{node.parent.to_xml}\n#{e}"
       end
 
-      def formula_where(dlist)
-        dlist or return
-        dlist["class"] = "formula_dl"
-      end
-
       def ol(docxml)
         ol_numbering(docxml)
         @xrefs.list_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))

data/lib/isodoc/ieee/word_cleanup_blocks.rb

@@ -88,8 +88,13 @@ module IsoDoc
       end
 
       def sourcecode_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Sourcecode']").each do |s|
-          s.replace(to_xml(s).gsub(%r{<br/>}, "</p><p class='Sourcecode'>"))
+        docxml.xpath("//p[@class = 'Sourcecode']").each do |para|
+          br_elements = para.xpath(".//br")
+          br_elements.empty? and next
+          split_para_at_breaks(para).reverse.each do |new_para|
+            para.add_next_sibling(new_para)
+          end
+          para.remove
         end
       end
 
@@ -135,6 +140,91 @@ module IsoDoc
           end
         end
       end
+
+      private
+
+      def split_para_at_breaks(para)
+        result_paras = []
+        current_para = create_new_para(para)
+        # Process each child node of the para
+        para.children.each do |node|
+          current_para =
+            process_node_for_sourcecode_breaks(node, current_para, result_paras)
+        end
+        # Add the final para if it has content
+        result_paras << current_para if para_has_content?(current_para)
+        result_paras
+      end
+
+      def create_new_para(original_para)
+        new_para = Nokogiri::XML::Node.new("p", original_para.document)
+        # Copy all attributes from original para
+        original_para.attributes.each do |name, attr|
+          new_para[name] = attr.value
+        end
+        new_para
+      end
+
+      def process_node_for_sourcecode_breaks(node, current, result_paras)
+        if node.name == "br"
+          # Found a break - finish current para and start a new one
+          result_paras << current if para_has_content?(current)
+          current = create_new_para(node.document.at("//p[@class='Sourcecode']"))
+        elsif node.xpath(".//br").any?
+          current = process_element_with_breaks(node, current, result_paras)
+        else
+          current.add_child(node.dup)
+        end
+        current
+      end
+
+      def process_element_with_breaks(node, curr_para, result_paras)
+        # Create element structure for current para
+        curr_elem = node.dup
+        curr_elem.children.remove
+
+        node.children.each do |child|
+          if child.name == "br"
+            # Close current element and finish para
+            element_has_content?(curr_elem) and
+              curr_para.add_child(curr_elem.dup)
+            para_has_content?(curr_para) and result_paras << curr_para
+            # Start new para and reopen element structure
+            curr_para = create_new_para(node.document.at("//p[@class='Sourcecode']"))
+            curr_elem = node.dup
+            curr_elem.children.remove
+          elsif child.xpath(".//br").any?
+            # Add child to current element
+            temp_para = create_new_para(node.document.at("//p[@class='Sourcecode']"))
+            temp_para = process_element_with_breaks(child, temp_para, result_paras)
+            # If new paras were created, we need to handle the split
+            if result_paras.any? && result_paras.last != curr_para
+              # A split occurred, add current element to current para and update
+              curr_para.add_child(curr_elem.dup) if element_has_content?(curr_elem)
+              curr_para = temp_para
+              curr_elem = node.dup
+              curr_elem.children.remove
+            else
+              # No split, add the processed child
+              curr_elem.add_child(child.dup)
+            end
+          # Recursively handle nested breaks
+          else
+            curr_elem.add_child(child.dup)
+          end
+        end
+        # Add final element if it has content
+        curr_para.add_child(curr_elem.dup) if element_has_content?(curr_elem)
+        curr_para
+      end
+
+      def para_has_content?(para)
+        para.children.any? && !para.content.strip.empty?
+      end
+
+      def element_has_content?(element)
+        element.children.any?
+      end
     end
   end
 end

data/lib/isodoc/ieee/word_convert.rb

@@ -118,10 +118,11 @@ module IsoDoc
       def formula_parse(node, out)
         out.div **formula_attrs(node) do |div|
           formula_parse1(node, div)
-          formula_where(node.at(ns("./dl")), div)
           node.children.each do |n|
-            %w(fmt-stem dl fmt-name).include? n.name and next
-            parse(n, div)
+            %w(fmt-stem fmt-name).include? n.name and next
+            if n.name == "dl" then formula_where(n, div)
+            else parse(n, div)
+            end
           end
         end
       end
@@ -231,6 +232,6 @@ module IsoDoc
 
       include BaseConvert
       include Init
-end
-end
+    end
+  end
 end

data/lib/metanorma/ieee/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>

data/lib/metanorma/ieee/front.rb

@@ -114,7 +114,7 @@ module Metanorma
 
       def metadata_status(node, xml)
         status = node.attr("status") || node.attr("docstage") ||
-          (node.attr("draft") ? "draft" : "approved")
+          (node.attr("version") || node.attr("draft") ? "draft" : "approved")
         xml.status do |s|
           s.stage status
         end

data/lib/metanorma/ieee/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.7 -->
+<!-- VERSION v2.1.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -72,6 +72,46 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
         </oneOrMore>
       </element>
     </define>
+    <define name="review">
+      <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
+the type attribute defaults to `review` for reviews</a:documentation>
+      <element name="annotation">
+        <ref name="RequiredId"/>
+        <ref name="ReviewAttributes"/>
+        <oneOrMore>
+          <ref name="paragraph">
+            <a:documentation>Reviewer comments content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </element>
+    </define>
+    <define name="ruby_pronunciation">
+      <a:documentation>Ruby annotation giving pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-pronunciation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="ruby_annotation">
+      <a:documentation>Ruby annotation giving information other than pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-annotation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="annotation">
+      <a:documentation>Source code annotation, corresponding to a callout</a:documentation>
+      <element name="callout-annotation">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="paragraph"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="section-title">
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
@@ -540,7 +580,7 @@ normative or informative references, some split references into sections organiz
       <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
-          <a:documentation>CSS style: only background-color supported</a:documentation>
+          <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
         </attribute>
       </optional>
     </define>
@@ -620,7 +660,7 @@ This is done if the footnote reference is already presented in some other form,
     <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
-        <a:documentation>CSS style: only background-color supported</a:documentation>
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
       </attribute>
     </optional>
   </define>
@@ -695,11 +735,22 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <a:documentation>Width of the table block in rendering</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
+      </attribute>
+    </optional>
     <ref name="BlockAttributes"/>
   </define>
   <define name="FigureAttributes" combine="interleave">
@@ -1417,7 +1468,7 @@ numbers</a:documentation>
       </optional>
       <ref name="DocumentBody"/>
       <optional>
-        <ref name="review-container">
+        <ref name="annotation-container">
           <a:documentation>Annotations to the document</a:documentation>
         </ref>
       </optional>
@@ -1461,8 +1512,8 @@ numbers</a:documentation>
       </oneOrMore>
     </element>
   </define>
-  <define name="review-container">
-    <element name="review-container">
+  <define name="annotation-container">
+    <element name="annotation-container">
       <oneOrMore>
         <ref name="review"/>
       </oneOrMore>

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.4.9".freeze
+    VERSION = "1.5.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-23 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc