metanorma-generic 3.2.3 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c11f49226ea10d4136e27236caf28a459cbdb5bcbbf6657a64b68d742158fe9
-  data.tar.gz: 1ae50495c623e5ab73df0d2042f755dcf239594aea965fe7dbacad190804f787
+  metadata.gz: 8a998eb0defb881cf65235d4d55088a1f7d2373737cc43d8091454627a618ac8
+  data.tar.gz: 509375f79c9604449940ef4fab8b34674ec351f21884c87c4af72fec618ca0a7
 SHA512:
-  metadata.gz: fcf1aa613e434f4eab913908d97b9c077b930514946e86bccd2ecfb78419ee28e7695aaca6cdc32b33321aa453fd11ea7894e7ed6207da9c67b7fcd3588395f0
-  data.tar.gz: f2631b3642211fb2857565afb2f20e781e8d9228e148051303cc86c2cf7377659af8eecb1769c998021f1aa6124dc31f44a085c2b56c367cecb6bb9add39f7e1
+  metadata.gz: bccb46569ab529b5aedd490a01ff1a4e0d704b882eafbe8d51704293e43cf63d40343ddeae7b0b5f969a323c8845b2790c88e8f34a5ed0d365dcf745b93f0957
+  data.tar.gz: 5e953c83402667d279f55170ad5a1131471c3027e43c1b688e10759a8429320f7e5421b14c446344b42e09731a75dda7e839d5ea0aee60567abac9b929a4ee9a

data/lib/isodoc/generic/html/htmlstyle.scss

@@ -78,11 +78,11 @@ nav {
   }
 }
 
-div.figure {
+figure {
   @include figureBlock();
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -328,11 +328,15 @@ p.Biblio, p.NormRef, div.Biblio, div.NormRef {
     margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3em;
+}
+
 /*
     3.6 Source Code + figures
 */
 
-.figure, pre, .pseudocode {
+figure, pre, .pseudocode {
   @include pseudocodeBlock(#f7f7f7);
 }
 
@@ -344,7 +348,7 @@ pre {
 @include recommendationBlock();
 @include listBlock();
 
-.FigureTitle, .SourceTitle {
+figcaption, .SourceTitle {
   @include blockTitle()
 }
 
@@ -399,7 +403,7 @@ table {
   @include table(1px solid black);
 }
 
-p.TableTitle {
+table > caption {
   text-align: center;
   margin-top: 2.5em;
   font-weight: 400;
@@ -658,7 +662,7 @@ To top button
     margin-top: 1.2em;
   }
 
-  .note, .figure, pre, .pseudocode, table {
+  .note, figure, pre, .pseudocode, table {
     page-break-inside: avoid;
   }
 

data/lib/isodoc/generic/pdf_convert.rb

@@ -1,5 +1,4 @@
 require_relative "base_convert"
-require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc

data/lib/metanorma/generic/basicdoc.rng

@@ -208,11 +208,15 @@ Applicable to modify and delete</a:documentation>
     </zeroOrMore>
     <optional>
       <element name="newcontent">
-        <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
+        <a:documentation>New content to be added to the document; applicable to add and modify.
+Can be blocks and/or sections</a:documentation>
         <ref name="OptionalId"/>
         <zeroOrMore>
           <ref name="BasicBlock"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="section"/>
+        </zeroOrMore>
       </element>
     </optional>
     <zeroOrMore>

data/lib/metanorma/generic/biblio.rng

@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/generic/cleanup.rb

@@ -0,0 +1,47 @@
+module Metanorma
+  module Generic
+    class Cleanup < Standoc::Cleanup
+      extend Forwardable
+
+      def sections_cleanup(xml)
+        super
+        xml.xpath("//*[@inline-header]").each do |h|
+          h.delete("inline-header")
+        end
+      end
+
+      def boilerplate_isodoc(xmldoc)
+        conv = super or return nil
+        Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
+          conv.meta.set(a, configuration.send(a))
+        end
+        # conv.meta.set(:bibdata, bibdata_hash(xmldoc))
+        @isodoc = conv
+        @isodoc
+      end
+
+      def bibdata_hash(xmldoc)
+        b = xmldoc.at("//bibdata") || xmldoc.at("//xmlns:bibdata")
+        BibdataConfig.from_xml("<metanorma>#{b.to_xml}</metanorma>")
+          .bibdata.to_hash
+      end
+
+      def boilerplate_file(xmldoc)
+        f = configuration.boilerplate
+        f.nil? and return super
+        f.is_a? String and return @conv.baselocation(f)
+        f.is_a? Hash and f[@lang] and return @conv.baselocation(f[@lang])
+        super
+      end
+
+      def published?(status, _xmldoc)
+        stages = configuration&.published_stages || ["published"]
+        (Array(stages).map(&:downcase).include? status.downcase)
+      end
+
+      def configuration
+        @conv.configuration
+      end
+    end
+  end
+end

data/lib/metanorma/generic/converter.rb

@@ -1,5 +1,5 @@
 require "asciidoctor"
-require "metanorma/standoc/converter"
+require "metanorma-standoc"
 require "fileutils"
 require_relative "front"
 require_relative "bibdata_config"
@@ -75,50 +75,6 @@ module Metanorma
                                      nil, false, "#{@filename}.pdf")
       end
 
-      def schema_location
-        baselocation(configuration.validate_rng_file) ||
-          File.join(File.dirname(__FILE__), "generic.rng")
-      end
-
-      def schema_file
-        configuration.validate_rng_file || "generic.rng"
-      end
-
-      def content_validate(doc)
-        super
-        bibdata_validate(doc.root)
-      end
-
-      def bibdata_validate(doc)
-        stage_validate(doc)
-        committee_validate(doc)
-      end
-
-      def stage_validate(xmldoc)
-        stages = configuration.stage_abbreviations&.keys || return
-        stages.empty? and return
-        stage = xmldoc.at("//bibdata/status/stage")&.text
-        stages.include? stage or
-          @log.add("GENERIC_2", nil, params: [stage])
-      end
-
-      def committee_validate(xmldoc)
-        committees = Array(configuration&.committees) || return
-        committees.empty? and return
-        xmldoc.xpath("//bibdata/contributor[role/description = 'committee']/" \
-            "organization/subdivision/name").each do |c|
-          committees.include? c.text or
-            @log.add("GENERIC_3", nil, params: [c.text])
-        end
-      end
-
-      def sections_cleanup(xml)
-        super
-        xml.xpath("//*[@inline-header]").each do |h|
-          h.delete("inline-header")
-        end
-      end
-
       def blank_method(*args); end
 
       def html_converter(node)
@@ -129,7 +85,7 @@ module Metanorma
         IsoDoc::Generic::PresentationXMLConvert
           .new(html_extract_attributes(node)
           .merge(output_formats: ::Metanorma::Generic::Processor.new
-          .output_formats))
+            .output_formats))
       end
 
       alias_method :pdf_converter, :html_converter
@@ -143,35 +99,6 @@ module Metanorma
       def configuration
         Metanorma::Generic.configuration
       end
-
-      def boilerplate_isodoc(xmldoc)
-        conv = super or return nil
-        Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
-          conv.meta.set(a, configuration.send(a))
-        end
-        # conv.meta.set(:bibdata, bibdata_hash(xmldoc))
-        @isodoc = conv
-        @isodoc
-      end
-
-      def bibdata_hash(xmldoc)
-        b = xmldoc.at("//bibdata") || xmldoc.at("//xmlns:bibdata")
-        BibdataConfig.from_xml("<metanorma>#{b.to_xml}</metanorma>")
-          .bibdata.to_hash
-      end
-
-      def boilerplate_file(xmldoc)
-        f = configuration.boilerplate
-        f.nil? and return super
-        f.is_a? String and return baselocation(f)
-        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/isodoc.rng

@@ -641,8 +641,85 @@ This is done if the footnote reference is already presented in some other form,
         </ref>
       </zeroOrMore>
     </define>
+    <define name="altsource">
+      <a:documentation>Alternative file to use as media</a:documentation>
+      <element name="altsource">
+        <ref name="MediaAttributes"/>
+        <optional>
+          <attribute name="tag">
+            <a:documentation>Comma-delimited tag to indicate when the alternate file is to be used, 
+at minimum allows contain `html`, `doc`, `pdf` as the main target formats of Metanorma,
+and `default` for the fallback. The presence of an altsource tagged `default` is required</a:documentation>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="media">
+            <a:documentation>CSS media query to indicate when the alternate file is to be used</a:documentation>
+          </attribute>
+        </optional>
+      </element>
+    </define>
+    <define name="image">
+      <a:documentation>Container for image content</a:documentation>
+      <choice>
+        <element name="image">
+          <ref name="RequiredId"/>
+          <ref name="ImageAttributes">
+            <a:documentation>When specified along with altsource, ImageAttributes give the default image to be rendered</a:documentation>
+          </ref>
+          <ref name="ImageBody"/>
+        </element>
+        <element name="svg">
+          <a:documentation>Add svg mark up to image</a:documentation>
+          <oneOrMore>
+            <choice>
+              <text/>
+              <ref name="AnyElement"/>
+            </choice>
+          </oneOrMore>
+        </element>
+      </choice>
+    </define>
+    <define name="ImageAttributes">
+      <optional>
+        <ref name="MediaAttributes">
+          <a:documentation>If the image contains altsource, the media attributes are given on each of the altsource elements instead of the root node</a:documentation>
+        </ref>
+      </optional>
+      <ref name="MediaAccessibilityAttributes"/>
+      <optional>
+        <attribute name="width">
+          <a:documentation>Height of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="height">
+          <a:documentation>Width of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="ImageBody">
+    <optional>
+      <element name="svg">
+        <a:documentation>image can contain SVG XML, which is used to access its identifiers within the Metanorma XML</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="altsource">
+        <a:documentation>Alternative files to use as media</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="key">
     <a:documentation>Key to a table, figure, or formula</a:documentation>
     <element name="key">
@@ -930,34 +1007,6 @@ titlecase, or lowercase</a:documentation>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
-  <define name="image" combine="choice">
-    <choice>
-      <element name="image">
-        <ref name="RequiredId"/>
-        <ref name="ImageAttributes"/>
-        <optional>
-          <element name="svg">
-            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
-            <oneOrMore>
-              <choice>
-                <text/>
-                <ref name="AnyElement"/>
-              </choice>
-            </oneOrMore>
-          </element>
-        </optional>
-      </element>
-      <element name="svg">
-        <a:documentation>Add svg mark up to image</a:documentation>
-        <oneOrMore>
-          <choice>
-            <text/>
-            <ref name="AnyElement"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </choice>
-  </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">
       <a:documentation>Bibliographic source for the information in the paragraph

data/lib/metanorma/generic/validate.rb

@@ -0,0 +1,46 @@
+module Metanorma
+  module Generic
+    class Validate < Standoc::Validate
+      def schema_location
+        @conv.baselocation(configuration.validate_rng_file) ||
+          File.join(File.dirname(__FILE__), "generic.rng")
+      end
+
+      def schema_file
+        configuration.validate_rng_file || "generic.rng"
+      end
+
+      def content_validate(doc)
+        super
+        bibdata_validate(doc.root)
+      end
+
+      def bibdata_validate(doc)
+        stage_validate(doc)
+        committee_validate(doc)
+      end
+
+      def stage_validate(xmldoc)
+        stages = configuration.stage_abbreviations&.keys || return
+        stages.empty? and return
+        stage = xmldoc.at("//bibdata/status/stage")&.text
+        stages.include? stage or
+          @log.add("GENERIC_2", nil, params: [stage])
+      end
+
+      def committee_validate(xmldoc)
+        committees = Array(configuration&.committees) || return
+        committees.empty? and return
+        xmldoc.xpath("//bibdata/contributor[role/description = 'committee']/" \
+            "organization/subdivision/name").each do |c|
+          committees.include? c.text or
+            @log.add("GENERIC_3", nil, params: [c.text])
+        end
+      end
+
+      def configuration
+        @conv.configuration
+      end
+    end
+  end
+end

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.2.3".freeze
+    VERSION = "3.3.1".freeze
   end
 end

data/lib/metanorma-generic.rb

@@ -1,6 +1,8 @@
 require "metanorma/generic"
 require "asciidoctor"
 require "metanorma/generic/converter"
+require "metanorma/generic/validate"
+require "metanorma/generic/cleanup"
 require "isodoc/generic"
 require "metanorma"
 

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", "~> 3.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.3.1"
 
   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: 3.2.3
+  version: 3.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-16 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -210,9 +210,6 @@ files:
 - LICENSE
 - README.adoc
 - lib/asciidoctor/generic.rb
-- lib/asciidoctor/generic/converter.rb
-- lib/asciidoctor/generic/deprecated.rb
-- lib/asciidoctor/generic/front.rb
 - lib/isodoc/generic.rb
 - lib/isodoc/generic/base_convert.rb
 - lib/isodoc/generic/html/generic.scss
@@ -240,6 +237,7 @@ files:
 - lib/metanorma/generic/bibdata_config.rb
 - lib/metanorma/generic/biblio-standoc.rng
 - lib/metanorma/generic/biblio.rng
+- lib/metanorma/generic/cleanup.rb
 - lib/metanorma/generic/converter.rb
 - lib/metanorma/generic/fonts_manifest.yaml
 - lib/metanorma/generic/front.rb
@@ -249,6 +247,7 @@ files:
 - lib/metanorma/generic/processor.rb
 - lib/metanorma/generic/reqt.rng
 - lib/metanorma/generic/rsd.rng
+- lib/metanorma/generic/validate.rb
 - lib/metanorma/generic/version.rb
 - metanorma-generic.gemspec
 - metanorma.yml.example

data/lib/asciidoctor/generic/converter.rb

@@ -1,3 +0,0 @@
-require "asciidoctor/generic/deprecated"
-require "metanorma/generic/converter"
-

data/lib/asciidoctor/generic/deprecated.rb

@@ -1,7 +0,0 @@
-warn <<~WARN
-  Please replace your references to Asciidoctor::Generic with Metanorma::Generic and your instances of require 'asciidoctor/generic' with require 'metanorma/generic'
-WARN
-
-exit 127 if ENV["METANORMA_DEPRECATION_FAIL"]
-
-Asciidoctor::Generic = Metanorma::Generic unless defined? Asciidoctor::Generic

data/lib/asciidoctor/generic/front.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/generic/deprecated"
-require "metanorma/generic/front"