metanorma-ribose 2.7.7 → 2.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3838b3c591e380f3d4181c3cfc086562d74f1013ad27ace96d39eecf1cd9bd
-  data.tar.gz: 19925bc0c4bd917e79a7c7b803f7f58d798ec5422944828da679079c6b4d6d7f
+  metadata.gz: d7905a07814702213dd4ba17720dd1b43326c98d59f621e70fa5c2606d189ddd
+  data.tar.gz: 93580473607817bea2d37253ea5dc1da52cb6b692167d2a8a499d13ae1c2f198
 SHA512:
-  metadata.gz: 7c718aa3dc36f894f235f3ff73ed0c7d02131f5ac56fb59d0b91e16eaff5b192d072707898a4e38d1c9eef6e2a1243c54580498630bcc3ddc250a9999d84e27c
-  data.tar.gz: 7a5d544904e782bef4d78827801464ea8b36dc40560a6ac6b8809c2c3b87c8e8e0fca57fac2f4431e5412b11b964ef9d53e84ce469333b4ac7863ca8e6a14d35
+  metadata.gz: ff6f0b1e75d0a7864b1770305dfad316a105e1c38b0ed29b7c49c171b4f75d9bc91f182a151f69363938001e9f1be32790ca1101561fc5291dac2bc0ef06c2aa
+  data.tar.gz: 3bd6f619078bd0df33c2d5b4fd8b8fe2b3fec7c87e46492b029d2b17b29797bdb37355f8e4b8158a798ca6b7ab53e4af89802d6a61648738273b609b119afa61

data/lib/isodoc/ribose/html/htmlstyle.css

@@ -455,6 +455,10 @@ svg {
   border-bottom: solid 3px #2E382E;
 }
 
+:root {
+  --ribose-primary-color: #1661AD;
+}
+
 body {
   margin-left: auto;
   margin-right: auto;
@@ -506,8 +510,8 @@ main {
   padding-left: 110px;
 }
 #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
-  background: #1661AD;
-  box-shadow: inset -5px 0px 10px -5px #1661AD !important;
+  background: var(--ribose-primary-color);
+  box-shadow: inset -5px 0px 10px -5px var(--ribose-primary-color) !important;
 }
 #toc .toc-active a, #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
   color: #485094;
@@ -581,7 +585,7 @@ main {
     position: fixed;
     height: 100%;
     width: 30px;
-    background-color: #1661AD;
+    background-color: var(--ribose-primary-color);
     color: white !important;
     cursor: pointer;
     z-index: 100;
@@ -865,7 +869,7 @@ h5,
 h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
-  color: #1661AD;
+  color: var(--ribose-primary-color);
   font-weight: 300;
   margin-top: 1.6em;
   margin-bottom: 0.3em;
@@ -898,7 +902,7 @@ h3, .h3 {
 }
 
 .TermNum, .Terms, .AltTerms {
-  color: #1661AD;
+  color: var(--ribose-primary-color);
 }
 
 h2.TermNum {
@@ -936,17 +940,17 @@ a, a:visited {
 
 a:hover {
   color: white;
-  background: #1661AD;
-  box-shadow: 3px 0 0 #1661AD, -3px 0 0 #1661AD;
+  background: var(--ribose-primary-color);
+  box-shadow: 3px 0 0 var(--ribose-primary-color), -3px 0 0 var(--ribose-primary-color);
 }
 
 *::selection {
-  background: #1661AD;
+  background: var(--ribose-primary-color);
   color: white;
 }
 
 *::-moz-selection {
-  background: #1661AD;
+  background: var(--ribose-primary-color);
   color: white;
 }
 
@@ -1192,14 +1196,14 @@ a.footnote-number {
   margin-top: 5em;
   width: 250px;
   text-align: left;
-  border: #1661AD solid 2px;
-  color: #1661AD !important;
+  border: var(--ribose-primary-color) solid 2px;
+  color: var(--ribose-primary-color) !important;
   border-radius: 25px;
 }
 
 .contact-info a,
 .contact-info a:hover {
-  color: #1661AD;
+  color: var(--ribose-primary-color);
 }
 
 .contact-info p,
@@ -1252,7 +1256,7 @@ h2 p, .h2 p {
 }
 
 .wrapper-top {
-  background: linear-gradient(200deg, #0f365e, #1661AD);
+  background: linear-gradient(200deg, #0f365e, var(--ribose-primary-color));
   color: #ffffff;
   padding: 2em 0;
   width: 100%;
@@ -1261,7 +1265,7 @@ h2 p, .h2 p {
 .wrapper-top-bottom {
   width: 0;
   height: 0;
-  border-top: 100px solid #1661AD;
+  border-top: 100px solid var(--ribose-primary-color);
   border-right: 100px solid transparent;
   position: absolute;
 }

data/lib/isodoc/ribose/html/htmlstyle.scss

@@ -9,6 +9,10 @@
 
 @use 'base_style/all' as *;
 
+:root {
+  --ribose-primary-color: #1661AD;
+}
+
 body {
   @include bodyStyle1($normalfontsize, 1.4em, #1d1d1d, #ffffff, 300);
   // @include sidebarNavContainer(323px);
@@ -19,7 +23,7 @@ main {
 }
 
 #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  @include toc(#485094, #1661AD, #485094);
+  @include toc(#485094, var(--ribose-primary-color), #485094);
   @include sidebarToc();
 
   .toc-active a {
@@ -49,7 +53,7 @@ nav {
 }
 
 #toggle {
-  @include sidebarNavToggle(white, #1661AD)
+  @include sidebarNavToggle(white, var(--ribose-primary-color))
 }
 
 #myBtn {
@@ -217,7 +221,7 @@ h5,
 h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: $headerfont;
-  color: #1661AD;
+  color: var(--ribose-primary-color);
   font-weight: 300;
   margin-top: 1.6em;
   margin-bottom: 0.3em;
@@ -250,7 +254,7 @@ h3, .h3 {
 }
 
 .TermNum, .Terms, .AltTerms {
-  color: #1661AD;
+  color: var(--ribose-primary-color);
 }
 
 h2.TermNum {
@@ -281,7 +285,7 @@ p.AltTerms {
 /*
   3.2 Links
 */
-@include elementStyles(#485094, #1661AD, white);
+@include elementStyles(#485094, var(--ribose-primary-color), white);
 
 /*
     3.3 Lists
@@ -468,15 +472,15 @@ a.footnote-number {
   width: 250px;
 
   text-align: left;
-  border: #1661AD solid 2px;
-  color: #1661AD !important;
+  border: var(--ribose-primary-color) solid 2px;
+  color: var(--ribose-primary-color) !important;
   border-radius: 25px;
 
 }
 
 .contact-info a,
 .contact-info a:hover {
-  color: #1661AD;
+  color: var(--ribose-primary-color);
 }
 
 .contact-info p,
@@ -533,7 +537,7 @@ h2 p, .h2 p {
 }
 
 .wrapper-top {
-  background: linear-gradient(200deg, #0f365e, #1661AD);
+  background: linear-gradient(200deg, #0f365e, var(--ribose-primary-color));
   color: #ffffff;
   padding: 2em 0;
   width: 100%;
@@ -542,7 +546,7 @@ h2 p, .h2 p {
 .wrapper-top-bottom {
   width: 0;
   height: 0;
-  border-top: 100px solid #1661AD;
+  border-top: 100px solid var(--ribose-primary-color);
   border-right: 100px solid transparent;
   position: absolute;
 }

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>
@@ -1009,7 +1007,8 @@
 					<!-- repeat table header on each page -->
 					<fo:table-row role="SKIP">
 						<fo:table-cell text-align="left" role="SKIP">
-							<fo:block xsl:use-attribute-sets="references-non-normative-title-style"> <!-- Bibliography section title -->
+							<fo:block xsl:use-attribute-sets="title-style"> <!-- Bibliography section title -->
+								<xsl:call-template name="refine_title-style"/>
 								<xsl:apply-templates select="mn:fmt-title/node()"/>
 							</fo:block>
 						</fo:table-cell>
@@ -2503,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(..)"/>
 
@@ -8633,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 -->
 
@@ -8645,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">
@@ -11411,17 +11416,18 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 		<xsl:attribute name="margin-left">-15mm</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 		<xsl:attribute name="font-size">22pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">16pt</xsl:attribute>
 		<xsl:attribute name="color">black</xsl:attribute>
 		<xsl:attribute name="line-height">125%</xsl:attribute>
 	</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") -->
@@ -11613,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">
@@ -13281,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">
@@ -13551,6 +13557,7 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
@@ -13617,14 +13624,29 @@
 			<xsl:attribute name="space-before">8pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
 		</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="self::mn:references[not(@normative='true')]">
+			<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>
 		<!-- $namespace = 'rsd' -->
 		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</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>
@@ -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/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.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/ribose/version.rb

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