metanorma-ribose 2.7.6 → 2.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38b190ae398a5e6724c9abc62418739045c05c00d5a5dcf1b9c1249077dd9885
-  data.tar.gz: 07f2118fd348f5a6adc2fe5f70f5be9aad98d965bbebabac624cfae45807be6a
+  metadata.gz: 64014a9dc6ce1324ae1fb9aeffd03787de0cdcb3cda157646106ae60b68140a4
+  data.tar.gz: '0938e80f5ffc88f80c541ff37f6c9cfe827ef345ce0d096a508a8156ab089040'
 SHA512:
-  metadata.gz: b4204c8891cd12fc5a63dacc28eee280f9f2ee36a7ede9708fc04c0ce74277b162df90ede83d8e096dea1264bdf7d25e11fa7c31897040eb7db6ea65a19676c1
-  data.tar.gz: d70bb849797f7f7002f6e9a7840187e3d9b175960b77a2f93411df2f80fefd8341b92bbf25c42a0bc39d3cd6110b446c6c071e75fe7f4e4c4ea2810d14cafff5
+  metadata.gz: f918f729e8f4682329192f51f3f9f25f4231ab53e966ff8a4585de2e981ffa648b930636d0d49089b539987672368e6f7ab23736da2a93986b41fbf15d705b3b
+  data.tar.gz: f19affcdddf969452a379289d1f0f61d50eb6858c59c87758dddc9ba61700b0db9d93823db14021c05a1f572db12b60d4dd5f770f574cc81cbaf38a155879487

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/init.rb

@@ -16,8 +16,8 @@ module IsoDoc
 
       def i18n_init(lang, script, locale, i18nyaml = nil)
         @i18n = I18n.new(
-          lang, script, locale: locale, i18nyaml: i18nyaml ||
-          Metanorma::Ribose.configuration.i18nyaml || @i18nyaml
+          lang, script, locale: locale, i18nyaml: [i18nyaml,
+          Metanorma::Ribose.configuration.i18nyaml, @i18nyaml]
         )
       end
     end

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

@@ -35,24 +35,20 @@
 	<xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
 
 	<xsl:variable name="docnumber_version">
-		<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'rsd' or @type = 'Ribose']"/>
-			<xsl:text>:</xsl:text>
-			<xsl:value-of select="$copyright_year"/>
-
-			<xsl:variable name="edition" select="normalize-space(/mn:metanorma/mn:bibdata/mn:edition[normalize-space(@language) = ''])"/>
-			<xsl:if test="$edition != ''">
-				<xsl:variable name="title-version">
-					<xsl:call-template name="capitalize">
-						<xsl:with-param name="str">
-							<xsl:call-template name="getLocalizedString">
-								<xsl:with-param name="key">version</xsl:with-param>
-							</xsl:call-template>
-						</xsl:with-param>
-					</xsl:call-template>
-				</xsl:variable>
-				<xsl:text>, </xsl:text><xsl:value-of select="$title-version"/><xsl:text> </xsl:text><xsl:value-of select="$edition"/>
-			</xsl:if>
-
+		<xsl:value-of select="concat(/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'rsd' or @type = 'Ribose' or @primary = 'true'], ':', $copyright_year)"/>
+		<xsl:variable name="edition" select="normalize-space(/mn:metanorma/mn:bibdata/mn:edition[normalize-space(@language) = ''])"/>
+		<xsl:if test="$edition != ''">
+			<xsl:variable name="title-version">
+				<xsl:call-template name="capitalize">
+					<xsl:with-param name="str">
+						<xsl:call-template name="getLocalizedString">
+							<xsl:with-param name="key">version</xsl:with-param>
+						</xsl:call-template>
+					</xsl:with-param>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:value-of select="concat(', ', $title-version, ' ', $edition)"/>
+		</xsl:if>
 	</xsl:variable>
 
 	<xsl:template name="layout-master-set">
@@ -638,7 +634,7 @@
 				<xsl:if test="$contents//mnx:item[@display = 'true']">
 
 					<fo:block-container xsl:use-attribute-sets="toc-style">
-						<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+						<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 							<xsl:for-each select="$contents//mnx:item[@display = 'true']">
 								<fo:block xsl:use-attribute-sets="toc-item-style">
 
@@ -810,44 +806,6 @@
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
 
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<!-- <xsl:when test="ancestor::mn:preface and $level &gt;= 2">12pt</xsl:when>
-				<xsl:when test="ancestor::mn:preface">13pt</xsl:when> -->
-				<xsl:when test="$level = 1">22pt</xsl:when>
-				<!-- <xsl:when test="$level = 2">13pt</xsl:when>
-				<xsl:when test="$level &gt;= 3">11pt</xsl:when>
-				<xsl:otherwise>16pt</xsl:otherwise> -->
-				<xsl:when test="$level &gt;= 2">13pt</xsl:when>
-				<xsl:otherwise>13pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="font-weight">
-			<xsl:choose>
-				<xsl:when test="$level &gt;= 4">normal</xsl:when>
-				<xsl:otherwise>bold</xsl:otherwise> <!-- 600 - semibold-->
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="space-before">
-			<xsl:choose>
-				<xsl:when test="$level = 1">25mm</xsl:when>
-				<xsl:when test="$level = 2">9mm</xsl:when>
-				<xsl:when test="$level = 3">12pt</xsl:when>
-				<xsl:when test="$level &gt;= 4">8pt</xsl:when>
-				<xsl:otherwise>13.5pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="margin-bottom">
-			<xsl:choose>
-				<xsl:when test="$level = 1">12pt</xsl:when>
-				<xsl:when test="$level &gt;= 4">4pt</xsl:when>
-				<xsl:otherwise>12pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
 		<xsl:variable name="element-name">
 			<xsl:choose>
 				<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
@@ -855,27 +813,17 @@
 			</xsl:choose>
 		</xsl:variable>
 
-		<xsl:variable name="color">
-			<xsl:choose>
-				<xsl:when test="$level = 3"><xsl:value-of select="$color_blue"/></xsl:when>
-				<xsl:otherwise>black</xsl:otherwise>
-			</xsl:choose>
+		<xsl:variable name="title_styles">
+			<styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"/></styles>
 		</xsl:variable>
 
 		<xsl:element name="{$element-name}">
-			<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
-			<xsl:attribute name="font-weight"><xsl:value-of select="$font-weight"/></xsl:attribute>
-			<xsl:attribute name="space-before"><xsl:value-of select="$space-before"/></xsl:attribute>
-			<xsl:attribute name="margin-bottom"><xsl:value-of select="$margin-bottom"/></xsl:attribute>
-			<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:attribute name="color"><xsl:value-of select="$color"/></xsl:attribute>
-			<xsl:attribute name="line-height">125%</xsl:attribute>
-			<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+			<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
 
 			<xsl:choose>
 				<xsl:when test="$level = 1">
 					<fo:block-container margin-left="-15mm" role="SKIP">
-						<fo:block-container margin-left="0mm" role="SKIP">
+						<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 							<fo:table width="100%" table-layout="fixed" role="SKIP">
 								<fo:table-column column-width="15mm"/>
 								<fo:table-column column-width="150mm"/>
@@ -944,25 +892,16 @@
 		</xsl:variable>
 
 		<xsl:call-template name="setNamedDestination"/>
-		<xsl:element name="{$element-name}">
-			<xsl:attribute name="id">
-				<xsl:value-of select="@id"/>
-			</xsl:attribute>
 
-			<xsl:call-template name="setBlockAttributes"/>
+		<xsl:variable name="p_styles">
+			<styles xsl:use-attribute-sets="p-style">
+				<xsl:call-template name="refine_p-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template>
+			</styles>
+		</xsl:variable>
 
-			<xsl:attribute name="space-after">
-				<xsl:choose>
-					<xsl:when test="ancestor::mn:li">6pt</xsl:when>
-					<xsl:when test="ancestor::mn:feedback-statement and not(following-sibling::mn:p)">0pt</xsl:when>
-					<xsl:otherwise>6pt</xsl:otherwise> <!-- 12pt-->
-				</xsl:choose>
-			</xsl:attribute>
-			<xsl:if test="ancestor::mn:dl"> <!-- ancestor::mn:li or  -->
-				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-			</xsl:if>
+		<xsl:element name="{$element-name}">
+			<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
 
-			<!-- <xsl:attribute name="line-height">155%</xsl:attribute> -->
 			<xsl:apply-templates>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 			</xsl:apply-templates>
@@ -982,7 +921,7 @@
 
 	<xsl:template match="mn:ul | mn:ol" mode="list" priority="2">
 		<fo:block-container role="SKIP">
-			<fo:block-container margin-left="0mm" role="SKIP">
+			<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 				<xsl:choose>
 					<xsl:when test="not(ancestor::mn:ul) and not(ancestor::mn:ol)">
 						<fo:block padding-bottom="12pt" padding-top="4pt" role="SKIP">
@@ -1070,7 +1009,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>
@@ -1142,7 +1082,7 @@
 		<fo:block-container xsl:use-attribute-sets="clause-style">
 			<xsl:call-template name="refine_clause-style"/>
 
-			<fo:block-container margin-left="0mm" role="SKIP">
+			<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 				<xsl:call-template name="setNamedDestination"/>
 				<fo:block role="SKIP">
 					<xsl:call-template name="setId"/>
@@ -1273,7 +1213,8 @@
 	<xsl:template name="insertFooter">
 		<!-- <xsl:param name="invert"/> -->
 		<xsl:variable name="footerText">
-			<xsl:text>Ribose</xsl:text>
+			<!-- Ribose -->
+			<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type = 'publisher']/mn:organization/mn:abbreviation"/>
 			<xsl:text> </xsl:text>
 			<xsl:call-template name="capitalizeWords">
 				<xsl:with-param name="str">
@@ -3416,6 +3357,10 @@
 		</xsl:element>
 	</xsl:template>
 
+	<!-- show sourcecode's name 'before' or 'after' source code -->
+	<xsl:variable name="sourcecode-name-position"><xsl:text>before</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:sourcecode" name="sourcecode">
 
 		<xsl:variable name="sourcecode_attributes">
@@ -3439,8 +3384,12 @@
 
 					<xsl:call-template name="refine_sourcecode-container-style"/>
 
-					<fo:block-container margin-left="0mm" role="SKIP">
-						<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+
+						<!-- <xsl:if test="$namespace = 'rsd'"> -->
+						<xsl:if test="$sourcecode-name-position = 'before'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
+						</xsl:if>
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
 
@@ -3463,6 +3412,16 @@
 
 						<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
 
+						<!-- <xsl:choose>
+							<xsl:when test="$namespace = 'rsd'"></xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates select="mn:fmt-name" />  --><!-- show sourcecode's name AFTER content -->
+							<!-- </xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:if test="$sourcecode-name-position = 'after'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+						</xsl:if>
+
 					</fo:block-container>
 				</fo:block-container>
 			</xsl:otherwise>
@@ -9313,6 +9272,10 @@
 	<!-- image    -->
 	<!-- ====== -->
 
+	<!-- show figure's name 'before' or 'after' image -->
+	<xsl:variable name="figure-name-position"><xsl:text>before</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:figure" name="figure">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -9323,8 +9286,11 @@
 			<xsl:call-template name="setTrackChangesStyles">
 				<xsl:with-param name="isAdded" select="$isAdded"/>
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
-			</xsl:call-template> <!-- show figure's name BEFORE image -->
-			<xsl:apply-templates select="mn:fmt-name"/>
+			</xsl:call-template>
+
+			<xsl:if test="$figure-name-position = 'before'"> <!-- show figure's name BEFORE image -->
+				<xsl:apply-templates select="mn:fmt-name"/>
+			</xsl:if>
 
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="mn:note[@type = 'units']"/>
@@ -9347,6 +9313,16 @@
 				<xsl:call-template name="showFigureKey"/>
 			</xsl:if>
 
+			<!-- <xsl:choose>
+				<xsl:when test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'rsd'"></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:fmt-name" /> --> <!-- show figure's name AFTER image -->
+				<!-- </xsl:otherwise>
+			</xsl:choose> -->
+			<xsl:if test="$figure-name-position = 'after'">
+				<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+			</xsl:if>
+
 		</fo:block-container>
 	</xsl:template>
 
@@ -11436,18 +11412,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") -->
@@ -13577,7 +13553,8 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
-	</xsl:attribute-set>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
 	</xsl:template>
@@ -13588,6 +13565,77 @@
 	<xsl:template name="refine_p-zzSTDTitle1-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="p-style">
+	</xsl:attribute-set> <!-- p-style -->
+
+	<xsl:template name="refine_p-style">
+		<xsl:param name="element-name"/>
+		<xsl:param name="margin"/>
+		<xsl:call-template name="setBlockAttributes"/>
+
+		<xsl:copy-of select="@id"/>
+
+		<xsl:attribute name="space-after">
+			<xsl:choose>
+				<xsl:when test="ancestor::mn:li">6pt</xsl:when>
+				<xsl:when test="ancestor::mn:feedback-statement and not(following-sibling::mn:p)">0pt</xsl:when>
+				<xsl:otherwise>6pt</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+		<xsl:if test="ancestor::mn:dl">
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+		</xsl:if>
+		<!-- namespace = 'rsd' -->
+
+	</xsl:template> <!-- refine_p-style -->
+
+	<xsl:attribute-set name="title-style">
+		<!-- Note: font-size for level 1 title -->
+		<xsl:attribute name="font-size">22pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="space-before">25mm</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="line-height">125%</xsl:attribute>
+	</xsl:attribute-set> <!-- title-style -->
+
+	<xsl:template name="refine_title-style">
+		<xsl:param name="element-name"/>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:if test="$level &gt;= 2">
+			<xsl:attribute name="font-size">13pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$level = 2">
+			<xsl:attribute name="space-before">9mm</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$level = 3">
+			<xsl:attribute name="space-before">12pt</xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$level &gt;= 4">
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<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:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -13926,6 +13974,12 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="reset-margins-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="clause-style">
 
 	</xsl:attribute-set>
@@ -14945,8 +14999,9 @@
 
 	<xsl:template name="setTextAlignment">
 		<xsl:param name="default">left</xsl:param>
+		<xsl:param name="skip_default">false</xsl:param>
 		<xsl:variable name="align" select="normalize-space(@align)"/>
-		<xsl:attribute name="text-align">
+		<xsl:variable name="text_align">
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
@@ -14954,9 +15009,13 @@
 				<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
 				<xsl:when test="ancestor::mn:td/@align"><xsl:value-of select="ancestor::mn:td/@align"/></xsl:when>
 				<xsl:when test="ancestor::mn:th/@align"><xsl:value-of select="ancestor::mn:th/@align"/></xsl:when>
+				<xsl:when test="$skip_default = 'true'"/>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
-		</xsl:attribute>
+		</xsl:variable>
+		<xsl:if test="normalize-space($text_align) != ''">
+			<xsl:attribute name="text-align"><xsl:value-of select="$text_align"/></xsl:attribute>
+		</xsl:if>
 		<xsl:if test="$align = 'indent'">
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 		</xsl:if>
@@ -14964,8 +15023,10 @@
 
 	<xsl:template name="setBlockAttributes">
 		<xsl:param name="text_align_default">left</xsl:param>
+		<xsl:param name="skip_text_align_default">false</xsl:param>
 		<xsl:call-template name="setTextAlignment">
 			<xsl:with-param name="default" select="$text_align_default"/>
+			<xsl:with-param name="skip_default" select="$skip_text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
 		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">

data/lib/metanorma/ribose/biblio.rng

@@ -690,7 +690,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>
@@ -1296,17 +1296,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/converter.rb

@@ -56,3 +56,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "log"

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.4 -->
 
   <!--
     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/log.rb

@@ -0,0 +1,15 @@
+module Metanorma
+  module Ribose
+    class Converter
+      RIBOSE_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        # No gem-specific log messages currently defined
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(RIBOSE_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/ribose/version.rb

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

data/metanorma-ribose.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 3.1.0"
+  spec.add_dependency "metanorma-generic", "~> 3.2.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.7.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ files:
 - lib/metanorma/ribose/boilerplate.adoc
 - lib/metanorma/ribose/converter.rb
 - lib/metanorma/ribose/isodoc.rng
+- lib/metanorma/ribose/log.rb
 - lib/metanorma/ribose/processor.rb
 - lib/metanorma/ribose/relaton-ribose.rng
 - lib/metanorma/ribose/reqt.rng