metanorma-jis 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 940e63ca6b0fbe0f8ffcfeb667c50207e3368f065840941e1377d172bf4b022f
-  data.tar.gz: 7cd7632a9b316836a0e08f517a6c27cb6c12a72ba2d551a21fa29c6d542f98ff
+  metadata.gz: 51d33b08d2336531fafeb2cd92258ecd7f4d2ecc22789d688840fff5e3b9f4b4
+  data.tar.gz: 20d1c0ad57701d3cd632c1cc33964528a5e34aa646a0290af52f841081fa54a1
 SHA512:
-  metadata.gz: ad51ac315b7537a46c60c441b3ab817f9fa028565c09dce86dd08b7a7f5ecb29b1b1abd97c27482ded83cfd0c5849465eacf68cd871f192c60366c0616110b82
-  data.tar.gz: 457843fe15780ca34e369bc5714affcd6599d2abd3c35d4c0190bfa39be7187c49a6a67bb5fe7f9a8dc53de75637b743ffe50f267d3e5538e865d6d043cce188
+  metadata.gz: fc470c9a97b273a3c4989add0df8b28d87173bcca11ca7e1ac2abb46111bf89864db95b23f441970a35b7b6156929109e7b7c7ddd649017aae2ad1551bf1720a
+  data.tar.gz: e3192bb844ec32eab702e75891b7165b04c802e7acc3c8bc2a277a3d47e2e911427c36716559db01cbd1c81c4ba0f6f93c2bf6611655b95468513b30943022fc

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

@@ -2119,6 +2119,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termexample-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-style">
 
 			<xsl:attribute name="margin-top">4pt</xsl:attribute>
@@ -3238,6 +3242,36 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template name="processMainSectionsDefault_flatxml">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5305,13 +5339,13 @@
 		<tr>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
 				</xsl:attribute>
 				<xsl:apply-templates/>
 			</td>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
 				</xsl:attribute>
 
 						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -5926,6 +5960,10 @@
 		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END Rich text formatting -->
 	<!-- ========================= -->
@@ -6556,7 +6594,7 @@
 				</xsl:choose>
 			</xsl:variable>
 			<xsl:attribute name="id">
-				<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
+				<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
 			</xsl:attribute>
 
 			<xsl:for-each select="*[local-name() = 'p']">
@@ -6564,7 +6602,7 @@
 					<xsl:copy-of select="@*"/>
 					<xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
 					<xsl:attribute name="id">
-						<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
+						<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
 					</xsl:attribute>
 
 					<!-- <xsl:copy-of select="node()" /> -->
@@ -6628,7 +6666,7 @@
 					<xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
 					<xsl:copy>
 						<xsl:attribute name="id">
-							<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
+							<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
 						</xsl:attribute>
 						<xsl:copy-of select="node()"/>
 					</xsl:copy>
@@ -9422,7 +9460,7 @@
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'termexample']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
-
+			<xsl:call-template name="refine_termexample-style"/>
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:apply-templates select="*[local-name()='name']"/>

data/lib/isodoc/jis/metadata.rb

@@ -9,14 +9,14 @@ module IsoDoc
         %w(en ja).include?(lang) or lang = "ja"
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
-        set_encoded(:doctitlemain, tp[:main])
+        tp[:main] and set(:doctitlemain, tp[:main].children.to_xml)
         main = compose_title(tp, tn, lang)
         set(:doctitle, main)
-        set_encoded(:doctitleintro, tp[:intro])
+        tp[:intro] and set(:doctitleintro, tp[:intro].children.to_xml)
         set(:doctitlepartlabel, part_prefix(tn, lang))
-        set_encoded(:doctitlepart, tp[:part])
+        tp[:part] and set(:doctitlepart, tp[:part].children.to_xml)
         set(:doctitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set_encoded(:doctitleamd, tp[:amd])
+        tp[:amd] and set(:doctitleamd, tp[:amd].children.to_xml)
         set(:doctitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 
@@ -24,14 +24,14 @@ module IsoDoc
         lang = @lang == "ja" ? "en" : "ja"
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
-        set_encoded(:docsubtitlemain, tp[:main])
+        tp[:main] and set(:docsubtitlemain, tp[:main].children.to_xml)
         main = compose_title(tp, tn, lang)
         set(:docsubtitle, main)
-        set_encoded(:docsubtitleintro, tp[:intro])
+        tp[:intro] and set(:docsubtitleintro, tp[:intro].children.to_xml)
         set(:docsubtitlepartlabel, part_prefix(tn, lang))
-        set_encoded(:docsubtitlepart, tp[:part])
+        tp[:part] and set(:docsubtitlepart, tp[:part].children.to_xml)
         set(:docsubtitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set_encoded(:docsubtitleamd, tp[:amd])
+        tp[:amd] and set(:docsubtitleamd, tp[:amd].children.to_xml)
         set(:docsubtitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 

data/lib/metanorma/jis/front.rb

@@ -68,17 +68,16 @@ module Metanorma
         ret = node.attr(attr + suffix) and return ret
         ret = langs.each_with_object({}).each do |l, m|
           x = node.attr("#{attr}-#{l}#{suffix}") and m[l] = x
-        end.compact
+        end
         ret.empty? and return nil
-        ret
+        compact_blank(ret)
       end
 
       def extract_org_attrs_complex(node, opts, source, suffix)
-        { name: multiling_docattr(node, source, suffix, LANGS),
-          role: opts[:role], desc: opts[:desc],
-          abbr: multiling_docattr(node, "#{source}-abbr", suffix, LANGS),
-          logo: multiling_docattr(node, "#{source}_logo", suffix, LANGS) }
-          .compact
+        compact_blank({ name: multiling_docattr(node, source, suffix, LANGS),
+                        role: opts[:role], desc: opts[:desc],
+                        abbr: multiling_docattr(node, "#{source}-abbr", suffix, LANGS),
+                        logo: multiling_docattr(node, "#{source}_logo", suffix, LANGS) })
           .merge(extract_org_attrs_address(node, opts, suffix))
       end
 
@@ -142,7 +141,6 @@ module Metanorma
           xml.docidentifier id.sub(/^JIS /, ""), **attr_code(type: "JIS")
         else iso_id(node, xml)
         end
-        xml.docnumber node.attr("docnumber")
       end
 
       def get_typeabbr(node, amd: false)
@@ -168,12 +166,13 @@ module Metanorma
                 publisher: pub[0],
                 copublisher: pub[1..-1] }.compact
         ret[:copublisher].empty? and ret.delete(:copublisher)
-        ret
+        compact_blank(ret)
       end
 
       def iso_id_params_add(node)
-        { number: node.attr("amendment-number"),
-          year: iso_id_year(node) }.compact
+        ret = { number: node.attr("amendment-number"),
+                year: iso_id_year(node) }
+        compact_blank(ret)
       end
 
       def iso_id_out(xml, params, _with_prf)

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.2.1".freeze
+    VERSION = "0.2.2".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "japanese_calendar", "~> 0"
-  spec.add_dependency "metanorma-iso", "~> 2.7.0"
+  spec.add_dependency "metanorma-iso", "~> 2.7.2"
   spec.add_dependency "pubid-jis"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: pubid-jis
   requirement: !ruby/object:Gem::Requirement