metanorma-plateau 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b9502dbb12bc7774d093699d7859cbabce81c4e290f14e6a0921c97b30068f1
-  data.tar.gz: 885b279f620ec1f8ca940c46d8226106c92b6a79a83735a8c85f833c902f2f4e
+  metadata.gz: 38805e986aa828aaf5643505c602f768a9fcca059f609fd9277ea19d27a96d75
+  data.tar.gz: 80505ea36d9ad9add5ad0bbf58e263914ff98510c824dac89e5c221164baca6a
 SHA512:
-  metadata.gz: fd5b15979492ead604a2b194a33b88359cc7c8abdb9e54f46074f40d40ffdf9686bf6caa83f64f3d617a1028c753207ad32d9644a13297ada7d64d514426619e
-  data.tar.gz: f8b6f02d94ecd5148be9aaddb50097d4c69d1087fc2412da2b510730386dabdfeace0d58fb822064ae4d6cfd862422a2134ee5625a989044e0a03d7037c9429f
+  metadata.gz: 55b12233299061c56b7de9977489402fb1c3410b6e3f1740a19347e6673b2b5ec5c869ed0707e9464146e67fd1d769eaa3c9bcead010ea4c48f9261933ccd676
+  data.tar.gz: b2926315ab374f5227748b6216db23e501dd00dcdb3984f3814854cbfc6ddb038b637541e69f3497b31ede8b9ee579381c7149d3192f8646b841d588b60a38b6

data/README.adoc

@@ -2,7 +2,7 @@
 
 image:https://img.shields.io/gem/v/metanorma-plateau.svg["Gem Version", link="https://rubygems.org/gems/metanorma-plateau"]
 image:https://github.com/metanorma/metanorma-plateau/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-plateau/actions?workflow=rake"]
-image:https://codeclimate.com/github/metanorma/metanorma-plateau/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-plateau"]
+// image:https://codeclimate.com/github/metanorma/metanorma-plateau/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-plateau"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-plateau.svg["Pull Requests", link="https://github.com/metanorma/metanorma-plateau/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-plateau/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-plateau/releases"]
 

data/lib/isodoc/plateau/plateau.international-standard.xsl

@@ -457,7 +457,7 @@
 		</xsl:call-template>
 	</xsl:template> <!-- END: processPrefaceAndMainSectionsPlateau_items -->
 
-	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="4">
+	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="4">
 		<xsl:param name="num"/>
 		<xsl:if test="$doctype = 'technical-report'">
 			<fo:block font-size="16pt" margin-top="5mm"><xsl:value-of select="$i18n_table_of_contents"/></fo:block>
@@ -466,11 +466,10 @@
 		<xsl:apply-templates/>
 		<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
 			<!-- fill ToC -->
-			<fo:block role="TOC" font-weight="bold">
-				<xsl:if test="$doctype = 'technical-report'">
-					<xsl:attribute name="font-weight">normal</xsl:attribute>
-					<xsl:attribute name="line-height">1.2</xsl:attribute>
-				</xsl:if>
+			<fo:block role="TOC" xsl:use-attribute-sets="toc-style">
+
+				<xsl:call-template name="refine_toc-style"/>
+
 				<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true']">
 					<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true'][@level &lt;= $toc_level or @type='figure' or @type = 'table']">
 						<fo:block role="TOCI">
@@ -564,7 +563,7 @@
 
 	<xsl:template name="insertTocItem">
 		<xsl:param name="printSection">false</xsl:param>
-		<fo:block text-align-last="justify" role="TOCI">
+		<fo:block xsl:use-attribute-sets="toc-item-style">
 			<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
 				<xsl:if test="$printSection = 'true' and @section != ''">
 					<xsl:value-of select="@section"/>
@@ -572,7 +571,7 @@
 				</xsl:if>
 				<fo:inline><xsl:apply-templates select="mnx:title"/><xsl:text> </xsl:text></fo:inline>
 				<fo:inline keep-together.within-line="always">
-					<fo:leader leader-pattern="dots"/>
+					<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 					<fo:inline>
 						<xsl:if test="$doctype = 'technical-report'"><xsl:text>- </xsl:text></xsl:if>
 						<fo:page-number-citation ref-id="{@id}"/>
@@ -11641,7 +11640,7 @@
 
 	<xsl:template name="insertFootnoteSeparatorCommon">
 		<xsl:param name="leader_length">30%</xsl:param>
-		<fo:static-content flow-name="xsl-footnote-separator">
+		<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 			<fo:block>
 				<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
 			</fo:block>
@@ -12501,17 +12500,28 @@
 	<!-- =================== -->
 
 	<xsl:attribute-set name="toc-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:if test="$doctype = 'technical-report'">
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<xsl:attribute name="line-height">1.2</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-title-page-style">
 	</xsl:attribute-set> <!-- toc-title-page-style -->
 
+	<xsl:template name="refine_toc-title-page-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-item-block-style">
 	</xsl:attribute-set>
 
@@ -12520,12 +12530,14 @@
 
 	<xsl:attribute-set name="toc-item-style">
 		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="text-align-last">justify</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-item-style -->
 
 	<xsl:template name="refine_toc-item-style">
 	</xsl:template> <!-- END: refine_toc-item-style -->
 
 	<xsl:attribute-set name="toc-leader-style">
+		<xsl:attribute name="leader-pattern">dots</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-leader-style -->
 
 	<xsl:attribute-set name="toc-pagenumber-style">
@@ -12535,6 +12547,9 @@
 	<xsl:attribute-set name="toc-listof-title-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-listof-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-listof-item-block-style">
 	</xsl:attribute-set>
 
@@ -12879,7 +12894,7 @@
 								</xsl:if>
 
 								<xsl:for-each select="$contents_nodes/mnx:doc">
-									<fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
+									<fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
 										<xsl:if test="@bundle = 'true'">
 											<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
 										</xsl:if>
@@ -12913,7 +12928,7 @@
 											</xsl:choose>
 										</fo:bookmark-title>
 
-										<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
+										<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
 
 										<xsl:call-template name="insertFigureBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>

data/lib/metanorma/plateau/basicdoc.rng

@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
       <ref name="pure_strike"/>
       <ref name="pure_smallcap"/>
       <ref name="br"/>
+      <ref name="stem"/>
     </choice>
   </define>
   <define name="NestedTextElement">
     <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
     <choice>
       <ref name="PureTextElement"/>
-      <ref name="stem"/>
       <ref name="eref"/>
       <ref name="xref"/>
       <ref name="hyperlink"/>

data/lib/metanorma/plateau/isodoc.rng

@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
 but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <text/>
     </define>
-    <define name="index-primary">
-      <element name="primary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-secondary">
-      <element name="secondary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-tertiary">
-      <element name="tertiary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="review">
       <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
 the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </element>
     </define>
-    <define name="sub">
-      <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
-      <element name="sub">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sup">
-      <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
-      <element name="sup">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="pagebreak">
       <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
       <element name="pagebreak">
@@ -1094,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -1107,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -2025,10 +1971,7 @@ used in document amendments</a:documentation>
       <element name="name">
         <a:documentation>The symbolic form of the designation</a:documentation>
         <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
+          <ref name="PureTextElement"/>
         </oneOrMore>
       </element>
     </element>
@@ -2081,7 +2024,6 @@ used in document amendments</a:documentation>
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
-            <ref name="stem"/>
             <ref name="index"/>
             <ref name="index-xref"/>
           </choice>

data/lib/metanorma/plateau/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "1.1.1".freeze
+    VERSION = "1.1.2".freeze
   end
 end

data/metanorma-plateau.gemspec

@@ -45,5 +45,5 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "xml-c14n"
+  spec.add_development_dependency "canon"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-jis
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="