metanorma-ribose 2.7.8 → 2.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64014a9dc6ce1324ae1fb9aeffd03787de0cdcb3cda157646106ae60b68140a4
-  data.tar.gz: '0938e80f5ffc88f80c541ff37f6c9cfe827ef345ce0d096a508a8156ab089040'
+  metadata.gz: d7905a07814702213dd4ba17720dd1b43326c98d59f621e70fa5c2606d189ddd
+  data.tar.gz: 93580473607817bea2d37253ea5dc1da52cb6b692167d2a8a499d13ae1c2f198
 SHA512:
-  metadata.gz: f918f729e8f4682329192f51f3f9f25f4231ab53e966ff8a4585de2e981ffa648b930636d0d49089b539987672368e6f7ab23736da2a93986b41fbf15d705b3b
-  data.tar.gz: f19affcdddf969452a379289d1f0f61d50eb6858c59c87758dddc9ba61700b0db9d93823db14021c05a1f572db12b60d4dd5f770f574cc81cbaf38a155879487
+  metadata.gz: ff6f0b1e75d0a7864b1770305dfad316a105e1c38b0ed29b7c49c171b4f75d9bc91f182a151f69363938001e9f1be32790ca1101561fc5291dac2bc0ef06c2aa
+  data.tar.gz: 3bd6f619078bd0df33c2d5b4fd8b8fe2b3fec7c87e46492b029d2b17b29797bdb37355f8e4b8158a798ca6b7ab53e4af89802d6a61648738273b609b119afa61

data/lib/isodoc/ribose/ribose.standard.xsl

@@ -943,15 +943,13 @@
 	</xsl:template>
 
 	<xsl:template match="mn:ul/mn:note | mn:ol/mn:note" priority="2">
-		<fo:list-item font-size="10pt">
-			<xsl:if test="ancestor::mn:table">
-				<xsl:attribute name="font-size">8pt</xsl:attribute>
-			</xsl:if>
+		<fo:list-item xsl:use-attribute-sets="note-style">
+			<xsl:call-template name="refine_note-style"/>
+
 			<fo:list-item-label><fo:block/></fo:list-item-label>
 			<fo:list-item-body>
 				<fo:block>
-					<xsl:apply-templates select="mn:fmt-name"/>
-					<xsl:apply-templates select="node()[not(parent::mn:fmt-name)]"/>
+					<xsl:call-template name="note"/>
 				</fo:block>
 			</fo:list-item-body>
 		</fo:list-item>
@@ -2504,7 +2502,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(..)"/>
 
@@ -8634,9 +8632,15 @@
 	</xsl:attribute-set> <!-- note-style -->
 
 	<xsl:template name="refine_note-style">
-		<xsl:if test="ancestor::mn:ul or ancestor::mn:ol and not(ancestor::mn:note[1]/following-sibling::*)">
-			<xsl:attribute name="margin-top">6pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		<xsl:if test="ancestor::mn:ul or ancestor::mn:ol">
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+			<xsl:if test="ancestor::mn:table">
+				<xsl:attribute name="font-size">8pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(ancestor::mn:note[1]/following-sibling::*)">
+				<xsl:attribute name="margin-top">6pt</xsl:attribute>
+				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			</xsl:if>
 		</xsl:if>
 	</xsl:template> <!-- refine_note-style -->
 
@@ -8646,7 +8650,7 @@
 	<xsl:attribute-set name="note-name-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
-		<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
+		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 	</xsl:attribute-set> <!-- note-name-style -->
 
 	<xsl:template name="refine_note-name-style">
@@ -11615,9 +11619,9 @@
 						<xsl:if test="normalize-space(translate($biblio_tag_first_part, '[] 1234567890', '')) != ''">
 							<xsl:attribute name="margin-left">8mm</xsl:attribute>
 							<xsl:attribute name="text-indent">-8mm</xsl:attribute>
-							<xsl:if test="not(contains($biblio_tag_first_part, '['))">[</xsl:if>
+							<!-- <xsl:if test="not(contains($biblio_tag_first_part, '['))">[</xsl:if> -->
 							<xsl:value-of select="$biblio_tag_first_part"/>
-							<xsl:if test="not(contains($biblio_tag_first_part, '['))">]</xsl:if>
+							<!-- <xsl:if test="not(contains($biblio_tag_first_part, '['))">]</xsl:if> -->
 							<xsl:text> </xsl:text>
 						</xsl:if>
 						<xsl:apply-templates select="mn:biblio-tag">
@@ -13283,7 +13287,7 @@
 	<xsl:template match="mn:termnote/mn:fmt-name/mn:tab" priority="2"/>
 
 	<xsl:template match="mn:note/mn:fmt-name/mn:tab" mode="tab">
-		<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
+		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 	</xsl:template>
 
 	<xsl:template name="insertNonBreakSpaces">
@@ -13637,9 +13641,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/metanorma/ribose/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/ribose/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/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.7.8".freeze
+    VERSION = "2.7.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 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-generic