metanorma-cc 2.7.4 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f73000680e511d8e998ff10f830adbfe0435a3ad7e36093372f3ca7f0ac9a34e
-  data.tar.gz: 521967b9a30c47f4b0d30b81c5cb4ca5379fd845f7a875841818aac3af5c75e0
+  metadata.gz: 4ac3b3a75965dbdafd86766d5f51ade18833186845b3ae5933722adea6101811
+  data.tar.gz: 1009119a627b80d955dfad8852d32000bf8bb3bff6e404cb5afc379955ffd508
 SHA512:
-  metadata.gz: 698fa135b508aa07b177b367238d42beaf140ddeb83ad331b5a32942c777d3ce064e3469741b733c17a4c8fab55c91d6aad3ecd686a3710b04c57e79ccd3028a
-  data.tar.gz: 76ed2c211bf0b0b84aa7cb11dbb812da73ff97c514d1f73c96ccf6094e04baf561ab607587b426288ee0efbab98bba377314dfdbce06ca4cdb2f9af1ff118b22
+  metadata.gz: 4dfc2b6a15dc3ce85ee5a40d214a7fa6bbc99ebb044884c11d780b3b2e527b4e954509728553f280a6553e21b59e3220f58184df28efa9be7d71fe5a96c3a6e4
+  data.tar.gz: febc6660d5f8cdfb58e84e9352ee83ae381bd29f45eea0b5708e150df2d749793e7e3fe98a2129eb22521d2dd70e0d0d7d8fd0aaede8e626febaa3428335ddf2

data/lib/isodoc/cc/cc.standard.xsl

@@ -175,13 +175,34 @@
 				<xsl:call-template name="updateXML"/>
 			</xsl:variable>
 
+			<xsl:if test="$debug = 'true'">
+				<redirect:write file="updated_xml.xml">
+					<xsl:copy-of select="$updated_xml"/>
+				</redirect:write>
+			</xsl:if>
+
 			<xsl:for-each select="xalan:nodeset($updated_xml)/*">
 
 				<xsl:variable name="updated_xml_with_pages">
 					<xsl:call-template name="processPrefaceAndMainSectionsDefault_items"/>
 				</xsl:variable>
 
+				<xsl:if test="$debug = 'true'">
+					<redirect:write file="updated_xml_with_pages.xml">
+						<xsl:copy-of select="$updated_xml_with_pages"/>
+					</redirect:write>
+				</xsl:if>
+
+				<xsl:if test="$debug = 'true'">
+					<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
+						<xsl:copy-of select="$contents"/>
+					</redirect:write>
+				</xsl:if>
+
 				<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
+
+					<xsl:call-template name="inner-cover-page"/>
+
 					<xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
 						<!-- Copyright, Content, Foreword, etc. pages -->
@@ -192,9 +213,6 @@
 								<xsl:call-template name="getPageSequenceOrientation"/>
 							</xsl:attribute>
 
-							<xsl:if test="position() = 1">
-								<xsl:attribute name="initial-page-number">2</xsl:attribute>
-							</xsl:if>
 							<xsl:if test="position() = last()">
 								<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
 							</xsl:if>
@@ -203,35 +221,6 @@
 							<xsl:call-template name="insertHeaderFooter"/>
 							<fo:flow flow-name="xsl-region-body">
 
-								<xsl:if test="$debug = 'true'">
-									<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
-										<xsl:copy-of select="$contents"/>
-									</redirect:write>
-								</xsl:if>
-
-								<xsl:if test="position() = 1">
-									<fo:block margin-bottom="15pt"> </fo:block>
-									<fo:block margin-bottom="14pt">
-										<xsl:text>© </xsl:text>
-										<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:from"/>
-										<xsl:text> </xsl:text>
-										<fo:inline>
-											<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
-										</fo:inline>
-									</fo:block>
-									<fo:block margin-bottom="12pt">
-										<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
-									</fo:block>
-									<fo:block margin-bottom="12pt">
-										<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
-									</fo:block>
-									<fo:block>
-										<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-address']"/>
-									</fo:block>
-
-									<fo:block break-after="page"/>
-								</xsl:if>  <!-- for 1st page_sequence only -->
-
 								<!-- Table of contents, Foreword, Introduction -->
 								<!-- <xsl:call-template name="processPrefaceSectionsDefault"/> -->
 								<xsl:apply-templates/>
@@ -274,6 +263,8 @@
 
 			</xsl:for-each>
 
+			<xsl:call-template name="back-page"/>
+
 		</fo:root>
 	</xsl:template>
 
@@ -344,6 +335,36 @@
 		</fo:page-sequence>
 	</xsl:template> <!-- END: cover-page -->
 
+	<xsl:template name="inner-cover-page">
+		<fo:page-sequence master-reference="preface" format="i" initial-page-number="2">
+			<xsl:call-template name="insertFootnoteSeparatorCommon"/>
+			<xsl:call-template name="insertHeaderFooter"/>
+			<fo:flow flow-name="xsl-region-body">
+				<fo:block margin-bottom="15pt"> </fo:block>
+				<fo:block margin-bottom="14pt">
+					<xsl:text>© </xsl:text>
+					<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:from"/>
+					<xsl:text> </xsl:text>
+					<fo:inline>
+						<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
+					</fo:inline>
+				</fo:block>
+				<fo:block margin-bottom="12pt">
+					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
+				</fo:block>
+				<fo:block margin-bottom="12pt">
+					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
+				</fo:block>
+				<fo:block>
+					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-address']"/>
+				</fo:block>
+			</fo:flow>
+		</fo:page-sequence>
+	</xsl:template> <!-- inner-cover-page -->
+
+	<xsl:template name="back-page">
+	</xsl:template>
+
 	<xsl:template name="insertListOf_Title">
 		<xsl:param name="title"/>
 		<fo:block xsl:use-attribute-sets="toc-listof-title-style">
@@ -2282,7 +2303,6 @@
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
 
 	<xsl:template name="refine_feedback-statement-title-style">
-
 	</xsl:template>
 
 	<xsl:attribute-set name="feedback-statement-p-style">
@@ -8054,15 +8074,22 @@
 	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
-	</xsl:template>
+	</xsl:template> <!-- refine_quote-style -->
 
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-source-style -->
 
 	<xsl:template name="refine_quote-source-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="source-style">
+	</xsl:attribute-set> <!-- source-style -->
+
+	<xsl:template name="refine_source-style">
+
+	</xsl:template> <!-- refine_source-style -->
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -8110,7 +8137,9 @@
 		</xsl:if>
 		<xsl:choose>
 			<xsl:when test="not(parent::quote)">
-				<fo:block>
+				<fo:block xsl:use-attribute-sets="source-style">
+					<xsl:call-template name="refine_source-style"/>
+
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -10203,7 +10232,7 @@
 
 	<xsl:template name="refine_fn-reference-style">
 		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
-		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
 	</xsl:template> <!-- refine_fn-reference-style -->
 
 	<xsl:attribute-set name="fn-style">
@@ -10214,6 +10243,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="fn-num-style">
+		<xsl:attribute name="role">Reference</xsl:attribute>
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -10287,33 +10317,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<xsl:variable name="fn_styles">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:bibitem">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
-								<xsl:call-template name="refine_bibitem-note-fn-style"/>
-							</fn_styles>
-						</xsl:when>
-						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style">
-								<xsl:call-template name="refine_fn-num-style"/>
-							</fn_styles>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
-
-				<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
-					<xsl:copy-of select="."/>
-				</xsl:for-each>
+				<xsl:call-template name="refine_fn-num-style"/>
 
 				<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
 				<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if> -->
 
-				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
@@ -10610,30 +10623,6 @@
 	<xsl:template name="refine_bibitem-non-normative-list-body-style">
 	</xsl:template>
 
-	<!-- footnote reference number for bibitem, in the text  -->
-	<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>
-		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
-
-	<xsl:template name="refine_bibitem-note-fn-style">
-	</xsl:template>
-
-	<!-- footnote number on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-number-style">
-		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
-		<xsl:attribute name="font-size">60%</xsl:attribute>
-		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
-
-	<!-- footnote body (text) on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-body-style">
-		<xsl:attribute name="font-size">10pt</xsl:attribute>
-		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-		<xsl:attribute name="start-indent">0pt</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
-
 	<xsl:attribute-set name="references-non-normative-style">
 	</xsl:attribute-set> <!-- references-non-normative-style -->
 
@@ -12996,6 +12985,17 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_clause-style">
+		<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
+		<!-- <xsl:if test="$namespace = 'rsd'">
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevel">
+					<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:if test="$level &gt;= 4">
+				<xsl:attribute name="margin-left">13mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if> -->
 	</xsl:template>
 
 	<!-- main sections -->

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cc
-    VERSION = "2.7.4".freeze
+    VERSION = "2.7.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic