metanorma-cc 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f0001744462f6a12891ef4f0b288ff8b2a9a04b4c74c843e24cc4508fc0a45
-  data.tar.gz: 831870abd5cce8c14e1a4ed2d14561e188b1ec59311795bb7849b9badbc01e0f
+  metadata.gz: e6773b2389fcbb144d384002256bd7ba303aab7baa25f20ac37b0d40af9ae451
+  data.tar.gz: ad6d676e3086792134308b0e0abeb32f4a21b65141a923ddb8fe4303d8d822b8
 SHA512:
-  metadata.gz: 928dfb9b3cb2ce5b99ffc4c31cce6456695542470acc26ef51ffddcde4ae493f362f5c5a6c2eacf97e5226cf393f3dcf781b866f3ec885397d40ef5223de6fda
-  data.tar.gz: 3c2ad0815ec8ee15565256f32b8f55b22c8ecbc95d4df5a16d1874afab0c822f2621620ac00468cc6a47fbe7a15d29bab47ad5efba9097f8424bfd469e53484b
+  metadata.gz: 3f0bc68cc852e0ed53dc3a97009a8d4ebd73d0deadc1950bb34c77e2587d11c4840e1f56308c597ed821d2cae87c8b8a681c94902fc811c6dd62662c7f69e58b
+  data.tar.gz: 8fc55cd529d92cdaf66d93f37979b618df59d3a1e2883480661660795d4f1676756dfee017efc2977c39693cfdd6ff7d44bf0a48748b038bcce7b0a7bf8a9606

data/lib/asciidoctor/cc/isodoc.rng

@@ -2063,7 +2063,12 @@
   <define name="verbaldefinition">
     <element name="verbaldefinition">
       <oneOrMore>
-        <ref name="paragraph"/>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="dl"/>
+          <ref name="ol"/>
+          <ref name="ul"/>
+        </choice>
       </oneOrMore>
       <zeroOrMore>
         <ref name="termsource"/>
@@ -2163,6 +2168,12 @@
           <value>modified</value>
         </choice>
       </attribute>
+      <attribute name="type">
+        <choice>
+          <value>authoritative</value>
+          <value>lineage</value>
+        </choice>
+      </attribute>
       <ref name="origin"/>
       <optional>
         <ref name="modification"/>

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/>
@@ -2799,6 +2799,7 @@
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
+					<xsl:copy-of select="@id"/>
 					
 					
 					<xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3636,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">
@@ -4617,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']]">
@@ -4733,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>
@@ -4823,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>
@@ -4921,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'">

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "1.8.0".freeze
+    VERSION = "1.8.1".freeze
   end
 end

metadata

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