metanorma-generic 3.1.2 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50b039e644c1672d5e945c482602c872a21bceff11ac3f7d4d9d768639b81b1
-  data.tar.gz: 3fbcdb088cf39e43227dc48cc23874af81829e743d7a583e3408300f06dfbad8
+  metadata.gz: 28240604233a01b6fe0040e0764123ac77a6ab9fb6893b1d760f5786425bc8d3
+  data.tar.gz: 879de0d79f7cd020c0e6cbef606bbb301779794278d43a8ae1e1dbaf4ed60b04
 SHA512:
-  metadata.gz: 11057878ee61b576be907979f6db2d66a30dea8b19b886e1aacce53d50b254bf989369b4f50d16cd1a16643412936b21d76d2f41b74e9e1cd0dd94316913615d
-  data.tar.gz: 5a7b58efe110889513dd6621fdd3bfc365b8eb2df02b91ca5ccad467dce4fd7ebb3a70b38e3257a2e3ed50e1a6e7fd9d1367efedc73450d5a8d0d53ec187c74b
+  metadata.gz: cabbd0463f13c372ad5fe3627a87ec55b62268a2f3e9aa09d1ecf2325b4035bf92a231d5d8dcbb3229535c74d2a061493304f91330f088002af2b864aaff99d3
+  data.tar.gz: 5fae636b2e3c53a1402c30f90141f85f34fa43d9be3d4ae3523d3327f2847d283d3066b7348bf388851612a5bced79854d9b05547317123a64809aad3eb73290

data/lib/isodoc/generic/metadata.rb

@@ -53,21 +53,15 @@ module IsoDoc
 
       def author(isoxml, _out)
         super
-        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
+        tc = isoxml.at(ns("//bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/name"))
         set(:tc, tc.text) if tc
       end
 
       def stage_abbr(status)
-        return super unless configuration.stage_abbreviations
-
+        configuration.stage_abbreviations or return super
         Hash(configuration.stage_abbreviations).dig(status)
       end
 
-      def unpublished(status)
-        stages = configuration&.published_stages || ["published"]
-        !(Array(stages).map { |m| m.downcase }.include? status.downcase)
-      end
-
       def doctype(isoxml, _out)
         super
         b = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}")) ||
@@ -77,10 +71,8 @@ module IsoDoc
 
       def xmlhash2hash(hash)
         ret = {}
-        return ret if hash.nil? || hash[:kind] != "element"
-
-        hash[:attr].nil? or
-          hash[:attr].each { |k, v| ret["#{hash[:name]}_#{k}"] = v }
+        hash.nil? || hash[:kind] != "element" and return ret
+        hash[:attr]&.each { |k, v| ret["#{hash[:name]}_#{k}"] = v }
         ret[hash[:name]] = hash[:kids] ? xmlhash2hash_kids(hash) : hash[:text]
         ret
       end

data/lib/metanorma/generic/biblio-standoc.rng

@@ -76,12 +76,6 @@ from other documents in the same doctype</a:documentation>
     <ref name="flavor">
       <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
     </ref>
-    <optional>
-      <ref name="editorialgroup">
-        <a:documentation>Groups associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-      </ref>
-    </optional>
     <zeroOrMore>
       <ref name="ics">
         <a:documentation>Classification of the document contents taken from the International Classification of Standards</a:documentation>
@@ -130,49 +124,6 @@ a standards definition organization</a:documentation>
 However we prefer not to hardcode it, given ongoing extension.</a:documentation>
     <text/>
   </define>
-  <define name="editorialgroup">
-    <a:documentation>A group associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-    <element name="editorialgroup">
-      <oneOrMore>
-        <ref name="technical-committee">
-          <a:documentation>A technical committee associated with the production of the standards document</a:documentation>
-        </ref>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="technical-committee">
-    <a:documentation>Technical committee associated with the production of a standards document</a:documentation>
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="IsoWorkgroup">
-    <optional>
-      <attribute name="number">
-        <a:documentation>Numeric identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="type">
-        <a:documentation>Type of the technical committee, used in identifying the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="identifier">
-        <a:documentation>Non-numeric, complete identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="prefix">
-        <a:documentation>Disambiguating prefix added to number to form the identifier of the technical committee,
-typically indicating its type</a:documentation>
-      </attribute>
-    </optional>
-    <text>
-      <a:documentation>Name of the technical committee</a:documentation>
-    </text>
-  </define>
   <define name="ics">
     <a:documentation>Classification taken from the International Classification of Standards. 
 ICS is defined by ISO here -- https://www.iso.org/publication/PUB100033.html</a:documentation>

data/lib/metanorma/generic/biblio.rng

@@ -242,6 +242,8 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
     </choice>
   </define>
   <define name="roledescription">
+    <a:documentation>A more detailed description of the role of the contributor
+Some descriptions are reserved words; in particular, the editorial committee of a standard has the role description "committee"</a:documentation>
     <element name="description">
       <ref name="LocalizedMarkedUpString"/>
     </element>
@@ -443,7 +445,10 @@ real names (if the person is named with a pseudonym or user name); previous lega
     </oneOrMore>
     <zeroOrMore>
       <ref name="subdivision">
-        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item</a:documentation>
+        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item.
+Multiple subdivisions can be specified for an organization, with no implication of hierarchical
+relation between them
+Editorial and advisory groups are represented as consecutive subdivisions of the SDO</a:documentation>
       </ref>
     </zeroOrMore>
     <optional>
@@ -485,6 +490,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
           <a:documentation>The type of subdivision</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subtype">
+          <a:documentation>The subtype of subdivision; e.g. different types of technical committee</a:documentation>
+        </attribute>
+      </optional>
       <ref name="OrganizationType">
         <a:documentation>The subdivision, modelled recursively as an organization</a:documentation>
       </ref>

data/lib/metanorma/generic/converter.rb

@@ -121,7 +121,8 @@ module Metanorma
       def committee_validate(xmldoc)
         committees = Array(configuration&.committees) || return
         committees.empty? and return
-        xmldoc.xpath("//bibdata/ext/editorialgroup/committee").each do |c|
+        xmldoc.xpath("//bibdata/contributor[role/description = 'committee']/" \
+            "organization/subdivision/name").each do |c|
           committees.include? c.text or
             @log.add("Document Attributes", nil,
                      "#{c.text} is not a recognised committee")
@@ -166,7 +167,8 @@ module Metanorma
           conv.meta.set(a, configuration.send(a))
         end
         #conv.meta.set(:bibdata, bibdata_hash(xmldoc))
-        conv
+        @isodoc = conv
+        @isodoc
       end
 
       def bibdata_hash(xmldoc)
@@ -182,6 +184,11 @@ module Metanorma
         f.is_a? Hash and f[@lang] and return baselocation(f[@lang])
         super
       end
+
+      def published?(status, _xmldoc)
+        stages = configuration&.published_stages || ["published"]
+        (Array(stages).map(&:downcase).include? status.downcase)
+      end
     end
   end
 end

data/lib/metanorma/generic/front.rb

@@ -21,18 +21,8 @@ module Metanorma
         Array(configuration.relations) || []
       end
 
-      def metadata_committee(node, xml)
-        node.attr("committee") or return
-        xml.editorialgroup do |a|
-          a.committee node.attr("committee"),
-                      **attr_code(type: node.attr("committee-type"))
-          i = 2
-          while node.attr("committee_#{i}")
-            a.committee node.attr("committee_#{i}"),
-                        **attr_code(type: node.attr("committee-type_#{i}"))
-            i += 1
-          end
-        end
+      def metadata_committee_types(_node)
+        Array(configuration.committee_types || "committee")
       end
 
       def metadata_status(node, xml)

data/lib/metanorma/generic/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.1.0 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -123,6 +123,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlBody">
       <optional>
@@ -140,6 +144,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlAttributes">
       <a:documentation>NOTE: `start` attribute is not included by default, because of problems it raises with DOC output</a:documentation>
@@ -188,6 +196,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="dt">
       <element name="dt">
@@ -443,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -592,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -841,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">
@@ -871,6 +890,12 @@ titlecase, or lowercase</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="ParagraphFnBody" combine="interleave">
+    <ref name="BlockSource">
+      <a:documentation>Bibliographic source for the information in the paragraph
+parargaph sources are currently only rendered in metanorma-plateau</a:documentation>
+    </ref>
+  </define>
   <define name="BasicBlock" combine="choice">
     <ref name="columnbreak"/>
   </define>
@@ -2233,6 +2258,11 @@ used in document amendments</a:documentation>
       <ref name="RequiredId"/>
       <ref name="NumberingAttributes"/>
       <ref name="BlockAttributes"/>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Semantic classification of note</a:documentation>
+        </attribute>
+      </optional>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>

data/lib/metanorma/generic/processor.rb

@@ -51,7 +51,11 @@ module Metanorma
         when :presentation
           IsoDoc::Generic::PresentationXMLConvert.new(options)
             .convert(inname, isodoc_node, nil, outname)
-        else super end
+        when :pdf
+          IsoDoc::Generic::PdfConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
+        else super
+        end
       end
     end
   end

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.1.2".freeze
+    VERSION = "3.1.4".freeze
   end
 end

data/lib/metanorma/generic.rb

@@ -21,6 +21,7 @@ module Metanorma
         bibliography_titles
         boilerplate
         committees
+        committee_types
         document_namespace
         docid_template
         doctypes

data/metanorma.yml.example

@@ -42,6 +42,9 @@ metadata_extensions:
   - security
 published_stages:
   - published
+committee_types:
+  - Committee
+  - Workgroup
 committees:
   - TC 1
 relations:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc