metanorma-jis 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb5c64ea8744feaed4b20df04ae5dd8f8f42d9908252adf5e7c1e853e19f13e2
-  data.tar.gz: 62081c0dd8d64b004146712e132e5b5ab65cc276f6647f90f180c05e5e10c6dc
+  metadata.gz: 5ab0b01630fb8d1bfe5b00f02e1a2b5bdec5d25747bdb0cff159637bf113aca4
+  data.tar.gz: f6c399abfa6e0eb718c699442c94c0bf697ed62860320b4c4cd998192e1676af
 SHA512:
-  metadata.gz: 69a2eb26de40e52c826ef40f95630d101a0367ec61b6ce7c03389e5cc038f4e3ef1f5edff5fba17b5af105e18c5790238210f161ef12897436c061e55b080c28
-  data.tar.gz: 05e2a234f7a545d02249ba02374f45590fbe755a19e746734597e08c567e3142b0ee9357f5462221494ec2602312137b7cc52a114afc879d4053f7da82673d71
+  metadata.gz: ca03cf008a8456cb07057dd40ff491a2354f8b46c4f85b9b2debf1a3305301d10419155296821ae154707c52e4ca66e858d0e07d5380f4cd64366b1466773646
+  data.tar.gz: 06c7813d7204d9257c8eb3da0666b2196b1a22d979d839411961b5a5cc7a441d781b5173e55b632834bf9981b151c8c77ae8db9f1f0372bc95650ef2f4bd32c4

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 -->
 					<!-- ========================== -->
@@ -1024,6 +1026,9 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="inner-cover-page">
+	</xsl:template>
+
 	<xsl:template match="mn:references[not(@hidden = 'true')]" mode="linear_xml" priority="2">
 		<xsl:copy>
 			<xsl:apply-templates select="@*|node()" mode="linear_xml"/>
@@ -2869,7 +2874,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>
@@ -7324,7 +7329,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">
@@ -13148,15 +13152,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 +13219,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 +15440,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 +15451,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 +15552,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
-
-				<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>
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<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 +15900,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 +18287,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 -->

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/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.6.5".freeze
+    VERSION = "0.6.6".freeze
   end
 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.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar