metanorma-plateau 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 395bd0ddb1051233f50c4e50672c98227da150d638f4693857861421b43d238a
-  data.tar.gz: 0f69c4cee8908eb8c104a116150df2f05ed458bb01bfa2105c12669a85a558a7
+  metadata.gz: 86f7c18c1343e8d2ef7350db1a5b5249c09c645b16269ec63581be1a7fb34323
+  data.tar.gz: 8f8eb68e1dc7610e21d650b9595228421786927e203da3276cd7971d1a9fce6c
 SHA512:
-  metadata.gz: 2aba824057acd6a554ef6829d166072e5f685816248cfd2f5b1a44bb4e7ed20debbbf18207054739d8f2b4f58dba03ea382e0f89c8750a6b9b77a0a0f9790280
-  data.tar.gz: d26e2a4f67a0caf9a2bf2087222abcf286c09a8917eebb38e899c6babeb04bf2c05ddd45d89afc5a01d597a37828775e39a01d8e2592cc768f54756aef4a240c
+  metadata.gz: b0440e60dec457cd3a971d47cb3974b39600ed3c93380df7642404b074391fe273b743cdd58694085059b48ef24ca058fb2a1ac8813646e1ceeaab64ea736e26
+  data.tar.gz: b1d933ad3ad3befbefd20bdb2922fac4cb4acd1bec3e722964b41adc657475b5ab11ed962b012f7390a2705508635261ad5688724a7d4ee11e748fd4de32aaa8

data/lib/isodoc/plateau/plateau.international-standard.xsl

@@ -1213,6 +1213,13 @@
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
 
+					<xsl:if test="(ancestor::*[local-name() = 'td' or local-name() = 'th']) and            (.//*[local-name() = 'font_en' or local-name() = 'font_en_bold'])">
+						<xsl:if test="$isGenerateTableIF = 'false'">
+							<xsl:attribute name="language">en</xsl:attribute>
+							<xsl:attribute name="hyphenate">true</xsl:attribute>
+						</xsl:if>
+					</xsl:if>
+
 					<xsl:if test="parent::plateau:clause or (ancestor::plateau:note and not(ancestor::plateau:table))">
 						<xsl:text>　</xsl:text>
 					</xsl:if>
@@ -1670,8 +1677,20 @@
 	<!-- Key title after the table -->
 	<xsl:template match="plateau:table/plateau:p[@class = 'ListTitle']" priority="2" mode="update_xml_step1"/>
 
+  <!-- added to fix conflict with previous update in update_xml_pres -->
+	<xsl:template match="*[local-name() = 'preferred'] | *[local-name() = 'admitted'] | *[local-name() = 'deprecates'] |      *[local-name() = 'definition'] | *[local-name() = 'termsource'] | *[local-name() = 'termsource'] |      *[local-name() = 'term'][@unnumbered = 'true']" mode="update_xml_step1" priority="2">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'font_en_bold'][normalize-space() != '']">
-		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
+		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']">
+			<xsl:choose>
+				<xsl:when test="$isGenerateTableIF = 'false'"><fo:inline font-size="0.1pt"><xsl:text> </xsl:text></fo:inline></xsl:when>
+				<xsl:otherwise><fo:inline><xsl:value-of select="$zero_width_space"/></fo:inline></xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 		<fo:inline font-family="Noto Sans Condensed" font-weight="300"> <!--  font-weight="bold" -->
 			<!-- <xsl:if test="ancestor::*[local-name() = 'preferred']">
 				<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -1690,11 +1709,21 @@
 
 			<xsl:apply-templates/>
 		</fo:inline>
-		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
+		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']">
+			<xsl:choose>
+				<xsl:when test="$isGenerateTableIF = 'false'"><fo:inline font-size="0.1pt"><xsl:text> </xsl:text></fo:inline></xsl:when>
+				<xsl:otherwise><fo:inline><xsl:value-of select="$zero_width_space"/></fo:inline></xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'font_en'][normalize-space() != '']">
-		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
+		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']">
+			<xsl:choose>
+				<xsl:when test="$isGenerateTableIF = 'false'"><fo:inline font-size="0.1pt"><xsl:text> </xsl:text></fo:inline></xsl:when>
+				<xsl:otherwise><fo:inline><xsl:value-of select="$zero_width_space"/></fo:inline></xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 		<fo:inline>
 			<xsl:if test="not(ancestor::plateau:p[@class = 'zzSTDTitle2']) and not(ancestor::plateau:span[@class = 'JIS'])">
 				<xsl:attribute name="font-family">Noto Sans Condensed</xsl:attribute>
@@ -1705,7 +1734,12 @@
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
-		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
+		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']">
+			<xsl:choose>
+				<xsl:when test="$isGenerateTableIF = 'false'"><fo:inline font-size="0.1pt"><xsl:text> </xsl:text></fo:inline></xsl:when>
+				<xsl:otherwise><fo:inline><xsl:value-of select="$zero_width_space"/></fo:inline></xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 	</xsl:template>
 
 	<!-- ========================= -->
@@ -7109,9 +7143,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 -->
@@ -13164,16 +13203,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']"/>
@@ -13271,6 +13324,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/plateau/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/plateau/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "0.1.15".freeze
+    VERSION = "0.1.16".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 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-jis