metanorma-vg 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11aff3ac0ea7e93d6dbf30e56142b193a223d58b84f480705ae176ca1736c46f
-  data.tar.gz: 841f05c701a01f12e9027fc84ca47d3b2c1b64b745fc6ac8790a1e6e0d547561
+  metadata.gz: 0610f33690b4f1e434f8662206e557ea4104035c8de5ab2d0c3707084fb43ffa
+  data.tar.gz: 4b579f4519d1e9e317f64107d6267ce2897628a82ae1e9eabc87cad80f4e741b
 SHA512:
-  metadata.gz: 8b47d5c475bcc57c561967d6ab05dc7e57c52a6c56c2f8eda4cb4832aef032471955ac5ec6008dcdff0fd3812fd4c91bf294de050ad7c2579aa11db1e29f1568
-  data.tar.gz: a4e2641b45e124baf4e892a4a185cc3a40f08e17aad1f0cc3d0e26dca34bd134c12fe3603896cce5f15edad66641e1221f2bd5a22df72ab7425d4c041af7b173
+  metadata.gz: 72b3080a5ca64ff78a514e792c0567b0c2eea254b840502ccc7194b7a7b42c799923e3dc007224e65d5bc7d8eab96cc2697b5ed0222a99c94bbfc83f4c1816fb
+  data.tar.gz: c51943fc8be0847f10c5e98ad5ef3c429bbdc0ab0fbcfadf35ca5fc343061b5911e15c039fe1d034c0b040aeac21cca8320cdc50ddd4958ac7e941bfb54ce024

data/lib/asciidoctor/vg/isodoc.rng

@@ -922,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1180,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/isodoc/vg/html_convert.rb

@@ -1,6 +1,6 @@
 require "isodoc"
 require "isodoc/generic/html_convert"
-require "isodoc/vg/metadata"
+require_relative "init"
 
 module IsoDoc
   module VG
@@ -12,9 +12,7 @@ module IsoDoc
         Metanorma::VG.configuration
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
+      include Init
     end
   end
 end

data/lib/isodoc/vg/init.rb

@@ -0,0 +1,19 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+
+module IsoDoc
+  module VG
+    module Init
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, labels, options)
+      end
+    end
+  end
+end
+

data/lib/isodoc/vg/presentation_xml_convert.rb

@@ -1,9 +1,11 @@
 require "isodoc"
 require "metanorma-generic"
+require_relative "init"
 
 module IsoDoc
   module VG
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      include Init
     end
   end
 end

data/lib/isodoc/vg/word_convert.rb

@@ -1,6 +1,6 @@
 require "isodoc"
 require "isodoc/generic/word_convert"
-require "isodoc/vg/metadata"
+require_relative "init"
 
 module IsoDoc
   module VG
@@ -11,9 +11,7 @@ module IsoDoc
         Metanorma::VG.configuration
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
+      include Init
     end
   end
 end

data/lib/isodoc/vg/xref.rb

@@ -0,0 +1,6 @@
+module IsoDoc
+  module Csa
+    class Xref < IsoDoc::Xref
+    end
+  end
+end

data/lib/metanorma/vg/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module VG
-    VERSION = "1.1.3"
+    VERSION = "1.2.0"
   end
 end

data/metanorma-vsd.gemspec

@@ -28,10 +28,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  #spec.add_dependency "nokogiri"
-  spec.add_dependency "metanorma-generic", "~> 1.5.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-generic", "~> 1.6.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-vg
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -238,9 +224,11 @@ files:
 - lib/isodoc/vg/html/wordstyle.css
 - lib/isodoc/vg/html/wordstyle.scss
 - lib/isodoc/vg/html_convert.rb
+- lib/isodoc/vg/init.rb
 - lib/isodoc/vg/metadata.rb
 - lib/isodoc/vg/presentation_xml_convert.rb
 - lib/isodoc/vg/word_convert.rb
+- lib/isodoc/vg/xref.rb
 - lib/metanorma-vg.rb
 - lib/metanorma/vg.rb
 - lib/metanorma/vg/processor.rb