metanorma-itu 1.4.5 → 2.0.0

data/lib/isodoc/itu/ref.rb

@@ -9,7 +9,7 @@ module IsoDoc
         list.tr **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
           id = render_identifier(bibitem_ref_code(b))
           ref.td **{ style: "vertical-align:top" } do |td|
-            td << (id[0] || "[#{id[1]}]")
+            td << (id[:metanorma] || "[#{id[:sdo]}]")
               &.gsub(/-/, "&#x2011;")&.gsub(/ /, "&#xa0;")
             date_note_process(b, td)
           end
@@ -65,7 +65,7 @@ module IsoDoc
       end
 
       IGNORE_IDS = "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or "\
-        "@type = 'rfc-anchor'".freeze
+                   "@type = 'rfc-anchor' or @type = 'metanorma-ordinal'".freeze
 
       def multi_bibitem_ref_code(b)
         id = b.xpath(ns("./docidentifier[not(@type = 'metanorma' or "\

data/lib/{asciidoctor → metanorma}/itu/cleanup.rb

@@ -1,4 +1,4 @@
-module Asciidoctor
+module Metanorma
   module ITU
     class Converter < Standoc::Converter
       def sections_cleanup(xml)

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

@@ -1,12 +1,12 @@
 require "asciidoctor"
-require "asciidoctor/standoc/converter"
+require "metanorma/standoc/converter"
 require "fileutils"
 require "metanorma-utils"
 require_relative "./front"
 require_relative "./validate"
 require_relative "./cleanup"
 
-module Asciidoctor
+module Metanorma
   module ITU
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "itu-standard".freeze

data/lib/{asciidoctor → metanorma}/itu/front.rb

@@ -1,9 +1,9 @@
 require "asciidoctor"
-require "asciidoctor/standoc/converter"
+require "metanorma/standoc/converter"
 require "fileutils"
 require_relative "./front_id"
 
-module Asciidoctor
+module Metanorma
   module ITU
     class Converter < Standoc::Converter
       def metadata_status(node, xml)

data/lib/{asciidoctor → metanorma}/itu/front_id.rb

@@ -1,4 +1,4 @@
-module Asciidoctor
+module Metanorma
   module ITU
     class Converter < Standoc::Converter
       def metadata_id(node, xml)

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

@@ -32,6 +32,19 @@
         <ref name="DocumentType"/>
       </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 +703,7 @@
             <ref name="terms"/>
             <ref name="term-clause"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </oneOrMore>
       </element>
@@ -1680,6 +1694,7 @@
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
+          <ref name="floating-title"/>
         </choice>
       </oneOrMore>
     </choice>
@@ -1722,6 +1737,7 @@
           <ref name="terms"/>
           <ref name="definitions"/>
           <ref name="references"/>
+          <ref name="floating-title"/>
         </choice>
       </zeroOrMore>
     </group>
@@ -2534,4 +2550,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/{asciidoctor → metanorma}/itu/itu.rng

@@ -181,6 +181,7 @@
             <ref name="clause-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>

data/lib/{asciidoctor → metanorma}/itu/validate.rb

@@ -1,4 +1,4 @@
-module Asciidoctor
+module Metanorma
   module ITU
     class Converter < Standoc::Converter
       def bibdata_validate(doc)

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.4.5".freeze
+    VERSION = "2.0.0".freeze
   end
 end

data/lib/metanorma/itu.rb

@@ -1,5 +1,6 @@
 require "metanorma/itu/version"
 require "metanorma/itu/processor"
+require "metanorma/itu/converter"
 
 module Metanorma
   module ITU

data/lib/metanorma-itu.rb

@@ -1,6 +1,5 @@
 require "metanorma/itu"
 require "asciidoctor"
-require "asciidoctor/itu"
 require "isodoc/itu"
 
 if defined? Metanorma

data/metanorma-itu.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,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: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -269,18 +269,6 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- lib/asciidoctor/itu.rb
-- lib/asciidoctor/itu/basicdoc.rng
-- lib/asciidoctor/itu/biblio.rng
-- lib/asciidoctor/itu/boilerplate.xml
-- lib/asciidoctor/itu/cleanup.rb
-- lib/asciidoctor/itu/converter.rb
-- lib/asciidoctor/itu/front.rb
-- lib/asciidoctor/itu/front_id.rb
-- lib/asciidoctor/itu/isodoc.rng
-- lib/asciidoctor/itu/itu.rng
-- lib/asciidoctor/itu/reqt.rng
-- lib/asciidoctor/itu/validate.rb
 - lib/isodoc/itu.rb
 - lib/isodoc/itu/base_convert.rb
 - lib/isodoc/itu/cleanup.rb
@@ -334,7 +322,18 @@ files:
 - lib/isodoc/itu/xref_section.rb
 - lib/metanorma-itu.rb
 - lib/metanorma/itu.rb
+- lib/metanorma/itu/basicdoc.rng
+- lib/metanorma/itu/biblio.rng
+- lib/metanorma/itu/boilerplate.xml
+- lib/metanorma/itu/cleanup.rb
+- lib/metanorma/itu/converter.rb
+- lib/metanorma/itu/front.rb
+- lib/metanorma/itu/front_id.rb
+- lib/metanorma/itu/isodoc.rng
+- lib/metanorma/itu/itu.rng
 - lib/metanorma/itu/processor.rb
+- lib/metanorma/itu/reqt.rng
+- lib/metanorma/itu/validate.rb
 - lib/metanorma/itu/version.rb
 - metanorma-itu.gemspec
 homepage: https://github.com/metanorma/metanorma-itu

data/lib/asciidoctor/itu.rb

@@ -1,6 +0,0 @@
-require "asciidoctor/itu/converter"
-
-module Asciidoctor
-  module ITU
-  end
-end