metanorma-iso 3.2.2 → 3.2.3

data/lib/isodoc/iso/presentation_origin.rb

@@ -19,7 +19,7 @@ module IsoDoc
         id = elem["bibitemid"] or return
         b = @bibitem_lookup[id] or return
         b["type"] != "standard" ||
-          !b.at(ns("./docidentifier[not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"))
+          !b.at(ns("./docidentifier[not(@type = 'metanorma' or @type = 'metanorma-ordinal' or @type='author-date')]"))
       end
 
       # style [1] references as [Reference 1], eref or origin

data/lib/isodoc/iso/presentation_xref.rb

@@ -147,6 +147,11 @@ module IsoDoc
         locality_span_wrap(super, @xrefs.anchor(node["target"], :subtype) ||
                            @xrefs.anchor(node["target"], :type))
       end
+
+      def anchor_xref(node, target, container: false)
+        #require "debug"; binding.b
+        super
+      end
     end
   end
 end

data/lib/isodoc/iso/xref_section.rb

@@ -30,28 +30,40 @@ module IsoDoc
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
-        i = clause_counter(0)
-        clause.xpath(ns("./clause")).each do |c|
+        clause.xpath(ns("./clause"))
+          .each_with_object(clause_counter(0)) do |c, i|
           section_names1(c, semx(clause, "0"), i.increment(c).print, 2)
         end
       end
 
-      # subclauses are not prefixed with "Clause"
-      # retaining subtype for the semantics
       def section_name_anchors(clause, num, level)
         if clause["type"] == "section"
-          xref = labelled_autonum(@labels["section"], num)
-          label = labelled_autonum(@labels["section"], num)
-          @anchors[clause["id"]] =
-            { label:, xref:, elem: @labels["section"],
-              title: clause_title(clause), level: level, type: "clause" }
+          section_name_anchors_section(clause, num, level)
         elsif level > 1
-          @anchors[clause["id"]] =
-            { label: num, level: level, xref: num, subtype: "clause" }
-        else super
+          section_name_anchors_subclause(clause, num, level)
+        else
+          super
         end
       end
 
+      def section_name_anchors_section(clause, num, level)
+        xref = labelled_autonum(@labels["section"], num)
+        label = labelled_autonum(@labels["section"], num)
+        @anchors[clause["id"]] =
+          { label:, xref:, elem: @labels["section"],
+            title: clause_title(clause), level: level, type: "clause" }
+      end
+
+      # subclauses are not prefixed with "Clause" but @labels["subclause"],
+      # which in ISO is "" (but in inheriting flavors/tastes may be "Subclause")
+      # Retaining subtype for the semantics
+      def section_name_anchors_subclause(clause, num, level)
+        xref = labelled_autonum(@labels["subclause"], num)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref:, subtype: "clause",
+            title: subclause_title(clause), elem: @labels["subclause"] }
+      end
+
       def annex_name_anchors1(clause, num, level)
         level == 1 and return annex_name_anchors(clause, num, level)
         ret = { label: num, level: level, subtype: "annex" }
@@ -63,6 +75,15 @@ module IsoDoc
                end
         @anchors[clause["id"]] = ret.merge(ret2)
       end
+
+      def subclause_title(clause, use_elem_name: false)
+        ret = clause.at(ns("./title"))&.text
+        if use_elem_name && ret.blank?
+          @i18n.labels["subclause"]&.capitalize
+        else
+          clause_title(clause, use_elem_name: use_elem_name)
+        end
+      end
     end
   end
 end

data/lib/metanorma/iso/biblio.rng

@@ -466,11 +466,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -502,6 +502,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -513,6 +518,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -1236,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>

data/lib/metanorma/iso/front.rb

@@ -34,7 +34,8 @@ module Metanorma
         id = iso_id_default(iso_id_params(node))
         id.stage or return
         if abbr = id.typed_stage_abbrev
-          abbr = abbr.to_s.upcase.strip
+          # remove IS: work around breakages in pubid-iso
+          abbr = abbr.to_s.upcase.strip.sub(/^IS /, "")
         end
         xml.stagename metadata_stagename(id)&.strip,
                       **attr_code(abbreviation: abbr)

data/lib/metanorma/iso/front_id.rb

@@ -125,6 +125,7 @@ module Metanorma
         if stage && !cen?(node.attr("publisher"))
           ret[:stage] = stage
           ret[:stage] == "60.00" and ret[:stage] = :PRF
+          #ret[:stage] == "60.60" and ret[:stage] = nil
         end
         ret
       end
@@ -160,6 +161,7 @@ module Metanorma
         @amd and return
         iso_id_out_non_amd(xml, params, with_prf)
       rescue StandardError, *STAGE_ERROR => e
+        @log.add("ISO_52", "Document identifier: #{e}")
         clean_abort("Document identifier: #{e}", xml)
       end
 
@@ -170,10 +172,11 @@ module Metanorma
       end
 
       def iso_id_out_common(xml, params, with_prf)
+        params1 = skip_60_60(params)
         add_noko_elem(xml, "docidentifier",
-                      iso_id_default(params).to_s(with_prf:),
+                      iso_id_default(params1).to_s(with_prf:),
                       **attr_code(type: "ISO", primary: "true"))
-        add_noko_elem(xml, "docidentifier", iso_id_reference(params)
+        add_noko_elem(xml, "docidentifier", iso_id_reference(params1)
                       .to_s(format: :ref_num_short, with_prf:),
                       **attr_code(type: "iso-reference"))
         add_noko_elem(xml, "docidentifier", iso_id_reference(params).urn,
@@ -181,14 +184,23 @@ module Metanorma
       end
 
       def iso_id_out_non_amd(xml, params, with_prf)
+        params1 = skip_60_60(params)
         add_noko_elem(xml, "docidentifier",
-                      iso_id_undated(params).to_s(with_prf:),
+                      iso_id_undated(params1).to_s(with_prf:),
                       **attr_code(type: "iso-undated"))
         add_noko_elem(xml, "docidentifier",
-                      iso_id_with_lang(params).to_s(format: :ref_num_long, with_prf:),
+                      iso_id_with_lang(params1).to_s(format: :ref_num_long, with_prf:),
                       **attr_code(type: "iso-with-lang"))
       end
 
+      # work around breakages in pubid-iso
+      def skip_60_60(params)
+        ret = params.dup
+        ret[:stage] == "60.60" and ret[:stage] = nil
+        warn ret
+        ret
+      end
+
       def iso_id_default(params)
         params_nolang = params.dup.tap { |hs| hs.delete(:language) }
         params1 = params_nolang

data/lib/metanorma/iso/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.4 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437

data/lib/metanorma/iso/log.rb

@@ -137,6 +137,9 @@ module Metanorma
         "ISO_51": { category: "Style",
                     error: "non-terms clauses cannot cross-reference terms clause (%s)",
                     severity: 2 },
+        "ISO_52": { category: "Style",
+                    error: "non-terms clauses cannot cross-reference terms clause (%s)",
+                    severity: 0 },
       }.freeze
       # rubocop:enable Naming/VariableNumber
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.2.2".freeze
+    VERSION = "3.2.3".freeze
   end
 end

data/lib/relaton/render/selective_capitalize.rb

@@ -0,0 +1,43 @@
+module Relaton
+  module Render
+    module Template
+      module SelectiveCapitalize
+        def selective_capitalize(input, exceptions)
+          return nil if input.nil?
+          
+          # Convert exceptions to an array if it's not already
+          exceptions_array = exceptions.is_a?(Array) ? exceptions : [exceptions]
+          
+          # Split the input into words
+          words = input.split(/\s+/)
+          
+          # Capitalize each word unless it's in the exceptions list
+          words.map do |word|
+            if exceptions_array.include?(word.downcase)
+              word
+            else
+              word.capitalize
+            end
+          end.join(' ')
+        end
+      end
+    end
+  end
+end
+
+# Extend the customise_liquid method to register our filter
+module Relaton
+  module Render
+    module Template
+      class General
+        alias_method :original_customise_liquid, :customise_liquid
+        
+        def customise_liquid
+          original_customise_liquid
+          # Register our filter
+          ::Liquid::Template.register_filter(::Relaton::Render::Template::SelectiveCapitalize)
+        end
+      end
+    end
+  end
+end

data/metanorma-iso.gemspec

@@ -35,8 +35,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-standoc", "~> 3.2.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
+  #spec.add_dependency "pubid-cen"
+  #spec.add_dependency "pubid-iec"
+  #spec.add_dependency "pubid-iso", "~> 0.7.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
 
+  spec.add_development_dependency "canon", "= 0.1.3"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
@@ -46,10 +50,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"
-spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-17 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: canon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +276,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: canon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 description: |
   metanorma-iso lets you write ISO standards in AsciiDoc syntax.
 
@@ -405,6 +405,7 @@ files:
 - lib/relaton/render/config.yml
 - lib/relaton/render/general.rb
 - lib/relaton/render/parse.rb
+- lib/relaton/render/selective_capitalize.rb
 - metanorma-iso.gemspec
 homepage: https://github.com/metanorma/metanorma-iso
 licenses: