metanorma-ieee 1.0.9 → 1.0.11

data/lib/isodoc/ieee/word_cleanup.rb

@@ -38,6 +38,9 @@ module IsoDoc
 
       def make_WordToC(docxml, level)
         toc = ""
+        if source = docxml.at("//div[@class = 'TOC']")
+          toc = to_xml(source.children)
+        end
         xpath = (1..level).each.map do |i|
           "//h#{i}[not(ancestor::*[@class = 'WordSection2'])]"
         end.join (" | ")
@@ -70,7 +73,7 @@ module IsoDoc
         if hdr.at("./ancestor::div[@class = 'Annex']")
           hdr.delete("class")
           hdr["style"] = "mso-list:l13 level#{idx} lfo33;"
-        elsif hdr.at("./ancestor::div[@class = 'Section3']")
+        elsif hdr.at("./ancestor::div[@class = 'Section3' or @class = 'WordSectionContents']")
           hdr.name = "p"
           hdr["class"] = "IEEEStdsLevel#{idx}frontmatter"
         else

data/lib/isodoc/ieee/word_convert.rb

@@ -47,12 +47,11 @@ module IsoDoc
           ulstyle: "l11", olstyle: "l16" }
       end
 
-      def abstract(isoxml, out)
-        f = isoxml.at(ns("//preface/abstract")) || return
+      def abstract(clause, out)
         page_break(out)
-        out.div **attr_code(id: f["id"], class: "abstract") do |s|
-          clause_name(f, f.at(ns("./title")), s, { class: "AbstractTitle" })
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
+        out.div **attr_code(id: clause["id"], class: "abstract") do |s|
+          clause_name(clause, clause.at(ns("./title")), s, { class: "AbstractTitle" })
+          clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
@@ -176,6 +175,16 @@ module IsoDoc
         end
       end
 
+      def table_of_contents(clause, out)
+        out.div class: "WordSectionContents" do |div|
+          clause_name(clause, clause.at(ns("./title")), div,
+                      { class: "IEEEStdsLevel1frontmatter" })
+          clause.elements.each do |e|
+            parse(e, div) unless e.name == "title"
+          end
+        end
+      end
+
       include BaseConvert
       include Init
     end

data/lib/metanorma/ieee/cleanup_ref.rb

@@ -118,7 +118,7 @@ module Metanorma
         end
       end
 
-      def select_docid(ref)
+      def select_docid(ref, type = nil)
         ret = super
         if %w(standard techreport).include?(ref["type"]) then ret
         else

data/lib/metanorma/ieee/ieee.rng

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/ieee" xmlns="http://relaxng.org/ns/structure/1.0">
+<grammar ns='https://www.metanorma.org/ns/ieee' xmlns="http://relaxng.org/ns/structure/1.0">
   <!--
+    VERSION v1.2.1
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for csand additions. And we do not want that.
@@ -29,13 +30,7 @@
   </include>
   <define name="ieee-standard">
     <element name="ieee-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/ieee/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.2 -->
 <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">
@@ -210,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -1349,15 +1353,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>
@@ -2131,6 +2139,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "1.0.9".freeze
+    VERSION = "1.0.11".freeze
   end
 end

data/metanorma-ieee.gemspec

@@ -27,6 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "metanorma-standoc", "~> 2.4.2"
   spec.add_dependency "mnconvert", "~> 1.20"
+  #spec.add_dependency "pubid-ieee", "~> 0.1.1"
+  #spec.add_dependency "pubid-iso", "~> 0.5.3"
+  #spec.add_dependency "relaton-iso", "~> 1.15.4"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc