metanorma-jis 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a97d43bcc7cfe72372d3ba002193451b0702bddd5ff2a5c7dee75a5a7c61085
-  data.tar.gz: 340ccc61aca2bd7ecac371b64e9a7dcf87ea5bf0f6bbb8ef9606240a1fae6e73
+  metadata.gz: 98094992cf3a869d5f3c7f263bdfb907ef647773965782d3204be741ba15e68f
+  data.tar.gz: 48c5da92c8d9d12ece725eaadd2544b0196a2d149f2e67c92f17df9ddc60f027
 SHA512:
-  metadata.gz: 19f570ff8e6d5b5eef3efe3bf8c7ffe4798eb6fa3d65ab7e868c3f46bab997c647e96825cd1e107d8c6db631d64807fc5f57b75432e5c3809720d1a4d88920cc
-  data.tar.gz: 6c363bc9e2a13c536de107822eae3b623bf00987fa7b6697011c5147bb1b3b0e32fed170d984b3e316efed2ef2cbaba901e90f5c14727036a16a5c52ffc2ff87
+  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/i18n.rb

@@ -21,7 +21,7 @@ module IsoDoc
       # use Japanese ordinals for era years
       def japanese_date(date)
         date.nil? and return date
-        d = date.split(/-/).map(&:to_i)
+        d = date.split("-").map(&:to_i)
         time = Date.new(*d)
         yr = japanese_year(time)
         case d.size

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

@@ -86,7 +86,7 @@
 				<fo:region-end region-name="right-region" extent="22mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="cover-page_2024" page-width="{$pageWidthA5}mm" page-height="{$pageHeightA5}mm">
+			<fo:simple-page-master master-name="cover-page_vertical_layout" page-width="{$pageWidthA5}mm" page-height="{$pageHeightA5}mm">
 				<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
 				 fo:region-body/@margin-top = left margin
 				 fo:region-body/@margin-bottom = right margin
@@ -170,7 +170,7 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 			</fo:simple-page-master>
 
-			<fo:page-sequence-master master-name="document_toc">
+			<fo:page-sequence-master master-name="toc">
 				<fo:repeatable-page-master-alternatives>
 					<fo:conditional-page-master-reference page-position="first" master-reference="first_page_toc"/>
 					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
@@ -179,7 +179,7 @@
 			</fo:page-sequence-master>
 
 			<xsl:if test="1 = 3">
-			<fo:simple-page-master master-name="document_toc_2024" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="toc_vertical_layout" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
 				 fo:region-body/@margin-top = left margin
 				 fo:region-body/@margin-bottom = right margin
@@ -195,7 +195,7 @@
 			</fo:simple-page-master>
 			</xsl:if>
 
-			<fo:simple-page-master master-name="document_toc_2024" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="toc_vertical_layout" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
 				 fo:region-body/@margin-top = left margin
 				 fo:region-body/@margin-bottom = right margin
@@ -210,7 +210,7 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!--  background-color="red" -->
 			</fo:simple-page-master>
 
-			<fo:page-sequence-master master-name="document_preface">
+			<fo:page-sequence-master master-name="preface">
 				<fo:repeatable-page-master-alternatives>
 					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
 					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
@@ -232,7 +232,7 @@
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
-			<fo:simple-page-master master-name="document_2024" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="document_vertical_layout" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<xsl:if test="$isGenerateTableIF = 'true'">
 					<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
 					<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
@@ -255,7 +255,7 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!--  background-color="red" -->
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="document_2024_page" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="document_vertical_layout_page" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<xsl:if test="$isGenerateTableIF = 'true'">
 					<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
 					<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
@@ -277,7 +277,7 @@
 				<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> <!--  background-color="blue" -->
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!--  background-color="red" -->
 			</fo:simple-page-master>
-			<fo:simple-page-master master-name="document_2024_last" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="document_vertical_layout_last" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<xsl:if test="$isGenerateTableIF = 'true'">
 					<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
 					<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
@@ -307,10 +307,10 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!--  background-color="red" -->
 			</fo:simple-page-master>
 
-			<fo:page-sequence-master master-name="document_2024_with_last">
+			<fo:page-sequence-master master-name="document_vertical_layout_with_last">
 				<fo:repeatable-page-master-alternatives>
-					<fo:conditional-page-master-reference page-position="last" master-reference="document_2024_last"/>
-					<fo:conditional-page-master-reference page-position="any" master-reference="document_2024_page"/>
+					<fo:conditional-page-master-reference page-position="last" master-reference="document_vertical_layout_last"/>
+					<fo:conditional-page-master-reference page-position="any" master-reference="document_vertical_layout_page"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
@@ -377,7 +377,7 @@
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
-			<fo:simple-page-master master-name="back-page_2024" page-width="{$pageWidthA5}mm" page-height="{$pageHeightA5}mm">
+			<fo:simple-page-master master-name="back-page" page-width="{$pageWidthA5}mm" page-height="{$pageHeightA5}mm">
 				<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
 				 fo:region-body/@margin-top = left margin
 				 fo:region-body/@margin-bottom = right margin
@@ -547,10 +547,10 @@
 
 						<xsl:choose>
 							<xsl:when test="self::mn:clause and @type = 'toc'">
-								<fo:page-sequence master-reference="document_toc" force-page-count="no-force">
+								<fo:page-sequence master-reference="toc" force-page-count="no-force">
 
 									<xsl:if test="$vertical_layout = 'true'">
-										<xsl:attribute name="master-reference">document_toc_2024</xsl:attribute>
+										<xsl:attribute name="master-reference">toc_vertical_layout</xsl:attribute>
 										<xsl:attribute name="format">一</xsl:attribute>
 									</xsl:if>
 
@@ -617,10 +617,10 @@
 
 								<xsl:if test="$paged_xml_preface/mn:page and count($paged_xml_preface/mn:page/*) != 0">
 									<!-- Preface pages -->
-									<fo:page-sequence master-reference="document_preface" force-page-count="no-force">
+									<fo:page-sequence master-reference="preface" force-page-count="no-force">
 
 										<xsl:if test="$vertical_layout = 'true'">
-											<xsl:attribute name="master-reference">document_2024</xsl:attribute>
+											<xsl:attribute name="master-reference">document_vertical_layout</xsl:attribute>
 											<xsl:attribute name="format">一</xsl:attribute>
 										</xsl:if>
 
@@ -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>
@@ -679,7 +679,7 @@
 					<xsl:if test="not($vertical_layout = 'true') and not($doctype = 'technical-specification')">
 
 					<!-- Document type rendering -->
-					<fo:page-sequence master-reference="document_preface" force-page-count="no-force">
+					<fo:page-sequence master-reference="preface" force-page-count="no-force">
 						<xsl:call-template name="insertHeaderFooter">
 							<xsl:with-param name="docidentifier" select="$docidentifier"/>
 							<xsl:with-param name="copyrightText" select="$copyrightText"/>
@@ -779,9 +779,9 @@
 
 							<xsl:choose>
 								<xsl:when test="$vertical_layout = 'true'">
-									<xsl:attribute name="master-reference">document_2024</xsl:attribute>
+									<xsl:attribute name="master-reference">document_vertical_layout</xsl:attribute>
 									<xsl:if test="position() = last()">
-										<xsl:attribute name="master-reference">document_2024_with_last</xsl:attribute>
+										<xsl:attribute name="master-reference">document_vertical_layout_with_last</xsl:attribute>
 									</xsl:if>
 
 									<xsl:attribute name="format">一</xsl:attribute>
@@ -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'">
@@ -996,7 +994,7 @@
 			<xsl:variable name="copyrightText"><xsl:call-template name="get_copyrightText"/></xsl:variable>
 			<xsl:choose>
 				<xsl:when test="$vertical_layout = 'true'">
-					<xsl:call-template name="insertCoverPage2024">
+					<xsl:call-template name="insertCoverPageVerticalLayout">
 						<xsl:with-param name="num" select="$num"/>
 						<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS"/>
 					</xsl:call-template>
@@ -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>
@@ -1319,7 +1300,7 @@
 	</xsl:variable>
 	<xsl:variable name="i18n_JIS" select="normalize-space($i18n_JIS_)"/>
 
-	<xsl:template name="insertCoverPage2024">
+	<xsl:template name="insertCoverPageVerticalLayout">
 		<xsl:param name="num"/>
 		<xsl:param name="docidentifier_jis"/>
 
@@ -1327,7 +1308,7 @@
 		<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">
+		<fo:page-sequence master-reference="cover-page_vertical_layout" force-page-count="no-force">
 
 			<!-- <xsl:variable name="cover_page_background_1_value" select="normalize-space(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:color-cover-page-background-1)"/>
 			<xsl:variable name="cover_page_background_1_">
@@ -1501,7 +1482,7 @@
 
 			</fo:flow>
 		</fo:page-sequence>
-	</xsl:template> <!-- insertCoverPage2024 -->
+	</xsl:template> <!-- insertCoverPageVerticalLayout -->
 
 	<xsl:template name="back-page">
 		<xsl:param name="num"/>
@@ -1509,7 +1490,7 @@
 		<xsl:if test="$isGenerateTableIF = 'false'">
 			<xsl:if test="$vertical_layout = 'true'">
 
-				<fo:page-sequence master-reference="back-page_2024" force-page-count="no-force" font-family="Noto Serif JP" font-weight="500">
+				<fo:page-sequence master-reference="back-page" force-page-count="no-force" font-family="Noto Serif JP" font-weight="500">
 
 					<fo:static-content flow-name="header">
 						<xsl:variable name="presentation_metadata_image_name">
@@ -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>
@@ -10703,6 +10684,16 @@
 		</xsl:variable>
 		<xsl:variable name="quot">"</xsl:variable>
 		<xsl:variable name="styles_">
+			<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
+			<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
+				<style name="border-top">none</style>
+				<style name="border-right">none</style>
+				<style name="border-left">none</style>
+				<style name="border-bottom">none</style>
+				<style name="color">inherit</style>
+				<style name="background-color">transparent</style>
+			</xsl:if>
+
 			<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -12745,7 +12736,10 @@
 
 	<xsl:template match="mn:note" name="note">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+		<fo:block xsl:use-attribute-sets="note-style" role="SKIP">
+			<xsl:if test="not(parent::mn:references)">
+				<xsl:copy-of select="@id"/>
+			</xsl:if>
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:call-template name="refine_note-style"/>
@@ -15392,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>
@@ -15628,8 +15622,8 @@
 	</xsl:template> <!-- bibitem -->
 
 	<!-- Bibliography (non-normative references) -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
-		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
+	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 		<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 		<xsl:call-template name="setNamedDestination"/>
@@ -15681,7 +15675,7 @@
 				</fo:list-item>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
+		<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
 			<xsl:with-param name="skip">false</xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
@@ -15701,8 +15695,25 @@
 		</fo:inline>
 		<xsl:apply-templates select="mn:formattedref"/>
 
+		<xsl:call-template name="processBibliographyNote"/>
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
+	<xsl:template name="processBibliographyNote">
+		<xsl:if test="self::mn:note">
+			<xsl:variable name="note_node">
+				<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
+					<xsl:copy> <!-- skip @id -->
+						<xsl:copy-of select="node()"/>
+					</xsl:copy>
+				</xsl:element>
+			</xsl:variable>
+			<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
+				<xsl:call-template name="note"/>
+			</xsl:for-each> -->
+			<xsl:call-template name="note"/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="mn:title" mode="title">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
@@ -16248,6 +16259,87 @@
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
 
+	<xsl:attribute-set name="toc-style">
+	</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>
+
+	<xsl:template name="refine_toc-item-block-style">
+	</xsl:template>
+
+	<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">
+	</xsl:attribute-set>
+
+	<!-- List of Figures, Tables -->
+	<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>
+
+	<xsl:attribute-set name="toc-listof-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -16585,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>
@@ -16619,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/isodoc/jis/table.rb

@@ -4,18 +4,26 @@ module IsoDoc
       def table_title_parse(node, out); end
 
       def table_attrs(node)
-        style = node["style"] || "border-collapse:collapse;" \
-                 "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
-                 "border:none;mso-padding-alt: " \
-                 "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
-                 "mso-border-insidev:none;"
+        style = table_attrs_style(node, node["class"])
+        klass = node.text.length > 4000 ? "MsoTableGridBig" : "MsoTableGrid"
+        node["plain"] == "true" and klass = nil
         { id: node["id"], title: node["alt"],
           summary: node["summary"], width: node["width"],
-          class: (node.text.length > 4000 ? "MsoTableGridBig" : "MsoTableGrid"),
+          class: klass,
           style: style,
           border: 0, cellspacing: 0, cellpadding: 0 }
       end
 
+      def table_attrs_style(node, _klass)
+        style = node["style"]
+        node["plain"] == "true" or style ||= "border-collapse:collapse;" \
+                 "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
+                 "border:none;mso-padding-alt: " \
+                 "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
+                 "mso-border-insidev:none;"
+        style
+      end
+
       def make_tr_attr_style(cell, row, rowmax, totalrows, opt)
         top = row.zero? ? "#{SW1} 1.5pt;" : "none;"
         bottom = "#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;"
@@ -31,16 +39,16 @@ module IsoDoc
       end
 
       def new_fullcolspan_row(table, tfoot)
-        # how many columns in the table?
-        cols = 0
+        cols = 0 # how many columns in the table?
         table.at(".//tr").xpath("./td | ./th").each do |td|
           cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
-        style = "border-top:0pt;mso-border-top-alt:0pt;" \
+        table["class"].nil? or # plain table
+          style = "style='border-top:0pt;mso-border-top-alt:0pt;" \
                 "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;" \
                 "border-left:#{SW1} 1.5pt;mso-border-left-alt:#{SW1} 1.5pt;" \
-                "border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;"
-        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
+                "border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;'"
+        tfoot.add_child("<tr><td colspan='#{cols}' #{style}/></tr>")
         tfoot.xpath(".//td").last
       end
     end

data/lib/metanorma/jis/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
@@ -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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.8 -->
+<!-- VERSION v2.1.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -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">
@@ -735,6 +683,12 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <a:documentation>Width of the table block in rendering</a:documentation>
@@ -1088,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>
@@ -1101,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>
@@ -2019,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>
@@ -2075,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.0".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.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 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:
     - - ">="