metanorma-ieee 0.0.4 → 0.0.6.1

data/lib/metanorma/ieee/ieee.rng

@@ -14,14 +14,18 @@
         <value>guide</value>
         <value>recommended-practice</value>
         <value>standard</value>
+        <value>whitepaper</value>
+        <value>redline</value>
+        <value>other</value>
       </choice>
     </define>
     <define name="stage">
       <element name="stage">
         <choice>
-          <value>developing</value>
-          <value>active</value>
-          <value>inactive</value>
+          <value>draft</value>
+          <value>approved</value>
+          <value>superseded</value>
+          <value>withdrawn</value>
         </choice>
       </element>
     </define>
@@ -64,10 +68,59 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="standard_status"/>
+      </optional>
+      <optional>
+        <ref name="standard_modified"/>
+      </optional>
+      <optional>
+        <ref name="pubstatus"/>
+      </optional>
+      <optional>
+        <ref name="holdstatus"/>
+      </optional>
     </define>
   </include>
+  <define name="standard_status">
+    <element name="standard_status">
+      <choice>
+        <value>Inactive</value>
+        <value>Active</value>
+        <value>Superseded</value>
+      </choice>
+    </element>
+  </define>
+  <define name="standard_modified">
+    <element name="standard_modified">
+      <choice>
+        <value>Draft</value>
+        <value>Withdrawn</value>
+        <value>Superseded</value>
+        <value>Approved</value>
+        <value>Reserved</value>
+        <value>Redline</value>
+      </choice>
+    </element>
+  </define>
+  <define name="pubstatus">
+    <element name="pubstatus">
+      <choice>
+        <value>Active</value>
+        <value>Inactive</value>
+      </choice>
+    </element>
+  </define>
+  <define name="holdstatus">
+    <element name="holdstatus">
+      <choice>
+        <value>Hold</value>
+        <value>Publish</value>
+      </choice>
+    </element>
+  </define>
   <define name="BibliographicDateType" combine="choice">
-    <value>feecback-ended</value>
+    <value>feedback-ended</value>
   </define>
   <define name="trialuse">
     <element name="trial-use">

data/lib/metanorma/ieee/validate.rb

@@ -29,7 +29,8 @@ module Metanorma
 
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
-        %w(standard recommended-practice guide).include? doctype or
+        %w(standard recommended-practice guide whitepaper redline other)
+          .include? doctype or
           @log.add("Document Attributes", nil,
                    "#{doctype} is not a recognised document type")
         docsubtype = xmldoc&.at("//bibdata/ext/subdoctype")&.text or return
@@ -40,7 +41,7 @@ module Metanorma
 
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
-        %w(active inactive developing).include? stage or
+        %w(draft approved superseded withdrawn).include? stage or
           @log.add("Document Attributes", nil,
                    "#{stage} is not a recognised stage")
       end
@@ -148,13 +149,13 @@ module Metanorma
         pref = image_name_prefix(xmldoc)
         (xmldoc.xpath("//figure") - xmldoc.xpath("//table//figure"))
           .each do |f|
-            i = f.at("./image") or next
-            next if i["src"].start_with?("data:")
+            (i = f.at("./image") and !i["src"]&.start_with?("data:")) or next
 
             num = xrefs.anchor(f["id"], :label)
-            File.basename(i["src"], ".*") == "#{pref}_fig#{num}" or
+            base = File.basename(i["src"], ".*")
+            base == "#{pref}_fig#{num}" or
               @log.add("Style", i,
-                       "Image name #{i['src']} is expected to be #{pref}_fig#{num}")
+                       "Image name #{base} is expected to be #{pref}_fig#{num}")
           end
       end
 
@@ -169,13 +170,13 @@ module Metanorma
       def table_figure_name_validate(xmldoc, xrefs)
         xmldoc.xpath("//table[.//figure]").each do |t|
           xmldoc.xpath(".//figure").each do |f|
-            i = f.at("./image") or next
-            next if i["src"].start_with?("data:")
+            (i = f.at("./image") and !i["src"]&.start_with?("data:")) or next
 
             num = tablefigurenumber(t, f, xrefs)
-            File.basename(i["src"]) == num or
+            base = File.basename(i["src"])
+            base == num or
               @log.add("Style", i,
-                       "Image name #{i['src']} is expected to be #{num}")
+                       "Image name #{base} is expected to be #{num}")
           end
         end
       end

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "0.0.4".freeze
+    VERSION = "0.0.6.1".freeze
   end
 end

data/lib/metanorma-ieee.rb

@@ -3,6 +3,6 @@ require "asciidoctor"
 require "isodoc/ieee"
 require "html2doc/ieee"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   Metanorma::Registry.instance.register(Metanorma::IEEE::Processor)
 end

data/lib/relaton/render/config.yml

@@ -1,5 +1,5 @@
 nametemplate:
-  one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} ,_{{initials[0] | join: '. '}}.{% endif %}"
+  one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} ,_{{initials[0] | join: '. '}} {% endif %}"
   two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} ,_{{initials[0] | join: '. '}}.{% endif %} , {{ labels['and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{initials[1] | join: '. '}}. {{surname[1] }}{% endif %}"
   more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} ,_{{initials[0] | join: '. '}}.{% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{initials[1] | join: '. '}}. {{surname[1] }}{% endif %} , {{ labels['and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{initials[2] | join: '. '}}. {{surname[2] }}{% endif %}"
 extenttemplate:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -202,6 +202,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
+- ".hound.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -266,12 +268,12 @@ files:
 - lib/metanorma/ieee/version.rb
 - lib/relaton/render/config.yml
 - lib/relaton/render/general.rb
-- metanorma-itu.gemspec
+- metanorma-ieee.gemspec
 homepage: https://github.com/metanorma/metanorma-ieee
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -286,8 +288,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Metanorma for the IEEE
 test_files: []