metanorma-jis 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae16550b824fa8a0e98d33676ab83e93c32e3de519ef3c52e86347e49c29600
-  data.tar.gz: 806341c51894e499f46055434f1d2130fe7d2b502c9e6673c5c8cb85e43aa671
+  metadata.gz: 98094992cf3a869d5f3c7f263bdfb907ef647773965782d3204be741ba15e68f
+  data.tar.gz: 48c5da92c8d9d12ece725eaadd2544b0196a2d149f2e67c92f17df9ddc60f027
 SHA512:
-  metadata.gz: becd76f3e3b7260b8fdb012d8e1c56c419de280a63c054f8ff63d3dd7048cd657dc66a96c153e0e3f553d61bc9890586496ce0ada3edf8c015a477f3aea6a0d5
-  data.tar.gz: 27c9e90f4a68fcd56fd423ada507489a401ef74c707674f0dbc964a614018aefeb0f6f7d3895d42b7536978dbf7ef132b5cde09ea371d7e9ad2f86e28430fbdf
+  metadata.gz: 29c6303271559325fc30a8e0cc4e491496a553f5fb95939109ba971b90f677c215dc7ce5b5f7fe6bad4c1b1e56baffd2e866d39859f0211efd688711fbab0817
+  data.tar.gz: 7c137347ce3dc90fd92e5f697d2687205ab9711e29662fc3ad213b1c426ad8b3db354c11c9899ce380028593dfab1a08653f810e167fdbf9f62e9184ecfdeeff

data/README.adoc

@@ -2,7 +2,7 @@
 
 image:https://img.shields.io/gem/v/metanorma-jis.svg["Gem Version", link="https://rubygems.org/gems/metanorma-jis"]
 image:https://github.com/metanorma/metanorma-jis/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-jis/actions?workflow=rake"]
-image:https://codeclimate.com/github/metanorma/metanorma-jis/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-jis"]
+// image:https://codeclimate.com/github/metanorma/metanorma-jis/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-jis"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-jis.svg["Pull Requests", link="https://github.com/metanorma/metanorma-jis/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-jis/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-jis/releases"]
 

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

@@ -628,7 +628,7 @@
 											<xsl:attribute name="initial-page-number">1</xsl:attribute>
 										</xsl:if>
 
-										<fo:static-content flow-name="xsl-footnote-separator">
+										<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 											<fo:block text-align="center" margin-bottom="6pt">
 												<fo:leader leader-pattern="rule" leader-length="80mm"/>
 											</fo:block>
@@ -803,11 +803,9 @@
 								</xsl:otherwise>
 							</xsl:choose>
 
-							<fo:static-content flow-name="xsl-footnote-separator">
-								<fo:block>
-									<fo:leader leader-pattern="rule" leader-length="15%"/>
-								</fo:block>
-							</fo:static-content>
+							<xsl:call-template name="insertFootnoteSeparatorCommon">
+								<xsl:with-param name="leader_length">15%</xsl:with-param>
+							</xsl:call-template>
 
 							<xsl:variable name="section_title">
 								<xsl:if test="$isCommentary = 'true'">
@@ -1037,18 +1035,14 @@
 		<fo:inline><xsl:if test="not($vertical_layout = 'true')"><xsl:attribute name="font-family">IPAexGothic</xsl:attribute></xsl:if>：</fo:inline>
 	</xsl:template>
 
-	<xsl:template match="mn:preface/mn:clause[@type = 'toc']" priority="4">
+	<xsl:template match="mn:preface/mn:clause[@type = 'toc']" name="toc" priority="4">
 		<xsl:param name="num"/>
 		<xsl:apply-templates/>
 		<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
 			<!-- fill ToC -->
 			<fo:block role="TOC">
-				<xsl:if test="not($vertical_layout = 'true') and not($lang = 'en')">
-					<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="$vertical_layout = 'true'">
-					<xsl:attribute name="font-size">10.5pt</xsl:attribute>
-				</xsl:if>
+
+				<xsl:call-template name="refine_toc-style"/>
 
 				<xsl:if test="$updated_contents_xml/mnx:doc[@num = $num]//mnx:item[@display = 'true']">
 					<xsl:for-each select="$updated_contents_xml/mnx:doc[@num = $num]//mnx:item[@display = 'true'][@level &lt;= $toc_level or @type='figure' or @type = 'table']">
@@ -1117,18 +1111,11 @@
 	</xsl:template>
 
 	<xsl:template match="mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
-		<fo:block text-align="center" font-size="14pt" margin-top="8.5mm">
-			<xsl:if test="not($vertical_layout = 'true')">
-				<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
-			</xsl:if>
+		<fo:block xsl:use-attribute-sets="toc-title-style">
+
+			<xsl:call-template name="refine_toc-title-style"/>
+
 			<xsl:if test="$vertical_layout = 'true'">
-				<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_, '　', '')"/>
@@ -1139,16 +1126,10 @@
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:block>
-		<fo:block text-align="right" margin-top="10mm">
-			<xsl:if test="not($vertical_layout = 'true')">
-				<xsl:attribute name="font-family">IPAexMincho</xsl:attribute>
-				<xsl:attribute name="font-size">8pt</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="$vertical_layout = 'true'">
-				<xsl:attribute name="font-size">10.5pt</xsl:attribute>
-				<xsl:attribute name="margin-top">1mm</xsl:attribute>
-				<xsl:attribute name="margin-bottom">6mm</xsl:attribute>
-			</xsl:if>
+		<fo:block xsl:use-attribute-sets="toc-title-page-style">
+
+			<xsl:call-template name="refine_toc-title-page-style"/>
+
 			<!-- Page -->
 			<xsl:call-template name="getLocalizedString">
 				<xsl:with-param name="key">locality.page</xsl:with-param>
@@ -1157,7 +1138,7 @@
 	</xsl:template>
 
 	<xsl:template name="insertTocItem">
-		<fo:block text-align-last="justify" role="SKIP">
+		<fo:block xsl:use-attribute-sets="toc-item-style">
 			<fo:basic-link internal-destination="{@id}" fox:alt-text="{normalize-space(mnx:title)}">
 				<fo:inline>
 					<xsl:if test="$vertical_layout = 'true'">
@@ -1166,7 +1147,7 @@
 					<xsl:apply-templates select="mnx:title"/>
 				</fo:inline>
 				<fo:inline keep-together.within-line="always">
-					<fo:leader leader-pattern="dots">
+					<fo:leader xsl:use-attribute-sets="toc-leader-style">
 						<xsl:if test="$vertical_layout = 'true'">
 							<xsl:attribute name="leader-pattern">rule</xsl:attribute>
 							<xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
@@ -1594,7 +1575,7 @@
 		<xsl:param name="copyrightText"/>
 		<fo:page-sequence master-reference="document" force-page-count="no-force">
 
-			<fo:static-content flow-name="xsl-footnote-separator">
+			<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 				<fo:block text-align="center" margin-bottom="6pt">
 					<fo:leader leader-pattern="rule" leader-length="80mm" rule-style="solid" rule-thickness="0.3pt"/>
 				</fo:block>
@@ -15405,7 +15386,7 @@
 
 	<xsl:template name="insertFootnoteSeparatorCommon">
 		<xsl:param name="leader_length">30%</xsl:param>
-		<fo:static-content flow-name="xsl-footnote-separator">
+		<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 			<fo:block>
 				<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
 			</fo:block>
@@ -16282,14 +16263,47 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:if test="not($vertical_layout = 'true') and not($lang = 'en')">
+			<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$vertical_layout = 'true'">
+			<xsl:attribute name="font-size">10.5pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-style">
+		<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="margin-top">8.5mm</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-title-style">
+		<xsl:if test="not($vertical_layout = 'true')">
+			<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$vertical_layout = 'true'">
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-title-page-style">
+		<xsl:attribute name="text-align">right</xsl:attribute>
+		<xsl:attribute name="margin-top">10mm</xsl:attribute>
 	</xsl:attribute-set> <!-- toc-title-page-style -->
 
+	<xsl:template name="refine_toc-title-page-style">
+		<xsl:if test="not($vertical_layout = 'true')">
+			<xsl:attribute name="font-family">IPAexMincho</xsl:attribute>
+			<xsl:attribute name="font-size">8pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$vertical_layout = 'true'">
+			<xsl:attribute name="font-size">10.5pt</xsl:attribute>
+			<xsl:attribute name="margin-top">1mm</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6mm</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-item-block-style">
 	</xsl:attribute-set>
 
@@ -16298,12 +16312,15 @@
 
 	<xsl:attribute-set name="toc-item-style">
 		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="text-align-last">justify</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-item-style -->
 
 	<xsl:template name="refine_toc-item-style">
 	</xsl:template> <!-- END: refine_toc-item-style -->
 
 	<xsl:attribute-set name="toc-leader-style">
+		<xsl:attribute name="leader-pattern">dots</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-leader-style -->
 
 	<xsl:attribute-set name="toc-pagenumber-style">
@@ -16313,6 +16330,9 @@
 	<xsl:attribute-set name="toc-listof-title-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-listof-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-listof-item-block-style">
 	</xsl:attribute-set>
 
@@ -16657,7 +16677,7 @@
 								</xsl:if>
 
 								<xsl:for-each select="$contents_nodes/mnx:doc">
-									<fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
+									<fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
 										<xsl:if test="@bundle = 'true'">
 											<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
 										</xsl:if>
@@ -16691,7 +16711,7 @@
 											</xsl:choose>
 										</fo:bookmark-title>
 
-										<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
+										<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
 
 										<xsl:call-template name="insertFigureBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>

data/lib/metanorma/jis/basicdoc.rng

@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
       <ref name="pure_strike"/>
       <ref name="pure_smallcap"/>
       <ref name="br"/>
+      <ref name="stem"/>
     </choice>
   </define>
   <define name="NestedTextElement">
     <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
     <choice>
       <ref name="PureTextElement"/>
-      <ref name="stem"/>
       <ref name="eref"/>
       <ref name="xref"/>
       <ref name="hyperlink"/>

data/lib/metanorma/jis/isodoc.rng

@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
 but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <text/>
     </define>
-    <define name="index-primary">
-      <element name="primary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-secondary">
-      <element name="secondary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-tertiary">
-      <element name="tertiary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="review">
       <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
 the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </element>
     </define>
-    <define name="sub">
-      <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
-      <element name="sub">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sup">
-      <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
-      <element name="sup">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="pagebreak">
       <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
       <element name="pagebreak">
@@ -1094,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -1107,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -2025,10 +1971,7 @@ used in document amendments</a:documentation>
       <element name="name">
         <a:documentation>The symbolic form of the designation</a:documentation>
         <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
+          <ref name="PureTextElement"/>
         </oneOrMore>
       </element>
     </element>
@@ -2081,7 +2024,6 @@ used in document amendments</a:documentation>
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
-            <ref name="stem"/>
             <ref name="index"/>
             <ref name="index-xref"/>
           </choice>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.6.1".freeze
+    VERSION = "0.6.2".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -47,5 +47,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "xml-c14n"
+  spec.add_development_dependency "canon"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="