metanorma-plateau 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5216a29d12ec97ea08cd293a8424eb56bc7f8487abcb05d7e8605f76d4bfbbea
-  data.tar.gz: a34fa09773500f77484c9e0fdb59b8c9c44b5386d4ca36b249aef8b69464b3cb
+  metadata.gz: 2b4ede8a282db7fb5088115a55e9278b0447cc589054bb791b1b4aa2e489d131
+  data.tar.gz: 58fd4dc3eb13d644fc5aad09b802a62d04b802e1c4fd186af425249e838804ef
 SHA512:
-  metadata.gz: b4d64fa9a76290f5bf140b5655af2d758c97bfc9f109e014bb908acd64814b4a88d6fbd4b42b3919ec93bc98c16e7774cc4339c1ae6f8c0b5f6d17558d6c9c22
-  data.tar.gz: 6b9ea93d58e3b12fdd47dfe35de29f4831f6420d5be088c00fae7daa2b9ea9c4c3469c942121150293567b02543043fdf5e3f9c11df02ffa6acef260bbbc1e3f
+  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(..)"/>
 
@@ -11959,10 +11959,10 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -14016,6 +14016,10 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0mm</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
@@ -14160,11 +14164,6 @@
 				<xsl:attribute name="space-before">9mm</xsl:attribute>
 				<xsl:attribute name="margin-bottom">9mm</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="ancestor::mn:annex">
-				<xsl:attribute name="font-size">14pt</xsl:attribute>
-				<xsl:attribute name="text-align">center</xsl:attribute>
-				<xsl:attribute name="space-before">0mm</xsl:attribute>
-			</xsl:if>
 			<xsl:if test="$doctype = 'technical-report'">
 				<xsl:attribute name="font-size">16pt</xsl:attribute>
 			</xsl:if>
@@ -14225,6 +14224,20 @@
 			</xsl:if>
 		</xsl:if>
 
+		<xsl:if test="parent::mn:annex"><!-- Annex title -->
+			<xsl:variable name="annex_title_styles">
+				<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+		</xsl:if>
+
+		<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
+			<xsl:variable name="bibliography_title_styles">
+				<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
+		</xsl:if>
+
 		<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
 			<xsl:copy-of select="@id"/>
 		</xsl:if>
@@ -14233,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>
@@ -690,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -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>
@@ -1296,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/plateau/cleanup.rb

@@ -1,7 +1,7 @@
 module Metanorma
   module Plateau
     # after term def processed, process source after paragraphs so that
-    # the moving of paragraphs there does not nclude termdef
+    # the moving of paragraphs there does not include termdef
     class Converter < Jis::Converter
       def termdef_cleanup(xmldoc)
         super
@@ -13,16 +13,6 @@ module Metanorma
         end
       end
 
-      # Abandoned in favour of JIS ordering
-      #       def pub_class(bib)
-      #         return 1 if bib.at("#{PUBLISHER}[name = '#{pub_hash['en']}']") ||
-      #           bib.at("#{PUBLISHER}[name = '#{pub_hash['ja']}']") ||
-      #           bib.at("#{PUBLISHER}[abbreviation = 'MLIT']")
-      #         return 2 if bib["type"] == "standard"
-      #
-      #         3
-      #       end
-
       def biblio_reorder(xmldoc)
         xmldoc.xpath("//references").each do |r|
           biblio_reorder1(r)

data/lib/metanorma/plateau/converter.rb

@@ -44,8 +44,9 @@ module Metanorma
 
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
-          xml.docidentifier "PLATEAU #{id.sub(/^PLATEAU /, '')}",
-                            **attr_code(type: "PLATEAU", primary: "true")
+          add_noko_elem(xml, "docidentifier",
+                        "PLATEAU #{id.sub(/^PLATEAU /, '')}", type: "PLATEAU",
+                                                              primary: "true")
         else iso_id(node, xml)
         end
       end
@@ -53,16 +54,17 @@ module Metanorma
       # do not use pubid
       def iso_id(node, xml)
         id = node.attr("docnumber") or return
-        xml.docidentifier "PLATEAU #{id.sub(/^PLATEAU /, '')}",
-                          **attr_code(type: "PLATEAU", primary: "true")
+        add_noko_elem(xml, "docidentifier",
+                      "PLATEAU #{id.sub(/^PLATEAU /, '')}", type: "PLATEAU",
+                                                            primary: "true")
       end
 
       # do not use pubid
       def metadata_status(node, xml)
         stage = get_stage(node)
         xml.status do |s|
-          s.stage stage
-          i = node.attr("iteration") and s.iteration i
+          add_noko_elem(s, "stage", stage)
+          add_noko_elem(s, "iteration", node.attr("iteration"))
         end
       end
 

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.3 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <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">

data/lib/metanorma/plateau/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "1.2.1".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.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-jis