metanorma-iho 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 288f5d8afd0281c3ff10cb514820baa3b9915e1f050c946bed0c9eaa22a3c506
-  data.tar.gz: 665c46bd50d23bed2a4b9ba983890694c7b9da051a7adf4d71f4c8b478ce839d
+  metadata.gz: aaadb9f1a37db3c3b5aff92d2a593b365194c6d4e1435d06a7334766511adb1c
+  data.tar.gz: fb552d20da927d65e91ad726ef7926fc7a1617cdee4cc71cfab8807d64a79888
 SHA512:
-  metadata.gz: 0f272b7464a8932dda4d3947eb5b1c471387766e12ec86b33887eb31b0482ea6c077c8c3f6fb110756fe5322774e675b8801c2bec5796790a085fdfba49bb6ad
-  data.tar.gz: f4b6b13deb6ae462ce7f23b909a3c342b1f278fd895382cf0d38a68710e2d6ba399b15d2338e385759b854c97f04063c2a636bed0d754c2f8e9bd4b819043ee8
+  metadata.gz: 664a4bdc46f48822c6eb58ad3e258498dd8ff33da546168b905a4c5299643a1f0e3b7928167457139b7db70c2572f37305318f31f78ffb74824f6f78e9c7d2e0
+  data.tar.gz: 475f2b786a53d4641fc6ebc0d8ab08c142d6c3dacf3053d5046497d7d8e63b2125b0104729d390b6d88097adace7536c061d269bc06f2374483b26015dcd85a6

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main  ]
+    branches: [ master, main ]
     tags: [ v* ]
   pull_request:
 
@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@master
 
@@ -49,5 +39,5 @@ jobs:
         with:
           token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
           repository: ${{ github.repository }}
-          event-type: notify
+          event-type: tests-passed
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/.hound.yml

@@ -0,0 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,12 +1,10 @@
-# This project follows the Ribose OSS style guide.
-# https://github.com/riboseinc/oss-guides
-# All project-specific additions and overrides should be specified in this file.
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
 # local repo-specific modifications
+# ...
 
 AllCops:
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
   TargetRubyVersion: 2.4

data/lib/asciidoctor/iho/iho.rng

@@ -36,6 +36,9 @@
       <optional>
         <ref name="doctype"/>
       </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <zeroOrMore>
         <ref name="editorialgroup"/>
       </zeroOrMore>

data/lib/asciidoctor/iho/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -543,6 +548,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -890,6 +898,14 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="docsubtype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>

data/lib/isodoc/iho/base_convert.rb

@@ -15,30 +15,32 @@ module IsoDoc
         super
       end
 
-      def std_bibitem_entry(list, b, ordinal, biblio)
-        list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+      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}]")
-          standard_citation(ref, b)
+          standard_citation(ref, bib)
         end
       end
 
-      def nodes_to_span(n)
+      def nodes_to_span(node)
         noko do |xml|
           xml.span do |s|
-            n&.children&.each { |x| parse(x, s) }
+            node&.children&.each { |x| parse(x, s) }
           end
         end.join("")
       end
 
       def multiplenames_and(names)
-        return "" if names.length == 0
+        return "" if names.empty?
         return names[0] if names.length == 1
         return "#{names[0]} and #{names[1]}" if names.length == 2
+
         names[0..-2].join(", ") + " and #{names[-1]}"
       end
 
-      def extract_publisher(b)
-        c = b.xpath(ns("./contributor[role/@type = 'publisher'][organization]"))
+      def extract_publisher(bib)
+        c = bib
+          .xpath(ns("./contributor[role/@type = 'publisher'][organization]"))
         abbrs = []
         names = []
         c&.each do |c1|
@@ -47,63 +49,55 @@ module IsoDoc
           names << nodes_to_span(n)
         end
         return [nil, nil] if names.empty?
-        return [multiplenames_and(names), (abbrs.map { |x| x.text }).join("/")]
+
+        [multiplenames_and(names), abbrs.map(&:text).join("/")]
       end
 
-      def inline_bibitem_ref_code(b)
-        id = b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
-                     "or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"))
-        id ||= b.at(ns("./docidentifier[not(@type = 'metanorma')]"))
+      def inline_bibitem_ref_code(bib)
+        id = bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
+                       "@type = 'metanorma' or @type = 'ISSN' or "\
+                       "@type = 'ISBN' or @type = 'rfc-anchor')]"))
+        id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma')]"))
         return [nil, id, nil] if id
-        id = Nokogiri::XML::Node.new("docidentifier", b.document)
+
+        id = Nokogiri::XML::Node.new("docidentifier", bib.document)
         id << "(NO ID)"
         [nil, id, nil]
       end
 
-      def extract_edition(b)
-        b&.at(ns("./edition"))&.text
+      def extract_edition(bib)
+        bib&.at(ns("./edition"))&.text
       end
 
-      def extract_uri(b)
-        b.at(ns("./uri"))
+      def extract_uri(bib)
+        bib.at(ns("./uri"))
       end
 
       def omit_docid_prefix(prefix)
         return true if prefix == "IHO"
+
         super
       end
 
       def render_identifier(id)
-        if !id[1].nil? and id[1]["type"] == "IHO"
+        if !id[1].nil? && (id[1]["type"] == "IHO")
           id[1].children = id[1].text.sub(/^IHO /, "")
         end
         super
       end
 
-      def extract_publisher(b)
-        c = b.xpath(ns("./contributor[role/@type = 'publisher'][organization]"))
-        abbrs = []
-        names = []
-        c&.each do |c1|
-          n = c1.at(ns("./organization/name")) or next
-          abbrs << (c1.at(ns("./organization/abbreviation")) || n)
-          names << nodes_to_span(n)
-        end
-        return [nil, nil] if names.empty?
-        return [multiplenames_and(names), (abbrs.map { |x| x.text }).join("/")]
-      end
+      def extract_author(bib)
+        c = bib.xpath(ns("./contributor[role/@type = 'author']"))
+        c = bib.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
+        return extract_publisher(bib)[0] if c.empty?
 
-      def extract_author(b)
-        c = b.xpath(ns("./contributor[role/@type = 'author']"))
-        c = b.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
-        return extract_publisher(b)[0] if c.empty?
         c.map do |c1|
           c1&.at(ns("./organization/name"))&.text || extract_person_name(c1)
         end.reject { |e| e.nil? || e.empty? }.join(", ")
       end
 
-      def extract_person_name(b)
-        p = b.at(ns("./person/name")) or return
+      def extract_person_name(bib)
+        p = bib.at(ns("./person/name")) or return
         c = p.at(ns("./completename")) and return c.text
         s = p&.at(ns("./surname"))&.text or return
         i = p.xpath(ns("./initial")) and
@@ -113,25 +107,25 @@ module IsoDoc
         front ? "#{s} #{front}" : s
       end
 
-      def is_iho?(b)
-        extract_publisher(b)[1] == "IHO"
+      def iho?(bib)
+        extract_publisher(bib)[1] == "IHO"
       end
 
       # [{number}] {docID} edition {edition}: {title}, {author/organization}
-      def standard_citation(out, b)
-        if ftitle = b.at(ns("./formattedref"))
+      def standard_citation(out, bib)
+        if ftitle = bib.at(ns("./formattedref"))
           ftitle&.children&.each { |n| parse(n, out) }
         else
-          id = render_identifier(inline_bibitem_ref_code(b))
+          id = render_identifier(inline_bibitem_ref_code(bib))
           out << id[1] if id[1]
-          ed = extract_edition(b) if is_iho?(b)
+          ed = extract_edition(bib) if iho?(bib)
           out << " edition #{ed}" if ed
           out << ": " if id[1] || ed
-          iso_title(b)&.children&.each { |n| parse(n, out) }
+          iso_title(bib)&.children&.each { |n| parse(n, out) }
           out << ", "
-          author = extract_author(b)
+          author = extract_author(bib)
           out << author
-          u = extract_uri(b)
+          u = extract_uri(bib)
           out << " (<a href='#{u.text}'>#{u.text}</a>)" if u
         end
       end

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

@@ -1122,6 +1122,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -1190,6 +1191,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
 		
 		
@@ -1209,9 +1211,7 @@
 		
 		
 		
-		
-		
-		
+				
 				
 		
 		
@@ -1261,6 +1261,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 		
 		
@@ -1277,11 +1278,13 @@
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="eref-style">
 		
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-style">
 		
 		
@@ -1379,6 +1382,7 @@
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="origin-style">
 		
 		
@@ -1386,6 +1390,7 @@
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
@@ -1458,8 +1463,10 @@
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="definition-style">
 		
 		
@@ -2212,6 +2219,7 @@
 			
 			
 			
+			
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -2580,6 +2588,7 @@
 							
 							
 							
+							
 							<xsl:variable name="title-key">
 								
 								
@@ -2868,6 +2877,8 @@
 			
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='padding']">
+		<fo:inline padding-right="{@value}"> </fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
 		<fo:inline font-size="80%" vertical-align="super">
 			<xsl:apply-templates/>
@@ -3360,6 +3371,16 @@
 		<mathml:mspace width="0.5ex"/>
 	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
+			<xsl:choose>
+				<xsl:when test="@updatetype = 'true'">
+					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(@target)"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="target_text">
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
 					<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
@@ -3372,19 +3393,19 @@
 		<fo:inline xsl:use-attribute-sets="link-style">
 			
 			<xsl:choose>
-				<xsl:when test="$target = ''">
+				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
 				</xsl:when>
 				<xsl:otherwise>
-					<fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
+					<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
 						<xsl:choose>
 							<xsl:when test="normalize-space(.) = ''">
-								<!-- <xsl:value-of select="$target"/> -->
 								<xsl:call-template name="add-zero-spaces-link-java">
-									<xsl:with-param name="text" select="$target"/>
+									<xsl:with-param name="text" select="$target_text"/>
 								</xsl:call-template>
 							</xsl:when>
 							<xsl:otherwise>
+								<!-- output text from <link>text</link> -->
 								<xsl:apply-templates/>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -3962,6 +3983,7 @@
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 	
 		<fo:block-container margin-left="0mm">
+			<xsl:copy-of select="@id"/>
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -4239,6 +4261,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
+			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
 			<xsl:variable name="element">
@@ -4348,12 +4371,13 @@
 					
 					
 					
+					
 						<xsl:call-template name="getTitle">
 							<xsl:with-param name="name" select="'title-source'"/>
 						</xsl:call-template>
+						<xsl:text>: </xsl:text>
 					
 					
-					<xsl:text>: </xsl:text>
 				</fo:inline>
 			
 			<fo:inline xsl:use-attribute-sets="origin-style">
@@ -4480,6 +4504,7 @@
 			
 			
 			
+			
 		</xsl:variable>
 		
 		<xsl:variable name="padding-right">
@@ -5244,6 +5269,9 @@
 						<xsl:when test="parent::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 1"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'preface'] and not(ancestor::*[local-name() = 'foreword']) and not(ancestor::*[local-name() = 'introduction'])"> <!-- for preface/clause -->
+							<xsl:value-of select="$level_total - 1"/>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 2"/>
 						</xsl:when>
@@ -5384,7 +5412,14 @@
 			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
 				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 			</xsl:when>
-			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+			<xsl:otherwise>
+				<xsl:variable name="key_">
+					<xsl:call-template name="capitalize">
+						<xsl:with-param name="str" select="translate($key, '_', ' ')"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$key_"/>
+			</xsl:otherwise>
 		</xsl:choose>
 		
 	</xsl:template><xsl:template name="setTrackChangesStyles">

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

@@ -1122,6 +1122,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -1190,6 +1191,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
 		
 		
@@ -1209,9 +1211,7 @@
 		
 		
 		
-		
-		
-		
+				
 				
 		
 		
@@ -1261,6 +1261,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 		
 		
@@ -1277,11 +1278,13 @@
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="eref-style">
 		
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-style">
 		
 		
@@ -1379,6 +1382,7 @@
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="origin-style">
 		
 		
@@ -1386,6 +1390,7 @@
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
@@ -1458,8 +1463,10 @@
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="definition-style">
 		
 		
@@ -2212,6 +2219,7 @@
 			
 			
 			
+			
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -2580,6 +2588,7 @@
 							
 							
 							
+							
 							<xsl:variable name="title-key">
 								
 								
@@ -2868,6 +2877,8 @@
 			
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='padding']">
+		<fo:inline padding-right="{@value}"> </fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
 		<fo:inline font-size="80%" vertical-align="super">
 			<xsl:apply-templates/>
@@ -3360,6 +3371,16 @@
 		<mathml:mspace width="0.5ex"/>
 	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
+			<xsl:choose>
+				<xsl:when test="@updatetype = 'true'">
+					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(@target)"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="target_text">
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
 					<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
@@ -3372,19 +3393,19 @@
 		<fo:inline xsl:use-attribute-sets="link-style">
 			
 			<xsl:choose>
-				<xsl:when test="$target = ''">
+				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
 				</xsl:when>
 				<xsl:otherwise>
-					<fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
+					<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
 						<xsl:choose>
 							<xsl:when test="normalize-space(.) = ''">
-								<!-- <xsl:value-of select="$target"/> -->
 								<xsl:call-template name="add-zero-spaces-link-java">
-									<xsl:with-param name="text" select="$target"/>
+									<xsl:with-param name="text" select="$target_text"/>
 								</xsl:call-template>
 							</xsl:when>
 							<xsl:otherwise>
+								<!-- output text from <link>text</link> -->
 								<xsl:apply-templates/>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -3962,6 +3983,7 @@
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 	
 		<fo:block-container margin-left="0mm">
+			<xsl:copy-of select="@id"/>
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -4239,6 +4261,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
+			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
 			<xsl:variable name="element">
@@ -4348,12 +4371,13 @@
 					
 					
 					
+					
 						<xsl:call-template name="getTitle">
 							<xsl:with-param name="name" select="'title-source'"/>
 						</xsl:call-template>
+						<xsl:text>: </xsl:text>
 					
 					
-					<xsl:text>: </xsl:text>
 				</fo:inline>
 			
 			<fo:inline xsl:use-attribute-sets="origin-style">
@@ -4480,6 +4504,7 @@
 			
 			
 			
+			
 		</xsl:variable>
 		
 		<xsl:variable name="padding-right">
@@ -5244,6 +5269,9 @@
 						<xsl:when test="parent::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 1"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'preface'] and not(ancestor::*[local-name() = 'foreword']) and not(ancestor::*[local-name() = 'introduction'])"> <!-- for preface/clause -->
+							<xsl:value-of select="$level_total - 1"/>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 2"/>
 						</xsl:when>
@@ -5384,7 +5412,14 @@
 			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
 				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 			</xsl:when>
-			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+			<xsl:otherwise>
+				<xsl:variable name="key_">
+					<xsl:call-template name="capitalize">
+						<xsl:with-param name="str" select="translate($key, '_', ' ')"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$key_"/>
+			</xsl:otherwise>
 		</xsl:choose>
 		
 	</xsl:template><xsl:template name="setTrackChangesStyles">

data/lib/isodoc/iho/init.rb

@@ -9,17 +9,17 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def xref_init(lang, script, klass, labels, options)
+      def xref_init(lang, script, _klass, labels, options)
         html = HtmlConvert.new(language: lang, script: script)
         @xrefs = Xref.new(lang, script, html, labels, options)
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
         @i18n = I18n.new(
-          lang, script, i18nyaml || 
-          Metanorma::IHO.configuration.i18nyaml || @i18nyaml)
+          lang, script, i18nyaml ||
+          Metanorma::IHO.configuration.i18nyaml || @i18nyaml
+        )
       end
     end
   end
 end
-

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.3.3".freeze
+    VERSION = "0.3.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -190,6 +190,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
 - ".gitignore"
+- ".hound.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile