metanorma-ieee 0.0.6.1 → 0.1.0

data/lib/isodoc/ieee/ieee_xml_convert.rb

@@ -0,0 +1,36 @@
+require "isodoc"
+require "mnconvert"
+
+module IsoDoc
+  module IEEE
+    class IEEEXMLConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options) # rubocop:disable Lint/MissingSuper
+        @libdir = File.dirname(__FILE__)
+        @format = :ieee
+        @suffix = "ieee.xml"
+        @ieeedtd = options[:ieeedtd]
+      end
+
+      def inputfile(in_fname, filename)
+        /\.xml$/.match?(in_fname) or
+          in_fname = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
+            f.write file
+            f.path
+          end
+        in_fname
+      end
+
+      def convert(in_fname, file = nil, debug = false, out_fname = nil)
+        file = File.read(in_fname, encoding: "utf-8") if file.nil?
+        _docxml, filename, dir = convert_init(file, in_fname, debug)
+        in_fname = inputfile(in_fname, filename)
+        FileUtils.rm_rf dir
+        opt = { input_format: MnConvert::InputFormat::MN,
+                output_file: out_fname || "#{filename}.#{@suffix}",
+                output_format: :ieee }
+        @ieeedtd and opt.merge!(validation_against: @ieeedtd)
+        MnConvert.convert(in_fname, opt)
+      end
+    end
+  end
+end

data/lib/isodoc/ieee/init.rb

@@ -6,8 +6,8 @@ require_relative "i18n"
 module IsoDoc
   module IEEE
     module Init
-      def metadata_init(lang, script, i18n)
-        @meta = Metadata.new(lang, script, i18n)
+      def metadata_init(lang, script, locale, i18n)
+        @meta = Metadata.new(lang, script, locale, i18n)
       end
 
       def xref_init(lang, script, _klass, i18n, options)
@@ -16,8 +16,9 @@ module IsoDoc
         @xrefs = Xref.new(lang, script, html, i18n, options)
       end
 
-      def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
+      def i18n_init(lang, script, locale, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, locale: locale,
+                                       i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def fileloc(loc)

data/lib/isodoc/ieee/word_authority.rb

@@ -114,7 +114,7 @@ module IsoDoc
           para = i % 2 == 1 && i != ret.size - 2 ? "<p>&#xa0;</p>" : ""
           "<div class='WordSection'>#{para}#{d}</div>"
         end.join(SECTIONBREAK)
-        div.document.at("//div[@class = 'WordSection11']")
+        div.document.at("//div[@class = 'WordSectionIntro']")
           .previous_element.previous = SECTIONBREAK + out
       end
 

data/lib/isodoc/ieee/word_cleanup.rb

@@ -88,7 +88,7 @@ module IsoDoc
           d.replace(d.children)
         i = 0
         docxml.xpath("//div[@class]").each do |div|
-          next unless /^WordSection/.match?(div["class"])
+          next unless /^WordSection\d*$/.match?(div["class"])
 
           i += 1
           div["class"] = "WordSection#{i}"

data/lib/isodoc/ieee/word_convert.rb

@@ -57,11 +57,11 @@ module IsoDoc
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "WordSection13" } do |_div3|
+        body.div **{ class: "WordSectionMiddleTitle" } do |_div3|
           middle_title_ieee(docxml, body)
         end
         section_break(body, continuous: true)
-        body.div **{ class: "WordSection14" } do |div3|
+        body.div **{ class: "WordSectionMain" } do |div3|
           middle docxml, div3
           footnotes div3
           comments div3

data/lib/isodoc/ieee/xref.rb

@@ -34,11 +34,6 @@ module IsoDoc
           n = section_names(doc.at(ns("//sections/definitions")), n, 1)
           clause_names(doc, n)
         end
-        if @parse_settings.empty?
-          middle_section_asset_names(doc)
-          termnote_anchor_names(doc)
-          termexample_anchor_names(doc)
-        end
       end
 
       def middle_sections

data/lib/isodoc/ieee.rb

@@ -4,6 +4,7 @@ require "isodoc/ieee/html_convert"
 require "isodoc/ieee/pdf_convert"
 require "isodoc/ieee/word_convert"
 require "isodoc/ieee/presentation_xml_convert"
+require "isodoc/ieee/ieee_xml_convert"
 
 module IsoDoc
   module IEEE

data/lib/metanorma/ieee/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -650,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -741,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/ieee/cleanup.rb

@@ -117,7 +117,7 @@ module Metanorma
         x = xmldoc.dup
         x.root.add_namespace(nil, self.class::XML_NAMESPACE)
         xml = Nokogiri::XML(x.to_xml)
-        i = isodoc(@lang, @script)
+        i = isodoc(@lang, @script, @locale)
         i.bibdata_i18n(xml.at("//xmlns:bibdata"))
         i.info(xml, nil)
         i

data/lib/metanorma/ieee/cleanup_ref.rb

@@ -47,9 +47,9 @@ module Metanorma
         else
           bib1 = bib.dup
           bib1.add_namespace(nil, self.class::XML_NAMESPACE)
-          i = IsoDoc::IEEE::PresentationXMLConvert.new({ lang: @lang,
-                                                         script: @script })
-          i.i18n_init(@lang, @script)
+          i = IsoDoc::IEEE::PresentationXMLConvert
+            .new({ lang: @lang, script: @script, locale: @locale })
+          i.i18n_init(@lang, @script, @locale)
           i.creatornames(bib1)
         end
       end

data/lib/metanorma/ieee/converter.rb

@@ -60,7 +60,8 @@ module Metanorma
 
       def html_extract_attributes(node)
         super.merge(hierarchical_assets:
-                    node.attr("hierarchical-object-numbering"))
+                    node.attr("hierarchical-object-numbering"),
+                    ieeedtd: node.attr("ieee-dtd"))
       end
 
       def doc_extract_attributes(node)
@@ -78,12 +79,20 @@ module Metanorma
       end
 
       def pdf_converter(node)
+        return nil if node.attr("no-pdf")
+
         IsoDoc::IEEE::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(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))
+      end
     end
   end
 end

data/lib/metanorma/ieee/isodoc.rng

@@ -205,6 +205,15 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style">
+            <choice>
+              <value>basic</value>
+              <value>full</value>
+              <value>short</value>
+            </choice>
+          </attribute>
+        </optional>
         <ref name="XrefBody"/>
       </element>
     </define>

data/lib/metanorma/ieee/processor.rb

@@ -14,6 +14,7 @@ module Metanorma
           html: "html",
           doc: "doc",
           pdf: "pdf",
+          ieee: "ieee.xml",
         )
       end
 
@@ -47,6 +48,9 @@ module Metanorma
           IsoDoc::IEEE::PresentationXMLConvert.new(options).convert(
             inname, isodoc_node, nil, outname
           )
+        when :ieee
+          IsoDoc::IEEE::IEEEXMLConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/ieee/version.rb

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

data/lib/metanorma-ieee.rb

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

data/lib/relaton/render/config.yml

@@ -5,7 +5,7 @@ nametemplate:
 extenttemplate:
   misc: "{{ volume }}, {{issue}}, {{ page }}, {{ duration }}"
 template:
-  # skip standardidentifier, it is inserted in front of formattedref within metanorma
+  # skip authoritative_identifier, it is inserted in front of formattedref within metanorma
   standard: "{{ title }}."
   techreport: standard
   article: "{{creatornames}}, “{{title}},” <em>{{ series }}</em>, {{ extent }}, {{ date }}, {{ labels['viewed'] }}_{{date_accessed}}, {{ uri }} ."

data/metanorma-ieee.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
+  spec.add_dependency "mnconvert", "~> 1.20"
 
   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: 0.0.6.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
+- !ruby/object:Gem::Dependency
+  name: mnconvert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +221,7 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.devel
 - LICENSE
 - README.adoc
 - Rakefile
@@ -237,6 +252,7 @@ files:
 - lib/isodoc/ieee/ieee.amendment.xsl
 - lib/isodoc/ieee/ieee.rb
 - lib/isodoc/ieee/ieee.standard.xsl
+- lib/isodoc/ieee/ieee_xml_convert.rb
 - lib/isodoc/ieee/init.rb
 - lib/isodoc/ieee/metadata.rb
 - lib/isodoc/ieee/pdf_convert.rb