metanorma-ribose 2.7.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7150c2ad2ea033fff4c6bddbdedea1e2fb31b077ee71886b977e8931a1a5a0b8
-  data.tar.gz: a63bd4987076926fd877cbe9c010b6047204106a5ab70f00a9b688119cb1d3ca
+  metadata.gz: 8c4cb0cfa512d21d60215aaddc28433aa82aca27b0b96c17284707e9115e4cff
+  data.tar.gz: b2ddf087d596cbbb85793e2f2bdd4c5529900dbfdd463662c509b32ca405092c
 SHA512:
-  metadata.gz: 17d46be07312641d72f83d67b083ec06f2532d6c495d6480b3ba850397a142387ed4bb7c30d81920fe9e100de58bbb371c82b61b07d924a42178090c3c975834
-  data.tar.gz: c63973b067656111f50c4c4e866a2fac35cd07ee50a319b1340f8ecf08699c3978b30be4ed8939a1d97740b88f396e2afc50c4a1f9ed3790d1c91180d4d1b694
+  metadata.gz: ed16916f277c36593b6755ec6541b44041f0444126308bab2bce1f014a283a607a3ec378f709504eeb4d9776430562c29c4fe39cceb25180e09d933b4efb8015
+  data.tar.gz: e0840c816a8a940babff0100d620146fc371b1bf4a713324f304e070bb12b03af3bf927f867874bb5d4bb278c3690c28af75700f2f8d4c7700a52d1caa08084f

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

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -483,10 +473,6 @@ main {
   margin: 0 3em 0 6em;
 }
 
-#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -538,6 +524,10 @@ main {
     color: black;
   }
 }
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -632,7 +622,6 @@ main {
   cursor: pointer;
   padding: 10px 15px 10px 15px;
   border-radius: 4px;
-  text-transform: uppercase;
 }
 #myBtn:hover {
   opacity: 1;
@@ -642,6 +631,9 @@ main {
     display: none;
   }
 }
+#myBtn {
+  text-transform: uppercase;
+}
 #myBtn a.anchorjs-link:hover {
   background: none;
   color: #485094;
@@ -666,12 +658,6 @@ main {
     margin: 0;
   }
 }
-div.figure {
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-}
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -684,6 +670,12 @@ div.figure > img, div.figure > svg {
   max-width: 100%;
   height: auto;
 }
+div.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 table div.figure {
   padding: 0;
@@ -1028,6 +1020,13 @@ p.NormRef {
 /*
     3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -1038,13 +1037,6 @@ pre,
   margin: 2em 0 1em 0;
   overflow: auto;
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1108,12 +1100,14 @@ pre {
   padding: 1.2em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2.7em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2.7em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;

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

@@ -350,9 +350,13 @@
 				<xsl:variable name="toc_and_boilerplate">
 					<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:clause[@type = 'toc']"/>
 
+					<!-- <xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement"/>
+					
 					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
+					
+					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/> -->
 
-					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/>
+					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/*"/>
 				</xsl:variable>
 
 				<xsl:if test="normalize-space($toc_and_boilerplate) != ''">
@@ -388,9 +392,9 @@
 							<xsl:call-template name="insertHeaderFooter">
 								<xsl:with-param name="section">main</xsl:with-param>
 							</xsl:call-template>
-							<fo:flow flow-name="xsl-region-body">
+							<fo:flow flow-name="xsl-region-body" role="SKIP">
 
-								<fo:block line-height="130%">
+								<fo:block line-height="130%" role="SKIP">
 
 									<!-- <xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract" />
 									<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:foreword" />
@@ -410,6 +414,8 @@
 				</xsl:for-each>
 			</xsl:for-each>
 
+			<xsl:call-template name="back-page"/>
+
 		</fo:root>
 	</xsl:template>
 
@@ -500,9 +506,17 @@
 					<xsl:if test="string-length($title) &gt; 80">
 						<xsl:attribute name="margin-right">-30mm</xsl:attribute>
 					</xsl:if>
-					<fo:block font-size="27pt" font-weight="bold" role="H1">
-							<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang]" mode="cover_page"/>
-					</fo:block>
+
+					<xsl:variable name="titles">
+						<xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and (@type = 'intro' or not(@type))]"/>
+						<xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and @type = 'main'][last()]"/>
+					</xsl:variable>
+					<xsl:for-each select="xalan:nodeset($titles)/mn:title">
+						<fo:block font-size="27pt" font-weight="bold" role="H1">
+							<xsl:apply-templates/><xsl:if test="position() != last()"><xsl:value-of select="$nonbreak_space_em_dash"/></xsl:if>
+						</fo:block>
+					</xsl:for-each>
+
 					<fo:block space-before="9pt" font-size="16.8pt" font-weight="600">
 						<xsl:value-of select="$docnumber_version"/>
 					</fo:block>
@@ -511,6 +525,9 @@
 		</fo:page-sequence>
 	</xsl:template> <!-- END: cover-page -->
 
+	<xsl:template name="back-page">
+	</xsl:template>
+
 	<xsl:template name="processPrefaceAndMainSectionsRibose_items">
 		<xsl:variable name="updated_xml_step_move_pagebreak">
 
@@ -598,12 +615,8 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="mn:title" mode="cover_page">
-		<xsl:apply-templates/>
-	</xsl:template>
-
 	<xsl:template match="mn:preface/mn:clause[@type = 'toc']" name="toc" priority="3">
-		<fo:block role="TOC">
+		<fo:block role="SKIP">
 			<xsl:apply-templates/>
 
 			<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
@@ -611,7 +624,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">
+						<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 							<xsl:for-each select="$contents//mnx:item[@display = 'true']">
 								<fo:block xsl:use-attribute-sets="toc-item-style">
 
@@ -744,18 +757,20 @@
 	<!-- ============================= -->
 	<!-- ============================= -->
 
+	<xsl:template match="mn:copyright-statement" priority="2"/>
+
+	<xsl:template match="mn:legal-statement" priority="2">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<xsl:template match="mn:feedback-statement" priority="2">
-		<fo:block-container border="1pt solid black" padding="1mm" padding-left="2mm">
+		<fo:block-container xsl:use-attribute-sets="feedback-statement-style">
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:block-container>
 	</xsl:template>
 
-	<xsl:template match="mn:legal-statement" priority="2">
-		<xsl:apply-templates/>
-	</xsl:template>
-
 	<!-- ====== -->
 	<!-- title      -->
 	<!-- ====== -->
@@ -843,20 +858,21 @@
 
 			<xsl:choose>
 				<xsl:when test="$level = 1">
-					<fo:block-container margin-left="-15mm">
-						<fo:block-container margin-left="0mm">
-							<fo:table width="100%" table-layout="fixed">
+					<fo:block-container margin-left="-15mm" role="SKIP">
+						<fo:block-container margin-left="0mm" role="SKIP">
+							<fo:table width="100%" table-layout="fixed" role="SKIP">
 								<fo:table-column column-width="15mm"/>
 								<fo:table-column column-width="150mm"/>
-								<fo:table-body>
-									<fo:table-row>
-										<fo:table-cell text-align="left">
-											<fo:block>
+								<fo:table-body role="SKIP">
+									<fo:table-row role="SKIP">
+										<fo:table-cell text-align="left" role="SKIP">
+											<fo:block role="SKIP">
+												<xsl:call-template name="setIDforNamedDestinationInline"/>
 												<xsl:call-template name="extractSection"/><!-- section number 1 2 3  ... -->
 											</fo:block>
 										</fo:table-cell>
-										<fo:table-cell>
-											<fo:block>
+										<fo:table-cell role="SKIP">
+											<fo:block role="SKIP">
 													<xsl:call-template name="extractTitle"/> <!-- section title -->
 													<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
 												</fo:block>
@@ -868,6 +884,7 @@
 					</fo:block-container>
 				</xsl:when>
 				<xsl:otherwise>
+						<xsl:call-template name="setIDforNamedDestinationInline"/>
 						<xsl:apply-templates/>
 						<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
 				</xsl:otherwise>
@@ -889,7 +906,9 @@
 	</xsl:template> -->
 
 	<xsl:template match="mn:terms" priority="3">
-		<fo:block break-after="page"/>
+		<xsl:if test="not(ancestor::*[@type = 'terms'])">
+			<fo:block break-after="page"/>
+		</xsl:if>
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
@@ -907,6 +926,8 @@
 				<xsl:otherwise>fo:block</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
+
+		<xsl:call-template name="setNamedDestination"/>
 		<xsl:element name="{$element-name}">
 			<xsl:attribute name="id">
 				<xsl:value-of select="@id"/>
@@ -944,11 +965,11 @@
 	</xsl:template>
 
 	<xsl:template match="mn:ul | mn:ol" mode="list" priority="2">
-		<fo:block-container>
-			<fo:block-container margin-left="0mm">
+		<fo:block-container role="SKIP">
+			<fo:block-container margin-left="0mm" role="SKIP">
 				<xsl:choose>
 					<xsl:when test="not(ancestor::mn:ul) and not(ancestor::mn:ol)">
-						<fo:block padding-bottom="12pt" padding-top="4pt">
+						<fo:block padding-bottom="12pt" padding-top="4pt" role="SKIP">
 							<xsl:call-template name="listProcessing"/>
 						</fo:block>
 					</xsl:when>
@@ -982,21 +1003,10 @@
 	</xsl:template>
 
 	<xsl:template match="mn:fmt-preferred | mn:fmt-deprecates | mn:fmt-admitted" priority="2">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<xsl:when test="$level &gt;= 2">13pt</xsl:when>
-				<xsl:otherwise>12pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:variable name="levelTerm">
-			<xsl:call-template name="getLevelTermName"/>
-		</xsl:variable>
-		<fo:block font-weight="bold" color="black" font-size="{$font-size}" keep-with-next="always" role="H{$levelTerm}"> <!-- 600 - semibold -->
+
+		<fo:block xsl:use-attribute-sets="preferred-style">
+			<xsl:call-template name="refine_preferred-style"/>
 			<xsl:if test="preceding-sibling::*[1][self::mn:fmt-name]">
-				<xsl:attribute name="space-before">11mm</xsl:attribute>
 				<fo:inline padding-right="1mm">
 					<xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
 				</fo:inline>
@@ -1030,52 +1040,54 @@
 					</fo:inline>
 				</fo:block>
 			</fo:inline-container>
-
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:references[not(@normative='true')]" priority="3">
 		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
-			<fo:table width="100%" table-layout="fixed">
+		<fo:block id="{@id}" role="SKIP">
+			<fo:table width="100%" table-layout="fixed" role="Sect">
 				<fo:table-column column-width="100%"/>
-				<fo:table-header>
-					<fo:table-row>
-						<fo:table-cell text-align="left">
-							<fo:block margin-left="-15mm" role="H1"> <!-- Bibliography section title -->
-								<xsl:attribute name="font-size">22pt</xsl:attribute>
-								<xsl:attribute name="font-weight">bold</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>
+				<fo:table-header role="SKIP">
+					<!-- 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 -->
 								<xsl:apply-templates select="mn:fmt-title/node()"/>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-header>
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell text-align="left">
-							<fo:block>
+				<fo:table-body role="SKIP">
+					<fo:table-row role="SKIP">
+						<fo:table-cell text-align="left" role="SKIP">
+							<fo:block role="L">
 								<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-body>
 			</fo:table>
-
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="*[self::mn:table or self::mn:figure or self::mn:sourcecode]/mn:fmt-name/node()[1][self::text()]" priority="2">
+		<xsl:variable name="styles_">
+			<xsl:choose>
+				<xsl:when test="ancestor::mn:table"><styles xsl:use-attribute-sets="table-number-style"><xsl:call-template name="refine_table-number-style"/></styles></xsl:when>
+				<xsl:when test="ancestor::mn:figure"><styles xsl:use-attribute-sets="figure-number-style"><xsl:call-template name="refine_figure-number-style"/></styles></xsl:when>
+				<xsl:when test="ancestor::mn:sourcecode"><styles xsl:use-attribute-sets="sourcecode-number-style"><xsl:call-template name="refine_sourcecode-number-style"/></styles></xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
 		<xsl:choose>
 			<xsl:when test="contains(., '—')">
 				<xsl:variable name="name_number" select="normalize-space(translate(substring-before(., '—'), ' ', ' '))"/>
-				<fo:inline font-weight="bold" font-style="normal" color="black"><xsl:value-of select="java:toUpperCase(java:java.lang.String.new($name_number))"/><xsl:text>:</xsl:text></fo:inline>
+				<fo:inline><xsl:copy-of select="$styles/styles/@*"/><xsl:value-of select="$name_number"/><xsl:text>:</xsl:text></fo:inline>
 				<xsl:value-of select="substring-after(., '—')"/>
 			</xsl:when>
 			<xsl:when test="starts-with(., 'Figure ') or starts-with(., 'Table ')">
-				<fo:inline font-weight="bold" font-style="normal" color="black"><xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/></fo:inline>
+				<fo:inline><xsl:copy-of select="$styles/styles/@*"/><xsl:value-of select="."/></fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="."/>
@@ -1084,17 +1096,12 @@
 	</xsl:template>
 
 	<xsl:template match="mn:clause" priority="2">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel">
-				<xsl:with-param name="depth" select="mn:title/@depth"/>
-			</xsl:call-template>
-		</xsl:variable>
-		<fo:block-container>
-			<xsl:if test="$level &gt;= 4">
-				<xsl:attribute name="margin-left">13mm</xsl:attribute>
-			</xsl:if>
-			<fo:block-container margin-left="0mm">
-				<fo:block>
+		<fo:block-container xsl:use-attribute-sets="clause-style">
+			<xsl:call-template name="refine_clause-style"/>
+
+			<fo:block-container margin-left="0mm" role="SKIP">
+				<xsl:call-template name="setNamedDestination"/>
+				<fo:block role="SKIP">
 					<xsl:call-template name="setId"/>
 					<xsl:call-template name="addReviewHelper"/>
 					<xsl:apply-templates/>
@@ -1105,11 +1112,21 @@
 
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="section"/>
+
+		<xsl:call-template name="insertHoneycomb">
+			<xsl:with-param name="section" select="$section"/>
+		</xsl:call-template>
+
+		<xsl:call-template name="insertFooter"/>
+	</xsl:template>
+
+	<xsl:template name="insertHoneycomb">
+		<xsl:param name="section"/>
 		<!-- LT - left top -->
 		<!-- RT - right top -->
 		<!-- LB - left bottom -->
 		<!-- RB - right bottom -->
-		<xsl:variable name="width">170,26</xsl:variable>
+		<!-- <xsl:variable name="width">170,26</xsl:variable> -->
 		<xsl:variable name="left_left">-28.02</xsl:variable>
 		<xsl:variable name="left_right">72</xsl:variable>
 		<xsl:variable name="top_top">-25.75</xsl:variable>
@@ -1201,19 +1218,36 @@
 					</fo:block>
 			</fo:block-container>
 		</fo:static-content>
-
-		<xsl:call-template name="insertFooter"/>
 	</xsl:template>
 
 	<xsl:template name="insertFooter">
-		<xsl:param name="invert"/>
+		<!-- <xsl:param name="invert"/> -->
 		<xsl:variable name="footerText">
 			<xsl:text>Ribose</xsl:text>
 			<xsl:text> </xsl:text>
-			<xsl:call-template name="capitalize">
-				<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
+			<xsl:call-template name="capitalizeWords">
+				<xsl:with-param name="str">
+					<xsl:choose>
+						<xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:doctype-alias">
+							<xsl:value-of select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:doctype-alias"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
 			</xsl:call-template>
 		</xsl:variable>
+		<xsl:call-template name="insertFooterOdd">
+			<xsl:with-param name="footerText" select="$footerText"/>
+		</xsl:call-template>
+		<xsl:call-template name="insertFooterEven">
+			<xsl:with-param name="footerText" select="$footerText"/>
+		</xsl:call-template>
+	</xsl:template>
+
+	<xsl:template name="insertFooterOdd">
+		<xsl:param name="footerText"/>
 		<fo:static-content flow-name="footer-odd" role="artifact">
 			<fo:block-container font-size="8pt" height="100%" color="black">
 				<fo:block text-align-last="justify" margin-right="1mm">
@@ -1226,14 +1260,18 @@
 				</fo:block>
 			</fo:block-container>
 		</fo:static-content>
+	</xsl:template>
+
+	<xsl:template name="insertFooterEven">
+		<xsl:param name="footerText"/>
 		<fo:static-content flow-name="footer-even" role="artifact">
 			<fo:block-container font-size="8pt" height="100%" color="black">
 				<fo:block text-align-last="justify" margin-right="1mm">
 					<fo:inline padding-right="11mm"><fo:page-number/></fo:inline>
 					<fo:inline>
-						<xsl:if test="$invert = 'true'">
+						<!-- <xsl:if test="$invert = 'true'">
 							<xsl:attribute name="color">white</xsl:attribute>
-						</xsl:if>
+						</xsl:if> -->
 						<xsl:value-of select="$footerText"/>
 					</fo:inline>
 					<fo:inline keep-together.within-line="always">
@@ -1529,6 +1567,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -1614,11 +1653,12 @@
 	<xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable>
 	<xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable>
 	<xsl:attribute-set name="root-style">
-		<xsl:attribute name="font-family">OpenSans, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
+		<xsl:attribute name="font-family">Open Sans, Source Sans 3, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
 		<xsl:attribute name="font-family-generic">Sans</xsl:attribute>
 		<xsl:attribute name="font-weight">300</xsl:attribute>
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="color">rgb(88, 88, 90)</xsl:attribute>
+		<xsl:attribute name="font-selection-strategy">character-by-character</xsl:attribute>
 	</xsl:attribute-set> <!-- root-style -->
 
 	<xsl:template name="insertRootStyle">
@@ -2073,6 +2113,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -2087,10 +2128,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -2925,6 +2966,9 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="feedback-statement-style">
+		<xsl:attribute name="border">1pt solid black</xsl:attribute>
+		<xsl:attribute name="padding">1mm</xsl:attribute>
+		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set> <!-- feedback-statement-style -->
 
 	<xsl:template name="refine_feedback-statement-style">
@@ -3196,7 +3240,6 @@
 		<xsl:attribute name="role">Code</xsl:attribute>
 		<xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="line-height">113%</xsl:attribute>
 	</xsl:attribute-set> <!-- sourcecode-style -->
 
@@ -3215,6 +3258,16 @@
 		</xsl:if>
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-style">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -4621,6 +4674,32 @@
 	<xsl:template name="refine_term-name-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="preferred-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:variable name="font-size">
+			<xsl:choose>
+				<xsl:when test="$level &gt;= 2">13pt</xsl:when>
+				<xsl:otherwise>12pt</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="levelTerm">
+			<xsl:call-template name="getLevelTermName"/>
+		</xsl:variable>
+		<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
+		<xsl:attribute name="role">H<xsl:value-of select="$levelTerm"/></xsl:attribute>
+		<xsl:if test="preceding-sibling::*[1][self::mn:fmt-name]">
+			<xsl:attribute name="space-before">11mm</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="preferred-block-style">
 	</xsl:attribute-set> <!-- preferred-block-style -->
 
@@ -4981,6 +5060,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="example-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<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>
@@ -5268,6 +5348,16 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-style">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -5722,7 +5812,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -8877,6 +8967,16 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-style">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-size">13pt</xsl:attribute>
@@ -11286,6 +11386,13 @@
 	<!-- ================ -->
 
 	<xsl:attribute-set name="references-non-normative-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="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">
@@ -11324,9 +11431,29 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
 		<xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
 
 	<xsl:template name="refine_bibitem-non-normative-list-style">
+		<xsl:variable name="last_bibitem_bibliotag">
+			<xsl:apply-templates select="following-sibling::mn:bibitem[not(@hidden='true')][last()]/mn:biblio-tag">
+				<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+			</xsl:apply-templates>
+			<xsl:if test="not(following-sibling::mn:bibitem[not(@hidden='true')][last()]/mn:biblio-tag)">
+				<xsl:apply-templates select="mn:biblio-tag">
+					<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+				</xsl:apply-templates>
+			</xsl:if>
+		</xsl:variable>
+		<xsl:variable name="last_bibitem_bibliotag_number_length" select="string-length(translate($last_bibitem_bibliotag, '[] ', ''))"/>
+		<xsl:if test="$last_bibitem_bibliotag_number_length &gt; 1">
+			<xsl:attribute name="provisional-distance-between-starts">
+				<xsl:choose>
+					<xsl:when test="$last_bibitem_bibliotag_number_length = 2">9.2mm</xsl:when>
+					<xsl:when test="$last_bibitem_bibliotag_number_length &gt;= 3">11mm</xsl:when>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:attribute-set name="bibitem-non-normative-list-item-style">
@@ -11447,11 +11574,12 @@
 	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 		<xsl:call-template name="setNamedDestination"/>
+		<!-- continue from <xsl:template match="mn:references[not(@normative='true')]" priority="3"> -->
 		<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
 			<xsl:call-template name="refine_bibitem-non-normative-list-style"/>
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
-					<fo:block>
+					<fo:block role="SKIP">
 						<xsl:apply-templates select="mn:biblio-tag">
 							<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
 						</xsl:apply-templates>
@@ -12106,6 +12234,7 @@
 	<xsl:attribute-set name="toc-style">
 		<xsl:attribute name="margin-left">32mm</xsl:attribute>
 		<xsl:attribute name="margin-right">-17mm</xsl:attribute>
+		<xsl:attribute name="role">TOC</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
@@ -13740,13 +13869,32 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel">
+				<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:if test="$level &gt;= 4">
+			<xsl:attribute name="margin-left">13mm</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
+		<xsl:if test="@type = 'terms'">
+			<fo:block break-after="page"/>
+		</xsl:if>
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
+			<xsl:call-template name="addTagElementT"/>
 
 			<xsl:call-template name="addReviewHelper"/>
 
@@ -13871,6 +14019,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>

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.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.7.3".freeze
+    VERSION = "2.7.4".freeze
   end
 end

data/metanorma.yml

@@ -51,7 +51,10 @@ webfont:
   - "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,600,600i&display=swap"
   - "https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,600;1,300;1,600&display=swap" 
 fonts_manifest:
-  Source Sans Pro:
+  Open Sans:
+  Open Sans Light:
+  Open Sans Semibold:
+  Source Sans 3:
   STIX Two Math:
   Source Serif Pro:
   Source Code Pro:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic