metanorma-plateau 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61a7684c746d7b6b93e22ef00c72b7f2ed07a5fec087b82e5e8e6ffecc38859d
-  data.tar.gz: 24bf9edcb866dbac1a138fe949a0a41b507f8d323750f2becea5f3e17194ba04
+  metadata.gz: 2b4ede8a282db7fb5088115a55e9278b0447cc589054bb791b1b4aa2e489d131
+  data.tar.gz: 58fd4dc3eb13d644fc5aad09b802a62d04b802e1c4fd186af425249e838804ef
 SHA512:
-  metadata.gz: 2d1ac86e09f64d70a2e95959fe5ce073a37e020872f0b654d6a78b23d1acb70f917f4fb148df4036c8bbe9e131159887bd83f84a8530d4aa94aa1a3b72a5745d
-  data.tar.gz: a9a0538c5839b842541175011b2f7e8cb40c60303c196cc37c5c439303489ff880e968ef41f3786eb525fb9ec52eb7a9bd28de784144422d4c44a52ab8641b8c
+  metadata.gz: be94be61342f4238cef4b6715d4eb17d818ed3f85ffa4248298f8c3760304d02c69060403a455b7e832e75a61d85ba4c8b3231dc20a8dc3604d96370c65af982
+  data.tar.gz: f872733250771b13dca726427203dc2d9a149f611be8b8df9d07e3bbab421abcd8cecd68a46835644f29c0a536254a995b98edcb4ecb3d16efef51f94f70c85e

data/lib/isodoc/plateau/init.rb

@@ -25,7 +25,8 @@ module IsoDoc
 
       def bibrenderer(options = {})
         ::Relaton::Render::Plateau::General.new(options
-          .merge(language: @lang, script: @script, i18nhash: @i18n.get))
+          .merge(language: @lang, script: @script, i18nhash: @i18n.get,
+                 config: @relatonrenderconfig))
       end
     end
   end

data/lib/isodoc/plateau/plateau.international-standard.xsl

@@ -3135,7 +3135,7 @@
 	<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
 	<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::mn:bibdata or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or ancestor::mn:fmt-name or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::mn:bibdata or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or     ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or ancestor::mn:fmt-name or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<xsl:variable name="parent" select="local-name(..)"/>
 
@@ -14246,9 +14246,12 @@
 	</xsl:template> <!-- refine_title-style -->
 
 	<xsl:template name="processPrefaceSectionsDefault">
+		<xsl:param name="num"/>
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
-			<xsl:apply-templates select="."/>
+			<xsl:apply-templates select=".">
+				<xsl:with-param name="num" select="$num"/>
+			</xsl:apply-templates>
 		</xsl:for-each>
 	</xsl:template>
 

data/lib/isodoc/plateau/presentation_xml_convert.rb

@@ -112,7 +112,7 @@ module IsoDoc
         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')]
+          ./docidentifier[not(#{SERIAL_NUM_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

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

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "1.2.2".freeze
+    VERSION = "1.2.3".freeze
   end
 end

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

@@ -10,6 +10,7 @@ module Relaton
     module Plateau
       class General < ::Relaton::Render::Jis::General
         def initialize(opt = {})
+          @configpath = opt[:config]
           i18n = opt[:i18n] ||
             i18n_klass(language: opt[:language], script: opt[:script],
                        locale: opt[:locale], i18nhash: opt[:i18nhash])
@@ -77,7 +78,8 @@ module Relaton
           i18n = i18n_config(lang, @i18n.config[@lang]).get
           ::Relaton::Render::Plateau::General.new(options
             .deep_merge(yaml)
-            .merge(language: lang, script: script, i18nhash: i18n))
+            .merge(language: lang, script: script, i18nhash: i18n,
+                   config: @configpath))
         end
 
         def bibrenderer_lang_prep(lang)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.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-jis