metanorma-generic 3.5.0 → 3.5.1.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e662cc5234929d4f4c58d97a6f126e9ca754fd7e42927c9a304ffa6b0aa54014
-  data.tar.gz: 4e9ee665b31028cdaf17bd0aeb0b0055862dca7e4067571d85d101fd3f6d9135
+  metadata.gz: fe8a07846a2115c9a96007c6eb8ca34f195310aeecc9ddcc69e24874569a7f33
+  data.tar.gz: 31dbdfc104e68db5bef5e91177ce910b3f32124a4dc6dc87ab98d6a80863922d
 SHA512:
-  metadata.gz: 77285ec273ba755507e6fe898cb109944642077733bc255ab2012ebd94a5b8ac752eff89d08c346e48b565af28d6006663f2fdaaf704a1a50bf6c4289dc8ef55
-  data.tar.gz: 0ac4ddcc9138d4bd72100238cb087ac6aca9b0363e822a1e63bad5098ebf4e61a3a5cfdc3c7c9feb907b2c67f0da3cca4acd64cfcef2f86822b4212039b3d14f
+  metadata.gz: f2ed5a33f21b696fc20d1ff380d474583fac15547af80c5b46590f8007357a50905720ea5766a7f3e6a07195b71699caa869880ca43a275ecc265c61d44b5c05
+  data.tar.gz: cfd3824d7aa22372e05c39fb97aedca32f1b8419b399c9c8df2be8019076755146f3551cdc7e866ef6853dd17ba5810b0226d4f565576811c7fc16cdbc07a6f0

data/Gemfile

@@ -7,3 +7,22 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 gemspec
 
 eval_gemfile("Gemfile.devel") rescue nil
+
+# standoc main: the Document model tree (released 3.5.0 predates it)
+gem "metanorma-standoc", github: "metanorma/metanorma-standoc", branch: "main"
+# the released plugin line dropped the preprocessor names standoc main registers
+gem "metanorma-plugin-lutaml", github: "metanorma/metanorma-plugin-lutaml", branch: "main"
+
+# metanorma-document main: SvgmapElement and the base component tree
+gem "metanorma-document", github: "metanorma/metanorma-document", branch: "main"
+
+# canonical line: relaton 3 prerelease monogem + git-main render/core
+# (released isodoc 3.7.3 lacks the moxml-aware BibdataConfig wrapper;
+# released relaton alpha.5 crashes the bibdata Liquid drop round-trip)
+gem "relaton", "= 3.0.0.pre.alpha.14"
+gem "relaton-render", "= 3.0.0.pre.alpha.43"
+gem "relaton-bib", "2.2.0.pre.alpha.1"
+gem "pubid", github: "pubid/pubid", branch: "main"
+gem "isodoc", github: "metanorma/isodoc", branch: "main"
+gem "isodoc-i18n", github: "metanorma/isodoc-i18n", branch: "main"
+gem "canon", "0.3.87"

data/lib/isodoc/generic/metadata.rb

@@ -51,8 +51,12 @@ module IsoDoc
 
       def author(isoxml, _out)
         super
-        tc = isoxml.at(ns("//bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/name"))
-        set(:tc, tc.text) if tc
+        tc = isoxml.at(ns("//bibdata/contributor[role/description = 'committee']/" \
+                          "organization/subdivision[@type = 'Committee']/name"))
+        tc or return
+        committee = configuration.committee(tc.text)
+        set(:tc, committee ? committee.display_name : tc.text)
+        committee and set(:tc_committee, committee)
       end
 
       def stage_abbr(status)

data/lib/metanorma/generic/committee.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Metanorma
+  module Generic
+    class Committee < Lutaml::Model::Serializable
+      attribute :code, :string
+      attribute :full_name, :string
+
+      def display_name
+        full_name || code
+      end
+    end
+  end
+end

data/lib/metanorma/generic/document/root.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Generic::Document
+    class Root < Lutaml::Model::Serializable
+      include Metanorma::Standoc::Document::RootAttributes
+
+      attribute :bibdata,
+                Metanorma::Standoc::Document::Metadata::StandardBibData
+      attribute :preface,
+                Metanorma::Standoc::Document::Sections::Preface
+      attribute :sections,
+                Metanorma::Standoc::Document::Sections::Sections,
+                collection: true
+      attribute :annex,
+                Metanorma::Standoc::Document::Sections::AnnexSection,
+                collection: true
+      attribute :misccontainer,
+                Metanorma::Standoc::Document::Sections::MiscContainer
+
+      xml do
+        element "metanorma"
+        namespace Metanorma::Standoc::Document::Namespace
+
+        Metanorma::Standoc::Document::RootXmlMapping.apply(self)
+
+        map_element "misc-container", to: :misccontainer
+      end
+    end
+  end
+end

data/lib/metanorma/generic/document.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "metanorma/document"
+require "metanorma/standoc/document"
+module Metanorma
+  module Generic
+  end
+end
+
+module Metanorma
+  module Generic::Document
+    autoload :Root, "metanorma/generic/document/root"
+  end
+end
+
+module Metanorma
+  existing = defined?(Metanorma::GenericDocument) && Metanorma::GenericDocument
+  if !existing.equal?(Metanorma::Generic::Document)
+    Metanorma.send(:remove_const, :GenericDocument) if existing
+    GenericDocument = Metanorma::Generic::Document
+  end
+end
+
+# OCP adoption: ONE registration in the metanorma-core flavor table
+require "metanorma-core"
+
+Metanorma::Core::Flavors.register(Metanorma::Core::Flavor.new(
+  name: :generic,
+  gem: "metanorma-generic",
+  model_root: Metanorma::Generic::Document::Root,
+  pubid_module: nil,
+  renderers: { html: lambda do |_document, **_options|
+    Metanorma::Html::StandardRenderer
+  end },
+))

data/lib/metanorma/generic/generic.rng

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0">
   <include href="biblio-standoc.rng"/>
-  <include href="isodoc.rng">
+  <include href="standoc.rng">
     <define name="standard-document">
       <element name="metanorma">
         <ref name="Root-Attributes"/>

data/lib/metanorma/generic/{isodoc.rng → standoc.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.2.0 -->
+<!-- VERSION v2.3.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -328,7 +328,7 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
       </optional>
     </define>
     <define name="ExampleBodyContent">
-      <a:documentation>Content alternatives of an example in the isodoc context: as basicdoc,
+      <a:documentation>Content alternatives of an example in the standoc context: as basicdoc,
 with figure admitted, and note admitted only trailing the example body
 rather than interleaved. The content hook is overridden rather than
 ExampleBody itself, so that the extension seam survives: additive

data/lib/metanorma/generic/validate.rb

@@ -38,16 +38,16 @@ module Metanorma
         @docstage_valid and return @docstage_valid
         keys = configuration.stage_abbreviations&.keys or return
         (keys.map(&:to_s) +
-          Array(configuration.published_stages).map(&:to_s) +
+          Array(configuration.published_stages || ["published"])
+            .map(&:to_s) +
           [configuration.default_stage]).compact.uniq
       end
 
       def committee_validate(xmldoc)
-        committees = Array(configuration&.committees) || return
-        committees.empty? and return
+        Array(configuration&.committees).empty? and return
         xmldoc.xpath("//bibdata/contributor[role/description = 'committee']/" \
             "organization/subdivision/name").each do |c|
-          committees.include? c.text or
+          configuration.committee(c.text) or
             @log.add("GENERIC_3", nil, params: [c.text])
         end
       end

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.5.0".freeze
+    VERSION = "3.5.1.pre.alpha.1".freeze
   end
 end

data/lib/metanorma/generic.rb

@@ -1,3 +1,4 @@
+require "metanorma/generic/committee"
 require "metanorma/generic/processor"
 require "metanorma/generic/version"
 require "forwardable"
@@ -79,6 +80,28 @@ module Metanorma
 
       attr_accessor(*CONFIG_ATTRS)
 
+      # Assigning normalizes plain hashes (e.g. from metanorma.yml) into
+      # Committee models; Committee instances pass through unchanged.
+      def committees=(committees)
+        @committees = Array(committees).map do |committee|
+          case committee
+          when Committee then committee
+          when ::Hash then Committee.from_hash(committee)
+          # flavor metanorma.yml files carry committees as plain strings
+          # (e.g. bipm's); from_hash rejects non-hashes under
+          # lutaml-model 0.8.102's type checking.
+          else Committee.new(code: committee.to_s, full_name: committee.to_s)
+          end
+        end
+      end
+
+      def committee(code)
+        code or return nil
+        Array(committees).find do |committee|
+          committee.code == code.to_s.downcase
+        end
+      end
+
       class << self
         attr_accessor :_file
       end
@@ -100,6 +123,11 @@ module Metanorma
         default_org
         default_formats
         default_titles
+        parse_committees
+      end
+
+      def parse_committees
+        @committees and self.committees = @committees
       end
 
       def default_org
@@ -209,5 +237,6 @@ module Metanorma
     end
 
     configure {}
+    autoload :Document, "metanorma/generic/document"
   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.3.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 3.5.0"
+  spec.add_dependency "metanorma-standoc", ">= 3.5"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/metanorma.yml.example

@@ -46,7 +46,8 @@ committee_types:
   - Committee
   - Workgroup
 committees:
-  - TC 1
+  - code: tc1
+    full_name: Technical Committee 1
 relations:
   - part-of
   - translated-from

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -249,11 +250,13 @@ files:
 - lib/metanorma/generic/biblio-standoc.rng
 - lib/metanorma/generic/biblio.rng
 - lib/metanorma/generic/cleanup.rb
+- lib/metanorma/generic/committee.rb
 - lib/metanorma/generic/converter.rb
+- lib/metanorma/generic/document.rb
+- lib/metanorma/generic/document/root.rb
 - lib/metanorma/generic/fonts_manifest.yaml
 - lib/metanorma/generic/front.rb
 - lib/metanorma/generic/generic.rng
-- lib/metanorma/generic/isodoc.rng
 - lib/metanorma/generic/log.rb
 - lib/metanorma/generic/mathml4-content.rng
 - lib/metanorma/generic/mathml4-core.rng
@@ -264,6 +267,7 @@ files:
 - lib/metanorma/generic/processor.rb
 - lib/metanorma/generic/reqt.rng
 - lib/metanorma/generic/rsd.rng
+- lib/metanorma/generic/standoc.rng
 - lib/metanorma/generic/validate.rb
 - lib/metanorma/generic/version.rb
 - metanorma-generic.gemspec
@@ -272,6 +276,7 @@ homepage: https://github.com/metanorma/metanorma-generic
 licenses:
 - BSD-2-Clause
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -286,7 +291,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Metanorma template gem for customisation.
 test_files: []