metanorma-ribose 2.2.9 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5310dfaa7747f6ac6d3756261e5d9f776e930b5b324a0800782bbe370ccc3297
-  data.tar.gz: e7079c1ad9ae4c0077d244ab013853b5109f374fdee3447a1896a11e0cb38fb3
+  metadata.gz: 6760f62f6f13388645da96c08bb6fb57503caa0d15d0533d4186c0c5a7a630e9
+  data.tar.gz: 2649528ddd82313deaf120d4465362a711e4ec9d40940f145c801bca3f46224b
 SHA512:
-  metadata.gz: d659ef6831f2a1508d8e02f7b6bc84a035c88d0ed153cf0a2bb45a97e914d708bfb810e9fc76196ef9dbed479264ec8f9cb1f6ef39b2a6f9fcd4150a9d0d53d6
-  data.tar.gz: 0015f2d55595a86cf9b500a12d51af1a6b2fe186b38c1662167d2daf7cfaa444dc1edb746643e6ac7173e7f3727857d3a6555d83e788a1d4de5cfbfdc4babbe1
+  metadata.gz: df7524b04ae04047f829ad4570f7c0e0a6949720cff5f5eaab00bf6d8d1f9f3c8fbce1ba74570cb39f88950499a8722518b324ec22cff32ccef0cb8c58a389bd
+  data.tar.gz: ad1ed3f2674419b6ba2da079556381c62426ae46628977586825d31a363e746d3b85f0644f663c4ecd78dfb1e644e1fe9998acc5d8a721d50f36f82bc05eb548

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

@@ -3208,7 +3208,7 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
 						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 					</xsl:if>
@@ -3252,7 +3252,7 @@
 									<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
+									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'example') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
 
@@ -3770,7 +3770,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -3843,6 +3843,7 @@
 										<xsl:apply-templates select="../*[local-name()='p']"/>
 										<xsl:apply-templates select="../*[local-name()='dl']"/>
 										<xsl:apply-templates select="../*[local-name()='note']"/>
+										<xsl:apply-templates select="../*[local-name()='example']"/>
 										<xsl:apply-templates select="../*[local-name()='source']"/>
 
 								<xsl:variable name="isDisplayRowSeparator">
@@ -3851,7 +3852,7 @@
 
 								<!-- horizontal row separator -->
 								<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
-									<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
+									<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
 										<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
 
 											<xsl:call-template name="setBordersTableArray"/>
@@ -4112,13 +4113,13 @@
 		</fo:table-cell>
 	</xsl:template> <!-- td -->
 
-	<xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
+	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
 		<fo:block xsl:use-attribute-sets="table-note-style">
 
 			<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note name (NOTE, for example) -->
+			<!-- Table's note/example name (NOTE, for example) -->
 			<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
 				<xsl:call-template name="refine_table-note-name-style"/>
@@ -4132,7 +4133,7 @@
 
 	</xsl:template> <!-- table/note -->
 
-	<xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
+	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
 		<xsl:apply-templates/>
 	</xsl:template>
 
@@ -9081,6 +9082,12 @@
 
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
+		<fo:inline xsl:use-attribute-sets="example-name-style">
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
 		<xsl:param name="fo_element">block</xsl:param>
 
@@ -9655,6 +9662,9 @@
 					<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
+			<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
+				<xsl:value-of select="@label"/>
+			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists 'ol' -->
 
 				<!-- Example: for BSI <?list-start 2?> -->
@@ -9712,10 +9722,10 @@
 						<xsl:when test="$type = 'arabic'">
 							1.
 						</xsl:when>
-						<xsl:when test="$type = 'alphabet'">
+						<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
 							a.
 						</xsl:when>
-						<xsl:when test="$type = 'alphabet_upper'">
+						<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
 							A.
 						</xsl:when>
 						<xsl:when test="$type = 'roman'">

data/lib/metanorma/ribose/isodoc.rng

@@ -1012,6 +1012,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1053,6 +1054,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="date_inline">
+    <element name="date">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="format"/>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.2.9".freeze
+    VERSION = "2.2.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic