metanorma-standoc 2.10.4 → 2.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11972c007dd10b95b91d8598f5dce3843e59f7867e53768f43f03d04c63bf321
-  data.tar.gz: c22fd5262f6024f145c23d9f88471a9d8d061d51e7346fdac3535701715c36e5
+  metadata.gz: 1b53e3a5bc3494dc39d49d3d0da67e8055f2fb0ef8c4c68553e04d766d6af780
+  data.tar.gz: 40883de9d883c3df6ab9807cb1d01410946638ecbc592d01bfcf826d98ca4749
 SHA512:
-  metadata.gz: 2f39425e1441e9b6d251669be2e3fd02967cd41a1f4f5bd65c71e9546a4e510bcf42ab89203eade13afa4e755847b4b3557c0be3c2a9839efd5a64ec013b5d36
-  data.tar.gz: bf360c1ce44587d5c7244e0edbb759109db93bd71c7c852c94bd3b020ca70fc4d981582891f98588492a923ee87e5224b2ed33617dd4cd37edf7480cc1e24955
+  metadata.gz: 343fc359bdf0fb657593c3b1b004c733f873139c222a02a2e983c5cc76e536e995625f2d6df90dec9f9d39c3046394f33f521a442d7ee1c2b282c56a1ca0520b
+  data.tar.gz: 687d5cd989a9259b1ec011099742bef06a10f5cdfe993ebb07940baeb795be26d00acec6e6a6f2883e32ce4053ef1e2138164b69891b9909b0a1929da121359d

data/lib/metanorma/standoc/biblio.rng

@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>
@@ -1271,17 +1277,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/standoc/init.rb

@@ -6,7 +6,7 @@ module Metanorma
       def init(node)
         init_vars
         init_misc(node)
-        init_processing(node)
+        init_processing(node) # feeds init_i18n
         init_log(node)
         init_image(node)
         init_reqt(node)
@@ -39,12 +39,13 @@ module Metanorma
         @embed_hdr = node.attr("embed_hdr")
         @embed_id = node.attr("embed_id")
         @document_scheme = document_scheme(node)
-        @xrefstyle = node.attr("xrefstyle")
         @source_linenums = node.attr("source-linenums-option") == "true"
         @default_doctype = "standard"
       end
 
       def init_processing(node)
+        @localdir = Metanorma::Utils::localdir(node)
+        @xrefstyle = node.attr("xrefstyle")
         @novalid = node.attr("novalid")
         @smartquotes = node.attr("smartquotes") != "false"
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
@@ -100,7 +101,6 @@ module Metanorma
                       File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
                     else ""
                     end
-        @localdir = Metanorma::Utils::localdir(node)
         @output_dir = outputdir node
       end
 
@@ -109,7 +109,9 @@ module Metanorma
         @script = node.attr("script") ||
           Metanorma::Utils.default_script(node.attr("language"))
         @locale = node.attr("locale")
-        @isodoc = isodoc(@lang, @script, @locale, node.attr("i18nyaml"))
+        i18nyaml = node.attr("i18nyaml")
+        i18nyaml &&= File.join(@localdir, i18nyaml)
+        @isodoc = isodoc(@lang, @script, @locale, i18nyaml)
         @i18n = @isodoc.i18n
       end
 

data/lib/metanorma/standoc/render.rb

@@ -2,12 +2,14 @@ module Metanorma
   module Standoc
     module Base
       def html_extract_attributes(node)
+        i18nyaml = node.attr("i18nyaml")
+        i18nyaml &&= File.join(@localdir, i18nyaml)
         {
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
           headerfont: node.attr("header-font"),
           monospacefont: node.attr("monospace-font"),
-          i18nyaml: node.attr("i18nyaml"),
+          i18nyaml: i18nyaml,
           scope: node.attr("scope"),
           htmlstylesheet: node.attr("htmlstylesheet"),
           htmlstylesheet_override: node.attr("htmlstylesheet-override"),
@@ -48,12 +50,14 @@ module Metanorma
       end
 
       def doc_extract_attributes(node)
+        i18nyaml = node.attr("i18nyaml")
+        i18nyaml &&= File.join(@localdir, i18nyaml)
         attrs = {
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
           headerfont: node.attr("header-font"),
           monospacefont: node.attr("monospace-font"),
-          i18nyaml: node.attr("i18nyaml"),
+          i18nyaml: i18nyaml,
           scope: node.attr("scope"),
           wordstylesheet: node.attr("wordstylesheet"),
           wordstylesheet_override: node.attr("wordstylesheet-override"),

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.10.4".freeze
+    VERSION = "2.10.5".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
-  spec.add_dependency "iev", "~> 0.3.0"
+  spec.add_dependency "iev", "~> 0.3.5"
   spec.add_dependency "isodoc", "~> 2.12.4"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.10.4
+  version: 2.10.5
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -590,7 +590,7 @@ homepage: https://github.com/metanorma/metanorma-standoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -606,7 +606,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: metanorma-standoc realises standards following the Metanorma standoc model
 test_files: []