metanorma-jis 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c4ae85ab16813c1ea6df1c84c0f35eed81c3cfced1a6847f24c18ee4d3d15a
-  data.tar.gz: 6cd56b9042872341a10daa7a420eeb2fc253b36316d487ee40e0b863b1cd34fc
+  metadata.gz: 1705b0a1189c3766e1a185447e7ca92fa6c55ceebcb394f12d51782dbbe98a6e
+  data.tar.gz: 9e549d8aaba6c21294d6314c980e79de90bd92f9172cf29f056199a5af1f135b
 SHA512:
-  metadata.gz: 917d400c63d026ef24f46382369e4c0d0789060e85938bff493143045219ed36b256aa92d19f7dbfa74f06640f031a7ea231f44adfa1abf196ce9b32e8d0472a
-  data.tar.gz: 21a50c365f2107c6dc1fde249ff28453c2fcbf3d9d2c6c9064d6881738fbfc9d8a858bd9c7cc412b59e0be7ff643a27bdcb64c5843975b7158c1b4dd664ef0de
+  metadata.gz: ef60ef6cce41c377a25975953d216a707b6621923b9d88a4202535b59a1bc7e9de8a6548be68718c51fb5df05c5e91a3f432b171f67f8e1112f3d42ddcd00cb3
+  data.tar.gz: 1adc24ff72b309f1ccea730e3a047fc89d9678e489ec8f3d62c1213a26513babe1890a67a571fa33b4c804426f91fffdee28661a89a40025434ed02b41ecab72

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

@@ -229,6 +229,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 

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

@@ -229,6 +229,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 

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

@@ -251,7 +251,7 @@
 					<!-- Contents and preface pages -->
 					<!-- ========================== -->
 
-					<xsl:for-each select="/*/*[local-name()='preface']/*">
+					<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'clause' and @type = 'contributors')]">
 						<xsl:sort select="@displayorder" data-type="number"/>
 
 						<xsl:choose>
@@ -1427,12 +1427,16 @@
 
 	<xsl:template match="jis:p//text()[not(ancestor::jis:strong)] |       jis:dt/text()" mode="update_xml_step1">
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_font_en_open,'$1',$tag_font_en_close))"/>
-		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
-			<xsl:with-param name="tag_open" select="$tag_font_en_open"/>
-			<xsl:with-param name="tag_close" select="$tag_font_en_close"/>
-			<xsl:with-param name="text" select="$text_en_"/>
-		</xsl:call-template></text></xsl:variable>
-		<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
+		<xsl:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<xsl:call-template name="replace_text_tags">
+					<xsl:with-param name="tag_open" select="$tag_font_en_open"/>
+					<xsl:with-param name="tag_close" select="$tag_font_en_close"/>
+					<xsl:with-param name="text" select="$text_en_"/>
+				</xsl:call-template>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<!-- jis:term/jis:preferred2//text() | -->
@@ -1440,24 +1444,32 @@
 	<!-- <name>注記  1</name> to <name>注記<font_en>  1</font_en></name> -->
 	<xsl:template match="jis:title/text() |        jis:note/jis:name/text() |        jis:termnote/jis:name/text() |       jis:table/jis:name/text() |       jis:figure/jis:name/text() |       jis:termexample/jis:name/text() |       jis:xref//text() |       jis:origin/text()" mode="update_xml_step1">
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
-		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
-			<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
-			<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
-			<xsl:with-param name="text" select="$text_en_"/>
-		</xsl:call-template></text></xsl:variable>
-		<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
+		<xsl:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<xsl:call-template name="replace_text_tags">
+					<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
+					<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
+					<xsl:with-param name="text" select="$text_en_"/>
+				</xsl:call-template>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<!-- for $contents -->
 	<xsl:template match="title/text()">
 		<xsl:variable name="regex_en_contents">([^\u00A0\u2002-\u200B\u3000-\u9FFF\uF900-\uFFFF\(\)]{1,})</xsl:variable>
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en_contents, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
-		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
-			<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
-			<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
-			<xsl:with-param name="text" select="$text_en_"/>
-		</xsl:call-template></text></xsl:variable>
-		<xsl:apply-templates select="xalan:nodeset($text_en)/text/node()"/>
+		<xsl:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<xsl:call-template name="replace_text_tags">
+					<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
+					<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
+					<xsl:with-param name="text" select="$text_en_"/>
+				</xsl:call-template>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:apply-templates select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<!-- move example title to the first paragraph -->
@@ -1465,11 +1477,18 @@
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:element name="p" namespace="https://www.metanorma.org/ns/jis">
-				<xsl:value-of select="substring-after(jis:name/text(), ' — ')"/>
+				<xsl:value-of select="substring-after(jis:name/text()[1], ' — ')"/>
+				<xsl:apply-templates select="jis:name/text()[1]/following-sibling::node()" mode="update_xml_step1"/>
 			</xsl:element>
 			<xsl:apply-templates mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
+	<xsl:template match="jis:example/jis:name[contains(text(), ' — ')]" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates select="text()[1]" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
 	<xsl:template match="jis:example/jis:name/text()" mode="update_xml_step1">
 		<xsl:variable name="example_name">
 			<xsl:choose>
@@ -1478,12 +1497,16 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new($example_name), $regex_en, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
-		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
-			<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
-			<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
-			<xsl:with-param name="text" select="$text_en_"/>
-		</xsl:call-template></text></xsl:variable>
-		<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
+		<xsl:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<xsl:call-template name="replace_text_tags">
+					<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
+					<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
+					<xsl:with-param name="text" select="$text_en_"/>
+				</xsl:call-template>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<xsl:template match="jis:eref//text()" mode="update_xml_step1">
@@ -1491,11 +1514,11 @@
 		<xsl:variable name="parts">
 			<xsl:choose>
 				<xsl:when test="contains(., ':')">
-					<xsl:element name="{$element_name_font_en_bold}"><xsl:value-of select="substring-before(., ':')"/></xsl:element>
-					<xsl:element name="{$element_name_font_en}">:<xsl:value-of select="substring-after(., ':')"/></xsl:element>
+					<xsl:element name="{$element_name_font_en_bold}" namespace="{$namespace_full}"><xsl:value-of select="substring-before(., ':')"/></xsl:element>
+					<xsl:element name="{$element_name_font_en}" namespace="{$namespace_full}">:<xsl:value-of select="substring-after(., ':')"/></xsl:element>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:element name="{$element_name_font_en_bold}"><xsl:value-of select="."/></xsl:element>
+					<xsl:element name="{$element_name_font_en_bold}" namespace="{$namespace_full}"><xsl:value-of select="."/></xsl:element>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -1503,12 +1526,16 @@
 			<xsl:variable name="tag_open">###<xsl:value-of select="local-name()"/>###</xsl:variable>
 			<xsl:variable name="tag_close">###/<xsl:value-of select="local-name()"/>###</xsl:variable>
 			<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_open,'$1',$tag_close))"/>
-			<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
-				<xsl:with-param name="tag_open" select="$tag_open"/>
-				<xsl:with-param name="tag_close" select="$tag_close"/>
-				<xsl:with-param name="text" select="$text_en_"/>
-			</xsl:call-template></text></xsl:variable>
-			<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
+			<xsl:variable name="text_en">
+				<xsl:element name="text" namespace="{$namespace_full}">
+					<xsl:call-template name="replace_text_tags">
+						<xsl:with-param name="tag_open" select="$tag_open"/>
+						<xsl:with-param name="tag_close" select="$tag_close"/>
+						<xsl:with-param name="text" select="$text_en_"/>
+					</xsl:call-template>
+				</xsl:element>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 		</xsl:for-each>
 	</xsl:template>
 
@@ -1517,12 +1544,16 @@
 	</xsl:template>
 	<xsl:template match="jis:strong/text()" priority="2" mode="update_xml_step1">
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
-		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
-			<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
-			<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
-			<xsl:with-param name="text" select="$text_en_"/>
-		</xsl:call-template></text></xsl:variable>
-		<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
+		<xsl:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<xsl:call-template name="replace_text_tags">
+					<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
+					<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
+					<xsl:with-param name="text" select="$text_en_"/>
+				</xsl:call-template>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'font_en_bold'][normalize-space() != '']">
@@ -3457,13 +3488,35 @@
 			</xsl:for-each>
 		</xsl:element>
 
-		<xsl:call-template name="insertAnnexInSeparatePageSequences"/>
+		<xsl:call-template name="insertAnnexAndBibliographyInSeparatePageSequences"/>
 
-		<xsl:call-template name="insertBibliographyInSeparatePageSequences"/>
+		<!-- <xsl:call-template name="insertBibliographyInSeparatePageSequences"/> -->
 
 		<!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
 	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
 
+	<xsl:template name="insertAnnexAndBibliographyInSeparatePageSequences">
+		<xsl:for-each select="/*/*[local-name()='annex'] |           /*/*[local-name()='bibliography']/*[not(@normative='true')] |           /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]] |          /*/*[local-name()='indexsect']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'annex' or local-name() = 'indexsect'">
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:attribute name="main_page_sequence"/>
+						<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+					</xsl:element>
+				</xsl:when>
+				<xsl:otherwise> <!-- bibliography -->
+					<xsl:element name="bibliography" namespace="{$namespace_full}"> <!-- save context element -->
+						<xsl:element name="page_sequence" namespace="{$namespace_full}">
+							<xsl:attribute name="main_page_sequence"/>
+							<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+						</xsl:element>
+					</xsl:element>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="insertAnnexInSeparatePageSequences">
 		<xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -12290,10 +12343,12 @@
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
-			<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
-			<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
-			<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
-				<xsl:value-of select="."/>
+			<xsl:if test="1 = 2"> <!-- remove attachment/text(), because attachments added in the template 'addPDFUAmeta' before applying 'update_xml_step1' -->
+				<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
+				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
+				<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
+					<xsl:value-of select="normalize-space(.)"/>
+				</xsl:if>
 			</xsl:if>
 		</xsl:copy>
 	</xsl:template>
@@ -13275,7 +13330,8 @@
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
 			<xsl:choose>
 				<xsl:when test="normalize-space() != ''">
-					<pdf:embedded-file src="{.}" filename="{@name}"/>
+					<xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
+					<pdf:embedded-file src="{$src_attachment}" filename="{@name}"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- _{filename}_attachments -->

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -37,7 +37,7 @@ module IsoDoc
 
       def ol_depth(node)
         depth = node.ancestors("ol").size + 1
-        depth == 1 and return :alphabetic
+        depth == 1 and return :alphabet
         :arabic
       end
 

data/lib/isodoc/jis/word_cleanup.rb

@@ -7,14 +7,18 @@ module IsoDoc
         word_note_cleanup(docxml)
         boldface(docxml)
         super
-        move_to_inner_cover(docxml)
+      end
+
+      def word_remove_empty_sections(docxml)
+        move_to_inner_cover(docxml) # preempt by populating WordSection1
+        super
       end
 
       def move_to_inner_cover(docxml)
         source = docxml.at("//div[@type = 'inner-cover-note']")
         dest = docxml.at("//div[@id = 'boilerplate-inner-cover-note']")
         source && dest and dest.replace(source.remove)
-        source = docxml.at("//div[@type = 'contributors']")
+        source = docxml.at("//div[@type = 'participants']")
         dest = docxml.at("//div[@id = 'boilerplate-contributors']")
         source && dest and dest.replace(source.remove)
         docxml

data/lib/metanorma/jis/cleanup.rb

@@ -82,6 +82,37 @@ module Metanorma
         ::Metanorma::Standoc::Converter.instance_method(:ol_cleanup).bind(self)
           .call(doc)
       end
+
+      def biblio_reorder(xmldoc)
+        xmldoc.xpath("//references[@normative = 'true']").each do |r|
+          biblio_reorder1(r)
+        end
+      end
+
+      def pub_class_prep(bib)
+        iso = bib.at("#{PUBLISHER}[abbreviation = 'ISO']") ||
+          bib.at("#{PUBLISHER}[name = 'International Organization " \
+                                   "for Standardization']")
+        iec = bib.at("#{PUBLISHER}[abbreviation = 'IEC']") ||
+          bib.at("#{PUBLISHER}[name = 'International " \
+                                   "Electrotechnical Commission']")
+        jis = bib.at("#{PUBLISHER}[abbreviation = 'JIS']") ||
+          bib.at("#{PUBLISHER}[name = '#{pub_hash['ja']}']") ||
+          bib.at("#{PUBLISHER}[name = '#{pub_hash['en']}']")
+        [iso, iec, jis]
+      end
+
+      def pub_class(bib)
+        iso, iec, jis = pub_class_prep(bib)
+        jis && iec && iso and return 2
+        jis && iec and return 2
+        jis && iso and return 3
+        jis and return 1
+        iso && iec and return 4
+        iso and return 4
+        iec and return 5
+        6
+      end
     end
   end
 end

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.2".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar