metanorma-m3aawg 1.8.5 → 2.0.3

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

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

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

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -401,9 +398,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

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
 

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

@@ -32,6 +32,56 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="index">
+      <element name="index">
+        <optional>
+          <attribute name="to">
+            <data type="IDREF"/>
+          </attribute>
+        </optional>
+        <element name="primary">
+          <oneOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </oneOrMore>
+        </element>
+        <optional>
+          <element name="secondary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+        <optional>
+          <element name="tertiary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+    </define>
+    <define name="bibitem">
+      <element name="bibitem">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="hidden">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="BibliographicItem"/>
+      </element>
+    </define>
     <define name="section-title">
       <element name="title">
         <zeroOrMore>
@@ -690,6 +740,7 @@
             <ref name="terms"/>
             <ref name="term-clause"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </oneOrMore>
       </element>
@@ -1013,6 +1064,26 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="sub">
+      <element name="sub">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sup">
+      <element name="sup">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="pagebreak">
       <element name="pagebreak">
         <optional>
@@ -1680,6 +1751,7 @@
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
+          <ref name="floating-title"/>
         </choice>
       </oneOrMore>
     </choice>
@@ -1722,6 +1794,7 @@
           <ref name="terms"/>
           <ref name="definitions"/>
           <ref name="references"/>
+          <ref name="floating-title"/>
         </choice>
       </zeroOrMore>
     </group>
@@ -2200,7 +2273,18 @@
           <ref name="MultilingualRenderingType"/>
         </attribute>
       </optional>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="figure"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termsource">
@@ -2534,4 +2618,17 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="floating-title">
+    <element name="floating-title">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="depth">
+        <data type="int"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/m3aawg/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3AAWG
-    VERSION = "1.8.5".freeze
+    VERSION = "2.0.3".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.5
+  version: 2.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2022-02-07 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

data/lib/asciidoctor/m3aawg.rb

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