metanorma-ieee 1.3.1 → 1.3.3

data/lib/metanorma/ieee/biblio-standoc.rng

@@ -72,6 +72,9 @@ standards defining organization, and that is rendered in a distinct manner</a:do
 from other documents in the same doctype</a:documentation>
       </ref>
     </optional>
+    <ref name="flavor">
+      <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
+    </ref>
     <optional>
       <ref name="editorialgroup">
         <a:documentation>Groups associated with the production of the standards document, typically within
@@ -113,6 +116,16 @@ a standards definition organization</a:documentation>
   <define name="DocumentSubtype">
     <text/>
   </define>
+  <define name="flavor">
+    <element name="flavor">
+      <ref name="MetanormaFlavor"/>
+    </element>
+  </define>
+  <define name="MetanormaFlavor">
+    <a:documentation>This is in fact an enum, as of this writing: standoc iso generic ietf ieee itu nist ogc csa cc iho ribose jis iec bsi bipm plateau.
+However we prefer not to hardcode it, given ongoing extension.</a:documentation>
+    <text/>
+  </define>
   <define name="editorialgroup">
     <a:documentation>A group associated with the production of the standards document, typically within
 a standards definition organization</a:documentation>

data/lib/metanorma/ieee/biblio.rng

@@ -1382,18 +1382,7 @@ Applies whether the resource has already been created or not, and whether it is
   <define name="bdate">
     <a:documentation>Significant date in the lifecycle of the bibliographic item, including its production and its access</a:documentation>
     <element name="date">
-      <attribute name="type">
-        <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
-        <choice>
-          <ref name="BibliographicDateType"/>
-          <text/>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="text">
-          <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
-        </attribute>
-      </optional>
+      <ref name="bDateAttributes"/>
       <optional>
         <choice>
           <group>
@@ -1416,6 +1405,20 @@ Applies whether the resource has already been created or not, and whether it is
       </optional>
     </element>
   </define>
+  <define name="bDateAttributes">
+    <attribute name="type">
+      <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
+      <choice>
+        <ref name="BibliographicDateType"/>
+        <text/>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="text">
+        <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="docidentifier">
     <a:documentation>An identifier of a bibliographic item in an international standard scheme</a:documentation>
     <element name="docidentifier">
@@ -1884,6 +1887,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
+      <value>preliminaryDraftOf</value>
+      <value>hasPreliminaryDraft</value>
+      <value>revisionDraftOf</value>
+      <value>hasRevisionDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/ieee/cleanup.rb

@@ -2,7 +2,7 @@ require_relative "cleanup_ref"
 require_relative "term_lookup_cleanup"
 
 module Metanorma
-  module IEEE
+  module Ieee
     class Converter < Standoc::Converter
       def initial_boilerplate(xml, isodoc)
         intro_boilerplate(xml, isodoc)
@@ -130,7 +130,7 @@ module Metanorma
       def term_defs_boilerplate_cont(src, term, isodoc); end
 
       def termlookup_cleanup(xmldoc)
-        Metanorma::IEEE::TermLookupCleanup.new(xmldoc, @log).call
+        Metanorma::Ieee::TermLookupCleanup.new(xmldoc, @log).call
       end
 
       def boilerplate_isodoc(xmldoc)

data/lib/metanorma/ieee/cleanup_ref.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module IEEE
+  module Ieee
     class Converter < Standoc::Converter
       BIBLIO =
         "//bibliography/references[@normative = 'false'][not(@hidden)] | " \
@@ -20,7 +20,7 @@ module Metanorma
       end
 
       def sort_biblio(bib)
-        @i = IsoDoc::IEEE::PresentationXMLConvert
+        @i = IsoDoc::Ieee::PresentationXMLConvert
           .new({ lang: @lang, script: @script, locale: @locale })
         @i.i18n_init(@lang, @script, @locale)
         sort_keys = bib.each_with_object({}) do |b, m|

data/lib/metanorma/ieee/converter.rb

@@ -7,7 +7,7 @@ require_relative "cleanup"
 require_relative "validate"
 
 module Metanorma
-  module IEEE
+  module Ieee
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "ieee-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/ieee".freeze
@@ -81,29 +81,29 @@ module Metanorma
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::IEEE::PresentationXMLConvert
+        IsoDoc::Ieee::PresentationXMLConvert
           .new(html_extract_attributes(node)
-          .merge(output_formats: ::Metanorma::IEEE::Processor.new.output_formats))
+          .merge(output_formats: ::Metanorma::Ieee::Processor.new.output_formats))
       end
 
       def html_converter(node)
-        IsoDoc::IEEE::HtmlConvert.new(html_extract_attributes(node))
+        IsoDoc::Ieee::HtmlConvert.new(html_extract_attributes(node))
       end
 
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::IEEE::PdfConvert.new(pdf_extract_attributes(node))
+        IsoDoc::Ieee::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)
-        IsoDoc::IEEE::WordConvert.new(doc_extract_attributes(node))
+        IsoDoc::Ieee::WordConvert.new(doc_extract_attributes(node))
       end
 
       def ieee_xml_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::Iso::IEEEXMLConvert.new(html_extract_attributes(node))
+        IsoDoc::Iso::IeeeXMLConvert.new(html_extract_attributes(node))
       end
     end
   end

data/lib/metanorma/ieee/front.rb

@@ -2,7 +2,7 @@ require "isoics"
 require "pubid-ieee"
 
 module Metanorma
-  module IEEE
+  module Ieee
     class Converter < Standoc::Converter
       def metadata_committee(node, xml)
         metadata_committee_prep(node) or return

data/lib/metanorma/ieee/processor.rb

@@ -1,7 +1,7 @@
 require "metanorma/processor"
 
 module Metanorma
-  module IEEE
+  module Ieee
     class Processor < Metanorma::Processor
       def initialize
         @short = :ieee
@@ -30,27 +30,27 @@ module Metanorma
       end
 
       def version
-        "Metanorma::IEEE #{Metanorma::IEEE::VERSION}"
+        "Metanorma::Ieee #{Metanorma::Ieee::VERSION}"
       end
 
       def output(isodoc_node, inname, outname, format, options = {})
         options_preprocess(options)
         case format
         when :html
-          IsoDoc::IEEE::HtmlConvert.new(options).convert(inname, isodoc_node,
+          IsoDoc::Ieee::HtmlConvert.new(options).convert(inname, isodoc_node,
                                                          nil, outname)
         when :doc
-          IsoDoc::IEEE::WordConvert.new(options).convert(inname, isodoc_node,
+          IsoDoc::Ieee::WordConvert.new(options).convert(inname, isodoc_node,
                                                          nil, outname)
         when :pdf
-          IsoDoc::IEEE::PdfConvert.new(options).convert(inname, isodoc_node,
+          IsoDoc::Ieee::PdfConvert.new(options).convert(inname, isodoc_node,
                                                         nil, outname)
         when :presentation
-          IsoDoc::IEEE::PresentationXMLConvert.new(options).convert(
+          IsoDoc::Ieee::PresentationXMLConvert.new(options).convert(
             inname, isodoc_node, nil, outname
           )
         when :ieee
-          IsoDoc::IEEE::IEEEXMLConvert.new(options)
+          IsoDoc::Ieee::IeeeXMLConvert.new(options)
             .convert(inname, isodoc_node, nil, outname)
         else
           super

data/lib/metanorma/ieee/relaton-ieee.rng

@@ -54,6 +54,7 @@
       <optional>
         <ref name="docsubtype"/>
       </optional>
+      <ref name="flavor"/>
       <optional>
         <ref name="trialuse"/>
       </optional>

data/lib/metanorma/ieee/term_lookup_cleanup.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module IEEE
+  module Ieee
     class TermLookupCleanup < Metanorma::Standoc::TermLookupCleanup
       def remove_missing_ref_term(node, _target, type)
         type == "symbol" and return super

data/lib/metanorma/ieee/validate.rb

@@ -2,7 +2,7 @@ require_relative "validate_section"
 require_relative "validate_style"
 
 module Metanorma
-  module IEEE
+  module Ieee
     class Converter < Standoc::Converter
       def validate(doc)
         content_validate(doc)
@@ -127,9 +127,9 @@ module Metanorma
       end
 
       def xrefs(xmldoc)
-        klass = IsoDoc::IEEE::HtmlConvert.new(language: @lang, script: @script)
-        xrefs = IsoDoc::IEEE::Xref
-          .new(@lang, @script, klass, IsoDoc::IEEE::I18n.new(@lang, @script),
+        klass = IsoDoc::Ieee::HtmlConvert.new(language: @lang, script: @script)
+        xrefs = IsoDoc::Ieee::Xref
+          .new(@lang, @script, klass, IsoDoc::Ieee::I18n.new(@lang, @script),
                { hierarchicalassets: @hierarchical_assets })
         # don't process refs without relaton-render init
         xrefs.parse_inclusions(clauses: true, assets: true)

data/lib/metanorma/ieee/validate_section.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module IEEE
+  module Ieee
     class Converter < Standoc::Converter
       def section_validate(doc)
         unless %w(amendment technical-corrigendum).include? @doctype

data/lib/metanorma/ieee/validate_style.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module IEEE
+  module Ieee
     class Converter < Standoc::Converter
       ASSETS_TO_STYLE =
         "//termsource | //formula | //termnote | " \

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module IEEE
-    VERSION = "1.3.1".freeze
+  module Ieee
+    VERSION = "1.3.3".freeze
   end
 end

data/lib/metanorma/ieee.rb

@@ -3,7 +3,7 @@ require "metanorma/ieee/processor"
 require "metanorma/ieee/converter"
 
 module Metanorma
-  module IEEE
+  module Ieee
     ORGANIZATION_NAME_SHORT = "IEEE"
     ORGANIZATION_NAME_LONG = "Institute of Electrical and Electronics Engineers"
   end

data/lib/metanorma-ieee.rb

@@ -6,5 +6,5 @@ require "html2doc/ieee_wp"
 require "metanorma"
 
 if defined? Metanorma::Registry
-  Metanorma::Registry.instance.register(Metanorma::IEEE::Processor)
+  Metanorma::Registry.instance.register(Metanorma::Ieee::Processor)
 end

data/lib/relaton/render/general.rb

@@ -3,7 +3,7 @@ require_relative "parse"
 
 module Relaton
   module Render
-    module IEEE
+    module Ieee
       class General < ::Relaton::Render::IsoDoc::General
         def config_loc
           YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
@@ -11,7 +11,7 @@ module Relaton
 
         def klass_initialize(_options)
           super
-          @parseklass = Relaton::Render::IEEE::Parse
+          @parseklass = Relaton::Render::Ieee::Parse
         end
       end
     end

data/lib/relaton/render/parse.rb

@@ -1,6 +1,6 @@
 module Relaton
   module Render
-    module IEEE
+    module Ieee
       class Parse < ::Relaton::Render::Parse
         def simple_or_host_xml2hash(doc, host)
           ret = super

data/metanorma-ieee.gemspec

@@ -4,7 +4,7 @@ require "metanorma/ieee/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "metanorma-ieee"
-  spec.version       = Metanorma::IEEE::VERSION
+  spec.version       = Metanorma::Ieee::VERSION
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc