metanorma-plateau 1.1.6 → 1.2.0

data/lib/isodoc/plateau/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "init"
+require_relative "../../relaton/render-plateau/general"
 
 module IsoDoc
   module Plateau
@@ -98,6 +99,36 @@ module IsoDoc
         end
       end
 
+      def anchor_linkend(node, linkend)
+        title_fallback_docid?(node) and
+          node["style"] ||= "title"
+        super
+      end
+
+      # if we are falling back to a title identifier for citation,
+      # cite title-style, which gives us title marks
+      def title_fallback_docid?(elem)
+        sem_xml_descendant?(elem) and return
+        id = elem["bibitemid"] or return
+        b = @bibitem_lookup[id] or return
+        x = <<~XPATH
+          ./docidentifier[not(#{SKIP_DOCID} or @scope = 'biblio-tag' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type='title')]
+        XPATH
+        !b.at(ns(x)) && b.at(ns("./docidentifier[@type='title']"))
+      end
+
+      def termsource_join_delim(_elem)
+        @lang == "ja" ? "／" : "/"
+      end
+
+      def source_join_delim(_elem)
+        @lang == "ja" ? "／" : "/"
+      end
+
+      def termsource_mod_text_delim(_elem)
+        @lang == "ja" ? "、" : ", "
+      end
+
       include Init
     end
   end

data/lib/metanorma/plateau/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/plateau/converter.rb

@@ -39,8 +39,7 @@ module Metanorma
 
       def doctype_validate(_xmldoc)
         %w(handbook technical-report annex).include? @doctype or
-          @log.add("Document Attributes", nil,
-                   "#{@doctype} is not a recognised document type")
+          @log.add("PLATEAU_1", nil, params: [@doctype])
       end
 
       def metadata_id(node, xml)
@@ -100,3 +99,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "log"

data/lib/metanorma/plateau/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/plateau/log.rb

@@ -0,0 +1,17 @@
+module Metanorma
+  module Plateau
+    class Converter
+      PLATEAU_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "PLATEAU_1": { category: "Document Attributes",
+                       error: "%s is not a recognised document type",
+                       severity: 2 },
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(PLATEAU_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/plateau/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "1.1.6".freeze
+    VERSION = "1.2.0".freeze
   end
 end

data/lib/relaton/render-plateau/citations.rb

@@ -0,0 +1,9 @@
+module Relaton
+  module Render
+    class Citations
+      def renderer(cite)
+        @renderer[cite.dig(:data, :language)&.to_sym || @lang.to_sym]
+      end
+    end
+  end
+end

data/lib/relaton/render-plateau/config-en.yml

@@ -0,0 +1,2 @@
+
+

data/lib/relaton/render-plateau/config-ja.yml

@@ -0,0 +1,2 @@
+
+

data/lib/relaton/render-plateau/general.rb

@@ -0,0 +1,91 @@
+require "relaton-render"
+require "metanorma-jis"
+require_relative "citations"
+require_relative "i18n"
+require "isodoc-i18n"
+require_relative "../../isodoc/plateau/i18n"
+
+module Relaton
+  module Render
+    module Plateau
+      class General < ::Relaton::Render::Jis::General
+        def initialize(opt = {})
+          i18n = opt[:i18n] ||
+            i18n_klass(language: opt[:language], script: opt[:script],
+                       locale: opt[:locale], i18nhash: opt[:i18nhash])
+          opt["i18n_multi"] = {
+            en: i18n_config("en", i18n),
+            ja: i18n_config("ja", i18n),
+          }
+          super
+        end
+
+        def klass_initialize(_options)
+          super
+          @i18nklass = Relaton::Render::Plateau::I18n
+        end
+
+        def deep_clone(obj)
+          Marshal.load(Marshal.dump(obj))
+        end
+
+        def citation_renderers
+          { en: bibrenderer_lang("en", deep_clone(@config)),
+            ja: bibrenderer_lang("ja", deep_clone(@config)) }
+        end
+
+        SWITCH_PUNCT_KEYS =
+          %w(open-title close-title open-secondary-title close-secondary-title
+             biblio-field-delimiter comma).freeze
+
+        # cit_i18n is citation lang i18n
+        # @i18n is document lang i18n
+        # return merger of the two
+        # KILL
+        def bibrenderer_lang_config(lang)
+          script = lang == "ja" ? "Jpan" : "Latn"
+          cit_i18n = ::IsoDoc::Plateau::I18n.new(lang, script).get
+          i18n = deep_clone(@i18n.get)
+          SWITCH_PUNCT_KEYS.each { |k| i18n["punct"][k] = cit_i18n["punct"][k] }
+          # keep Latin punct half-width in Japanese context
+          lang == "en" and
+            i18n["punct"]["biblio-field-delimiter"] = "<esc>.</esc> "
+          i18n
+        end
+
+        # cit_i18n is citation lang i18n
+        # i18n is document lang i18n
+        # return customised merger of the two
+        def i18n_config(lang, i18n)
+          script = lang == "ja" ? "Jpan" : "Latn"
+          cit_i18n = ::IsoDoc::Plateau::I18n.new(lang, script)
+          i18n = deep_clone(i18n)
+          punct = i18n.get["punct"]
+          SWITCH_PUNCT_KEYS.each { |k| punct[k] = cit_i18n.get["punct"][k] }
+          # keep Latin punct half-width in Japanese context
+          lang == "en" and
+            punct["biblio-field-delimiter"] = "<esc>.</esc> "
+          i18n.set("punct", punct)
+          i18n.set("author_and", cit_i18n.get["author_and"])
+          i18n
+        end
+
+        def bibrenderer_lang(lang, options)
+          yaml, script = bibrenderer_lang_prep(lang)
+          # i18n = bibrenderer_lang_config(lang)
+          i18n = i18n_config(lang, @i18n.config[@lang]).get
+          ::Relaton::Render::Plateau::General.new(options
+            .deep_merge(yaml)
+            .merge(language: lang, script: script, i18nhash: i18n))
+        end
+
+        def bibrenderer_lang_prep(lang)
+          yaml = YAML.load_file(File.join(File.dirname(__FILE__),
+                                          "config-#{lang}.yml"))
+          script = lang == "ja" ? "Jpan" : "Latn"
+          [yaml, script]
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render-plateau/i18n.rb

@@ -0,0 +1,21 @@
+module Relaton
+  module Render
+    module Plateau
+      class I18n < ::Relaton::Render::I18n
+        def initialize(opt)
+          super
+          #require "debug"; binding.b
+          @lang = opt["language"]
+        end
+
+        def select_default
+          @i18n[@lang]
+        end
+
+        def select_obj(obj)
+          @i18n[obj[:language]]
+        end
+      end
+    end
+  end
+end

data/metanorma-plateau.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-jis", "~> 0.6.0"
+  spec.add_dependency "metanorma-jis", "~> 1.0.0"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"
@@ -40,10 +40,11 @@ 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"
+  spec.add_development_dependency "openssl"
+  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 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-jis
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: canon
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -234,6 +234,20 @@ 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 standards authoring environment for MLIT Project PLATEAU.
 
@@ -271,11 +285,17 @@ files:
 - lib/metanorma/plateau/isodoc.rng
 - lib/metanorma/plateau/isostandard.rng
 - lib/metanorma/plateau/jis.rng
+- lib/metanorma/plateau/log.rb
 - lib/metanorma/plateau/plateau.rng
 - lib/metanorma/plateau/processor.rb
 - lib/metanorma/plateau/relaton-jis.rng
 - lib/metanorma/plateau/reqt.rng
 - lib/metanorma/plateau/version.rb
+- lib/relaton/render-plateau/citations.rb
+- lib/relaton/render-plateau/config-en.yml
+- lib/relaton/render-plateau/config-ja.yml
+- lib/relaton/render-plateau/general.rb
+- lib/relaton/render-plateau/i18n.rb
 - metanorma-plateau.gemspec
 homepage: https://github.com/metanorma/metanorma-plateau
 licenses: