metanorma-cc 2.5.4 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b31d0ca70ffb8903d190d7d3087f046dea778e8f7b053f547c77575df1d3a1
-  data.tar.gz: 21528facf9965a72f2aea590f444a4865ecf763e25dc6e2a868a23070c8b9946
+  metadata.gz: cdee98655f21152c7fb1523b8ccba8af7a4b887f82439c3cb397a3726ce932ce
+  data.tar.gz: e3a9bddee0dc3d95c62981ea333b89533bf9bf0146637b955b4ac8c1c79fa92f
 SHA512:
-  metadata.gz: 8eda576b445cfb830153034c92892d889fd337e8796eb123283336cfb1c8d13cb8278ae32cb9f833ace1c96e8350bbe4bfb5f0f2adb0a344bd25120d0e1a66cc
-  data.tar.gz: df11767ebbdd870b1b98e70376e385c8fb93cee07b021beb58a58187c2b8c212e6da7f09963879eb7b292903995102bd9c3c257be9eb8f623d32a78bf22b9977
+  metadata.gz: 532ed62afb3d428e10cae116d10d5f236dfa1684a929980d75bcfce9d75eda5518e10e11ffe65b228f849910289c95b910ae78c337dd48472a82dc56350cc367
+  data.tar.gz: '05999ea26e85ad7bdcf2b5675141a78182a4edfb7aaebfcc5c45e025aa69e1c615e892970a77499b6a948bb814254d4a952699020046c0b3cd81842d8736e93e'

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

@@ -3984,10 +3984,14 @@
 				<xsl:variable name="fn_styles">
 					<xsl:choose>
 						<xsl:when test="ancestor::*[local-name() = 'bibitem']">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style"/>
+							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
+
+							</fn_styles>
 						</xsl:when>
 						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style"/>
+							<fn_styles xsl:use-attribute-sets="fn-num-style">
+
+							</fn_styles>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
@@ -4126,6 +4130,11 @@
 
 								<xsl:value-of select="@reference"/>
 
+								<!-- commented https://github.com/metanorma/isodoc/issues/614 -->
+								<!-- <xsl:if test="$namespace = 'itu'">
+									<xsl:text>)</xsl:text>
+								</xsl:if> -->
+
 							</fo:inline>
 							<fo:inline xsl:use-attribute-sets="table-fn-body-style">
 								<xsl:copy-of select="./node()"/>
@@ -4135,7 +4144,7 @@
 
 			</xsl:if>
 		</xsl:for-each>
-	</xsl:template>
+	</xsl:template> <!-- table_fn_display -->
 
 	<xsl:template name="create_fn">
 		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -4163,8 +4172,10 @@
 	<!-- EMD table's footnotes rendering -->
 	<!-- ============================ -->
 
+	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
-	<xsl:template name="fn_display_figure">
+	<!-- ============================ -->
+	<xsl:template name="fn_display_figure"> <!-- figure_fn_display -->
 
 		<!-- current figure id -->
 		<xsl:variable name="figure_id_">
@@ -4277,9 +4288,28 @@
 
 			</fo:block>
 		</xsl:if>
-
 	</xsl:template> <!-- fn_display_figure -->
 
+	<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+	<!-- figure's footnote label -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'dl'][@key = 'true']/*[local-name() = 'dt']/     *[local-name() = 'p'][count(node()[normalize-space() != '']) = 1]/*[local-name() = 'sup']" priority="3">
+		<xsl:variable name="key_iso">
+
+		</xsl:variable>
+		<xsl:if test="normalize-space($key_iso) = 'true'">
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+
+		</xsl:if>
+		<fo:inline xsl:use-attribute-sets="figure-fn-number-style"> <!-- id="{@id}"  -->
+			<!-- <xsl:value-of select="@reference"/> -->
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
+	<!-- ============================ -->
+	<!-- END: figure's footnotes rendering -->
+	<!-- ============================ -->
+
 	<!-- fn reference in the text rendering (for instance, 'some text 1) some text' ) -->
 	<xsl:template match="*[local-name()='fn']">
 		<fo:inline xsl:use-attribute-sets="fn-reference-style">
@@ -4295,6 +4325,10 @@
 
 				<xsl:value-of select="@reference"/>
 
+				<!-- commented, https://github.com/metanorma/isodoc/issues/614 -->
+				<!-- <xsl:if test="$namespace = 'jis'">
+					<fo:inline font-weight="normal">)</fo:inline>
+				</xsl:if> -->
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template>
@@ -4421,17 +4455,22 @@
 						</fo:block>
 					</xsl:when>  <!-- END: a few components -->
 					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
-						<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
+						<!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
+						<xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
 
-							<xsl:call-template name="refine_figure_key_style"/>
+									<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
 
-							<xsl:variable name="title-key">
-								<xsl:call-template name="getLocalizedString">
-									<xsl:with-param name="key">key</xsl:with-param>
-								</xsl:call-template>
-							</xsl:variable>
-							<xsl:value-of select="$title-key"/>
-						</fo:block>
+										<xsl:call-template name="refine_figure_key_style"/>
+
+										<xsl:variable name="title-key">
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">key</xsl:with-param>
+											</xsl:call-template>
+										</xsl:variable>
+										<xsl:value-of select="$title-key"/>
+									</fo:block>
+
+						</xsl:if>
 					</xsl:when>  <!-- END: definition list in a figure -->
 				</xsl:choose>
 
@@ -4617,6 +4656,14 @@
 
 	</xsl:template> <!-- END: dl -->
 
+	<!-- caption for figure key and another caption, https://github.com/metanorma/isodoc/issues/607 -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'p'][@keep-with-next = 'true' and *[local-name() = 'strong']]" priority="3">
+		<fo:block text-align="left" margin-bottom="12pt" keep-with-next="always">
+			<xsl:call-template name="refine_figure_key_style"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template name="refine_dl_formula_where_style">
 
 	</xsl:template> <!-- refine_dl_formula_where_style -->
@@ -6650,6 +6697,39 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="mathml_linebreak">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="mathml_linebreak"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- split math into two math -->
+	<xsl:template match="mathml:mo[@linebreak] | mathml:mspace[@linebreak]" mode="mathml_linebreak">
+		<xsl:variable name="math_elements_tree_">
+			<xsl:for-each select="ancestor::*[ancestor-or-self::mathml:math]">
+				<element pos="{position()}">
+					<xsl:copy-of select="@*[local-name() != 'id']"/>
+					<xsl:value-of select="name()"/>
+				</element>
+			</xsl:for-each>
+		</xsl:variable>
+
+		<xsl:variable name="math_elements_tree" select="xalan:nodeset($math_elements_tree_)"/>
+
+		<xsl:call-template name="insertClosingElements">
+			<xsl:with-param name="tree" select="$math_elements_tree"/>
+		</xsl:call-template>
+
+		<xsl:element name="br" namespace="{$namespace_full}"/>
+
+		<xsl:call-template name="insertOpeningElements">
+			<xsl:with-param name="tree" select="$math_elements_tree"/>
+			<xsl:with-param name="xmlns">http://www.w3.org/1998/Math/MathML</xsl:with-param>
+			<xsl:with-param name="add_continue">false</xsl:with-param>
+		</xsl:call-template>
+
+	</xsl:template>
+
 	<!-- Examples: 
 		<stem type="AsciiMath">x = 1</stem> 
 		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -6851,6 +6931,7 @@
 					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 					</xsl:if>
+
 					<xsl:if test="parent::*[local-name() = 'add']">
 						<xsl:call-template name="append_add-style"/>
 					</xsl:if>
@@ -6900,9 +6981,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template -->
+		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<xsl:if test="normalize-space() != ''">
-			<xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
-		</xsl:if>
+			<xsl:text>(</xsl:text><xsl:apply-templates /><xsl:text>)</xsl:text>
+		</xsl:if> -->
+		<xsl:apply-templates/>
 	</xsl:template>
 
 	<!-- stem inside formula with name (with formula's number) -->
@@ -6959,44 +7042,44 @@
 
 	<xsl:template match="*[local-name() = 'note']" name="note">
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+				<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
 
-			<xsl:call-template name="setBlockSpanAll"/>
+					<xsl:call-template name="setBlockSpanAll"/>
 
-			<xsl:call-template name="refine_note-style"/>
+					<xsl:call-template name="refine_note-style"/>
 
-			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 
-						<fo:block>
+								<fo:block>
 
-							<xsl:call-template name="refine_note_block_style"/>
+									<xsl:call-template name="refine_note_block_style"/>
 
-							<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
+									<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
 
-								<xsl:call-template name="refine_note-name-style"/>
+										<xsl:call-template name="refine_note-name-style"/>
 
-								<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
-								<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
-								<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
-									<xsl:call-template name="append_add-style"/>
-								</xsl:if>
+										<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
+										<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
+										<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
+											<xsl:call-template name="append_add-style"/>
+										</xsl:if>
 
-								<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
-								<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
-									<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
-										<xsl:with-param name="skip">false</xsl:with-param>
-									</xsl:apply-templates>
-								</xsl:if>
+										<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
+										<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
+											<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
+												<xsl:with-param name="skip">false</xsl:with-param>
+											</xsl:apply-templates>
+										</xsl:if>
 
-								<xsl:apply-templates select="*[local-name() = 'name']"/>
+										<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-							</fo:inline>
+									</fo:inline>
 
-							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-						</fo:block>
+									<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+								</fo:block>
 
-			</fo:block-container>
-		</fo:block-container>
+					</fo:block-container>
+				</fo:block-container>
 
 	</xsl:template>
 
@@ -7058,6 +7141,17 @@
 				</xsl:when>
 				<xsl:otherwise>
 
+					<!-- https://github.com/metanorma/isodoc/issues/607 -->
+					<!-- <xsl:if test="$namespace = 'ieee'">
+						<xsl:text>—</xsl:text> em dash &#x2014;
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece'  or $namespace = 'rsd'">
+						<xsl:text>:</xsl:text>
+					</xsl:if> -->
+
+					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp'">				
+						<xsl:text> – </xsl:text> en dash &#x2013;
+					</xsl:if> -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -7076,6 +7170,16 @@
 				</xsl:when>
 				<xsl:otherwise>
 
+					<!-- https://github.com/metanorma/isodoc/issues/607 -->
+					<!-- <xsl:if test="$namespace = 'ieee'">
+						<xsl:text>—</xsl:text> em dash &#x2014;
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'iso' or $namespace = 'iec' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' or $namespace = 'rsd' or $namespace = 'jcgm'">
+						<xsl:text>:</xsl:text>
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp' or $namespace = 'unece-rec' or $namespace = 'unece'">				
+						<xsl:text> – </xsl:text> en dash &#x2013;
+					</xsl:if> -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -9244,7 +9348,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:inline xsl:use-attribute-sets="termexample-name-style">
 				<xsl:call-template name="refine_termexample-name-style"/>
-				<xsl:apply-templates/>
+				<xsl:apply-templates/> <!-- commented $namespace = 'ieee', https://github.com/metanorma/isodoc/issues/614-->
 			</fo:inline>
 		</xsl:if>
 	</xsl:template>
@@ -9399,13 +9503,14 @@
 			</xsl:when>
 			<xsl:when test="contains(normalize-space($fo_element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-name-style">
+
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
 					<xsl:call-template name="refine_example-name-style"/>
-					<xsl:apply-templates/>
+					<xsl:apply-templates/> <!-- $namespace = 'ieee', see https://github.com/metanorma/isodoc/issues/614  -->
 				</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -9414,6 +9519,7 @@
 
 	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
 		<fo:inline xsl:use-attribute-sets="example-name-style">
+
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -9586,15 +9692,17 @@
 
 					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 						<fo:block role="BlockQuote">
-							<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
+							<xsl:apply-templates select="./node()[not(local-name() = 'author') and         not(local-name() = 'source') and         not(local-name() = 'attribution')]"/> <!-- process all nested nodes, except author and source -->
 						</fo:block>
 					</fo:block-container>
 				</fo:block-container>
-				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
+				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source'] or *[local-name() = 'attribution']">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
 						<!-- — ISO, ISO 7301:2011, Clause 1 -->
 						<xsl:apply-templates select="*[local-name() = 'author']"/>
 						<xsl:apply-templates select="*[local-name() = 'source']"/>
+						<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+						<xsl:apply-templates select="*[local-name() = 'attribution']/*[local-name() = 'p']/node()"/>
 					</fo:block>
 				</xsl:if>
 
@@ -9616,9 +9724,13 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'author']">
-		<xsl:text>— </xsl:text>
+		<xsl:if test="local-name(..) = 'quote'"> <!-- for old Presentation XML, https://github.com/metanorma/isodoc/issues/607 -->
+			<xsl:text>— </xsl:text>
+		</xsl:if>
 		<xsl:apply-templates/>
 	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'quote']//*[local-name() = 'referenceFrom']"/>
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -9791,20 +9903,26 @@
 
 			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
 				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
+
 					<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
 				</fo:block>
 			</xsl:if>
 
 			<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
 				<xsl:call-template name="setStyle_preferred"/>
+
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'domain']">
+		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
-		<xsl:text> </xsl:text>
+		<xsl:text> </xsl:text> -->
+		<xsl:if test="not(@hidden = 'true')">
+			<xsl:apply-templates/>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'admitted']">
@@ -9852,6 +9970,29 @@
 	<!-- END definition -->
 	<!-- ========== -->
 
+	<xsl:variable name="reviews_">
+		<xsl:for-each select="//*[local-name() = 'review'][@from]">
+			<xsl:copy>
+				<xsl:copy-of select="@from"/>
+				<xsl:copy-of select="@id"/>
+			</xsl:copy>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
+
+	<xsl:template name="addReviewHelper">
+		<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
+		<xsl:variable name="curr_id" select="@id"/>
+		<xsl:variable name="review_id" select="normalize-space($reviews//*[local-name() = 'review'][@from = $curr_id]/@id)"/>
+		<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
+			<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+		</xsl:if>
+		<!-- <fo:block>
+			<curr_id><xsl:value-of select="$curr_id"/></curr_id>
+			<xsl:copy-of select="$reviews"/>
+		</fo:block> -->
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
 
@@ -9860,6 +10001,8 @@
 
 			<xsl:call-template name="sections_element_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 
@@ -9900,6 +10043,7 @@
 
 		<fo:block>
 			<xsl:call-template name="setId"/>
+			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -9936,6 +10080,8 @@
 
 			<xsl:call-template name="refine_clause_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -9988,6 +10134,23 @@
 
 		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
 
+		<xsl:if test="1 = 1">
+		<xsl:choose>
+			<!-- if there isn't the attribute '@from', then -->
+			<xsl:when test="$id_from = ''">
+				<fo:block id="{@id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
+			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+		</xsl:choose>
+		</xsl:if>
+
+    <xsl:if test="1 = 2">
 		<xsl:choose>
 			<!-- if there isn't the attribute '@from', then -->
 			<xsl:when test="$id_from = ''">
@@ -10001,6 +10164,7 @@
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
+    </xsl:if>
 
 	</xsl:template>
 
@@ -11364,7 +11528,7 @@
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_step1"/>
 
-	<xsl:template match="*[local-name() = 'stem'] |        *[local-name() = 'image'] |        *[local-name() = 'sourcecode'] |        *[local-name() = 'bibdata'] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
+	<xsl:template match="*[local-name() = 'stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])] |        *[local-name() = 'image'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'sourcecode'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
@@ -11430,6 +11594,22 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:variable name="regex_passthrough">.*\bpdf\b.*</xsl:variable>
+	<xsl:template match="*[local-name() = 'passthrough']" mode="update_xml_step1">
+		<!-- <xsl:if test="contains(@formats, ' pdf ')"> -->
+		<xsl:if test="normalize-space(java:matches(java:java.lang.String.new(@formats), $regex_passthrough)) = 'true'">
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:if>
+	</xsl:template>
+
+	<!-- split math by element with @linebreak into maths -->
+	<xsl:template match="mathml:math[.//mathml:mo[@linebreak] or .//mathml:mspace[@linebreak]]" mode="update_xml_step1">
+		<xsl:variable name="maths">
+			<xsl:apply-templates select="." mode="mathml_linebreak"/>
+		</xsl:variable>
+		<xsl:copy-of select="$maths"/>
+	</xsl:template>
+
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->
@@ -11533,6 +11713,8 @@
 
 	<xsl:template name="insertOpeningElements">
 		<xsl:param name="tree"/>
+		<xsl:param name="xmlns"/>
+		<xsl:param name="add_continue">true</xsl:param>
 		<xsl:for-each select="$tree//element">
 			<xsl:text disable-output-escaping="yes">&lt;</xsl:text>
 				<xsl:value-of select="."/>
@@ -11543,7 +11725,8 @@
 					<xsl:value-of select="."/>
 					<xsl:text>"</xsl:text>
 				</xsl:for-each>
-				<xsl:if test="position() = 1"> continue="true"</xsl:if>
+				<xsl:if test="position() = 1 and $add_continue = 'true'"> continue="true"</xsl:if>
+				<xsl:if test="position() = 1 and $xmlns != ''"> xmlns="<xsl:value-of select="$xmlns"/>"</xsl:if>
 			<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
 			<xsl:if test="$debug = 'true'">
 				<xsl:message>&lt;<xsl:value-of select="."/>&gt;</xsl:message>
@@ -12753,9 +12936,10 @@
 	<xsl:template name="insertBackgroundPageImage">
 		<xsl:param name="number">1</xsl:param>
 		<xsl:param name="name">coverpage-image</xsl:param>
+		<xsl:param name="suffix"/>
 		<xsl:variable name="num" select="number($number)"/>
 		<!-- background image -->
-		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage_{$name}_{$number}_{generate-id()}">
+		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
 			<fo:block>
 				<xsl:for-each select="/*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = $name][1]/*[local-name() = 'value']/*[local-name() = 'image'][$num]">
 					<xsl:choose>
@@ -12821,16 +13005,29 @@
 
 	<!-- END: insert cover page image -->
 
+	<xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
 	<xsl:template name="insertVerticalChar">
 		<xsl:param name="str"/>
+		<xsl:param name="writing-mode">lr-tb</xsl:param>
+		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:if test="string-length($str) &gt; 0">
-			<fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+			<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+				<xsl:if test="normalize-space($writing-mode) != ''">
+					<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
+					<xsl:attribute name="reference-orientation">90</xsl:attribute>
+				</xsl:if>
+				<xsl:variable name="char" select="substring($str,1,1)"/>
+				<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
+					<xsl:attribute name="reference-orientation">0</xsl:attribute>
+				</xsl:if>
 				<fo:block-container width="1em">
-						<fo:block line-height="1em"><xsl:value-of select="substring($str,1,1)"/></fo:block>
+						<fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
 				</fo:block-container>
 			</fo:inline-container>
 			<xsl:call-template name="insertVerticalChar">
 				<xsl:with-param name="str" select="substring($str, 2)"/>
+				<xsl:with-param name="writing-mode" select="$writing-mode"/>
+				<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template>

data/lib/metanorma/cc/biblio.rng

@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

data/lib/metanorma/cc/cc.rng

@@ -10,7 +10,7 @@
   <include href="relaton-cc.rng"/>
   <include href="isodoc.rng">
     <start>
-      <ref name="csd-standard"/>
+      <ref name="cc-standard"/>
     </start>
     <define name="FigureBody">
       <zeroOrMore>
@@ -40,8 +40,8 @@
       </choice>
     </define>
   </include>
-  <define name="csd-standard">
-    <element name="csd-standard">
+  <define name="cc-standard">
+    <element name="cc-standard">
       <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>

data/lib/metanorma/cc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cc
-    VERSION = "2.5.4".freeze
+    VERSION = "2.5.6".freeze
   end
 end

data/metanorma-cc.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.7.0"
+  spec.add_dependency "metanorma-generic", "~> 2.7.2"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement