metanorma-cc 1.7.12 → 1.8.2

data/lib/asciidoctor/cc/reqt.rng

@@ -58,6 +58,14 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -101,7 +109,9 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
@@ -175,8 +185,19 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
-      <ref name="BasicBlock"/>
+      <choice>
+        <ref name="BasicBlock"/>
+        <ref name="component"/>
+      </choice>
     </oneOrMore>
   </define>
   <define name="ObligationType">

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

@@ -649,7 +649,7 @@
 		</xsl:variable>
 		<fo:block font-size="{$font-size}" line-height="1.1" role="H{$levelTerm}">
 			<fo:block font-weight="bold" keep-with-next="always">
-				<xsl:apply-templates select="ancestor::csd:term/csd:name" mode="presentation"/>	
+				<xsl:apply-templates select="ancestor::csd:term[1]/csd:name" mode="presentation"/>	
 			</fo:block>
 			<fo:block font-weight="bold" keep-with-next="always">
 				<xsl:apply-templates/>
@@ -911,6 +911,8 @@
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
 		
+		<title-table-figures lang="en">Table of Figures</title-table-figures>
+		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
 		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -1201,6 +1203,11 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
 		
 					
@@ -2284,9 +2291,8 @@
 				
 				<!-- Table's note name (NOTE, for example) -->
 
-				<fo:inline padding-right="2mm">
+				<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
 					
-				
 					
 					
 					
@@ -2793,6 +2799,7 @@
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
+					<xsl:copy-of select="@id"/>
 					
 					
 					<xsl:if test="normalize-space($key_iso) = 'true'">
@@ -2898,6 +2905,8 @@
 			<xsl:if test="$font-size != ''">
 				<xsl:attribute name="font-size">
 					<xsl:choose>
+						<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+						<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 						<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 					</xsl:choose>
@@ -3628,14 +3637,18 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'terms']">
+		<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']">
+		<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
 			
 			
-			
+			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
+				
+			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -3697,6 +3710,7 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
 					
+					
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -4063,7 +4077,7 @@
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
@@ -4161,6 +4175,8 @@
 				
 				
 				
+				
+				
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4354,12 +4370,16 @@
 				<xsl:if test="$font-size != ''">
 					<xsl:attribute name="font-size">
 						<xsl:choose>
+							<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+							<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 							<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 							<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
 				
+				
+				
 				<xsl:apply-templates/>			
 			</fo:block>
 				
@@ -4602,7 +4622,8 @@
 			</fo:block>			
 		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
-		<fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center"  -->
+		<fo:block font-size="11pt">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -4707,6 +4728,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>
@@ -4717,13 +4739,15 @@
 					<!-- <xsl:apply-templates /> -->
 					<xsl:copy-of select="$termsource_text"/>
 				</xsl:when>
-				<xsl:otherwise>					
+				<xsl:otherwise>
+					
 					
 						<xsl:text>[</xsl:text>
 					
 					<!-- <xsl:apply-templates />					 -->
 					<xsl:copy-of select="$termsource_text"/>
 					
+					
 						<xsl:text>]</xsl:text>
 					
 				</xsl:otherwise>
@@ -4807,12 +4831,20 @@
 	</xsl:template><xsl:template match="*[local-name() = 'author']">
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'eref']">
+	</xsl:template><xsl:variable name="bibitem_hidden_">
+		<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+		<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
 	
 		<xsl:variable name="bibitemid">
 			<xsl:choose>
-				<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
-				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
+				<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
+				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
+				<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
 				<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -4905,10 +4937,10 @@
 			</xsl:choose>
 		</xsl:variable>
 		
-		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+		<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
 		
 		<xsl:choose>
-			<xsl:when test="$language = 'zh'">
+			<xsl:when test="$lang = 'zh'">
 				<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
 			</xsl:when>
 			<xsl:when test="../../@inline-header = 'true'">
@@ -5893,12 +5925,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -152,6 +152,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   mso-style-noshow: yes;
+  mso-style-name: "Comment Text";
   mso-style-unhide: no;
   margin: 0cm;
   margin-bottom: .0001pt;
@@ -371,6 +372,7 @@ div.figure, p.figure {
 
 h1 {
   mso-style-priority: 1;
+  mso-style-name: "Heading 1";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-link: "Heading 1 Char";
@@ -457,6 +459,7 @@ h1.Annex {
 
 h2 {
   mso-style-priority: 2;
+  mso-style-name: "Heading 2";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "Heading 1";
@@ -485,6 +488,7 @@ h2 {
 
 h3 {
   mso-style-priority: 3;
+  mso-style-name: "Heading 3";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "Heading 1";
@@ -512,6 +516,7 @@ h3 {
 
 h4 {
   mso-style-priority: 4;
+  mso-style-name: "Heading 4";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "Heading 3";
@@ -539,6 +544,7 @@ h4 {
 
 h5 {
   mso-style-priority: 5;
+  mso-style-name: "Heading 5";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "Heading 4";
@@ -566,6 +572,7 @@ h5 {
 
 h6 {
   mso-style-priority: 6;
+  mso-style-name: "Heading 6";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "Heading 5";
@@ -593,6 +600,7 @@ h6 {
 
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
+  mso-style-name: "TOC 1";
   mso-style-unhide: no;
   mso-style-next: Normal;
   margin-top: 6.0pt;
@@ -615,6 +623,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
 
 p.MsoToc2, li.MsoToc2, div.MsoToc2 {
   mso-style-noshow: yes;
+  mso-style-name: "TOC 2";
   mso-style-priority: 39;
   mso-style-unhide: no;
   mso-style-parent: "TOC 1";
@@ -639,6 +648,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
 
 p.MsoToc3, li.MsoToc3, div.MsoToc3 {
   mso-style-noshow: yes;
+  mso-style-name: "TOC 3";
   mso-style-priority: 39;
   mso-style-unhide: no;
   mso-style-parent: "TOC 2";
@@ -662,6 +672,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
   mso-bidi-font-weight: normal; }
 
 span.MsoFootnoteReference {
+  mso-style-name: "Footnote Reference";
   mso-style-priority: 99;
   vertical-align: super; }
 

data/lib/isodoc/cc/html/wordstyle.scss

@@ -138,6 +138,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	{mso-style-noshow:yes;
+        mso-style-name:"Comment Text";
 	mso-style-unhide:no;
 	margin:0cm;
 	margin-bottom:.0001pt;
@@ -341,6 +342,7 @@ div.figure, p.figure
 	
 h1
 	{mso-style-priority:1;
+        mso-style-name:"Heading 1";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-link:"Heading 1 Char";
@@ -424,6 +426,7 @@ h1.Annex
         mso-bidi-font-weight:normal;}
 h2
 	{mso-style-priority:2;
+        mso-style-name:"Heading 2";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"Heading 1";
@@ -451,6 +454,7 @@ h2
 	mso-bidi-font-weight:normal;}
 h3
 	{mso-style-priority:3;
+        mso-style-name:"Heading 3";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"Heading 1";
@@ -477,6 +481,7 @@ h3
 	mso-bidi-font-weight:normal;}
 h4
 	{mso-style-priority:4;
+        mso-style-name:"Heading 4";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"Heading 3";
@@ -503,6 +508,7 @@ h4
 	mso-bidi-font-weight:normal;}
 h5
 	{mso-style-priority:5;
+        mso-style-name:"Heading 5";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"Heading 4";
@@ -529,6 +535,7 @@ h5
 	mso-bidi-font-weight:normal;}
 h6
 	{mso-style-priority:6;
+        mso-style-name:"Heading 6";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"Heading 5";
@@ -555,6 +562,7 @@ h6
 	mso-bidi-font-weight:normal;}
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
+        mso-style-name:"TOC 1";
 	mso-style-unhide:no;
 	mso-style-next:Normal;
 	margin-top:6.0pt;
@@ -576,6 +584,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
 	mso-bidi-font-weight:normal;}
 p.MsoToc2, li.MsoToc2, div.MsoToc2
 	{mso-style-noshow:yes;
+        mso-style-name:"TOC 2";
 	mso-style-priority:39;
 	mso-style-unhide:no;
 	mso-style-parent:"TOC 1";
@@ -599,6 +608,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	mso-bidi-font-weight:normal;}
 p.MsoToc3, li.MsoToc3, div.MsoToc3
 	{mso-style-noshow:yes;
+        mso-style-name:"TOC 3";
 	mso-style-priority:39;
 	mso-style-unhide:no;
 	mso-style-parent:"TOC 2";
@@ -620,8 +630,9 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
-span.MsoFootnoteReference
-	{mso-style-priority:99;
+span.MsoFootnoteReference {
+        mso-style-name:"Footnote Reference";
+        mso-style-priority:99;
 	vertical-align:super;}
 p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	{mso-style-noshow:yes;

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "1.7.12".freeze
+    VERSION = "1.8.2".freeze
   end
 end

data/metanorma-cc.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 1.10.2"
+  spec.add_dependency "metanorma-generic", "~> 1.11.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   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: 1.7.12
+  version: 1.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: metanorma-cc lets you write CalConnect standards in AsciiDoc.