metanorma-generic 2.7.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0df93886595c4231d7468467314c0d9b4c44e96963c92d257b5cd5f3c4a411a
-  data.tar.gz: 1d2e1f00ffe3384508577eae8bde782fa630eeda674625f3fc0e9090fe60660c
+  metadata.gz: 1eac917146566e8e8a88c879f06c74778d618083c1dfc67916b0965ec8bd222f
+  data.tar.gz: a6c4b12c359af39c05e825adef08df3a66e566f2a2b991bb3cfe24af710c3a58
 SHA512:
-  metadata.gz: a8f2df814eff57cf832b50d74283910aadd71d71b5a16c4443ebdba3b4e55cd85db055e488f1f1bc68443d9954a69af2308a049975f0f3aa70c029d67e8bd311
-  data.tar.gz: b32d41f697ac6102de55b65c85f51b66f487e27b8cbf66f519ec19a6c3691e1ae4db475f40f8e6122867eda72e74f4246bb130b14cfeb0ea1bae07a31a5e23d7
+  metadata.gz: a4e2d9750abcee0af0a0cae55ebc934ae12f4406f1223a519f94f0b4b7dbe92d942ca823ec3df33d9c474bf02c899af2ca7c8ebc3fa7281e1c555949c32e742d
+  data.tar.gz: 8bf89e4ed09f0df5d91a0ef95ba878f75232abecd1077dd2b8d189b6c2836f9edb2d59ee2c2a463655a456d8a6bba416bbeb6d06cd0382ddb3a8d5fe6e220022

data/lib/metanorma/generic/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>
@@ -941,6 +947,8 @@ May be electronic (e.g. Twitter direct message, email) or voice (e.g. a remark m
 typically cited as "personal communication")</a:documentation>
       <value>conversation</value>
       <a:documentation>An exchange of messages between two or more persons. May be electronic (e.g. web chat) or voice (e.g. phone call)</a:documentation>
+      <value>collection</value>
+      <a:documentation>A compound resource consisting of other resources, which are themselves presupposed to have their type specified..</a:documentation>
       <value>misc</value>
       <a:documentation>Bibliographic type not adequately described in the foregoing</a:documentation>
     </choice>
@@ -1271,17 +1279,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/generic/converter.rb

@@ -13,13 +13,13 @@ module Metanorma
 
       register_for "generic"
 
-      def xml_root_tag
-        configuration.xml_root_tag || XML_ROOT_TAG
-      end
-
-      def xml_namespace
-        configuration.document_namespace || XML_NAMESPACE
-      end
+      #def xml_root_tag
+        #configuration.xml_root_tag || XML_ROOT_TAG
+      #end
+#
+      #def xml_namespace
+        #configuration.document_namespace || XML_NAMESPACE
+      #end
 
       def baselocation(loc)
         loc.nil? and return nil

data/lib/metanorma/generic/generic.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns='https://www.metanorma.org/ns/generic' xmlns="http://relaxng.org/ns/structure/1.0">
+<grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0">
   <!--
     VERSION v1.2.1
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
@@ -8,34 +8,31 @@
   -->
   <include href="biblio-standoc.rng"/>
   <include href="isodoc.rng">
-    <start>
-      <ref name="generic-standard"/>
-    </start>
+    <define name="standard-document">
+      <element name="metanorma">
+        <ref name="Root-Attributes"/>
+        <ref name="bibdata"/>
+        <zeroOrMore>
+          <ref name="termdocsource"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="misccontainer"/>
+        </optional>
+        <optional>
+          <ref name="boilerplate"/>
+        </optional>
+        <ref name="preface"/>
+        <oneOrMore>
+          <ref name="sections"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="annex"/>
+        </zeroOrMore>
+        <ref name="bibliography"/>
+        <zeroOrMore>
+          <ref name="indexsect"/>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
-  <define name="generic-standard">
-    <element name="generic-standard">
-      <ref name="Root-Attributes"/>
-      <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="termdocsource"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="misccontainer"/>
-      </optional>
-      <optional>
-        <ref name="boilerplate"/>
-      </optional>
-      <ref name="preface"/>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annex"/>
-      </zeroOrMore>
-      <ref name="bibliography"/>
-      <zeroOrMore>
-        <ref name="indexsect"/>
-      </zeroOrMore>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/generic/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.1 -->
+<!-- VERSION v2.0.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -459,11 +459,14 @@ gives an explicit page orientation</a:documentation>
           <a:documentation>Description of location in a reference, which can be combined with other locations in a single citation</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="PureTextElement">
+      <optional>
+        <element name="display-text">
           <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-        </ref>
-      </zeroOrMore>
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
     </define>
   </include>
   <!-- end overrides -->
@@ -1205,10 +1208,13 @@ numbers</a:documentation>
         <value>presentation</value>
       </choice>
     </attribute>
+    <attribute name="flavor">
+      <a:documentation>Metanorma flavor, indicating SDO whose requiremnts the realisation aligns to</a:documentation>
+    </attribute>
   </define>
   <define name="standard-document">
     <a:documentation>Representation of a standardisation document</a:documentation>
-    <element name="standard-document">
+    <element name="metanorma">
       <ref name="Root-Attributes"/>
       <ref name="bibdata">
         <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.7.4".freeze
+    VERSION = "3.0.0".freeze
   end
 end

data/metanorma-generic.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.10.2"
+  spec.add_dependency "metanorma-standoc", "~> 3.0.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +240,7 @@ homepage: https://github.com/metanorma/metanorma-generic
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -256,7 +256,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 template gem for customisation.
 test_files: []