metanorma-iho 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5161d7cc65c40e09368460250df3e374f78e012b60162cc458eb137b29a3872f
-  data.tar.gz: '068e14d994c6e5a17a4f08824e428a31be3fd7e6889c9e647a98ce1ebc0d0c63'
+  metadata.gz: 1f5e72cf02e5f6419faf52ab11e814c0deeca05711464dc1d5251b05777f18e2
+  data.tar.gz: 647b2738c5947f1d042211eafa372f8b08fe6995e7dca5d970a1f6d451cf63f3
 SHA512:
-  metadata.gz: 47b64816583168678380726ae4f0f2945029e9ec41e4b2e8ff98027f4e680dbc86041d2ed123851ebe05913cfb3be9dbfdd0a23a60fdaa59e97023a47fa156c0
-  data.tar.gz: c7bbdb9e666df911e69054ce11a12b12b5b394fea5439b8c8e771b07c9922256ba36c2840178137f28b3d17b99c4255511a947494bc35ad06ecdd8b5c9871ece
+  metadata.gz: 6a68b7972fdb3666cda62e764f5b572d9857d53ad2368f1313aada4fbfdbbb93ab194c1935a97f09c8cd59e314e4272a931f202cd2c85e942c415135ef34a0e8
+  data.tar.gz: f49fe088dc48646596d19a127de1bb9379e9b1bb2cf8af0d63cb6b5da395fc67575a98bf66253da9f5a77625b4374fcb31861ac14e9d3d8f369395c1feaf6946

data/lib/isodoc/iho/base_convert.rb

@@ -10,23 +10,12 @@ module IsoDoc
         end
       end
 
-      def info(isoxml, out)
-        @meta.series isoxml, out
-        super
-      end
-
       def std_bibitem_entry(list, bib, ordinal, biblio)
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
           prefix_bracketed_ref(ref, "[#{ordinal}]")
           reference_format(bib, ref)
         end
       end
-
-      def omit_docid_prefix(prefix)
-        return true if prefix == "IHO"
-
-        super
-      end
     end
   end
 end

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

@@ -2065,10 +2065,12 @@
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
@@ -2687,6 +2689,14 @@
 				
 				
 				
+				<xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
+					<fo:block keep-with-previous="always" line-height="0.1">
+						<xsl:for-each select="*[local-name()='bookmark']">
+							<xsl:call-template name="bookmark"/>
+						</xsl:for-each>
+					</fo:block>
+				</xsl:if>
+				
 			</fo:block-container>
 		</xsl:variable>
 		
@@ -6477,7 +6487,7 @@
 						
 						
 						<!-- <xsl:if test="$namespace = 'ieee'">							
-							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+							<xsl:if test="$current_template = 'standard'">8</xsl:if>
 						</xsl:if> -->
 						
 								
@@ -7798,7 +7808,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
 		<!-- to split by '_' and other chars -->
 		<xsl:call-template name="add-zero-spaces-java"/>
-	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
+	</xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
 		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
 		<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
 		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
@@ -8547,6 +8557,7 @@
 		</xsl:call-template>
 	</xsl:template><xsl:template name="insertKeywords">
 		<xsl:param name="sorting" select="'true'"/>
+		<xsl:param name="meta" select="'false'"/>
 		<xsl:param name="charAtEnd" select="'.'"/>
 		<xsl:param name="charDelim" select="', '"/>
 		<xsl:choose>
@@ -8554,6 +8565,7 @@
 				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:sort data-type="text" order="ascending"/>
 					<xsl:call-template name="insertKeyword">
+						<xsl:with-param name="meta" select="$meta"/>
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
 						<xsl:with-param name="charDelim" select="$charDelim"/>
 					</xsl:call-template>
@@ -8562,6 +8574,7 @@
 			<xsl:otherwise>
 				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:call-template name="insertKeyword">
+						<xsl:with-param name="meta" select="$meta"/>
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
 						<xsl:with-param name="charDelim" select="$charDelim"/>
 					</xsl:call-template>
@@ -8571,7 +8584,15 @@
 	</xsl:template><xsl:template name="insertKeyword">
 		<xsl:param name="charAtEnd"/>
 		<xsl:param name="charDelim"/>
-		<xsl:apply-templates/>
+		<xsl:param name="meta"/>
+		<xsl:choose>
+			<xsl:when test="$meta = 'true'">
+				<xsl:value-of select="."/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
 		<xsl:choose>
 			<xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
 			<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
@@ -8622,7 +8643,9 @@
 						<xsl:value-of select="normalize-space($abstract)"/>
 					</dc:description>
 					<pdf:Keywords>
-						<xsl:call-template name="insertKeywords"/>
+						<xsl:call-template name="insertKeywords">
+							<xsl:with-param name="meta">true</xsl:with-param>
+						</xsl:call-template>
 					</pdf:Keywords>
 				</rdf:Description>
 				<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">

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

@@ -2065,10 +2065,12 @@
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
@@ -2687,6 +2689,14 @@
 				
 				
 				
+				<xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
+					<fo:block keep-with-previous="always" line-height="0.1">
+						<xsl:for-each select="*[local-name()='bookmark']">
+							<xsl:call-template name="bookmark"/>
+						</xsl:for-each>
+					</fo:block>
+				</xsl:if>
+				
 			</fo:block-container>
 		</xsl:variable>
 		
@@ -6477,7 +6487,7 @@
 						
 						
 						<!-- <xsl:if test="$namespace = 'ieee'">							
-							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+							<xsl:if test="$current_template = 'standard'">8</xsl:if>
 						</xsl:if> -->
 						
 								
@@ -7798,7 +7808,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
 		<!-- to split by '_' and other chars -->
 		<xsl:call-template name="add-zero-spaces-java"/>
-	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
+	</xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
 		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
 		<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
 		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
@@ -8547,6 +8557,7 @@
 		</xsl:call-template>
 	</xsl:template><xsl:template name="insertKeywords">
 		<xsl:param name="sorting" select="'true'"/>
+		<xsl:param name="meta" select="'false'"/>
 		<xsl:param name="charAtEnd" select="'.'"/>
 		<xsl:param name="charDelim" select="', '"/>
 		<xsl:choose>
@@ -8554,6 +8565,7 @@
 				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:sort data-type="text" order="ascending"/>
 					<xsl:call-template name="insertKeyword">
+						<xsl:with-param name="meta" select="$meta"/>
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
 						<xsl:with-param name="charDelim" select="$charDelim"/>
 					</xsl:call-template>
@@ -8562,6 +8574,7 @@
 			<xsl:otherwise>
 				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:call-template name="insertKeyword">
+						<xsl:with-param name="meta" select="$meta"/>
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
 						<xsl:with-param name="charDelim" select="$charDelim"/>
 					</xsl:call-template>
@@ -8571,7 +8584,15 @@
 	</xsl:template><xsl:template name="insertKeyword">
 		<xsl:param name="charAtEnd"/>
 		<xsl:param name="charDelim"/>
-		<xsl:apply-templates/>
+		<xsl:param name="meta"/>
+		<xsl:choose>
+			<xsl:when test="$meta = 'true'">
+				<xsl:value-of select="."/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
 		<xsl:choose>
 			<xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
 			<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
@@ -8622,7 +8643,9 @@
 						<xsl:value-of select="normalize-space($abstract)"/>
 					</dc:description>
 					<pdf:Keywords>
-						<xsl:call-template name="insertKeywords"/>
+						<xsl:call-template name="insertKeywords">
+							<xsl:with-param name="meta">true</xsl:with-param>
+						</xsl:call-template>
 					</pdf:Keywords>
 				</rdf:Description>
 				<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">

data/lib/isodoc/iho/init.rb

@@ -20,6 +20,17 @@ module IsoDoc
           Metanorma::IHO.configuration.i18nyaml || @i18nyaml
         )
       end
+
+      def info(isoxml, out)
+        @meta.series isoxml, out
+        super
+      end
+
+      def omit_docid_prefix(prefix)
+        return true if prefix == "IHO"
+
+        super
+      end
     end
   end
 end

data/lib/metanorma/iho/isodoc.rng

@@ -2504,6 +2504,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.6.4".freeze
+    VERSION = "0.6.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic