metanorma-ieee 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c662d2e1d2098e3135362a0d30c7faa4f2bc09d7ff48ed141634d6387bd87f5
-  data.tar.gz: 92a643d3c59276828c5d2176a05a16bcfdd5f70ee24d2425133356c04c183d72
+  metadata.gz: bc4895281aceec332b1a16b2d481ffcaf9e336ba9e2c49cfdc2d81015e85998c
+  data.tar.gz: ca5a9aae41560f57de081927bc688a5151c9deee0c0c1a75511f87de8e088f9a
 SHA512:
-  metadata.gz: 72e2433351b0e929361911adf0069f4426a8e50c10b1c503a22d5c18aa0a2c6fcf6c9df33c43c96d5a63cb8ed8a60b9422d55f0516ed7490f93a374c7470e6c1
-  data.tar.gz: c7b1b210e0cf40b99750a71cb24459485c79fc0bed2859258d2506dfe4c6a091f86142ccf01bdfba954a7e778330e8a0e1f5b939d789a254ddf021e4575c3ecb
+  metadata.gz: 42db1434c3b10a3d6389b5708f925a78fb5074aab2e2f9b29ec479e247733771f08fba5d0169ebb3e65f5a8fb7dcf1d9567728bdbc3fa65eb79d50c79eaaca80
+  data.tar.gz: 6fc8000efd5d636ad4e9c4ed869627e4a47344c2055597d8392cd45cc1d1064370a7e1cf03e10c46e32ced8e2a7bad73f63b3bce1aea720653a386a893f6315e

data/lib/html2doc/ieee/lists.rb

@@ -50,7 +50,8 @@ class Html2Doc
         l["class"] ||= list_style(type, level, "Middle")
         next unless l&.first_element_child&.name == "p"
 
-        l["style"] += (l.first_element_child["style"]&.sub(/mso-list[^;]+;/, "") || "")
+        l["style"] +=
+          l.first_element_child["style"]&.sub(/mso-list[^;]+;/, "") || ""
         l.first_element_child.replace(l.first_element_child.children)
       end
       list.replace(list.children)

data/lib/isodoc/ieee/ieee.amendment.xsl

@@ -9887,18 +9887,33 @@
 
 	<xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='localityStack']"/>
 
+	<xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pdfAttachmentsList_">
+		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
+			<attachment filename="{@name}"/>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
+
 	<xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='link']" name="link">
+		<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
+		<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="@updatetype = 'true'">
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
+				<!-- link to the PDF attachment -->
+				<xsl:when test="$pdfAttachmentsList//attachment[@filename = current()/@target]">
+					<xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
+				</xsl:when>
+				<!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
+					<xsl:value-of select="concat('url(embedded-file:', $target_attachment_name, ')')"/>
+				</xsl:when>
 				<xsl:when test="contains(@target, concat('_', $inputxml_filename_prefix, '_attachments'))">
-					<!-- link to the PDF attachment -->
 					<xsl:variable name="target_" select="translate(@target, '\', '/')"/>
 					<xsl:variable name="target__" select="substring-after($target_, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
 					<xsl:value-of select="concat('url(embedded-file:', $target__, ')')"/>
-				</xsl:when>
+				</xsl:when> -->
 				<xsl:otherwise>
 					<xsl:value-of select="normalize-space(@target)"/>
 				</xsl:otherwise>
@@ -14544,6 +14559,17 @@
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
+	<xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" 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>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- add @id, mandatory for table auto-layout algorithm -->
 	<xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1">
 		<xsl:copy>
@@ -15520,7 +15546,8 @@
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- _{filename}_attachments -->
-					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/>
+					<!-- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> -->
+					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
 					<pdf:embedded-file src="{$url}" filename="{@name}"/>
 				</xsl:otherwise>
 			</xsl:choose>

data/lib/isodoc/ieee/ieee.standard.xsl

@@ -9887,18 +9887,33 @@
 
 	<xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='localityStack']"/>
 
+	<xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pdfAttachmentsList_">
+		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
+			<attachment filename="{@name}"/>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
+
 	<xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='link']" name="link">
+		<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
+		<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="@updatetype = 'true'">
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
+				<!-- link to the PDF attachment -->
+				<xsl:when test="$pdfAttachmentsList//attachment[@filename = current()/@target]">
+					<xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
+				</xsl:when>
+				<!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
+					<xsl:value-of select="concat('url(embedded-file:', $target_attachment_name, ')')"/>
+				</xsl:when>
 				<xsl:when test="contains(@target, concat('_', $inputxml_filename_prefix, '_attachments'))">
-					<!-- link to the PDF attachment -->
 					<xsl:variable name="target_" select="translate(@target, '\', '/')"/>
 					<xsl:variable name="target__" select="substring-after($target_, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
 					<xsl:value-of select="concat('url(embedded-file:', $target__, ')')"/>
-				</xsl:when>
+				</xsl:when> -->
 				<xsl:otherwise>
 					<xsl:value-of select="normalize-space(@target)"/>
 				</xsl:otherwise>
@@ -14544,6 +14559,17 @@
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
+	<xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" 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>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- add @id, mandatory for table auto-layout algorithm -->
 	<xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1">
 		<xsl:copy>
@@ -15520,7 +15546,8 @@
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- _{filename}_attachments -->
-					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/>
+					<!-- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> -->
+					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
 					<pdf:embedded-file src="{$url}" filename="{@name}"/>
 				</xsl:otherwise>
 			</xsl:choose>

data/lib/isodoc/ieee/metadata.rb

@@ -10,15 +10,6 @@ module IsoDoc
         logos
       end
 
-      def logos
-        here = File.join(File.dirname(__FILE__), "html")
-        %i(wp_image001_emz wp_image003_emz wp_image008_emz)
-          .each do |w|
-          img = w.to_s.sub("_emz", ".emz")
-          set(w, File.expand_path(File.join(here, img)))
-        end
-      end
-
       def logos
         here = File.join(File.dirname(__FILE__), "html")
         suffix = ".emz"
@@ -33,7 +24,7 @@ module IsoDoc
 
       def bibdate(isoxml, _out)
         isoxml.xpath(ns("//bibdata/date[@format = 'ddMMMyyyy']")).each do |d|
-          set("#{d['type'].gsub('-', '_')}date".to_sym, Common::date_range(d))
+          set("#{d['type'].tr('-', '_')}date".to_sym, Common::date_range(d))
         end
         draft = isoxml.at(ns("//bibdata/date[@type = 'issued']")) ||
           isoxml.at(ns("//bibdata/date[@type = 'circulated']")) ||

data/lib/isodoc/ieee/presentation_ref.rb

@@ -45,15 +45,36 @@ module IsoDoc
         super
       end
 
+      KEEP_BIBRENDER_XPATH =
+        "./docidentifier | ./uri | ./note | ./title | ./biblio-tag".freeze
+
       def bibrender_relaton(xml, renderings)
         f = renderings[xml["id"]][:formattedref]
         fn = availability_note(xml)
         f &&= "<formattedref>#{f}#{fn}</formattedref>"
-        keep = "./docidentifier | ./uri | ./note | ./title | ./biblio-tag"
-        xml.children = "#{f}#{xml.xpath(ns(keep)).to_xml}"
+        xml.children = "#{f}#{xml.xpath(ns(KEEP_BIBRENDER_XPATH)).to_xml}"
+        author_date(xml, renderings)
         @author[xml["id"]] = renderings[xml["id"]][:author]
       end
 
+      def author_date(xml, renderings)
+        author_date?(xml) or return
+        cit = renderings[xml["id"]][:citation]
+        xml << "<docidentifier type='metanorma'>#{cit}</docidentifier>"
+        xml.at(ns("./biblio-tag"))&.remove
+        xml << "<biblio-tag>#{cit}, </biblio-tag>"
+      end
+
+      def author_date?(xml)
+        ret = !xml["type"]
+        ret ||= %w(standard techreport website webresource)
+          .include?(xml["type"])
+        ret ||= xml.at(".//ancestor::xmlns:references[@normative = 'false']")
+        ret ||= xml.at(ns("./docidentifier[@type = 'metanorma']"))
+        ret and return false
+        true
+      end
+
       def creatornames(bibitem)
         ::Relaton::Render::IEEE::General
           .new(language: @lang, i18nhash: @i18n.get,

data/lib/isodoc/ieee/presentation_terms.rb

@@ -86,7 +86,7 @@ module IsoDoc
         ins = coll.first.previous_element
         ret = sort_related(coll)
         coll.each(&:remove)
-        ret.reverse.each { |t| ins.next = t }
+        ret.reverse_each { |t| ins.next = t }
         ins.parent.xpath(ns("./related"))
       end
 
@@ -144,7 +144,7 @@ module IsoDoc
         coll = terms.xpath(ns("./term"))
         ret = sort_terms(coll)
         coll.each(&:remove)
-        ret.reverse.each { |t| ins.next = t }
+        ret.reverse_each { |t| ins.next = t }
       end
 
       def sort_terms(terms)

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -63,13 +63,17 @@ module IsoDoc
         capitalise_xref(node, linkend, anchor_value(node["target"]))
       end
 
+      def eref_locality_populate(type, node, number)
+        type == "page" and return ""
+        super
+      end
+
       def block_delim
         "—"
       end
 
       def note1(elem)
-        return if elem.parent.name == "bibitem" || elem["notag"] == "true"
-
+        elem.parent.name == "bibitem" || elem["notag"] == "true" and return
         n = @xrefs.get[elem["id"]]
         lbl = if n.nil? || n[:label].nil? || n[:label].empty? then @i18n.note
               else l10n("#{@i18n.note} #{n[:label]}")

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "1.2.12".freeze
+    VERSION = "1.2.13".freeze
   end
 end

data/metanorma-ieee.gemspec

@@ -41,4 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Metanorma for the ITU.
 
   '