metanorma-ribose 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0bd3dfdc7c8e1fa480a67bfed8b12b902f4f3aec39330c04316ba6aee526dc5
-  data.tar.gz: f8ae40d15422184e3f4d5746f31fa5a54c2bb8f323747a5a84cb04f07e1b37ff
+  metadata.gz: 284d22a131d86b0c7d6c646d9cd50911c32f3409fca61ceb5b241a0214fb0148
+  data.tar.gz: d0c711bab0e2d680e1a9eefae0fede9b137df1a82287a5ae92a79b8b79be811e
 SHA512:
-  metadata.gz: 200daf8c84ade837bf5bdcde6ffd06283960b6b561479bd5bf7015199ac329f8baa83c9fa1dda3a5a4a2717af6723a64e71680890fe9f6374240b267871c04b4
-  data.tar.gz: aa32f27c72fd0838a26f446c4768c0334bc1a1839e13e5cda889302f00f08a98b03b79d38a4d5264054883ee0d610d583a330e855419f8b966726dc0f54d0449
+  metadata.gz: 5ebc1a0f8d91cb8c0bb9a13c0a378a8aab52b3eee0cb6997493a331dc391592e3baa8b8718fcf3634c305adb443f9c69fea100d79eec5c7a5b604d948b3647ac
+  data.tar.gz: 818bbcf3ccc7e84d198c67975b6c212b94da3bab609d92028de5343c4032f7e763c7ed31777110a4ea3974206478eadeee0e08fb7a13d0bfaa7d0706700c04d0

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

@@ -319,6 +319,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/isodoc/ribose/presentation_xml_convert.rb

@@ -15,7 +15,7 @@ module IsoDoc
         elem.replace(l10n("<strong>#{@i18n.source}</strong>: #{sources}"))
       end
 
-      def designation_boldface(desgn); end
+      def designation_expression_boldface(desgn, name); end
 
       def preface_rearrange(doc)
         preface_move(doc.xpath(ns("//preface/abstract")),

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

@@ -19,12 +19,12 @@
 
 	<xsl:variable name="contents_">
 		<mnx:contents>
-
+			<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:clause[@type = 'toc']" mode="contents"/>
 			<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract" mode="contents"/>
 			<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:foreword" mode="contents"/>
 			<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:executivesummary" mode="contents"/>
 			<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:introduction" mode="contents"/>
-			<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:clause" mode="contents"/>
+			<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:clause[not(@type = 'toc')]" mode="contents"/>
 			<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:acknowledgements" mode="contents"/>
 
 			<xsl:call-template name="processMainSectionsDefault_Contents"/>
@@ -250,7 +250,7 @@
 				</xsl:variable>
 
 				<xsl:if test="normalize-space($toc_and_boilerplate) != ''">
-					<fo:page-sequence master-reference="document" force-page-count="no-force"> <!-- master-reference="toc" -->
+					<fo:page-sequence xsl:use-attribute-sets="page-sequence-main"> <!-- master-reference="toc" -->
 						<xsl:call-template name="insertHeaderFooter">
 							<xsl:with-param name="section">toc</xsl:with-param>
 						</xsl:call-template>
@@ -273,9 +273,8 @@
 
 					<xsl:for-each select=".//mn:page_sequence[normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
-						<xsl:variable name="page_orientation"><xsl:call-template name="getPageSequenceOrientation"/></xsl:variable>
-
-						<fo:page-sequence master-reference="document{$page_orientation}" force-page-count="no-force">
+						<fo:page-sequence xsl:use-attribute-sets="page-sequence-main">
+							<xsl:call-template name="refine_page-sequence-main"/>
 
 							<xsl:call-template name="insertFootnoteSeparatorCommon"/>
 
@@ -510,9 +509,9 @@
 					</xsl:call-template>
 					<xsl:apply-templates select="." mode="contents"/>
 					<xsl:text>  </xsl:text>
-					<fo:inline>
-						<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
-						<fo:inline xsl:use-attribute-sets="toc-pagenumber-style"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
+					<fo:inline role="SKIP">
+						<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
+						<fo:inline xsl:use-attribute-sets="toc-pagenumber-style"><fo:page-number-citation ref-id="{@id}" role="SKIP"/></fo:inline> <!-- <fo:wrapper role="artifact"> </fo:wrapper> -->
 					</fo:inline>
 				</fo:basic-link>
 			</fo:block>
@@ -523,6 +522,7 @@
 
 	<xsl:template match="mn:preface/mn:clause[@type = 'toc']" name="toc" priority="3">
 		<fo:block role="SKIP">
+			<xsl:copy-of select="@id"/>
 			<xsl:apply-templates/>
 
 			<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
@@ -531,38 +531,42 @@
 
 					<fo:block-container xsl:use-attribute-sets="toc-style">
 						<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">
-
-									<xsl:call-template name="refine_toc-item-style"/>
-
-									<fo:block text-align-last="justify" role="SKIP">
-										<fo:inline role="Lbl"><xsl:value-of select="@section"/></fo:inline>
-										<fo:wrapper role="Reference">
-											<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
-												<xsl:if test="@section != ''">
-													<xsl:text> </xsl:text>
-												</xsl:if>
-												<xsl:apply-templates select="mnx:title"/>
-												<xsl:text>  </xsl:text>
-												<fo:inline role="SKIP">
-													<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
-													<fo:inline xsl:use-attribute-sets="toc-pagenumber-style"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
-												</fo:inline>
-											</fo:basic-link>
-										</fo:wrapper>
+							<fo:block role="TOC">
+								<xsl:for-each select="$contents//mnx:item[@display = 'true']">
+									<fo:block xsl:use-attribute-sets="toc-item-style">
+
+										<xsl:call-template name="refine_toc-item-style"/>
+
+										<fo:block text-align-last="justify" role="SKIP">
+											<fo:inline role="Lbl"><xsl:value-of select="@section"/></fo:inline>
+											<fo:wrapper role="Reference">
+												<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
+													<xsl:if test="@section != ''">
+														<xsl:text> </xsl:text>
+													</xsl:if>
+													<xsl:apply-templates select="mnx:title"/>
+													<xsl:text>  </xsl:text>
+													<fo:inline role="SKIP">
+														<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
+														<fo:inline xsl:use-attribute-sets="toc-pagenumber-style"><fo:page-number-citation ref-id="{@id}" role="SKIP"/></fo:inline> <!-- <fo:wrapper role="artifact"> </fo:wrapper> -->
+													</fo:inline>
+												</fo:basic-link>
+											</fo:wrapper>
+										</fo:block>
 									</fo:block>
-								</fo:block>
-							</xsl:for-each>
+								</xsl:for-each>
+							</fo:block>
 
 							<!-- List of Tables -->
 							<xsl:if test="$contents//mnx:tables/mnx:table">
 								<xsl:call-template name="insertListOf_Title">
 									<xsl:with-param name="title" select="$title-list-tables"/>
 								</xsl:call-template>
-								<xsl:for-each select="$contents//mnx:tables/mnx:table">
-									<xsl:call-template name="insertListOf_Item"/>
-								</xsl:for-each>
+								<fo:block role="TOC">
+									<xsl:for-each select="$contents//mnx:tables/mnx:table">
+										<xsl:call-template name="insertListOf_Item"/>
+									</xsl:for-each>
+								</fo:block>
 							</xsl:if>
 
 							<!-- List of Figures -->
@@ -570,9 +574,11 @@
 								<xsl:call-template name="insertListOf_Title">
 									<xsl:with-param name="title" select="$title-list-figures"/>
 								</xsl:call-template>
-								<xsl:for-each select="$contents//mnx:figures/mnx:figure">
-									<xsl:call-template name="insertListOf_Item"/>
-								</xsl:for-each>
+								<fo:block role="TOC">
+									<xsl:for-each select="$contents//mnx:figures/mnx:figure">
+										<xsl:call-template name="insertListOf_Item"/>
+									</xsl:for-each>
+								</fo:block>
 							</xsl:if>
 
 						</fo:block-container>
@@ -581,7 +587,7 @@
 					<fo:block break-after="page"/>
 				</xsl:if>
 			</xsl:if>
-			<fo:block margin-bottom="12pt"> </fo:block>
+			<fo:block margin-bottom="12pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
 		</fo:block>
 	</xsl:template>
 
@@ -1510,20 +1516,25 @@
 	</xsl:variable>
 
 	<xsl:attribute-set name="page-sequence-preface">
-		<xsl:attribute name="format">i</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- page-sequence-preface -->
 
 	<xsl:template name="refine_page-sequence-preface">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:param name="num"/>
+		<xsl:param name="skip_force_page_count">false</xsl:param>
+	</xsl:template> <!-- refine_page-sequence-preface -->
 
 	<xsl:attribute-set name="page-sequence-main">
-
-	</xsl:attribute-set>
+		<xsl:attribute name="master-reference">document</xsl:attribute>
+		<xsl:attribute name="force-page-count">no-force</xsl:attribute>
+	</xsl:attribute-set> <!-- page-sequence-main -->
 
 	<xsl:template name="refine_page-sequence-main">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:attribute name="master-reference">document<xsl:call-template name="getPageSequenceOrientation"/></xsl:attribute>
+	</xsl:template> <!-- refine_page-sequence-main -->
 
 	<xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable>
 	<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>
@@ -12524,10 +12535,11 @@
 	<xsl:attribute-set name="toc-style">
 		<xsl:attribute name="margin-left">10mm</xsl:attribute> <!-- 32mm -->
 		<xsl:attribute name="margin-right">-17mm</xsl:attribute>
-		<xsl:attribute name="role">TOC</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute> <!-- TOC -->
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:copy-of select="@id"/>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-style">
@@ -12595,7 +12607,7 @@
 	<!-- List of Figures, Tables -->
 	<xsl:attribute-set name="toc-listof-title-style">
 		<!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
-		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="role">H2</xsl:attribute> <!-- TOCI -->
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="color">black</xsl:attribute>
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -12624,13 +12636,13 @@
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 
-		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 			<xsl:sort select="@displayorder" data-type="number"/>
 
 			<!-- process Section's title -->
@@ -12643,6 +12655,23 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template match="*[@type = 'toc'][mn:title or mn:fmt-title]" mode="contents" priority="2">
+		<xsl:variable name="title">
+			<xsl:call-template name="getName"/>
+		</xsl:variable>
+		<xsl:variable name="root">
+			<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
+			<xsl:if test="ancestor-or-self::mn:annex">annex</xsl:if>
+		</xsl:variable>
+		<mnx:item id="{@id}" level="1" section="" type="toc" root="{$root}" display="false">
+			<mnx:title>
+				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+					<xsl:with-param name="element" select="$root"/>
+				</xsl:apply-templates>
+			</mnx:title>
+		</mnx:item>
+	</xsl:template>
+
 	<xsl:template name="processMainSectionsDefault_Contents">
 
 		<xsl:variable name="nodes_sections_">
@@ -14431,16 +14460,17 @@
 	<!-- 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"/>
+		<xsl:param name="wrapper">true</xsl:param>
 		<xsl:variable name="element_node" select="xalan:nodeset($element)"/>
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' and $wrapper = 'true'">
 				<fo:wrapper role="Reference">
 					<xsl:copy-of select="$element_node"/>
 				</fo:wrapper>
 			</xsl:when>
-			<xsl:when test="$external-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' or $external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>

data/lib/metanorma/ribose/biblio.rng

@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/ribose/isodoc.rng

@@ -641,8 +641,85 @@ This is done if the footnote reference is already presented in some other form,
         </ref>
       </zeroOrMore>
     </define>
+    <define name="altsource">
+      <a:documentation>Alternative file to use as media</a:documentation>
+      <element name="altsource">
+        <ref name="MediaAttributes"/>
+        <optional>
+          <attribute name="tag">
+            <a:documentation>Comma-delimited tag to indicate when the alternate file is to be used, 
+at minimum allows contain `html`, `doc`, `pdf` as the main target formats of Metanorma,
+and `default` for the fallback. The presence of an altsource tagged `default` is required</a:documentation>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="media">
+            <a:documentation>CSS media query to indicate when the alternate file is to be used</a:documentation>
+          </attribute>
+        </optional>
+      </element>
+    </define>
+    <define name="image">
+      <a:documentation>Container for image content</a:documentation>
+      <choice>
+        <element name="image">
+          <ref name="RequiredId"/>
+          <ref name="ImageAttributes">
+            <a:documentation>When specified along with altsource, ImageAttributes give the default image to be rendered</a:documentation>
+          </ref>
+          <ref name="ImageBody"/>
+        </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="ImageAttributes">
+      <optional>
+        <ref name="MediaAttributes">
+          <a:documentation>If the image contains altsource, the media attributes are given on each of the altsource elements instead of the root node</a:documentation>
+        </ref>
+      </optional>
+      <ref name="MediaAccessibilityAttributes"/>
+      <optional>
+        <attribute name="width">
+          <a:documentation>Height of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="height">
+          <a:documentation>Width of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="ImageBody">
+    <optional>
+      <element name="svg">
+        <a:documentation>image can contain SVG XML, which is used to access its identifiers within the Metanorma XML</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="altsource">
+        <a:documentation>Alternative files to use as media</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="key">
     <a:documentation>Key to a table, figure, or formula</a:documentation>
     <element name="key">
@@ -930,34 +1007,6 @@ titlecase, or lowercase</a:documentation>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
-  <define name="image" combine="choice">
-    <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">
       <a:documentation>Bibliographic source for the information in the paragraph

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.8.1".freeze
+    VERSION = "2.8.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic