metanorma-cc 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbdee3c5ec8406ed5b5874fde2171f4558e48c1d34c5fb757f4270dd8882ce37
-  data.tar.gz: 3ed6a8df1f9dd8540f70c72b625cbfbb70f7b98fd5462ea977b37158a457c89d
+  metadata.gz: 92b75430711039a12ea6f8907c406e7cfc01a5169e4f31f643ee0aaeb542954e
+  data.tar.gz: 1bcd9bfcdfaab4918a83c9c1968b6cd9b2cd51369adc03ad905d01e12fa71070
 SHA512:
-  metadata.gz: 2a1aeb7a0668530f5dff2bd3c868760e6c71deeb09552ec88fa629f33989bcda8b513c3cab363a1dad4f1ac675c04a8077bd26508290482038f67dbe9063ce9c
-  data.tar.gz: 72d5964f39a259ca947fb68413ee9092490ec92322699410d1c11415861937dcab313aea09ab13ac4b2429bd496ed6052c8df3b9d0040b017cb5e794c81fede8
+  metadata.gz: 06a496b5fc95f4450c0b4673e81430b16d20dfbee0294abe6052a999b09403fbd598b68107fe3667376d81962f7de807f9ace6b5b608dc14cb77a078889c7c4c
+  data.tar.gz: 6fb8e7bda62fdb553c61a0740202ffc4039f0f4ea14b7927d6ab22705b508c24ca9ae605ab87eb9607382d767daf152c27750f332918a823a6f3f2f7a50d4eb2

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

@@ -228,16 +228,8 @@
 					<xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
 						<!-- Copyright, Content, Foreword, etc. pages -->
-						<fo:page-sequence master-reference="preface" format="i">
-
-							<xsl:attribute name="master-reference">
-								<xsl:text>preface</xsl:text>
-								<xsl:call-template name="getPageSequenceOrientation"/>
-							</xsl:attribute>
-
-							<xsl:if test="position() = last()">
-								<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-							</xsl:if>
+						<fo:page-sequence xsl:use-attribute-sets="page-sequence-preface">
+							<xsl:call-template name="refine_page-sequence-preface"/>
 
 							<xsl:call-template name="insertFootnoteSeparatorCommon"/>
 							<xsl:call-template name="insertHeaderFooter"/>
@@ -255,16 +247,8 @@
 					<xsl:for-each select=".//mn:page_sequence[not(parent::mn:preface)][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
 						<!-- Document Pages -->
-						<fo:page-sequence master-reference="document" format="1" force-page-count="no-force">
-
-							<xsl:attribute name="master-reference">
-								<xsl:text>document</xsl:text>
-								<xsl:call-template name="getPageSequenceOrientation"/>
-							</xsl:attribute>
-
-							<xsl:if test="position() = 1">
-								<xsl:attribute name="initial-page-number">1</xsl:attribute>
-							</xsl:if>
+						<fo:page-sequence xsl:use-attribute-sets="page-sequence-main">
+							<xsl:call-template name="refine_page-sequence-main"/>
 
 							<xsl:call-template name="insertFootnoteSeparatorCommon"/>
 							<xsl:call-template name="insertHeaderFooter"/>
@@ -367,7 +351,11 @@
 	</xsl:template> <!-- END: cover-page -->
 
 	<xsl:template name="inner-cover-page">
-		<fo:page-sequence master-reference="preface" format="i" initial-page-number="2">
+		<fo:page-sequence initial-page-number="2" xsl:use-attribute-sets="page-sequence-preface">
+			<xsl:call-template name="refine_page-sequence-preface">
+				<xsl:with-param name="skip_force_page_count">true</xsl:with-param>
+			</xsl:call-template>
+
 			<xsl:call-template name="insertFootnoteSeparatorCommon"/>
 			<xsl:call-template name="insertHeaderFooter"/>
 			<fo:flow flow-name="xsl-region-body">
@@ -418,7 +406,7 @@
 								</xsl:call-template>
 								<xsl:apply-templates select="." mode="contents"/>
 								<fo:inline keep-together.within-line="always" role="SKIP">
-									<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
+									<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 									<fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
 								</fo:inline>
 							</fo:basic-link>
@@ -465,7 +453,7 @@
 												<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}" role="SKIP">
 													<xsl:apply-templates select="mnx:title"/>
 													<fo:inline keep-together.within-line="always" role="SKIP">
-														<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
+														<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 														<fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
 													</fo:inline>
 												</fo:basic-link>
@@ -973,20 +961,41 @@
 	</xsl:variable>
 
 	<xsl:attribute-set name="page-sequence-preface">
+		<xsl:attribute name="master-reference">preface</xsl:attribute>
 		<xsl:attribute name="format">i</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- page-sequence-preface -->
 
 	<xsl:template name="refine_page-sequence-preface">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:param name="num"/>
+		<xsl:param name="skip_force_page_count">false</xsl:param>
+		<xsl:attribute name="master-reference">
+			<xsl:text>preface</xsl:text>
+			<xsl:call-template name="getPageSequenceOrientation"/>
+		</xsl:attribute>
+		<xsl:if test="$skip_force_page_count = 'false' and position() = last()">
+			<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_page-sequence-preface -->
 
 	<xsl:attribute-set name="page-sequence-main">
-
-	</xsl:attribute-set>
+		<xsl:attribute name="format">1</xsl:attribute>
+		<xsl:attribute name="force-page-count">no-force</xsl:attribute>
+		<xsl:attribute name="master-reference">document</xsl:attribute>
+	</xsl:attribute-set> <!-- page-sequence-main -->
 
 	<xsl:template name="refine_page-sequence-main">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:attribute name="master-reference">
+			<xsl:text>document</xsl:text>
+			<xsl:call-template name="getPageSequenceOrientation"/>
+		</xsl:attribute>
+		<xsl:if test="position() = 1">
+			<xsl:attribute name="initial-page-number">1</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_page-sequence-main -->
 
 	<xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable>
 	<xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable>
@@ -11756,6 +11765,7 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:copy-of select="@id"/>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-style">
@@ -11834,13 +11844,13 @@
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 
-		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 			<xsl:sort select="@displayorder" data-type="number"/>
 
 			<!-- process Section's title -->
@@ -11853,6 +11863,23 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template match="*[@type = 'toc'][mn:title or mn:fmt-title]" mode="contents" priority="2">
+		<xsl:variable name="title">
+			<xsl:call-template name="getName"/>
+		</xsl:variable>
+		<xsl:variable name="root">
+			<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
+			<xsl:if test="ancestor-or-self::mn:annex">annex</xsl:if>
+		</xsl:variable>
+		<mnx:item id="{@id}" level="1" section="" type="toc" root="{$root}" display="false">
+			<mnx:title>
+				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+					<xsl:with-param name="element" select="$root"/>
+				</xsl:apply-templates>
+			</mnx:title>
+		</mnx:item>
+	</xsl:template>
+
 	<xsl:template name="processMainSectionsDefault_Contents">
 
 		<xsl:variable name="nodes_sections_">
@@ -13631,16 +13658,17 @@
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>
+		<xsl:param name="wrapper">true</xsl:param>
 		<xsl:variable name="element_node" select="xalan:nodeset($element)"/>
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' and $wrapper = 'true'">
 				<fo:wrapper role="Reference">
 					<xsl:copy-of select="$element_node"/>
 				</fo:wrapper>
 			</xsl:when>
-			<xsl:when test="$external-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' or $external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>

data/lib/isodoc/cc/html/_coverpage.css

@@ -312,6 +312,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/isodoc/cc/html/htmlstyle.css

@@ -312,6 +312,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/metanorma/cc/biblio.rng

@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/cc/isodoc.rng

@@ -641,8 +641,85 @@ This is done if the footnote reference is already presented in some other form,
         </ref>
       </zeroOrMore>
     </define>
+    <define name="altsource">
+      <a:documentation>Alternative file to use as media</a:documentation>
+      <element name="altsource">
+        <ref name="MediaAttributes"/>
+        <optional>
+          <attribute name="tag">
+            <a:documentation>Comma-delimited tag to indicate when the alternate file is to be used, 
+at minimum allows contain `html`, `doc`, `pdf` as the main target formats of Metanorma,
+and `default` for the fallback. The presence of an altsource tagged `default` is required</a:documentation>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="media">
+            <a:documentation>CSS media query to indicate when the alternate file is to be used</a:documentation>
+          </attribute>
+        </optional>
+      </element>
+    </define>
+    <define name="image">
+      <a:documentation>Container for image content</a:documentation>
+      <choice>
+        <element name="image">
+          <ref name="RequiredId"/>
+          <ref name="ImageAttributes">
+            <a:documentation>When specified along with altsource, ImageAttributes give the default image to be rendered</a:documentation>
+          </ref>
+          <ref name="ImageBody"/>
+        </element>
+        <element name="svg">
+          <a:documentation>Add svg mark up to image</a:documentation>
+          <oneOrMore>
+            <choice>
+              <text/>
+              <ref name="AnyElement"/>
+            </choice>
+          </oneOrMore>
+        </element>
+      </choice>
+    </define>
+    <define name="ImageAttributes">
+      <optional>
+        <ref name="MediaAttributes">
+          <a:documentation>If the image contains altsource, the media attributes are given on each of the altsource elements instead of the root node</a:documentation>
+        </ref>
+      </optional>
+      <ref name="MediaAccessibilityAttributes"/>
+      <optional>
+        <attribute name="width">
+          <a:documentation>Height of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="height">
+          <a:documentation>Width of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="ImageBody">
+    <optional>
+      <element name="svg">
+        <a:documentation>image can contain SVG XML, which is used to access its identifiers within the Metanorma XML</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="altsource">
+        <a:documentation>Alternative files to use as media</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="key">
     <a:documentation>Key to a table, figure, or formula</a:documentation>
     <element name="key">
@@ -930,34 +1007,6 @@ titlecase, or lowercase</a:documentation>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
-  <define name="image" combine="choice">
-    <choice>
-      <element name="image">
-        <ref name="RequiredId"/>
-        <ref name="ImageAttributes"/>
-        <optional>
-          <element name="svg">
-            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
-            <oneOrMore>
-              <choice>
-                <text/>
-                <ref name="AnyElement"/>
-              </choice>
-            </oneOrMore>
-          </element>
-        </optional>
-      </element>
-      <element name="svg">
-        <a:documentation>Add svg mark up to image</a:documentation>
-        <oneOrMore>
-          <choice>
-            <text/>
-            <ref name="AnyElement"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </choice>
-  </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">
       <a:documentation>Bibliographic source for the information in the paragraph

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cc
-    VERSION = "2.8.1".freeze
+    VERSION = "2.8.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic