metanorma-jis 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6062c86d44e00e27bea037019df7a5b5f7a7d031704d0b775cacf88eb82cf8d5
-  data.tar.gz: ee7eec76b99fbf8311606e4322d814904e3e39fb54a5fa1408e47063c3097ff2
+  metadata.gz: cb5c64ea8744feaed4b20df04ae5dd8f8f42d9908252adf5e7c1e853e19f13e2
+  data.tar.gz: 62081c0dd8d64b004146712e132e5b5ab65cc276f6647f90f180c05e5e10c6dc
 SHA512:
-  metadata.gz: 9d40aa2543613f86c47c4cd8f6eb04fdb6ca10a10449c5b11687e79e415964672d66d17d5d0444076d0487ae73be62a940d73f18b52fd39503d546b261f9f1d7
-  data.tar.gz: b59fe617194dfbcd402387da5093e8bc181c28bf2303398ef3eaae21eef083329035dbdfb43519f4f743adec265b25908f644f0ba37af88aef544f59cdde0186
+  metadata.gz: 69a2eb26de40e52c826ef40f95630d101a0367ec61b6ce7c03389e5cc038f4e3ef1f5edff5fba17b5af105e18c5790238210f161ef12897436c061e55b080c28
+  data.tar.gz: 05e2a234f7a545d02249ba02374f45590fbe755a19e746734597e08c567e3142b0ee9357f5462221494ec2602312137b7cc52a114afc879d4053f7da82673d71

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

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -717,10 +707,6 @@ p.Terms {
 }
 
 /* Navigation*/
-#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -768,6 +754,10 @@ p.Terms {
     color: black;
   }
 }
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -785,9 +775,6 @@ p.Terms {
   font-size: 100%;
 }
 
-nav {
-  line-height: 1.2em;
-}
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -812,11 +799,10 @@ nav {
     background-color: white;
   }
 }
-
-#toggle {
-  margin-left: -4em;
-  margin-top: -2em;
+nav {
+  line-height: 1.2em;
 }
+
 @media screen and (min-width: 768px) {
   #toggle {
     position: fixed;
@@ -845,6 +831,10 @@ nav {
     display: none;
   }
 }
+#toggle {
+  margin-left: -4em;
+  margin-top: -2em;
+}
 
 @media screen and (min-width: 768px) {
   .container {
@@ -875,17 +865,6 @@ nav {
     width: 100%;
   }
 }
-.figure,
-pre,
-.pseudocode {
-  background-color: #f7f7f7;
-  font-size: {{monospacefontsize}};
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-  font-size: {{normalfontsize}};
-}
 .figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
@@ -893,13 +872,18 @@ pre .SourceTitle,
   font-size: 1em;
   text-align: center;
 }
-
-div.figure {
+.figure,
+pre,
+.pseudocode {
+  background-color: #f7f7f7;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
+  font-size: {{normalfontsize}};
 }
+
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -912,6 +896,12 @@ div.figure > img, div.figure > svg {
   max-width: 100%;
   height: auto;
 }
+div.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 table div.figure {
   padding: 0;
@@ -1143,6 +1133,13 @@ p.NormRef {
 /*
 3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -1154,13 +1151,6 @@ pre,
   overflow: auto;
   font-size: {{normalfontsize}};
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1233,19 +1223,23 @@ pre {
   padding: 0.5em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2em;
-  color: black;
-  padding-left: 2em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
   margin-left: -1.5em;
 }
+.example {
+  color: black;
+  padding-left: 2em;
+}
 .example .example-title {
   margin-left: -1.5em;
 }

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

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -660,10 +650,6 @@ p.Terms {
 }
 
 /* Navigation*/
-#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -711,6 +697,10 @@ p.Terms {
     color: black;
   }
 }
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -734,9 +724,6 @@ p.Terms {
   font-size: 100%;
 }
 
-nav {
-  line-height: 1.2em;
-}
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -761,12 +748,10 @@ nav {
     background-color: white;
   }
 }
-
-#toggle {
-  border-right: solid black 1px;
-  margin-left: -4em;
-  margin-top: -2em;
+nav {
+  line-height: 1.2em;
 }
+
 @media screen and (min-width: 768px) {
   #toggle {
     position: fixed;
@@ -795,6 +780,11 @@ nav {
     display: none;
   }
 }
+#toggle {
+  border-right: solid black 1px;
+  margin-left: -4em;
+  margin-top: -2em;
+}
 
 @media screen and (min-width: 768px) {
   .container {
@@ -824,17 +814,6 @@ nav {
     width: 100%;
   }
 }
-.figure,
-pre,
-.pseudocode {
-  background-color: #f7f7f7;
-  font-size: {{monospacefontsize}};
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-  font-size: {{normalfontsize}};
-}
 .figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
@@ -842,13 +821,18 @@ pre .SourceTitle,
   font-size: 1em;
   text-align: center;
 }
-
-div.figure {
+.figure,
+pre,
+.pseudocode {
+  background-color: #f7f7f7;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
+  font-size: {{normalfontsize}};
 }
+
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -861,6 +845,12 @@ div.figure > img, div.figure > svg {
   max-width: 100%;
   height: auto;
 }
+div.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 table div.figure {
   padding: 0;
@@ -1208,6 +1198,13 @@ p.Biblio, p.NormRef {
 /*
 3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -1219,13 +1216,6 @@ pre,
   overflow: auto;
   font-size: {{normalfontsize}};
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1299,19 +1289,23 @@ div.zzHelp {
   padding: 0.5em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2em;
-  color: black;
-  padding-left: 0.5em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
   margin-left: -1.5em;
 }
+.example {
+  color: black;
+  padding-left: 0.5em;
+}
 .example .example-title {
   margin-top: 0;
 }

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

@@ -5797,6 +5797,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -6360,6 +6361,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -6374,10 +6376,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -7572,6 +7574,12 @@
 	<xsl:template name="refine_sourcecode-style">
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -8972,6 +8980,12 @@
 		</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> <!-- preferred-block-style -->
 
@@ -9579,6 +9593,12 @@
 		</xsl:if>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -10054,7 +10074,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -13298,6 +13318,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
@@ -15999,7 +16025,7 @@
 
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
-					<fo:block role="SKIP">
+					<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
 						<fo:inline role="SKIP">
 							<xsl:apply-templates select="mn:biblio-tag">
 								<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
@@ -18285,10 +18311,17 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -18412,6 +18445,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -143,12 +143,8 @@ module IsoDoc
         end
       end
 
-      def non_document_footnotes(docxml)
-        table_fns = docxml.xpath(ns("//table//fn"))
-        fig_fns = docxml.xpath(ns("//figure//fn")) -
-          docxml.xpath(ns("//figure/name//fn")) -
-          docxml.xpath(ns("//figure/fmt-name//fn"))
-        table_fns + fig_fns
+      def table_footnotes(docxml)
+        docxml.xpath(ns("//table//fn"))
       end
 
       include Init

data/lib/metanorma/jis/cleanup.rb

@@ -1,14 +1,15 @@
 module Metanorma
   module Jis
     class Converter < Iso::Converter
-      def norm_ref_preface(ref)
+      def norm_ref_preface(ref, isodoc)
         if ref.at("./note[@type = 'boilerplate']")
           unwrap_boilerplate_clauses(ref, ".")
         else
           pref = if ref_empty?(ref) then @i18n.norm_empty_pref
                  else @i18n.get[ref_dated(ref)]
                  end
-          ref.at("./title").next = "<p>#{pref}</p>"
+          #ref.at("./title").next = "<p>#{pref}</p>"
+          ref.at("./title").next = boilerplate_snippet_convert(pref, isodoc)
         end
       end
 

data/lib/metanorma/jis/front.rb

@@ -134,12 +134,12 @@ module Metanorma
 
       def title(node, xml)
         %w(en ja).each do |lang|
-          at = { language: lang, format: "text/plain" }
-          title_full(node, xml, lang, at)
-          title_intro(node, xml, lang, at)
-          title_main(node, xml, lang, at)
-          title_part(node, xml, lang, at)
-          title_amd(node, xml, lang, at) if @amd
+          title_full(node, xml, lang)
+          %w(intro main part).each do |w|
+            title_component(node, xml, lang, { name: w, abbr: w })
+          end
+          @amd and title_component(node, xml, lang,
+                                   { name: "amendment", abbr: "amd" })
         end
       end
 

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.1.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.6.4".freeze
+    VERSION = "0.6.5".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar