metanorma-ribose 2.5.11 → 2.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1156484096c30a068a71bc24161bcbdcb4bf9849db623f12cfd2900bfa7ea05b
-  data.tar.gz: e853754d1770ea8ce4915c61592504056393e90a4d4a915a0201be23f612deba
+  metadata.gz: 22e5a9796d0c28c369ecb9ac164ae30969e4017e3ccb79c6001561e121636720
+  data.tar.gz: aa3505c305b73a316defb48783b566161a1223ee7f4959186a600f27ace0fe76
 SHA512:
-  metadata.gz: c40bf640bdf8084e28ad5de4a8a5b9343a0c5559eb78e82a64ca3b5f7913a29c4166774d22415b1aa57ee4f8575cf212efe62555922b4f649e879fdbba88db32
-  data.tar.gz: 51e7de395fc02e90cc392808431fb49134cdfa0d052253566e7ed10097e97bd99ee55c4b577e8036311c30bc2828e4f016f3adfe0be4f4aec35a2495d02555e3
+  metadata.gz: 1faa3784f9c7e46f3428bb1099e79065d0bed90e3beac55524a4832364493f4acb2d42c2828096e4f5d6d6083239a12449f831ed800ce1d499dd218713d9c2c2
+  data.tar.gz: 97bb9379a1540e1ba539a5ba2dcf7edf78ae82040fef304f19b8f67f29732b71d24608d19848ca32e06d14bf1958466842a1f1bd27889e0b5b5df5654ce5ef6b

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

@@ -6648,9 +6648,14 @@
 
 		<xsl:variable name="simple-table">
 
+			<xsl:variable name="table_without_semantic_elements">
+				<xsl:apply-templates mode="update_xml_pres"/>
+			</xsl:variable>
+
 			<!-- Step 0. replace <br/> to <p>...</p> -->
 			<xsl:variable name="table_without_br">
-				<xsl:apply-templates mode="table-without-br"/>
+				<!-- <xsl:apply-templates mode="table-without-br"/> -->
+				<xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
 			</xsl:variable>
 
 			<!-- Step 1. colspan processing -->
@@ -12702,16 +12707,30 @@
 
 	<xsl:template match="*[local-name() = 'fmt-name']"/>
 	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
-		<xsl:element name="name" namespace="{$namespace_full}">
-			<xsl:copy-of select="@*"/>
-			<xsl:apply-templates mode="update_xml_step1"/>
-		</xsl:element>
+		<xsl:choose>
+			<xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
+				<xsl:apply-templates mode="update_xml_step1"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="name" namespace="{$namespace_full}">
+					<xsl:copy-of select="@*"/>
+					<xsl:apply-templates mode="update_xml_step1"/>
+				</xsl:element>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
-		<xsl:element name="name" namespace="{$namespace_full}">
-			<xsl:copy-of select="@*"/>
-			<xsl:apply-templates mode="update_xml_pres"/>
-		</xsl:element>
+		<xsl:choose>
+			<xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
+				<xsl:apply-templates mode="update_xml_step1"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="name" namespace="{$namespace_full}">
+					<xsl:copy-of select="@*"/>
+					<xsl:apply-templates mode="update_xml_pres"/>
+				</xsl:element>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -12809,6 +12828,9 @@
 		<xsl:apply-templates mode="update_xml_pres"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'semx']">
+		<xsl:apply-templates/>
+	</xsl:template>
 	<xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>

data/lib/metanorma/ribose/biblio.rng

@@ -947,6 +947,8 @@ May be electronic (e.g. Twitter direct message, email) or voice (e.g. a remark m
 typically cited as "personal communication")</a:documentation>
       <value>conversation</value>
       <a:documentation>An exchange of messages between two or more persons. May be electronic (e.g. web chat) or voice (e.g. phone call)</a:documentation>
+      <value>collection</value>
+      <a:documentation>A compound resource consisting of other resources, which are themselves presupposed to have their type specified..</a:documentation>
       <value>misc</value>
       <a:documentation>Bibliographic type not adequately described in the foregoing</a:documentation>
     </choice>

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.5.11".freeze
+    VERSION = "2.5.12".freeze
   end
 end

metadata

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