metanorma-csa 2.2.10 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ec8990e49baa6f98f5a7354d3d7b0e488a049540bb1e5fc33085534b8f89745
-  data.tar.gz: 59eadeae945582a8c9302ce007307bf5adceb90ffc259f4c945369114a0ced91
+  metadata.gz: '0354818d41d11101f7b6c8887da47415bc21aa1ea6d09401ca2327123653042d'
+  data.tar.gz: ef4b3538d19b0dad0a4e690b6d54bccf94038afb4ccc7b4eb59a3e1ada381f0c
 SHA512:
-  metadata.gz: 3c855e74521c51bd16042c69d239a22b96d57676cbac2c9016db610b5a4f81c8966aae2eb3dd15405872a1c2ccb855efd905f4d52253070b38806359da850a49
-  data.tar.gz: fef69e7d6fab55890c6217d096c90b1750792e2d292f86df167aa379145895ee2dad42a993e9ef7ca8ec78f1eb76207e24f45273d329070013c80a52b433051e
+  metadata.gz: df2b1c575115cc72dee940c2f299507562733521fa3ca4885de4cd493e3db6ef437a3d9975eed9264d693e0a3cbcf3b31fccc747900dad16d5d8f23c77e130e9
+  data.tar.gz: 320844b64ebad5514704255397a55f818ba32a80a63b402f4590ba8ac100a3d141930fbe1f8f0e69b67439bbe3df27da4b3841e78b32adc439dcccf437654ddf

data/lib/isodoc/csa/csa.standard.xsl

@@ -1560,6 +1560,10 @@
 	</xsl:attribute-set> <!-- formula-stem-number-style -->
 	<!-- End Formula's styles -->
 
+	<xsl:template name="refine_formula-stem-number-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="image-style">
 		<xsl:attribute name="text-align">center</xsl:attribute>
 
@@ -2058,13 +2062,13 @@
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
+			<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = '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="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 
 			<!-- process Section's title -->
@@ -2098,12 +2102,12 @@
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
 
-		<xsl:for-each select="/*/*[local-name()='annex']">
+		<!-- <xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
-		</xsl:for-each>
+		</xsl:for-each> -->
 
-		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
+		<xsl:for-each select="/*/*[local-name()='annex'] | /*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
@@ -2556,7 +2560,7 @@
 							<fo:table-row>
 								<fo:table-cell column-number="2">
 									<xsl:copy-of select="$table-preamble"/>
-									<fo:block>
+									<fo:block role="SKIP">
 										<xsl:call-template name="setTrackChangesStyles">
 											<xsl:with-param name="isAdded" select="$isAdded"/>
 											<xsl:with-param name="isDeleted" select="$isDeleted"/>
@@ -2599,7 +2603,7 @@
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
 
-					<fo:block xsl:use-attribute-sets="table-name-style">
+					<fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
 
 						<xsl:call-template name="refine_table-name-style">
 							<xsl:with-param name="continued" select="$continued"/>
@@ -2984,8 +2988,8 @@
 	<xsl:template name="table-header-title">
 		<xsl:param name="cols-count"/>
 		<!-- row for title -->
-		<fo:table-row>
-			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
+		<fo:table-row role="SKIP">
+			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black" role="SKIP">
 
 				<xsl:call-template name="refine_table-header-title-style"/>
 
@@ -2994,7 +2998,7 @@
 						</xsl:apply-templates>
 
 						<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
-							<fo:block/>
+							<fo:block role="SKIP"/>
 						</xsl:if>
 
 			</fo:table-cell>
@@ -3305,7 +3309,7 @@
 
 			<xsl:call-template name="refine_table-header-cell-style"/>
 
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
@@ -3358,7 +3362,7 @@
 				<xsl:attribute name="text-align">left</xsl:attribute>
 			</xsl:if>
 
-			<fo:block>
+			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
 					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -4221,7 +4225,7 @@
 		-->
 		<fo:table-row>
 			<fo:table-cell number-columns-spanned="2">
-				<fo:block>
+				<fo:block role="SKIP">
 					<xsl:call-template name="note"/>
 				</fo:block>
 			</fo:table-cell>
@@ -4286,7 +4290,7 @@
 
 			<xsl:call-template name="refine_dt-cell-style"/>
 
-			<fo:block xsl:use-attribute-sets="dt-block-style">
+			<fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
 				<xsl:copy-of select="@id"/>
 
 				<xsl:if test="normalize-space($key_iso) = 'true'">
@@ -4316,7 +4320,7 @@
 
 			<xsl:call-template name="refine_dd-cell-style"/>
 
-			<fo:block>
+			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
 					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -4458,10 +4462,15 @@
 	<!-- ========================= -->
 	<xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
+			<xsl:call-template name="refine_italic_style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
+	<xsl:template name="refine_italic_style">
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<xsl:param name="split_keep-within-line"/>
 		<fo:inline font-weight="bold">
@@ -4686,11 +4695,41 @@
 
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<xsl:variable name="text" select="normalize-space(.)"/>
-		<fo:inline font-size="75%">
+		<fo:inline font-size="75%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
-					<xsl:call-template name="recursiveSmallCaps">
-						<xsl:with-param name="text" select="$text"/>
-					</xsl:call-template>
+					<xsl:variable name="smallCapsText">
+						<xsl:call-template name="recursiveSmallCaps">
+							<xsl:with-param name="text" select="$text"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<!-- merge neighboring fo:inline -->
+					<xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
+						<xsl:choose>
+							<xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
+							<xsl:when test="self::fo:inline and @font-size">
+								<xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
+								<!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
+								<xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
+								<xsl:variable name="next_text">
+									<xsl:choose>
+										<xsl:when test="$next_text_ = 0">99999999</xsl:when>
+										<xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
+									</xsl:choose>
+								</xsl:variable>
+								<!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
+								<fo:inline>
+									<xsl:copy-of select="@*"/>
+									<xsl:copy-of select="./node()"/>
+									<xsl:for-each select="following-sibling::node()[position() &lt; $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
+										<xsl:copy-of select="./node()"/>
+									</xsl:for-each>
+								</fo:inline>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:copy-of select="."/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
 				</xsl:if>
 			</fo:inline>
 	</xsl:template>
@@ -4702,7 +4741,7 @@
 		<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
     <xsl:choose>
       <xsl:when test="$char=$upperCase">
-        <fo:inline font-size="{100 div 0.75}%">
+        <fo:inline font-size="{100 div 0.75}%" role="SKIP">
           <xsl:value-of select="$upperCase"/>
         </fo:inline>
       </xsl:when>
@@ -4864,6 +4903,10 @@
 
 			<xsl:when test="not(contains($text, $separator))">
 				<word>
+					<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
+						<xsl:text>
+ </xsl:text> <!-- to add distance between dt and dd -->
+					</xsl:if>
 					<xsl:call-template name="enclose_text_in_tags">
 						<xsl:with-param name="text" select="normalize-space($text)"/>
 						<xsl:with-param name="tags" select="$tags"/>
@@ -4872,6 +4915,10 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<word>
+					<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
+						<xsl:text>
+ </xsl:text> <!-- to add distance between dt and dd -->
+					</xsl:if>
 					<xsl:call-template name="enclose_text_in_tags">
 						<xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
 						<xsl:with-param name="tags" select="$tags"/>
@@ -5055,6 +5102,10 @@
 	<xsl:template name="getSimpleTable">
 		<xsl:param name="id"/>
 
+		<!-- <test0>
+			<xsl:copy-of select="."/>
+		</test0> -->
+
 		<xsl:variable name="simple-table">
 
 			<!-- Step 0. replace <br/> to <p>...</p> -->
@@ -6100,7 +6151,7 @@
 				<fo:table-body>
 					<fo:table-row>
 						<fo:table-cell display-align="center">
-							<fo:block xsl:use-attribute-sets="formula-stem-block-style">
+							<fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
 
 								<xsl:call-template name="refine_formula-stem-block-style"/>
 
@@ -6108,7 +6159,10 @@
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell display-align="center">
-							<fo:block xsl:use-attribute-sets="formula-stem-number-style">
+							<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
+
+								<xsl:call-template name="refine_formula-stem-number-style"/>
+
 								<xsl:apply-templates select="../*[local-name() = 'name']"/>
 							</fo:block>
 						</fo:table-cell>
@@ -7622,7 +7676,7 @@
 	<!-- second td with sourcecode -->
 	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
 		<fo:table-cell>
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
@@ -8109,7 +8163,7 @@
 
 			<xsl:call-template name="setTableCellAttributes"/>
 
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
@@ -8131,7 +8185,7 @@
 
 			<xsl:call-template name="setTableCellAttributes"/>
 
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
@@ -8906,7 +8960,48 @@
 				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
-				<xsl:value-of select="@label"/>
+
+				<xsl:variable name="label">
+
+					<xsl:variable name="type" select="../@type"/>
+
+					<xsl:variable name="style_prefix_">
+						<xsl:if test="$type = 'roman'">
+							 <!-- Example: (i) -->
+						</xsl:if>
+					</xsl:variable>
+					<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
+
+					<xsl:variable name="style_suffix_">
+						<xsl:choose>
+							<xsl:when test="$type = 'arabic'">
+								)
+							</xsl:when>
+							<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
+								)
+							</xsl:when>
+							<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
+								)
+							</xsl:when>
+							<xsl:when test="$type = 'roman'">
+								)
+							</xsl:when>
+							<xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
+
+					<xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
+						<xsl:value-of select="$style_prefix"/>
+					</xsl:if>
+					<xsl:value-of select="@label"/>
+					<xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
+						<xsl:value-of select="$style_suffix"/>
+					</xsl:if>
+				</xsl:variable>
+
+				<xsl:value-of select="normalize-space($label)"/>
+
 			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists 'ol' -->
 
@@ -9099,7 +9194,7 @@
 			<xsl:call-template name="refine_list-item-style"/>
 
 			<fo:list-item-label end-indent="label-end()">
-				<fo:block xsl:use-attribute-sets="list-item-label-style">
+				<fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
 
 					<xsl:call-template name="refine_list-item-label-style"/>
 
@@ -9113,7 +9208,7 @@
 				</fo:block>
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
-				<fo:block>
+				<fo:block role="SKIP">
 
 					<xsl:call-template name="refine_list-item-body-style"/>
 
@@ -9392,10 +9487,10 @@
 			<fo:table-body>
 				<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
 
-					<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
-					<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
-					<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
-					<fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
 				</fo:table-row>
 				<xsl:apply-templates/>
 			</fo:table-body>
@@ -9410,7 +9505,7 @@
 
 	<xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
 		<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
-			<fo:block><xsl:apply-templates/></fo:block>
+			<fo:block role="SKIP"><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
 	</xsl:template>
 	<!-- ============ -->
@@ -9695,7 +9790,7 @@
 		<xsl:for-each select="*[local-name() = 'tab']">
 			<xsl:variable name="current_id" select="generate-id()"/>
 			<fo:table-cell>
-				<fo:block line-height-shift-adjustment="disregard-shifts">
+				<fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -9713,7 +9808,7 @@
 		</xsl:for-each>
 		<!-- last column - for page numbers -->
 		<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
 						<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">

data/lib/metanorma/csa/boilerplate.adoc

@@ -0,0 +1,35 @@
+== copyright-statement
+=== {blank}
+© {{ docyear }} Cloud Security Alliance, LLC.
+
+{% if unpublished %}
+== license-statement
+=== Warning for Drafts
+
+This document is not a CSA Standard. It is distributed for review and
+comment, and is subject to change without notice and may not be referred to as
+a Standard. Recipients of this draft are invited to submit, with their
+comments, notification of any relevant patent rights of which they are aware
+and to provide supporting documentation.
+{% endif %}
+
+== legal-statement
+=== {blank}
+All rights reserved. Unless otherwise specified, no part of this
+publication may be reproduced or utilized otherwise in any form or by any
+means, electronic or mechanical, including photocopying, or posting on the
+internet or an intranet, without prior written permission. Permission can
+be requested from the address below.
+
+== feedback-statement
+=== {blank}
+Cloud Security Alliance
+
+[align="left"]
+2212 Queen Anne Ave N +
+Seattle +
+WA 98109 +
+United States of America +
+ +
+copyright@cloudsecurityalliance.com +
+https://www.cloudsecurityalliance.com[www.cloudsecurityalliance.com]

data/lib/metanorma/csa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csa
-    VERSION = "2.2.10".freeze
+    VERSION = "2.2.11".freeze
   end
 end

data/metanorma.yml

@@ -27,6 +27,7 @@ header: lib/isodoc/csa/html/header.html
 wordcoverpage: lib/isodoc/csa/html/word_csa_titlepage.html
 wordintropage: lib/isodoc/csa/html/word_csa_intro.html
 wordstylesheet: lib/isodoc/csa/html/wordstyle.scss
+boilerplate: lib/metanorma/csa/boilerplate.adoc
 webfont:
   - "https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700"
   - "https://fonts.googleapis.com/css?family=Lato:400,400i,700,900"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csa
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -215,7 +215,7 @@ files:
 - lib/metanorma/csa/basicdoc.rng
 - lib/metanorma/csa/biblio-standoc.rng
 - lib/metanorma/csa/biblio.rng
-- lib/metanorma/csa/boilerplate.xml
+- lib/metanorma/csa/boilerplate.adoc
 - lib/metanorma/csa/converter.rb
 - lib/metanorma/csa/csa.rng
 - lib/metanorma/csa/isodoc.rng

data/lib/metanorma/csa/boilerplate.xml

@@ -1,48 +0,0 @@
-<boilerplate>
-  <copyright-statement>
-    <clause> 
-      <p>© {{ docyear }} Cloud Security Alliance, LLC.</p>
-    </clause>
-  </copyright-statement>
-
-  {% if unpublished %}
-  <license-statement>
-    <clause>
-    <title>Warning for Drafts</title>
-
-    <p>This document is not a CSA Standard. It is distributed for review and
-      comment, and is subject to change without notice and may not be referred to as
-      a Standard. Recipients of this draft are invited to submit, with their
-      comments, notification of any relevant patent rights of which they are aware
-      and to provide supporting documentation.
-    </p>
-  </clause>
-  </license-statement>
-  {% endif %}
-
-  <legal-statement>
-    <clause>
-      <p>All rights reserved. Unless otherwise specified, no part of this
-        publication may be reproduced or utilized otherwise in any form or by any
-        means, electronic or mechanical, including photocopying, or posting on the
-        internet or an intranet, without prior written permission. Permission can
-        be requested from the address below.
-      </p>
-    </clause>
-  </legal-statement>
-
-  <feedback-statement>
-    <clause>
-      <p>Cloud Security Alliance</p>
-      <p align="left">
-        2212  Queen Anne Ave N<br />
-        Seattle<br />
-        WA 98109<br />
-        United States of America<br />
-        <br />
-        <link target="mailto:copyright@cloudsecurityalliance.com">copyright@cloudsecurityalliance.com</link><br />
-        <link target="www.cloudsecurityalliance.com">www.cloudsecurityalliance.com</link>
-      </p>
-    </clause>
-  </feedback-statement>
-</boilerplate>