metanorma-jis 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a682db090b197edb90ddd8f287a3e6d5c6144ec1cf547e7ba6e3917fd8c6fcd8
-  data.tar.gz: 7c0834e3d7db92e8c970586df8d017816567dfed7de17236c8667f2daab66003
+  metadata.gz: 5c784b76a6c9e7e168e3d5b6538fad7ef2cff2a44b0a42e4c6623439e93f6d55
+  data.tar.gz: 8b9f329596bdcc698de66015cf540c825efd2fcd9dfbe4c71059587e4de9c243
 SHA512:
-  metadata.gz: 3c0d262d95ae7b6abb12adbaf9becbf875afdb5aad30b0c9343543c05ccd9300d5cc8d6e9be7c92f66579b4aa928bf2c3fbcd3d5db50824997026670753d7395
-  data.tar.gz: 2955ea4c486cb425a3b40de02205151cd99d191048ba10e6eceb9b2f11c42c26864bf40c9378a7b87d2564f2c18cb4e7ca53c85ef7c84e1e80871bbc204bb5d9
+  metadata.gz: 7dd69a3ab82bf22acb5cecf56e1a12935ae7eb33d6d47cd6a52dd87c4e94e19756118996d643ba7b65c74a061baf75ff68d2f52ffdfc5a89253eb418df9a40b8
+  data.tar.gz: 4d52dcf866a974a29494388496c7fbb3e200ff128d0d329620b2751d48a180c3de5cfbaf6b74902f4dd35855cb026a420e7d129c6b0fe94895c58fd7494310b3

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

@@ -530,18 +530,21 @@
 						<xsl:when test="$vertical_layout = 'true'">
 							<xsl:call-template name="insertCoverPage2024">
 								<xsl:with-param name="num" select="$num"/>
+								<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS_"/>
 							</xsl:call-template>
 						</xsl:when>
 						<xsl:when test="$doctype = 'technical-specification'">
 							<xsl:call-template name="insertCoverPageJSA">
 								<xsl:with-param name="num" select="$num"/>
 								<xsl:with-param name="doclang" select="$doclang"/>
+								<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS_"/>
 							</xsl:call-template>
 						</xsl:when>
 						<xsl:otherwise>
 							<xsl:call-template name="insertCoverPage">
 								<xsl:with-param name="num" select="$num"/>
 								<xsl:with-param name="copyrightText" select="$copyrightText"/>
+								<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS_"/>
 							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
@@ -585,6 +588,7 @@
 												<xsl:with-param name="title_ja" select="$title_ja"/>
 												<xsl:with-param name="i18n_JIS" select="$i18n_JIS"/>
 												<xsl:with-param name="docidentifier" select="concat('JIS ', $docidentifier_JIS)"/>
+												<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS_"/>
 												<xsl:with-param name="edition" select="$edition"/>
 												<xsl:with-param name="copyrightText">
 													<xsl:copy-of select="$copyrightText"/>
@@ -660,6 +664,7 @@
 													<xsl:with-param name="title_ja" select="$title_ja"/>
 													<xsl:with-param name="i18n_JIS" select="$i18n_JIS"/>
 													<xsl:with-param name="docidentifier" select="concat('JIS ', $docidentifier_JIS)"/>
+													<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS_"/>
 													<xsl:with-param name="edition" select="$edition"/>
 													<xsl:with-param name="copyrightText">
 														<xsl:copy-of select="$copyrightText"/>
@@ -855,6 +860,7 @@
 										<xsl:with-param name="title_ja" select="$title_ja"/>
 										<xsl:with-param name="i18n_JIS" select="$i18n_JIS"/>
 										<xsl:with-param name="docidentifier" select="concat('JIS ', $docidentifier_JIS)"/>
+										<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS_"/>
 										<xsl:with-param name="edition" select="$edition"/>
 										<xsl:with-param name="copyrightText">
 											<xsl:copy-of select="$copyrightText"/>
@@ -954,6 +960,7 @@
 							<xsl:with-param name="num" select="$num"/>
 							<xsl:with-param name="doclang" select="'en'"/>
 							<xsl:with-param name="first">false</xsl:with-param>
+							<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS_"/>
 						</xsl:call-template>
 					</xsl:if>
 
@@ -1081,18 +1088,18 @@
 				<xsl:attribute name="text-align">left</xsl:attribute>
 				<xsl:attribute name="font-weight">bold</xsl:attribute>
 				<!-- <xsl:attribute name="margin-top">26mm</xsl:attribute> -->
+				<!-- Contents -->
+				<!-- <xsl:call-template name="getLocalizedString">
+					<xsl:with-param name="key">table_of_contents</xsl:with-param>
+				</xsl:call-template> -->
+				<fo:marker marker-class-name="section_title">
+					<xsl:variable name="section_title_"><xsl:apply-templates/></xsl:variable>
+					<xsl:variable name="section_title" select="translate($section_title_, '　', '')"/>
+					<xsl:call-template name="insertVerticalChar">
+						<xsl:with-param name="str" select="$section_title"/>
+					</xsl:call-template>
+				</fo:marker>
 			</xsl:if>
-			<!-- Contents -->
-			<!-- <xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">table_of_contents</xsl:with-param>
-			</xsl:call-template> -->
-			<fo:marker marker-class-name="section_title">
-				<xsl:variable name="section_title_"><xsl:apply-templates/></xsl:variable>
-				<xsl:variable name="section_title" select="translate($section_title_, '　', '')"/>
-				<xsl:call-template name="insertVerticalChar">
-					<xsl:with-param name="str" select="$section_title"/>
-				</xsl:call-template>
-			</fo:marker>
 			<xsl:apply-templates/>
 		</fo:block>
 		<fo:block text-align="right" margin-top="10mm">
@@ -1144,13 +1151,15 @@
 		</fo:block>
 	</xsl:template>
 
-	<!-- docidentifier, 3 part: number, colon and year-->
-	<xsl:variable name="docidentifier_jis" select="/*/jis:bibdata/jis:docidentifier[@type = 'JIS']"/>
-	<xsl:variable name="docidentifier_number" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$1')"/>
-	<xsl:variable name="docidentifier_year" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$3')"/>
 	<xsl:template name="insertCoverPage">
 		<xsl:param name="num"/>
 		<xsl:param name="copyrightText"/>
+		<xsl:param name="docidentifier_jis"/>
+
+		<!-- docidentifier, 3 part: number, colon and year-->
+		<xsl:variable name="docidentifier_number" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$1')"/>
+		<xsl:variable name="docidentifier_year" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$3')"/>
+
 		<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
 			<xsl:call-template name="insertFooter">
 				<xsl:with-param name="copyrightText" select="$copyrightText"/>
@@ -1158,10 +1167,15 @@
 
 			<fo:flow flow-name="xsl-region-body">
 				<!-- JIS -->
-				<fo:block id="firstpage_id_{$num}">
-					<fo:instream-foreign-object content-width="81mm" fox:alt-text="JIS Logo">
-						<xsl:copy-of select="$JIS-Logo"/>
-					</fo:instream-foreign-object>
+				<fo:block>
+					<xsl:if test="$num = 1">
+						<xsl:attribute name="id">firstpage_id_0</xsl:attribute>
+					</xsl:if>
+					<fo:block id="firstpage_id_{$num}">
+						<fo:instream-foreign-object content-width="81mm" fox:alt-text="JIS Logo">
+							<xsl:copy-of select="$JIS-Logo"/>
+						</fo:instream-foreign-object>
+					</fo:block>
 				</fo:block>
 
 				<fo:block-container text-align="center">
@@ -1199,6 +1213,8 @@
 		<xsl:param name="num"/>
 		<xsl:param name="doclang"/>
 		<xsl:param name="first">true</xsl:param>
+		<xsl:param name="docidentifier_jis"/>
+
 		<fo:page-sequence master-reference="cover-page-JSA" force-page-count="no-force">
 			<fo:static-content flow-name="footer" font-family="IPAexGothic" font-size="10pt" line-height="1.7">
 				<fo:block text-align="center">
@@ -1240,7 +1256,7 @@
 
 				<fo:block-container text-align="center">
 					<fo:block font-family="IPAexGothic" font-size="15pt">
-						<xsl:value-of select="/*/jis:bibdata/jis:docidentifier[@type = 'JIS']"/>
+						<xsl:value-of select="$docidentifier_jis"/>
 					</fo:block>
 					<!-- title -->
 					<fo:block role="H1" font-family="IPAexGothic" font-size="32pt" line-height="1.3">
@@ -1260,6 +1276,11 @@
 	<xsl:variable name="i18n_JIS"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">JIS</xsl:with-param></xsl:call-template></xsl:variable>
 	<xsl:template name="insertCoverPage2024">
 		<xsl:param name="num"/>
+		<xsl:param name="docidentifier_jis"/>
+
+		<!-- docidentifier, 3 part: number, colon and year-->
+		<xsl:variable name="docidentifier_number" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$1')"/>
+		<xsl:variable name="docidentifier_year" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$3')"/>
 
 		<fo:page-sequence master-reference="cover-page_2024" force-page-count="no-force">
 
@@ -1941,7 +1962,7 @@
 						<xsl:call-template name="extractSection"/>
 					</xsl:variable>
 
-					<xsl:if test="$level = 1">
+					<xsl:if test="$level = 1 and $vertical_layout = 'true'">
 						<fo:marker marker-class-name="section_title">
 							<xsl:choose>
 								<xsl:when test="@ancestor = 'annex' and *[local-name() = 'br']">
@@ -3201,12 +3222,17 @@
 		<xsl:param name="cover_header_footer_background"/>
 		<xsl:param name="i18n_JIS"/>
 		<xsl:param name="docidentifier"/>
+		<xsl:param name="docidentifier_jis"/>
 		<xsl:param name="title_ja"/>
 		<xsl:param name="edition"/>
 		<xsl:param name="copyrightText"/>
 		<xsl:param name="insertLast"/>
 		<xsl:param name="bibdata"/>
 
+		<!-- docidentifier, 3 part: number, colon and year-->
+		<xsl:variable name="docidentifier_number" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$1')"/>
+		<xsl:variable name="docidentifier_year" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$3')"/>
+
 		<!-- header -->
 		<fo:static-content flow-name="right-region" role="artifact">
 			<fo:block-container font-size="9pt" height="{$pageHeightA5}mm" width="6mm" color="white" background-color="{$cover_header_footer_background}" text-align="center" margin-left="11mm">
@@ -5424,8 +5450,21 @@
 
 			<!-- <xsl:strip-space elements="jis:xref"/> -->
 
-	<xsl:variable name="namespace_full" select="namespace-uri(/*)"/> <!-- example: https://www.metanorma.org/ns/iso -->
-	<xsl:variable name="root_element" select="local-name(/*)"/> <!-- example: iso-standard -->
+	<xsl:variable name="namespace_full_">
+		<xsl:choose>
+			<xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[contains(local-name(), '-standard')][1])"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/iso -->
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
+
+	<xsl:variable name="root_element_">
+		<xsl:choose>
+			<xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[contains(local-name(), '-standard')][1])"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: iso-standard -->
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:variable name="root_element" select="normalize-space($root_element_)"/>
 
 	<xsl:variable name="document_scheme" select="normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'document-scheme']/*[local-name() = 'value'])"/>
 
@@ -10383,6 +10422,12 @@
     </xsl:if>
   </xsl:template>
 
+	<xsl:template match="*[local-name()='strike']">
+		<fo:inline text-decoration="line-through">
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'pagebreak']">
 		<fo:block break-after="page"/>
 		<fo:block> </fo:block>

data/lib/isodoc/jis/presentation_section.rb

@@ -70,19 +70,19 @@ module IsoDoc
       end
 
       def move_participants(doc)
-        p = doc.at(ns("//clause[@type = 'participants']")) or return
-        t = participant_table(p) or return
-        p.remove
-        ins = make_preface(doc) or return nil
-        ins.add_first_child t
+        doc.xpath(ns("//clause[@type = 'participants']")).reverse_each do |p|
+          t = participant_table(p) or next
+          p.remove
+          ins = make_preface(doc) or next
+          ins.add_first_child t
+        end
       end
 
       def participant_table(clause)
-        s = clause.at(ns("./sourcecode")) or return nil
-        y = YAML.safe_load(s.children.to_xml(encoding: "UTF-8")) or return nil
-        y.is_a?(Array) or return nil
+        s, t, y, d = participant_table_prep(clause)
+        s or return nil
         out1 = <<~OUTPUT
-          <clause id='_#{UUIDTools::UUID.random_create}'><title>#{@meta.get[:"investigative-committee"]} #{@i18n.membership_table}</title>
+          <clause id='_#{UUIDTools::UUID.random_create}' type="participants"><title>#{t}</title>
           <table unnumbered='true'>
           <thead>
           <tr><th/><th>#{@i18n.full_name}</th><th>#{@i18n.affiliation}</th></tr>
@@ -90,11 +90,21 @@ module IsoDoc
           <tbody>
         OUTPUT
         out2 = <<~OUTPUT
-          </tbody></table></clause>
+          </tbody>#{d&.to_xml}</table></clause>
         OUTPUT
         "#{out1}#{participant_rows(y)}#{out2}"
       end
 
+      def participant_table_prep(clause)
+        s = clause.at(ns("./sourcecode"))
+        t = clause.at(ns("./title"))&.children&.to_xml ||
+          %(#{@meta.get[:"investigative-committee"]} #{@i18n.membership_table})
+        y = YAML.safe_load(s.children.to_xml(encoding: "UTF-8"))
+        d = clause.at(ns("./dl[@key = 'true']"))
+        s && y.is_a?(Array) or return [nil, nil, nil, nil]
+        [s, t, y, d]
+      end
+
       def participant_rows(yaml)
         yaml.map do |y|
           r = y["role"] ? @i18n.l10n("(#{y['role']})") : ""

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -76,6 +76,7 @@ module IsoDoc
 
       def dl_to_para_name(node)
         e = node.at(ns("./fmt-name")) or return ""
+        node.parent.parent["type"] == "participants" and return ""
         "<p class='ListTitle'>#{e.children.to_xml}</p>"
       end
 

data/lib/metanorma/jis/biblio.rng

@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.4.3".freeze
+    VERSION = "0.4.4".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-23 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -322,7 +322,7 @@ homepage: https://github.com/metanorma/metanorma-jis
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: metanorma-jis lets you write JIS standards in AsciiDoc.
 test_files: []