metanorma-jis 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb5c64ea8744feaed4b20df04ae5dd8f8f42d9908252adf5e7c1e853e19f13e2
-  data.tar.gz: 62081c0dd8d64b004146712e132e5b5ab65cc276f6647f90f180c05e5e10c6dc
+  metadata.gz: cc35660a3519ecd96fc405bb9b779a5faa4e0beec0c5c8e9f3d10b097ec59383
+  data.tar.gz: 338cc7fa6625b69488b162d8d9d859c4def0715213b6bbe6d8312df083b5c6cf
 SHA512:
-  metadata.gz: 69a2eb26de40e52c826ef40f95630d101a0367ec61b6ce7c03389e5cc038f4e3ef1f5edff5fba17b5af105e18c5790238210f161ef12897436c061e55b080c28
-  data.tar.gz: 05e2a234f7a545d02249ba02374f45590fbe755a19e746734597e08c567e3142b0ee9357f5462221494ec2602312137b7cc52a114afc879d4053f7da82673d71
+  metadata.gz: 940badc26918dc33e357b8d7e3ae290f5f4ba9f4ac2adc21893d6e4af347125171ceeb498c72ecb045a1d4ef620d1efac8adf1f45f25c11a81a8d344e26ba68c
+  data.tar.gz: 04fb252ad1bab143b1c08be8121e4859ef26e33d79d97515aadb149e023b2c0c3f7a89ae8a487dbd7c4e5de19177fafeaacf1ce432224fec21724284d270b226

data/lib/isodoc/jis/html/style-human.css

@@ -1339,7 +1339,7 @@ span.TableFootnoteRef {
   font-size: {{footnotefontsize}};
 }
 
-sup a {
+sup {
   vertical-align: super;
   font-size: 0.8em;
 }

data/lib/isodoc/jis/html/style-human.scss

@@ -655,7 +655,7 @@ span.TableFootnoteRef {
     font-size: $footnotefontsize;
 }
 
-sup a {
+sup {
     vertical-align: super;
     font-size: 0.8em;
 }

data/lib/isodoc/jis/init.rb

@@ -21,7 +21,7 @@ module IsoDoc
 
       def bibrenderer(options = {})
         ::Relaton::Render::Jis::General.new(options
-          .merge(language: @lang, i18nhash: @i18n.get))
+          .merge(language: @lang, script: @script, i18nhash: @i18n.get))
       end
 
       def std_docid_semantic(text)

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

@@ -534,6 +534,8 @@
 						<xsl:with-param name="docidentifier" select="$docidentifier"/>
 					</xsl:call-template>
 
+					<xsl:call-template name="inner-cover-page"/>
+
 					<!-- ========================== -->
 					<!-- Contents and preface pages -->
 					<!-- ========================== -->
@@ -987,41 +989,51 @@
 	<xsl:template name="cover-page">
 		<xsl:param name="num"/>
 		<xsl:param name="docidentifier"/>
-		<xsl:if test="$isGenerateTableIF = 'false'">
-			<xsl:variable name="doctype"><xsl:call-template name="get_doctype"/></xsl:variable>
-			<xsl:variable name="docidentifier_JIS"><xsl:call-template name="get_docidentifier_JIS"/></xsl:variable>
-			<xsl:variable name="doclang"><xsl:call-template name="getLang"/></xsl:variable>
-			<xsl:variable name="copyrightText"><xsl:call-template name="get_copyrightText"/></xsl:variable>
-			<xsl:choose>
-				<xsl:when test="$vertical_layout = 'true'">
-					<xsl:call-template name="insertCoverPageVerticalLayout">
-						<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>
+		<xsl:choose>
+			<xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image']/mn:value/mn:image and         normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:full-coverpage-replacement) = 'true'">
+				<xsl:call-template name="insertCoverPageFullImage"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:if test="$isGenerateTableIF = 'false'">
+					<xsl:variable name="doctype"><xsl:call-template name="get_doctype"/></xsl:variable>
+					<xsl:variable name="docidentifier_JIS"><xsl:call-template name="get_docidentifier_JIS"/></xsl:variable>
+					<xsl:variable name="doclang"><xsl:call-template name="getLang"/></xsl:variable>
+					<xsl:variable name="copyrightText"><xsl:call-template name="get_copyrightText"/></xsl:variable>
+					<xsl:choose>
+						<xsl:when test="$vertical_layout = 'true'">
+							<xsl:call-template name="insertCoverPageVerticalLayout">
+								<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>
 
-			<xsl:if test="not($vertical_layout = 'true')">
-				<xsl:call-template name="insertInnerCoverPage">
-					<xsl:with-param name="docidentifier" select="$docidentifier"/>
-					<xsl:with-param name="copyrightText" select="$copyrightText"/>
-				</xsl:call-template>
-			</xsl:if>
-		</xsl:if>
+					<xsl:if test="not($vertical_layout = 'true')">
+						<xsl:call-template name="insertInnerCoverPage">
+							<xsl:with-param name="docidentifier" select="$docidentifier"/>
+							<xsl:with-param name="copyrightText" select="$copyrightText"/>
+						</xsl:call-template>
+					</xsl:if>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="inner-cover-page">
 	</xsl:template>
 
 	<xsl:template match="mn:references[not(@hidden = 'true')]" mode="linear_xml" priority="2">
@@ -2869,7 +2881,7 @@
 	<!-- mn:term/mn:preferred2//text() | -->
 
 	<!-- <name>注記  1</name> to <name>注記<font_en>  1</font_en></name> -->
-	<xsl:template match="mn:title/text() | mn:fmt-title/text() |        mn:term/mn:name/text() | mn:term/mn:fmt-name/text() |        mn:note/mn:name/text() | mn:note/mn:fmt-name/text() |        mn:termnote/mn:name/text() |mn:termnote/mn:fmt-name/text() |       mn:table/mn:name/text() |mn:table/mn:fmt-name/text() |       mn:figure/mn:name/text() |mn:figure/mn:fmt-name/text() |       mn:termexample/mn:name/text() |mn:termexample/mn:fmtname/text() |       mn:xref//text() | mn:fmt-xref//text() |       mn:origin/text() | mn:fmt-origin/text()" mode="update_xml_step1">
+	<xsl:template match="mn:title/text() | mn:fmt-title/text() |        mn:term/mn:name/text() | mn:term/mn:fmt-name/text() |        mn:note/mn:name/text() | mn:note/mn:fmt-name/text() |        mn:termnote/mn:name/text() |mn:termnote/mn:fmt-name/text() |       mn:table/mn:name/text() |mn:table/mn:fmt-name/text() |       mn:figure/mn:name/text() |mn:figure/mn:fmt-name/text() |       mn:termexample/mn:name/text() |mn:termexample/mn:fmtname/text() |       mn:xref//text() | mn:fmt-xref//text() |       mn:origin/text() | mn:fmt-origin/text() |       mn:fmt-link/text()" mode="update_xml_step1">
 		<xsl:choose>
 			<xsl:when test="$vertical_layout = 'true'">
 				<xsl:choose>
@@ -3255,6 +3267,23 @@
 		<xsl:param name="section"/>
 		<xsl:param name="copyrightText"/>
 		<xsl:param name="section_title"/>
+
+		<xsl:call-template name="insertHeader">
+			<xsl:with-param name="docidentifier" select="$docidentifier"/>
+			<xsl:with-param name="section" select="$section"/>
+			<xsl:with-param name="section_title" select="$section_title"/>
+		</xsl:call-template>
+
+		<xsl:call-template name="insertFooter">
+			<xsl:with-param name="section" select="$section"/>
+			<xsl:with-param name="copyrightText" select="$copyrightText"/>
+		</xsl:call-template>
+	</xsl:template>
+
+	<xsl:template name="insertHeader">
+		<xsl:param name="docidentifier"/>
+	  <xsl:param name="section"/>
+	  <xsl:param name="section_title"/>
 		<fo:static-content flow-name="header-odd-first" role="artifact">
 			<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="right">
 				<xsl:if test="$vertical_layout = 'true'">
@@ -3310,11 +3339,6 @@
 				<fo:block> </fo:block>
 			</fo:block-container>
 		</fo:static-content>
-
-		<xsl:call-template name="insertFooter">
-			<xsl:with-param name="section" select="$section"/>
-			<xsl:with-param name="copyrightText" select="$copyrightText"/>
-		</xsl:call-template>
 	</xsl:template>
 
 	<xsl:template name="insertFooter">
@@ -3322,9 +3346,9 @@
 		<xsl:param name="copyrightText"/>
 		<fo:static-content flow-name="footer">
 			<fo:block-container height="24mm" display-align="after">
-        <xsl:if test="$section = 'commentary'">
-          <xsl:attribute name="height">24.5mm</xsl:attribute>
-        </xsl:if>
+				<xsl:if test="$section = 'commentary'">
+					<xsl:attribute name="height">24.5mm</xsl:attribute>
+				</xsl:if>
 				<xsl:if test="$section = 'preface'">
 					<fo:block font-size="9pt" text-align="center" space-after="10pt">(<fo:inline font-family="Times New Roman"><fo:page-number/></fo:inline>)</fo:block>
 				</xsl:if>
@@ -7324,7 +7348,6 @@
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
 
 	<xsl:template name="refine_feedback-statement-title-style">
-
 	</xsl:template>
 
 	<xsl:attribute-set name="feedback-statement-p-style">
@@ -8968,95 +8991,89 @@
 	<xsl:template name="refine_term-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="term-name-style">
+	<xsl:attribute-set name="term-number-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="space-after">2pt</xsl:attribute>
 	</xsl:attribute-set> <!-- term-name-style -->
 
-	<xsl:template name="refine_term-name-style">
+	<xsl:template name="refine_term-number-style">
 		<xsl:if test="not($vertical_layout = 'true')">
 			<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:attribute-set name="preferred-style">
-	</xsl:attribute-set> <!-- preferred-style -->
-
-	<xsl:template name="refine_preferred-style">
-	</xsl:template>
-
-	<xsl:attribute-set name="preferred-block-style">
+	<xsl:attribute-set name="term-preferred-block-style">
 	</xsl:attribute-set> <!-- preferred-block-style -->
 
-	<xsl:template name="refine_preferred-block-style">
+	<xsl:template name="refine_term-preferred-block-style">
 		<xsl:if test="$vertical_layout = 'true'">
 			<xsl:attribute name="letter-spacing">1mm</xsl:attribute>
 			<xsl:attribute name="margin-left">-6mm</xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:attribute-set name="preferred-term-style">
+	<xsl:attribute-set name="term-preferred-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-term-style -->
 
-	<xsl:template name="refine_preferred-term-style">
+	<xsl:template name="refine_term-preferred-style">
 		<xsl:if test="mn:strong">
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:attribute-set name="domain-style">
-	</xsl:attribute-set> <!-- domain-style -->
+	<xsl:attribute-set name="term-domain-style">
+	</xsl:attribute-set> <!-- term-domain-style -->
 
-	<xsl:template name="refine_domain-style">
+	<xsl:template name="refine_term-domain-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="admitted-style">
-	</xsl:attribute-set> <!-- admitted-style -->
+	<xsl:attribute-set name="term-admitted-style">
+	</xsl:attribute-set> <!-- term-admitted-style -->
 
-	<xsl:template name="refine_admitted-style">
+	<xsl:template name="refine_term-admitted-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="deprecates-style">
-	</xsl:attribute-set> <!-- deprecates-style -->
+	<xsl:attribute-set name="term-deprecates-style">
+	</xsl:attribute-set> <!-- term-deprecates-style -->
 
-	<xsl:template name="refine_deprecates-style">
+	<xsl:template name="refine_term-deprecates-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
+	<xsl:attribute-set name="term-related-block-style" use-attribute-sets="term-preferred-block-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_related-block-style">
+	<xsl:template name="refine_term-related-block-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="definition-style">
+	<xsl:attribute-set name="term-definition-style">
 		<xsl:attribute name="space-before">2pt</xsl:attribute>
 		<xsl:attribute name="space-after">2pt</xsl:attribute>
-	</xsl:attribute-set> <!-- definition-style -->
+	</xsl:attribute-set> <!-- term-definition-style -->
 
-	<xsl:template name="refine_definition-style">
+	<xsl:template name="refine_term-definition-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="termsource-style">
+	<xsl:attribute-set name="term-termsource-style">
 		<xsl:attribute name="margin-left">6mm</xsl:attribute>
-	</xsl:attribute-set> <!-- termsource-style -->
+	</xsl:attribute-set> <!-- term-termsource-style -->
 
-	<xsl:template name="refine_termsource-style">
-	</xsl:template> <!-- refine_termsource-style -->
+	<xsl:template name="refine_term-termsource-style">
+	</xsl:template> <!-- refine_term-termsource-style -->
 
-	<xsl:attribute-set name="termsource-text-style">
-	</xsl:attribute-set> <!-- termsource-text-style -->
+	<xsl:attribute-set name="term-termsource-text-style">
+	</xsl:attribute-set> <!-- term-termsource-text-style -->
 
-	<xsl:template name="refine_termsource-text-style">
+	<xsl:template name="refine_term-termsource-text-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="origin-style">
-	</xsl:attribute-set> <!-- origin-style -->
+	<xsl:attribute-set name="term-origin-style">
+	</xsl:attribute-set> <!-- term-origin-style -->
 
-	<xsl:template name="refine_origin-style">
+	<xsl:template name="refine_term-origin-style">
 	</xsl:template>
 
 	<!-- ====== -->
@@ -9100,9 +9117,9 @@
 	<!-- modification -->
 	<!-- ====== -->
 	<xsl:template match="mn:fmt-termsource" name="termsource">
-		<fo:block xsl:use-attribute-sets="termsource-style">
+		<fo:block xsl:use-attribute-sets="term-termsource-style">
 
-			<xsl:call-template name="refine_termsource-style"/>
+			<xsl:call-template name="refine_term-termsource-style"/>
 
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
 			<xsl:variable name="termsource_text">
@@ -9150,8 +9167,8 @@
 
 	<!-- text SOURCE: -->
 	<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
-		<fo:inline xsl:use-attribute-sets="termsource-text-style">
-			<xsl:call-template name="refine_termsource-text-style"/>
+		<fo:inline xsl:use-attribute-sets="term-termsource-text-style">
+			<xsl:call-template name="refine_term-termsource-text-style"/>
 			<xsl:value-of select="."/>
 		</fo:inline>
 	</xsl:template>
@@ -9163,8 +9180,8 @@
 					<xsl:if test="normalize-space(@citeas) = ''">
 						<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
 					</xsl:if>
-					<fo:inline xsl:use-attribute-sets="origin-style">
-						<xsl:call-template name="refine_origin-style"/>
+					<fo:inline xsl:use-attribute-sets="term-origin-style">
+						<xsl:call-template name="refine_term-origin-style"/>
 						<xsl:apply-templates/>
 					</fo:inline>
 				</fo:basic-link>
@@ -9212,14 +9229,14 @@
 		<xsl:variable name="levelTerm">
 			<xsl:call-template name="getLevelTermName"/>
 		</xsl:variable>
-		<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
+		<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="term-preferred-block-style">
 
-			<xsl:call-template name="refine_preferred-block-style"/>
+			<xsl:call-template name="refine_term-preferred-block-style"/>
 
 			<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
 
-				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
-					<xsl:call-template name="refine_term-name-style"/>
+				<fo:block xsl:use-attribute-sets="term-number-style" role="SKIP">
+					<xsl:call-template name="refine_term-number-style"/>
 
 					<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
 						<xsl:call-template name="setIDforNamedDestination"/>
@@ -9229,8 +9246,8 @@
 				</fo:block>
 			</xsl:if>
 
-			<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
-				<xsl:call-template name="refine_preferred-term-style"/>
+			<fo:block xsl:use-attribute-sets="term-preferred-style" role="SKIP">
+				<xsl:call-template name="refine_term-preferred-style"/>
 				<xsl:if test="$vertical_layout = 'true'">
 					<xsl:attribute name="margin-left">6mm</xsl:attribute>
 					<xsl:attribute name="font-family">Noto Sans JP</xsl:attribute>
@@ -9258,15 +9275,15 @@
 	<xsl:template match="mn:domain"/>
 
 	<xsl:template match="mn:fmt-admitted">
-		<fo:block xsl:use-attribute-sets="admitted-style">
-			<xsl:call-template name="refine_admitted-style"/>
+		<fo:block xsl:use-attribute-sets="term-admitted-style">
+			<xsl:call-template name="refine_term-admitted-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:fmt-deprecates">
-		<fo:block xsl:use-attribute-sets="deprecates-style">
-			<xsl:call-template name="refine_deprecates-style"/>
+		<fo:block xsl:use-attribute-sets="term-deprecates-style">
+			<xsl:call-template name="refine_term-deprecates-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -9279,8 +9296,8 @@
 	<!--  End Preferred, admitted, deprecated -->
 
 	<xsl:template match="mn:fmt-related">
-		<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
-			<xsl:call-template name="refine_related-block-style"/>
+		<fo:block role="SKIP" xsl:use-attribute-sets="term-related-block-style">
+			<xsl:call-template name="refine_term-related-block-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -9294,8 +9311,8 @@
 	<!-- definition -->
 	<!-- ========== -->
 	<xsl:template match="mn:fmt-definition">
-		<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
-			<xsl:call-template name="refine_definition-style"/>
+		<fo:block xsl:use-attribute-sets="term-definition-style" role="SKIP">
+			<xsl:call-template name="refine_term-definition-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -13148,15 +13165,22 @@
 		<xsl:if test="ancestor::mn:li">
 			<xsl:attribute name="margin-left">7.5mm</xsl:attribute>
 		</xsl:if>
-	</xsl:template>
+	</xsl:template> <!-- refine_quote-style -->
 
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-source-style -->
 
 	<xsl:template name="refine_quote-source-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="source-style">
+	</xsl:attribute-set> <!-- source-style -->
+
+	<xsl:template name="refine_source-style">
+
+	</xsl:template> <!-- refine_source-style -->
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -13208,7 +13232,9 @@
 		</xsl:if>
 		<xsl:choose>
 			<xsl:when test="not(parent::quote)">
-				<fo:block>
+				<fo:block xsl:use-attribute-sets="source-style">
+					<xsl:call-template name="refine_source-style"/>
+
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -15427,7 +15453,7 @@
 			<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
 		</xsl:if>
 		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
-		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
 	</xsl:template> <!-- refine_fn-reference-style -->
 
 	<xsl:attribute-set name="fn-style">
@@ -15438,7 +15464,9 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="fn-num-style">
+		<xsl:attribute name="role">Reference</xsl:attribute>
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+		<xsl:attribute name="font-size">65%</xsl:attribute>
 		<xsl:attribute name="font-size">67%</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -15537,33 +15565,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<xsl:variable name="fn_styles">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:bibitem">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
-								<xsl:call-template name="refine_bibitem-note-fn-style"/>
-							</fn_styles>
-						</xsl:when>
-						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style">
-								<xsl:call-template name="refine_fn-num-style"/>
-							</fn_styles>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
-
-				<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
-					<xsl:copy-of select="."/>
-				</xsl:for-each>
+				<xsl:call-template name="refine_fn-num-style"/>
 
 				<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
 				<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if> -->
 
-				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
@@ -15902,33 +15913,6 @@
 	<xsl:template name="refine_bibitem-non-normative-list-body-style">
 	</xsl:template>
 
-	<!-- footnote reference number for bibitem, in the text  -->
-	<xsl:attribute-set name="bibitem-note-fn-style">
-		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-		<xsl:attribute name="font-size">65%</xsl:attribute>
-		<xsl:attribute name="font-size">67%</xsl:attribute>
-		<xsl:attribute name="font-weight">bold</xsl:attribute>
-		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
-
-	<xsl:template name="refine_bibitem-note-fn-style">
-		<xsl:if test="not($vertical_layout = 'true')">
-			<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
-		</xsl:if>
-	</xsl:template>
-
-	<!-- footnote number on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-number-style">
-		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
-
-	<!-- footnote body (text) on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-body-style">
-		<xsl:attribute name="font-size">10pt</xsl:attribute>
-		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-		<xsl:attribute name="start-indent">0pt</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
-
 	<xsl:attribute-set name="references-non-normative-style">
 	</xsl:attribute-set> <!-- references-non-normative-style -->
 
@@ -18316,6 +18300,17 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_clause-style">
+		<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
+		<!-- <xsl:if test="$namespace = 'rsd'">
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevel">
+					<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:if test="$level &gt;= 4">
+				<xsl:attribute name="margin-left">13mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if> -->
 	</xsl:template>
 
 	<!-- main sections -->
@@ -19398,6 +19393,20 @@
 		</fo:block-container>
 	</xsl:template>
 
+	<!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
+	<xsl:template name="insertCoverPageFullImage">
+		<xsl:param name="name">coverpage-image</xsl:param>
+		<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
+			<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
+				<fo:flow flow-name="xsl-region-body">
+					<xsl:call-template name="insertBackgroundPageImage">
+						<xsl:with-param name="number" select="position()"/>
+					</xsl:call-template>
+				</fo:flow>
+			</fo:page-sequence>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="insertPageImage">
 		<xsl:param name="svg_content_height" select="$pageHeight"/>
 		<xsl:param name="bitmap_width" select="$pageWidth"/>

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -48,11 +48,13 @@ module IsoDoc
       end
 
       def source1_label(elem, sources, ancestor)
-        case ancestor
-        when :table
-          elem.children = l10n("#{@i18n.source}: #{sources}")
-        else super
-        end
+        elem.children = if ancestor == :table
+                          l10n("#{@i18n.source}: #{sources}")
+                        elsif /\(.+\)/.match?(sources)
+                          l10n("[#{@i18n.source}: #{sources}]")
+                        else
+                          l10n("(#{@i18n.source}: #{sources})")
+                        end
       end
 
       def bibdata_i18n(bibdata)
@@ -147,6 +149,36 @@ module IsoDoc
         docxml.xpath(ns("//table//fn"))
       end
 
+      # if termsource xref has no SDO identifier, cite instead by full reference
+      def citeas(xmldoc)
+        super
+        xmldoc.xpath(ns("//fmt-origin")).each do |e|
+          fmt_origin_cite_full?(e) or next
+          bibitem = @bibitem_lookup[e["bibitemid"]]
+          cit = bibitem.at(ns("./formattedref")) or next
+          e["citeas"] = citeas_cleanup(to_xml(cit.children).strip)
+        end
+      end
+
+      def fmt_origin_cite_full?(elem)
+        sem_xml_descendant?(elem) and return
+        id = elem["bibitemid"] or return
+        b = @bibitem_lookup[id] or return
+        !b.at(ns(<<~XPATH))
+          ./docidentifier[not(#{SKIP_DOCID} or @scope = 'biblio-tag' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type='title')]
+        XPATH
+      end
+
+      def termsource_join_delim(_elem)
+        @lang == "ja" ? "、" : "; "
+      end
+
+      def source_join_delim(_elem)
+        @lang == "ja" ? "、" : "; "
+      end
+
+      def bracketed_refs_processing(docxml); end
+
       include Init
     end
   end

data/lib/isodoc/jis/xref.rb

@@ -69,8 +69,9 @@ module IsoDoc
         ) 
         if elem["unnumbered"] != "true"
           x = semx(elem, sublabel)
+          p = elem.at("./ancestor::xmlns:figure")
           @anchors[elem["id"]][:label] = x
-          @anchors[elem["id"]][:xref] = @anchors[elem.parent["id"]][:xref] + 
+          @anchors[elem["id"]][:xref] = @anchors[p["id"]][:xref] + 
             subfigure_separator(markup: true) + x + delim_wrap(subfigure_delim)
         end
       end 
@@ -171,12 +172,23 @@ module IsoDoc
           label = counter.increment(entry).listlabel(entry.parent, depth)
           s = semx(entry, label)
           base = @c.decode(opts[:prev_label].gsub(%r{<[^>]+>}, "")).split(/\)\s*/) # List a) 1.1.1
-          label = "#{base[-1].sub(/^の/,'')}#{clausesep}#{label}"
+          label = "#{base[-1].sub(/^の/,'')}<esc>#{clausesep}</esc>#{label}"
           [label, opts[:prev_label] + delim_wrap(clausesep) + s]
         else
           super
         end
       end
+
+      def hierarchical_figure_names(clause, num)
+        #require "debug"; binding.b
+        super
+      end
+
+      def localise_anchors(type = nil)
+        #require "debug"; binding.b
+        super
+      end
+
     end
   end
 end

data/lib/metanorma/jis/biblio.rng

@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibItemType" combine="choice">
+  <define name="BibItemType">
     <a:documentation>Type of bibliographic item.
 The value list complies with the types provided in ISO 690:2021.
 NOTE: These values represent a strict superset to BibTeX

data/lib/metanorma/jis/isodoc.rng

@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video"/>
         <ref name="audio"/>
-        <ref name="pre"/>
+        <ref name="pre">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
+          <ref name="paragraph-with-footnote">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure"/>
+          <ref name="figure">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image-no-id"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image-no-id">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video-no-id"/>
         <ref name="audio-no-id"/>
-        <ref name="pre-no-id"/>
+        <ref name="pre-no-id">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote-no-id"/>
+          <ref name="paragraph-with-footnote-no-id">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure-no-id"/>
+          <ref name="figure-no-id">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table-no-id">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
+      <ref name="LocalizedStringAttributes">
+        <a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
+      </ref>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.6.5".freeze
+    VERSION = "0.6.7".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 "canon"
+  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -238,16 +238,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 description: |
   metanorma-jis lets you write JIS standards in AsciiDoc syntax.