metanorma-iho 1.2.6 → 1.2.8

data/lib/isodoc/iho/init.rb

@@ -17,8 +17,8 @@ module IsoDoc
       def i18n_init(lang, script, locale, i18nyaml = nil)
         @i18n = I18n.new(
           lang, script, locale: locale,
-                        i18nyaml: i18nyaml ||
-          Metanorma::Iho.configuration.i18nyaml || @i18nyaml
+                        i18nyaml: [i18nyaml,
+          Metanorma::Iho.configuration.i18nyaml, @i18nyaml]
         )
       end
 

data/lib/metanorma/iho/biblio.rng

@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibItemType" combine="choice">
+  <define name="BibItemType">
     <a:documentation>Type of bibliographic item.
 The value list complies with the types provided in ISO 690:2021.
 NOTE: These values represent a strict superset to BibTeX

data/lib/metanorma/iho/converter.rb

@@ -37,3 +37,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "log"

data/lib/metanorma/iho/front.rb

@@ -19,8 +19,7 @@ module Metanorma
 
       def metadata_ext(node, ext)
         unless node.attr("workgroup")
-          @log.add("AsciiDoc Input", nil,
-                   "Missing workgroup attribute for document")
+          @log.add("IHO_1", nil)
         end
         super
         metadata_commentperiod(node, ext)
@@ -46,7 +45,7 @@ module Metanorma
       end
 
       def title_main(node, xml)
-        title = node.attr("title") || node.attr("doctitle")
+        title = node.attr("title") or return
         add_title_xml(xml, title, "en", "title-main")
       end
 
@@ -57,6 +56,7 @@ module Metanorma
         %i(appendix annex part supplement).each do |w|
           typed_title(m, xml, w)
         end
+        title_fallback(node, xml)
       end
 
       def typed_title(metadata, xml, type)

data/lib/metanorma/iho/isodoc.rng

@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video"/>
         <ref name="audio"/>
-        <ref name="pre"/>
+        <ref name="pre">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
+          <ref name="paragraph-with-footnote">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure"/>
+          <ref name="figure">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image-no-id"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image-no-id">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video-no-id"/>
         <ref name="audio-no-id"/>
-        <ref name="pre-no-id"/>
+        <ref name="pre-no-id">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote-no-id"/>
+          <ref name="paragraph-with-footnote-no-id">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure-no-id"/>
+          <ref name="figure-no-id">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table-no-id">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
+      <ref name="LocalizedStringAttributes">
+        <a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
+      </ref>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>

data/lib/metanorma/iho/log.rb

@@ -0,0 +1,17 @@
+module Metanorma
+  module Iho
+    class Converter
+      IHO_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "IHO_1": { category: "AsciiDoc Input",
+                   error: "Missing workgroup attribute for document",
+                   severity: 2 },
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(IHO_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iho
-    VERSION = "1.2.6".freeze
+    VERSION = "1.2.8".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -1,5 +1,5 @@
 template:
-  standard: "{{ authoritative_identifier | first }} edition_{{ edition }} : {{ title }}, {{ creatornames }}, {{role}}, {{ publisher }} ({{ uri }}) ." 
+  standard: "{{ authoritative_identifier | first }} {{ edition | downcase }} : {{ title }}$$$ {{ creatornames }}$$$ {{role}}$$$ {{ publisher }} ({{ uri }})" 
   misc: standard
 nametemplate:
   one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} {{initials[0]}}{% endif %}"

data/metanorma-iho.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-generic", "~> 3.1.0"
+  spec.add_dependency "metanorma-generic", "~> 3.2.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -40,5 +40,5 @@ 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 "canon"
+  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +182,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 description: |
   metanorma-iho lets you write IHO in AsciiDoc syntax.
 
@@ -247,6 +247,7 @@ files:
 - lib/metanorma/iho/front.rb
 - lib/metanorma/iho/iho.rng
 - lib/metanorma/iho/isodoc.rng
+- lib/metanorma/iho/log.rb
 - lib/metanorma/iho/processor.rb
 - lib/metanorma/iho/relaton-iho.rng
 - lib/metanorma/iho/reqt.rng