metanorma-m3aawg 1.8.3 → 2.0.1

data/lib/{asciidoctor → metanorma}/m3aawg/converter.rb

@@ -1,9 +1,9 @@
-require "asciidoctor/standoc/converter"
-require 'asciidoctor/generic/converter'
+require "metanorma/standoc/converter"
+require "metanorma/generic/converter"
 
-module Asciidoctor
+module Metanorma
   module M3AAWG
-    class Converter < Asciidoctor::Generic::Converter
+    class Converter < Metanorma::Generic::Converter
       XML_ROOT_TAG = "m3d-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/m3d".freeze
 
@@ -11,19 +11,20 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         return unless node.attr("technical-committee")
+
         xml.editorialgroup do |a|
           a.committee node.attr("technical-committee"),
-            **attr_code(type: node.attr("technical-committee-type"))
+                      **attr_code(type: node.attr("technical-committee-type"))
           i = 2
-          while node.attr("technical-committee_#{i}") do
+          while node.attr("technical-committee_#{i}")
             a.committee node.attr("technical-committee_#{i}"),
-              **attr_code(type: node.attr("technical-committee-type_#{i}"))
+                        **attr_code(type: node.attr("technical-committee-type_#{i}"))
             i += 1
           end
         end
       end
 
-       def configuration
+      def configuration
         Metanorma::M3AAWG.configuration
       end
 
@@ -33,11 +34,14 @@ module Asciidoctor
       end
 
       def outputs(node, ret)
-        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-        presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
+        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert("#{@filename}.xml")
+        html_converter(node).convert("#{@filename}.presentation.xml", nil,
+                                     false, "#{@filename}.html")
+        doc_converter(node).convert("#{@filename}.presentation.xml", nil,
+                                    false, "#{@filename}.doc")
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml", nil,
+                                     false, "#{@filename}.pdf")
       end
 
       def sections_cleanup(xml)
@@ -62,7 +66,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::M3AAWG::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::M3AAWG::PdfConvert.new(pdf_extract_attributes(node))
       end
     end
   end

data/lib/{asciidoctor → metanorma}/m3aawg/isodoc.rng

@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1959,7 +1973,11 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
@@ -1973,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>

data/lib/metanorma/m3aawg/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3AAWG
-    VERSION = "1.8.3".freeze
+    VERSION = "2.0.1".freeze
   end
 end

data/lib/metanorma-m3aawg.rb

@@ -1,5 +1,5 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
-require_relative "asciidoctor/m3aawg/converter"
+require_relative "metanorma/m3aawg/converter"
 require_relative "isodoc/m3aawg/html_convert"
 require_relative "isodoc/m3aawg/word_convert"
 require_relative "isodoc/m3aawg/pdf_convert"

data/metanorma-m3d.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "thread_safe"
 
-  spec.add_dependency "metanorma-generic", "~> 1.11.0"
+  spec.add_dependency "metanorma-generic", "~> 2.0.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/metanorma.yml

@@ -9,7 +9,7 @@ html_monospacefont: '"Space Mono",monospace'
 html_normalfontsize: "15px"
 html_footnotefontsize: "0.9em"
 i18nyaml: lib/isodoc/m3aawg/i18n-en.yaml
-validate_rng_file: lib/asciidoctor/m3aawg/m3d.rng
+validate_rng_file: lib/metanorma/m3aawg/m3d.rng
 htmlcoverpage: lib/isodoc/m3aawg/html/html_m3d_titlepage.html
 htmlintropage: lib/isodoc/m3aawg/html/html_m3d_intro.html
 htmlstylesheet: lib/isodoc/m3aawg/html/htmlstyle.scss

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3aawg
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -216,14 +216,6 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- lib/asciidoctor/m3aawg.rb
-- lib/asciidoctor/m3aawg/basicdoc.rng
-- lib/asciidoctor/m3aawg/biblio.rng
-- lib/asciidoctor/m3aawg/boilerplate.xml
-- lib/asciidoctor/m3aawg/converter.rb
-- lib/asciidoctor/m3aawg/isodoc.rng
-- lib/asciidoctor/m3aawg/m3d.rng
-- lib/asciidoctor/m3aawg/reqt.rng
 - lib/isodoc/m3aawg/base_convert.rb
 - lib/isodoc/m3aawg/html/dots-w@2x.png
 - lib/isodoc/m3aawg/html/dots@2x.png
@@ -254,7 +246,14 @@ files:
 - lib/isodoc/m3aawg/xref.rb
 - lib/metanorma-m3aawg.rb
 - lib/metanorma/m3aawg.rb
+- lib/metanorma/m3aawg/basicdoc.rng
+- lib/metanorma/m3aawg/biblio.rng
+- lib/metanorma/m3aawg/boilerplate.xml
+- lib/metanorma/m3aawg/converter.rb
+- lib/metanorma/m3aawg/isodoc.rng
+- lib/metanorma/m3aawg/m3d.rng
 - lib/metanorma/m3aawg/processor.rb
+- lib/metanorma/m3aawg/reqt.rng
 - lib/metanorma/m3aawg/version.rb
 - metanorma-m3d.gemspec
 - metanorma.yml
@@ -277,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: metanorma-m3d lets you write M3AAWG Documents in AsciiDoc.

data/lib/asciidoctor/m3aawg.rb

@@ -1,5 +0,0 @@
-module Asciidoctor
-  module M3AAWG
-    # Your code goes here...
-  end
-end