metanorma-cc 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02500ebd02ebe65c4c1a840c9a57022da0f064f3da738a801811746d04b18cbd
-  data.tar.gz: 52ecdef573a1d9e59d3a4ee98bb5de87149badb22e2836e9397b43e2ebdcaea4
+  metadata.gz: cd1570c8a37a6ec0bcd7e15acd14836d3541d7688eef69fb191b9bc0deb3c8b5
+  data.tar.gz: ffd05f720ddb23f881a45a42f8a61cf5ee1337e7d5025c10160adc4cf395b084
 SHA512:
-  metadata.gz: 0ec7d7f403145d1306fa3865c59fdaf8e1314b2e0d6abc1060b2a326b03b4703f05ad0aaa9cd0eba7528496c6e70d96f04065bf577f95d08e3272cee54cc431e
-  data.tar.gz: a7e0ee3a1dc9bf6ee378ad5ef6e3ebd372e2834f65c4a3ec3526c1fc569b8cc2015a78326f0bac59428247d18ee983a5652fe5818ba09bddeb8a460b51d7873c
+  metadata.gz: 12d79a97ae2a07b027eb5ad2c628676ca5fd6b652bea3dfe2bd7798d0b8fadece4b8e42a73a7c0ab6f915d2c894e16993547c949dbffee6b434cbc0e14ad01dd
+  data.tar.gz: 42406628678a495a575224b602072bfa564325aeb3150241323f7d611690073c540f6a8b499e8a6e43693f792e69864128b17cdcf957cb17a99e311f945722fb

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

@@ -822,6 +822,7 @@
 	<xsl:variable name="zero_width_space">​</xsl:variable>
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
+	<xsl:variable name="em_dash">—</xsl:variable>
 
 	<xsl:template name="getTitle">
 		<xsl:param name="name"/>
@@ -1138,6 +1139,10 @@
 
 	</xsl:attribute-set> <!-- example-name-style -->
 
+	<xsl:template name="refine_example-name-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-p-style">
 
 			<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
@@ -1154,6 +1159,10 @@
 
 	</xsl:attribute-set> <!-- termexample-name-style -->
 
+	<xsl:template name="refine_termexample-name-style">
+
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- Table styles -->
 	<!-- ========================== -->
@@ -1316,6 +1325,10 @@
 
 	</xsl:attribute-set> <!-- table-fn-style -->
 
+	<xsl:template name="refine_table-fn-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="table-fn-number-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -1324,6 +1337,10 @@
 
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
+	<xsl:template name="refine_table-fn-number-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-container-body-style">
 		<xsl:attribute name="text-indent">0</xsl:attribute>
 		<xsl:attribute name="start-indent">0</xsl:attribute>
@@ -2617,6 +2634,7 @@
 				<!-- centered table when table name is centered (see table-name-style) -->
 
 					<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
+
 						<fo:table-column column-width="proportional-column-width(1)"/>
 						<fo:table-column column-width="{@width}"/>
 						<fo:table-column column-width="proportional-column-width(1)"/>
@@ -3658,8 +3676,9 @@
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 
 						<fo:block xsl:use-attribute-sets="table-fn-style">
-
+							<xsl:call-template name="refine_table-fn-style"/>
 							<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
+								<xsl:call-template name="refine_table-fn-number-style"/>
 
 								<xsl:value-of select="@reference"/>
 
@@ -4800,11 +4819,16 @@
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
 		<xsl:variable name="text" select="."/>
-		<fo:inline font-size="75%" role="SKIP">
+		<xsl:variable name="ratio_">
+			0.75
+		</xsl:variable>
+		<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
+		<fo:inline font-size="{$ratio * 100}%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
 					<xsl:variable name="smallCapsText">
 						<xsl:call-template name="recursiveSmallCaps">
 							<xsl:with-param name="text" select="$text"/>
+							<xsl:with-param name="ratio" select="$ratio"/>
 						</xsl:call-template>
 					</xsl:variable>
 					<!-- merge neighboring fo:inline -->
@@ -4841,12 +4865,13 @@
 
 	<xsl:template name="recursiveSmallCaps">
     <xsl:param name="text"/>
+    <xsl:param name="ratio"/>
     <xsl:variable name="char" select="substring($text,1,1)"/>
     <!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
 		<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}%" role="SKIP">
+        <fo:inline font-size="{100 div $ratio}%" role="SKIP">
           <xsl:value-of select="$upperCase"/>
         </fo:inline>
       </xsl:when>
@@ -4857,6 +4882,7 @@
     <xsl:if test="string-length($text) &gt; 1">
       <xsl:call-template name="recursiveSmallCaps">
         <xsl:with-param name="text" select="substring($text,2)"/>
+        <xsl:with-param name="ratio" select="$ratio"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
@@ -4893,6 +4919,9 @@
 				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
+				<xsl:if test="$key = 'text-indent'">
+					<style name="padding-left"><xsl:value-of select="$value"/></style>
+				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -6295,6 +6324,11 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<!-- command between two xref points to non-standard bibitem -->
+	<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and    following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- formula  -->
 	<!-- ====== -->
@@ -6996,6 +7030,8 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:variable name="regex_starts_with_digit">^[0-9].*</xsl:variable>
+
 	<xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="svg_update"/>
@@ -7014,7 +7050,8 @@
 
 			<xsl:attribute name="width">
 				<xsl:choose>
-					<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+					<!-- width is non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 					<xsl:when test="$width != ''">
 						<xsl:value-of select="round($width)"/>
 					</xsl:when>
@@ -7023,7 +7060,8 @@
 			</xsl:attribute>
 			<xsl:attribute name="height">
 				<xsl:choose>
-					<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+					<!-- height non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 					<xsl:when test="$height != ''">
 						<xsl:value-of select="round($height)"/>
 					</xsl:when>
@@ -7040,7 +7078,7 @@
 		<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
 		<xsl:attribute name="width">
 			<xsl:choose>
-				<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+				<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
@@ -7051,7 +7089,7 @@
 		<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
 		<xsl:attribute name="height">
 			<xsl:choose>
-				<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+				<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
@@ -8515,6 +8553,7 @@
 	<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
 		<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/>
 			</fo:inline>
 		</xsl:if>
@@ -8665,6 +8704,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
+					<xsl:call-template name="refine_example-name-style"/>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:otherwise>
@@ -9876,6 +9916,7 @@
 	<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
 
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
+
 					<xsl:call-template name="processBibitem"/>
 				</fo:block>
 
@@ -9917,6 +9958,7 @@
 			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
 			<xsl:otherwise>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
+
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block role="SKIP">
 							<fo:inline role="SKIP">
@@ -11686,4 +11728,6 @@
 		</xsl:if>
 	</xsl:template>
 
+	<!-- update -->
+
 </xsl:stylesheet>

data/lib/metanorma/cc/biblio.rng

@@ -208,7 +208,9 @@
   </define>
   <define name="roledescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="person">
@@ -333,7 +335,9 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="organization">
@@ -897,7 +901,9 @@
   </define>
   <define name="formattedref">
     <element name="formattedref">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="license">
@@ -942,7 +948,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
-    <ref name="FormattedString"/>
+    <zeroOrMore>
+      <ref name="TextElement"/>
+    </zeroOrMore>
   </define>
   <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
@@ -1042,7 +1050,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="docnumber">
@@ -1267,12 +1277,16 @@
       <optional>
         <attribute name="type"/>
       </optional>
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="bibabstract">
     <element name="abstract">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="copyright">
@@ -1377,7 +1391,9 @@
       </attribute>
       <optional>
         <element name="description">
-          <ref name="FormattedString"/>
+          <oneOrMore>
+            <ref name="TextElement"/>
+          </oneOrMore>
         </element>
       </optional>
       <element name="bibitem">

data/lib/metanorma/cc/cc.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns='https://www.metanorma.org/ns/cc' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns='https://www.metanorma.org/ns/cc' xmlns="http://relaxng.org/ns/structure/1.0">
   <!--
     VERSION v1.2.1
     default namespace = "http://riboseinc.com/csd"
@@ -14,23 +14,8 @@
     </start>
     <define name="figure">
       <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="class"/>
-        </optional>
+        <ref name="FigureAttributes"/>
+        <ref name="BlockAttributes"/>
         <optional>
           <ref name="source"/>
         </optional>

data/lib/metanorma/cc/isodoc.rng

@@ -156,44 +156,7 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <attribute name="target">
-          <data type="string">
-            <param name="pattern">\i\c*|\c+#\c+</param>
-          </data>
-        </attribute>
-        <optional>
-          <attribute name="to">
-            <data type="string">
-              <param name="pattern">\i\c*|\c+#\c+</param>
-            </data>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="type">
-            <ref name="ReferenceFormat"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="case">
-            <choice>
-              <value>capital</value>
-              <value>lowercase</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="droploc">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="style">
-            <ref name="XrefStyleType"/>
-          </attribute>
-        </optional>
+        <ref name="XrefAttributes"/>
         <ref name="XrefBody"/>
       </element>
     </define>
@@ -407,23 +370,7 @@
     </define>
     <define name="figure">
       <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="class"/>
-        </optional>
+        <ref name="FigureAttributes"/>
         <ref name="BlockAttributes"/>
         <optional>
           <ref name="tname"/>
@@ -2450,6 +2397,49 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefAttributes">
+    <attribute name="target">
+      <data type="string">
+        <param name="pattern">\i\c*|\c+#\c+</param>
+      </data>
+    </attribute>
+    <optional>
+      <attribute name="to">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="case">
+        <choice>
+          <value>capital</value>
+          <value>lowercase</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="droploc">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <ref name="XrefStyleType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label"/>
+    </optional>
+  </define>
   <define name="XrefBody">
     <zeroOrMore>
       <ref name="XrefTarget"/>
@@ -2528,6 +2518,28 @@
       <attribute name="columns"/>
     </optional>
   </define>
+  <define name="FigureAttributes">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <optional>
+      <attribute name="unnumbered">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.4.4".freeze
+    VERSION = "2.4.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic