metanorma-ieee 1.0.14 → 1.1.0

data/lib/isodoc/ieee/word_convert.rb

@@ -50,32 +50,34 @@ module IsoDoc
       def abstract(clause, out)
         page_break(out)
         out.div **attr_code(id: clause["id"], class: "abstract") do |s|
-          clause_name(clause, clause.at(ns("./title")), s, { class: "AbstractTitle" })
+          clause_name(clause, clause.at(ns("./title")), s,
+                      { class: "AbstractTitle" })
           clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
+      MAIN_ELEMENTS =
+        "//sections/*[@displayorder][not(@class = 'zzSTDTitle1')] | " \
+        "//annex[@displayorder] | " \
+        "//bibliography/*[@displayorder] | //colophon/*[@displayorder] | " \
+        "//indexsect[@displayorder]".freeze
+
       def make_body3(body, docxml)
-        body.div class: "WordSectionMiddleTitle" do |_div3|
-          middle_title_ieee(docxml, body)
+        body.div class: "WordSectionMiddleTitle" do |div3|
+          middle_title_ieee(docxml, div3)
         end
         section_break(body, continuous: true)
         body.div class: "WordSectionMain" do |div3|
-          middle docxml, div3
+          content(div3, docxml, ns(self.class::MAIN_ELEMENTS))
           footnotes div3
           comments div3
         end
       end
 
-      def middle_title(isoxml, out); end
-
-      def middle_title_ieee(_docxml, out)
+      def middle_title_ieee(docxml, out)
+        title = docxml.at(ns("//p[@class = 'zzSTDTitle1']")) or return
         out.p(class: "IEEEStdsTitle", style: "margin-top:70.0pt") do |p|
-          p << @meta.get[:full_doctitle]
-          @meta.get[:amd] || @meta.get[:corr] and p << "<br/>"
-          @meta.get[:amd] and p << "Amendment #{@meta.get[:amd]}"
-          @meta.get[:amd] && @meta.get[:corr] and p << " "
-          @meta.get[:corr] and p << "Corrigenda #{@meta.get[:corr]}"
+          title.children.each { |n| parse(n, p) }
         end
       end
 
@@ -137,7 +139,6 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        preceding_floating_titles(name, div)
         return if name.nil?
 
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering

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.2.2 -->
+<!-- VERSION v1.2.3 -->
 <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">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>

data/lib/metanorma/ieee/term_lookup_cleanup.rb

@@ -1,7 +1,8 @@
 module Metanorma
   module IEEE
     class TermLookupCleanup < Metanorma::Standoc::TermLookupCleanup
-      def remove_missing_ref_term(node, _target)
+      def remove_missing_ref_term(node, _target, type)
+        type == "symbol" and return super
         node.at("../xrefrender")&.remove
         #node.replace("<preferred><expression><name>#{node.children.to_xml}"\
         #             "</name></expression></preferred>")

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "1.0.14".freeze
+    VERSION = "1.1.0".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(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.0"
   spec.add_dependency "mnconvert", "~> 1.20"
   #spec.add_dependency "pubid-ieee", "~> 0.1.1"
   #spec.add_dependency "pubid-iso", "~> 0.5.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-08-07 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.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,7 @@ files:
 - lib/isodoc/ieee/init.rb
 - lib/isodoc/ieee/metadata.rb
 - lib/isodoc/ieee/pdf_convert.rb
+- lib/isodoc/ieee/presentation_bibdata.rb
 - lib/isodoc/ieee/presentation_ref.rb
 - lib/isodoc/ieee/presentation_terms.rb
 - lib/isodoc/ieee/presentation_xml_convert.rb