metanorma-iho 0.9.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16b87b4a799b1e68df60702e316b4c58c34512d3a6c4e91c28f56c8c01b324a
-  data.tar.gz: c029dbfaae5fc3ee697f7a8bddee327c47eb2b843cd16b4961d9e654a9cf691c
+  metadata.gz: eca7ce0b97986804a03d34b28a9340a1db8a67794682f3972ccef345177c551f
+  data.tar.gz: 857fc0984a08a2094e1c08b0fb945ee178f4eca3134173d50619758132e7213a
 SHA512:
-  metadata.gz: ed12033c667766938f7d5045bb804ad8c1beed4528e8e920142b061fbb28b7fab33cefcd2da904f7e0e6442b089d0d5df3e082d29e094ec55ed23e25c97e17ef
-  data.tar.gz: f413dca0ddf19e59d6e9e0fedb20a94627e6803548ec56005c72d2d9d9d7bd7b4f328628202918a07cd9e4a9e997affac7fe5b135758e587f94f26bd248ed513
+  metadata.gz: daa2911323774f07433c7a4a88557465288b5be28fe246b32acb6b84b86db6da39b2c2ccac193a4d1de12127438eee0186e6c0fb8c482517e5addf8a61b4e997
+  data.tar.gz: 06b59c30143f00c3c651615af2e3070e481338a146cb77d3d08d88044631f396c9546c9ad5c70ea186b5b4ac455e6456b6e61662e8ee5e0b7d1c7069db80781d

data/lib/isodoc/iho/iho.specification.xsl

@@ -6967,18 +6967,33 @@
 
 	<xsl:template match="*[local-name()='localityStack']"/>
 
+	<xsl:variable 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 name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
+
 	<xsl:template 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>
@@ -8631,8 +8646,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'strong']" mode="contents_item">
+		<xsl:param name="element"/>
 		<xsl:copy>
-			<xsl:apply-templates mode="contents_item"/>
+			<xsl:apply-templates mode="contents_item">
+				<xsl:with-param name="element" select="$element"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
@@ -8699,7 +8717,10 @@
 
 	<!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output -->
 	<xsl:template match="*[local-name() = 'span']" mode="contents_item">
-		<xsl:apply-templates mode="contents_item"/>
+		<xsl:param name="element"/>
+		<xsl:apply-templates mode="contents_item">
+			<xsl:with-param name="element" select="$element"/>
+		</xsl:apply-templates>
 	</xsl:template>
 
 	<!-- =============== -->
@@ -11564,6 +11585,17 @@
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
+	<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>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- add @id, mandatory for table auto-layout algorithm -->
 	<xsl:template match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1">
 		<xsl:copy>
@@ -12438,7 +12470,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 xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/>
 				</xsl:otherwise>
 			</xsl:choose>

data/lib/isodoc/iho/iho.standard.xsl

@@ -6967,18 +6967,33 @@
 
 	<xsl:template match="*[local-name()='localityStack']"/>
 
+	<xsl:variable 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 name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
+
 	<xsl:template 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>
@@ -8631,8 +8646,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'strong']" mode="contents_item">
+		<xsl:param name="element"/>
 		<xsl:copy>
-			<xsl:apply-templates mode="contents_item"/>
+			<xsl:apply-templates mode="contents_item">
+				<xsl:with-param name="element" select="$element"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
@@ -8699,7 +8717,10 @@
 
 	<!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output -->
 	<xsl:template match="*[local-name() = 'span']" mode="contents_item">
-		<xsl:apply-templates mode="contents_item"/>
+		<xsl:param name="element"/>
+		<xsl:apply-templates mode="contents_item">
+			<xsl:with-param name="element" select="$element"/>
+		</xsl:apply-templates>
 	</xsl:template>
 
 	<!-- =============== -->
@@ -11564,6 +11585,17 @@
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
+	<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>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- add @id, mandatory for table auto-layout algorithm -->
 	<xsl:template match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1">
 		<xsl:copy>
@@ -12438,7 +12470,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 xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/>
 				</xsl:otherwise>
 			</xsl:choose>

data/lib/isodoc/iho/xref.rb

@@ -36,19 +36,21 @@ module IsoDoc
       end
 
       def clause_order_main(docxml)
-        if docxml.at(ns("//sections/clause//references"))
+        if docxml.at(ns("//bibliography//references[@normative = 'true']")) ||
+            docxml.at(ns("//sections/references[@normative = 'true']"))
           [
             { path: "//sections/clause[@type = 'scope']" },
+            { path: "#{@klass.norm_ref_xpath} | //sections/references" },
             { path: "//sections/terms | //sections/definitions | " \
-              "//sections/references | " \
               "//sections/clause[not(@type = 'scope')]", multi: true },
           ]
         else
           [
-            { path: "//sections/clause[@type = 'scope']" },
-            { path: @klass.norm_ref_xpath },
             { path: "//sections/terms | //sections/definitions | " \
-              "//sections/clause[not(@type = 'scope')]", multi: true },
+              "//sections/references | " \
+              "//bibliography/references[@normative = 'true'] | " \
+              "//bibliography/clause[.//references[@normative = 'true']] | " \
+              "//sections/clause", multi: true },
           ]
         end
       end

data/lib/metanorma/iho/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.2 -->
+<!-- VERSION v1.3.3 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -331,9 +331,9 @@
       <zeroOrMore>
         <ref name="table-note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="FigureAttr">
       <optional>
@@ -380,9 +380,9 @@
       <zeroOrMore>
         <ref name="note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="source">
       <element name="source">

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.9.11".freeze
+    VERSION = "1.0.0".freeze
   end
 end

data/metanorma-iho.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !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-iho lets you write IHO in AsciiDoc syntax.