metanorma-jis 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d96124c9e4fc24d870feb8468d5a189c91db7ec2cc09defdbef1e5aea95c1a
-  data.tar.gz: 71e3c4e32970bdb780959c39bcb4df6f0ed1ba372e400ba112a71bdc5413ba7d
+  metadata.gz: da9709b15e71dab76fa533ab0b25ebaceaa4e6ce54d873d1d7a1cf42badaaff2
+  data.tar.gz: 97b4c270b01ebd428b741db1a297575c830be52d8754c365bf9e50848602cf7d
 SHA512:
-  metadata.gz: 545df234a6cd22ec2d9391b171813ab7fa55804f2c8ef8ca4263f445b387154efcd937a512168b61e6026b243abed2697f13b2faa58f562e6a6adbc954eeae61
-  data.tar.gz: d8ce7d6270574ad2f26a9db44d221f24c1d64c8cf10bbed86921b8b3c91fd256d058e44aa89c605cc1248be2a6c35bc5b402a2f9b98efaab49221c30bc352a72
+  metadata.gz: 939759f056436000c2b3f809a5b16466928a76d6eb237b99cb3caf17b034a0bd078e3fc8302241b7c9a762944526ce0fe7538628b1781b4d041d49d51d70f12c
+  data.tar.gz: 498e749399c5bce3c30e213381f619378a33f0c0843eb9711c8835c091c0b70dfa10df6ab761bb953a733575e6dc5e89306329c47e83b4d84ae0c62b7d81d343

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

@@ -1369,20 +1369,20 @@
 					<fo:table-body>
 						<fo:table-row height="50mm">
 							<fo:table-cell>
-								<fo:block><xsl:value-of select="$publisher"/></fo:block>
+								<fo:block id="__internal_layout__coverpage_footer_block1_{$num}_{generate-id()}"><xsl:value-of select="$publisher"/></fo:block>
 							</fo:table-cell>
-							<fo:table-cell><fo:block> </fo:block></fo:table-cell>
+							<fo:table-cell><fo:block id="__internal_layout__coverpage_footer_block2_{$num}_{generate-id()}"> </fo:block></fo:table-cell>
 							<fo:table-cell>
-								<fo:block><xsl:value-of select="$authorizer"/></fo:block>
+								<fo:block id="__internal_layout__coverpage_footer_block3_{$num}_{generate-id()}"><xsl:value-of select="$authorizer"/></fo:block>
 							</fo:table-cell>
 						</fo:table-row>
 						<fo:table-row>
 							<fo:table-cell>
-								<fo:block><xsl:if test="normalize-space($publisher) != ''">発行</xsl:if></fo:block>
+								<fo:block id="__internal_layout__coverpage_footer_block4_{$num}_{generate-id()}"><xsl:if test="normalize-space($publisher) != ''">発行</xsl:if></fo:block>
 							</fo:table-cell>
-							<fo:table-cell><fo:block> </fo:block></fo:table-cell>
+							<fo:table-cell><fo:block id="__internal_layout__coverpage_footer_block5_{$num}_{generate-id()}"> </fo:block></fo:table-cell>
 							<fo:table-cell>
-								<fo:block><xsl:if test="normalize-space($authorizer) != ''">審議</xsl:if></fo:block>
+								<fo:block id="__internal_layout__coverpage_footer_block6_{$num}_{generate-id()}"><xsl:if test="normalize-space($authorizer) != ''">審議</xsl:if></fo:block>
 							</fo:table-cell>
 						</fo:table-row>
 					</fo:table-body>
@@ -1433,7 +1433,7 @@
 								</xsl:for-each>
 							</xsl:variable>
 							<xsl:attribute name="width"><xsl:value-of select="sum(xalan:nodeset($blocksWidth)//width)"/>em</xsl:attribute>
-							<fo:block-container width="1em">
+							<fo:block-container width="1em" id="__internal_layout__coverpage_block1_{$num}_{generate-id()}">
 								<xsl:copy-of select="$blocks"/>
 							</fo:block-container>
 					</fo:inline-container>
@@ -1441,7 +1441,7 @@
 					<fo:inline font-size="8.16pt" baseline-shift="20%">:</fo:inline>
 
 					<fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
-							<fo:block-container width="1em">
+							<fo:block-container width="1em" id="__internal_layout__coverpage_block2_{$num}_{generate-id()}">
 								<fo:block line-height="1em" margin-top="0.2em"/>
 								<fo:block font-size="8.16pt" baseline-shift="20%">
 									<xsl:call-template name="insertEachCharInBlock">
@@ -3024,7 +3024,12 @@
 
 	<!-- bold English text in non-vertical layout -->
 	<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>
 			<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -3033,12 +3038,22 @@
 			</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>
 
 	<!-- English text in non-vertical layout -->
 	<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::jis:p[@class = 'zzSTDTitle2']) and not(ancestor::jis:span[@class = 'JIS'])">
 				<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
@@ -3048,7 +3063,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>
 
 	<!-- English text in vertical layout -->
@@ -3329,7 +3349,7 @@
 			<fo:static-content flow-name="header-last" role="artifact">
 				<fo:block font-size="12pt" font-weight="bold" margin-left="10mm">
 					<fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
-							<fo:block-container width="1em">
+							<fo:block-container width="1em" id="__internal_layout__lastpage_{generate-id()}">
 								<xsl:call-template name="insertEachCharInBlock">
 									<xsl:with-param name="str">JIS <xsl:value-of select="$docidentifier_number"/></xsl:with-param>
 									<xsl:with-param name="spaceIndent">0.5em</xsl:with-param>
@@ -3382,7 +3402,10 @@
 		<fo:static-content flow-name="left-region"> <!--  role="artifact" commented, because there is <fo:retrieve-marker below, occurs java.lang.IndexOutOfBoundsException: Index: 1, Size: 1 -->
 			<fo:block-container absolute-position="fixed" left="0mm" top="0" width="6mm" height="{$pageHeightA5}mm" background-color="{$cover_header_footer_background}">
 				<fo:block-container font-size="9pt" color="white" text-align="center">
-					<fo:block margin-top="131mm">
+					<xsl:if test="$isGenerateTableIF = 'false'">
+						<xsl:attribute name="writing-mode">tb-rl</xsl:attribute>
+					</xsl:if>
+					<fo:block margin-top="131mm" margin-right="1mm">
 						<fo:page-number/>
 					</fo:block> <!-- 二 -->
 				</fo:block-container>
@@ -10945,9 +10968,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 -->
@@ -17021,16 +17049,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']"/>
@@ -17128,6 +17170,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/jis/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/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.4.5".freeze
+    VERSION = "0.4.6".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 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: japanese_calendar