metanorma-iso 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45add77cdb8b13df6e89dd7b66bf52bf94dfc2b7d6ac3c2c2f5f1fd7cbbd2e84
-  data.tar.gz: bd4b6b09d4a17130b7cda4c171569f5ad3635cdcf526b5ec6b0d60e9abfc76d3
+  metadata.gz: 64e6eab706552443cde266e7b76a56dd9ff53d94a796df0c03d105fa7ec945f6
+  data.tar.gz: 65fdb4f2385b6ab436e686688cf03bcd7c461bec73eb63eb802740257c7f296e
 SHA512:
-  metadata.gz: d572ea00343fd042be81986ba99c1858e2219880743e7db3e67a3dce7bfb3bed23cefcda83cf5de0cb2f63606d35078936755e7ddfdc17aee4d251b22da22b85
-  data.tar.gz: e1c7eee7693c31956bb10f66fa837cffbf9ff853cb20e4e8804e9170d843573db8457f4a121117d6698ce610e5d920bf3db8b0c594dea55f2e1ce6f7e40af2d5
+  metadata.gz: 9db77b1df94eb6ed6a5736c52fe4be6d4948bb2c07cc429457bfed51b090580e79e9b708ee7df64cdcec875596e4f78d99f062864f6516c7715a2fc85ce8715d
+  data.tar.gz: 725a406ca051536badb034f8035a7d2a61df84d3dd1422dcfb1d478f6e23cd659677dc7301e1442f756676b4c3c71f1c8c2fd12eb5b1f49d61259b5c9340b299

data/lib/isodoc/iso/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/iso/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/iso/i18n-en.yaml

@@ -14,7 +14,7 @@ reference_number_abbrev: Ref. No.
 price_based_on: Price based on % pages
 price: Price
 date_first_printing: Date of the first printing
-date_printing: Date of the % printing
+date_printing: "Date of the {{ var1 | ordinal_word: '', '' }} printing"
 descriptor: Descriptor
 under_preparation: Under preparation. (Stage at the time of publication %).
 withdrawn: Withdrawn.

data/lib/isodoc/iso/i18n-fr.yaml

@@ -14,7 +14,7 @@ reference_number_abbrev: Réf. №
 price_based_on: Prix basé sur % pages
 price: Prix
 date_first_printing: Date de la première impression
-date_printing: Date de la % impression
+date_printing: "Date de la {{ var1 | ordinal_word: '', 'f' }} impression"
 descriptor: Descripteur
 under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
 withdrawn: Retiré.

data/lib/isodoc/iso/i18n-ru.yaml

@@ -14,7 +14,7 @@ descriptor: Дескриптор
 price_based_on: Цена рассчитана на % стр.
 price: Цена
 date_first_printing: Дата первой печати
-date_printing: Дата % печати
+date_printing: "Дата {{ var1 | ordinal_word: '', 'f.gen' }} печати"
 under_preparation: В стадии подготовки. (Стадия на момент публикации %).
 withdrawn: Отозван.
 cancelled_and_replaced: Отменено и заменено на %.

data/lib/isodoc/iso/iso.amendment.xsl

@@ -7142,13 +7142,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"/>
@@ -16180,10 +16202,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>
@@ -17185,7 +17209,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/iso/iso.international-standard.xsl

@@ -7142,13 +7142,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"/>
@@ -16180,10 +16202,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>
@@ -17185,7 +17209,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/iso/presentation_bibdata.rb

@@ -73,6 +73,15 @@ module IsoDoc
         @lang == "fr" and e = bibdata.at(ns("./edition[@language = 'fr']")) and
           e.children = e.text.sub(/(\d+)(\p{L}+)/, "\\1<sup>\\2</sup>")
         @docscheme == "1951" and edition_replacement(bibdata)
+        edition_printing_date(bibdata)
+      end
+
+      def edition_printing_date(bibdata)
+        @i18n.date_printing &&
+          pd = bibdata.at(ns("//metanorma-extension/presentation-metadata/" \
+                             "printing-date[1]")) or return
+        x = @i18n.populate("date_printing", { "var1" => pd.text.to_i })
+        bibdata.at(ns("./ext")) << "<date-printing>#{x}</date-printing>"
       end
 
       def edition_replacement(bibdata)

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.8.2".freeze
+    VERSION = "2.8.3".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.9.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.9.3"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 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: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.9.3
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement