metanorma-jis 0.0.3 → 0.0.4

data/lib/metanorma/jis/isodoc.rng

@@ -382,6 +382,9 @@
         <optional>
           <ref name="dl"/>
         </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
       </element>
     </define>
     <define name="figure">
@@ -404,9 +407,6 @@
           <attribute name="class"/>
         </optional>
         <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -431,6 +431,20 @@
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
+        <optional>
+          <ref name="source"/>
+        </optional>
+      </element>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <ref name="origin"/>
+        <optional>
+          <ref name="modification"/>
+        </optional>
       </element>
     </define>
     <define name="sourcecode">
@@ -2099,10 +2113,7 @@
   <define name="termsource">
     <element name="termsource">
       <attribute name="status">
-        <choice>
-          <value>identical</value>
-          <value>modified</value>
-        </choice>
+        <ref name="SourceStatusType"/>
       </attribute>
       <attribute name="type">
         <choice>
@@ -2116,6 +2127,17 @@
       </optional>
     </element>
   </define>
+  <define name="SourceStatusType">
+    <choice>
+      <value>identical</value>
+      <value>modified</value>
+      <value>restyled</value>
+      <value>context-added</value>
+      <value>generalisation</value>
+      <value>specialisation</value>
+      <value>unspecified</value>
+    </choice>
+  </define>
   <define name="origin">
     <element name="origin">
       <choice>

data/lib/metanorma/jis/jis.rng

@@ -6,6 +6,16 @@
     <start>
       <ref name="jis-standard"/>
     </start>
+    <define name="annex">
+      <element name="annex">
+        <optional>
+          <attribute name="commentary">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="Annex-Section"/>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="floating-section-title">

data/lib/metanorma/jis/processor.rb

@@ -21,8 +21,8 @@ module Metanorma
       def fonts_manifest
         {
           "STIX Two Math" => nil,
-          "MS Gothic" => nil,
-          "MS Mincho" => nil,
+          "IPAexGothic" => nil,
+          "IPAexMincho" => nil,
           "Courier New" => nil,
           "Cambria Math" => nil,
           "Times New Roman" => nil,

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.0.3".freeze
+    VERSION = "0.0.4".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.4.0"
-  spec.add_dependency "ruby-jing"
+  spec.add_dependency "metanorma-iso", "~> 2.4.2"
+  spec.add_dependency "pubid-jis"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: pubid-jis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -238,6 +238,7 @@ files:
 - README.adoc
 - lib/html2doc/lists.rb
 - lib/isodoc/jis/base_convert.rb
+- lib/isodoc/jis/figure.rb
 - lib/isodoc/jis/html/header.html
 - lib/isodoc/jis/html/html_jis_intro.html
 - lib/isodoc/jis/html/html_jis_titlepage.html
@@ -262,6 +263,7 @@ files:
 - lib/isodoc/jis/metadata.rb
 - lib/isodoc/jis/pdf_convert.rb
 - lib/isodoc/jis/presentation_xml_convert.rb
+- lib/isodoc/jis/table.rb
 - lib/isodoc/jis/word_cleanup.rb
 - lib/isodoc/jis/word_convert.rb
 - lib/isodoc/jis/xref.rb