metanorma-cc 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74278944515a96765355e89d30bfa38d646f59103f31f99246ee3a41ef94881
-  data.tar.gz: 72d2d58b0a0a96269a64e64b1a98852c63d7e4d11073939a39133e2bcbf89fc3
+  metadata.gz: 32bfaf3f86ecb540428f86505f79864dd157364fbeb6fccf10c181cbeb58b2be
+  data.tar.gz: adfd87a733968a6a3f6433819f1e525673fe269195cc3796053b29f7d6e30ee8
 SHA512:
-  metadata.gz: 7e4b30978683747f20cd9c4461e9d2b0a262f10fb4c6b0d8a4b7e8fcc97bf58c09681b8a362b4c9f97c0147c570fd3d56a6e98f661be0188c539f0b6df0e72d3
-  data.tar.gz: fe54f010d18b64cd5ea8a5189df24b9b7c92140442e2cd543e2a18f22fd69f982b2ae7db8b2290ae1284d063537eb70f8de2414ac6fcb32f56464aafb4e5e054
+  metadata.gz: '098d32219289258a4427b7f0f0b86c66086b49a0346465dd05081216a8bf788a93781a03af337029759fe579e266b2c51ed7c54ea90a3840f158e8d93470079a'
+  data.tar.gz: a1a92edfde8b3a32a187f3516c3092ff3527e459360aee45e9a4c82542bd16889434dea7c1015877f5de5565f9d8762f226895d43fe58af72896da12121f5bc4

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

@@ -586,6 +586,8 @@
 	<xsl:param name="svg_images"/> <!-- svg images array -->
 	<xsl:variable name="images" select="document($svg_images)"/>
 	<xsl:param name="basepath"/> <!-- base path for images -->
+	<xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
+	<xsl:param name="inputxml_filename"/> <!-- input xml file name -->
 	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
 	<xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
@@ -638,6 +640,20 @@
 		<xsl:call-template name="getLang"/>
 	</xsl:variable>
 
+	<xsl:variable name="inputxml_filename_prefix">
+		<xsl:choose>
+			<xsl:when test="contains($inputxml_filename, '.presentation.xml')">
+				<xsl:value-of select="substring-before($inputxml_filename, '.presentation.xml')"/>
+			</xsl:when>
+			<xsl:when test="contains($inputxml_filename, '.xml')">
+				<xsl:value-of select="substring-before($inputxml_filename, '.xml')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$inputxml_filename"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
 	<!-- Note 1: Each xslt has declated variable `namespace` that allows to set some properties, processing logic, etc. for concrete xslt.
 	You can put such conditions by using xslt construction `xsl:if test="..."` or <xsl:choose><xsl:when test=""></xsl:when><xsl:otherwiste></xsl:otherwiste></xsl:choose>,
 	BUT DON'T put any another conditions together with $namespace = '...' (such conditions will be ignored). For another conditions, please use nested xsl:if or xsl:choose -->
@@ -1094,6 +1110,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termexample-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-style">
 
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -1531,6 +1551,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-block-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-style">
 
 	</xsl:attribute-set>
@@ -2169,6 +2193,36 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template name="processMainSectionsDefault_flatxml">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -2396,7 +2450,7 @@
 			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
 
 			<xsl:variable name="colwidths">
-				<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
+				<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col']) and not(@class = 'dl')">
 					<xsl:call-template name="calculate-column-widths">
 						<xsl:with-param name="cols-count" select="$cols-count"/>
 						<xsl:with-param name="table" select="$simple-table"/>
@@ -2508,6 +2562,11 @@
 										<fo:table-column column-width="{@width}"/>
 									</xsl:for-each>
 								</xsl:when>
+								<xsl:when test="@class = 'dl'">
+									<xsl:for-each select=".//*[local-name()='tr'][1]/*">
+										<fo:table-column column-width="{@width}"/>
+									</xsl:for-each>
+								</xsl:when>
 								<xsl:otherwise>
 									<xsl:call-template name="insertTableColumnWidth">
 										<xsl:with-param name="colwidths" select="$colwidths"/>
@@ -3783,6 +3842,7 @@
 	<!-- ===================== -->
 	<!-- Definition List -->
 	<!-- ===================== -->
+
 	<xsl:template match="*[local-name()='dl']">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -3995,10 +4055,21 @@
 										</xsl:variable>
 
 										<xsl:variable name="colwidths">
-											<xsl:call-template name="calculate-column-widths">
-												<xsl:with-param name="cols-count" select="2"/>
-												<xsl:with-param name="table" select="$simple-table"/>
-											</xsl:call-template>
+											<xsl:choose>
+												<!-- dl from table[@class='dl'] -->
+												<xsl:when test="*[local-name() = 'colgroup']">
+													<autolayout/>
+													<xsl:for-each select="*[local-name() = 'colgroup']/*[local-name() = 'col']">
+														<column><xsl:value-of select="translate(@width,'%m','')"/></column>
+													</xsl:for-each>
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:call-template name="calculate-column-widths">
+														<xsl:with-param name="cols-count" select="2"/>
+														<xsl:with-param name="table" select="$simple-table"/>
+													</xsl:call-template>
+												</xsl:otherwise>
+											</xsl:choose>
 										</xsl:variable>
 
 										<!-- <xsl:text disable-output-escaping="yes">&lt;!- -</xsl:text>
@@ -4244,13 +4315,13 @@
 		<tr>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
 				</xsl:attribute>
 				<xsl:apply-templates/>
 			</td>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
 				</xsl:attribute>
 
 						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -4862,6 +4933,10 @@
 		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END Rich text formatting -->
 	<!-- ========================= -->
@@ -5492,7 +5567,7 @@
 				</xsl:choose>
 			</xsl:variable>
 			<xsl:attribute name="id">
-				<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
+				<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
 			</xsl:attribute>
 
 			<xsl:for-each select="*[local-name() = 'p']">
@@ -5500,7 +5575,7 @@
 					<xsl:copy-of select="@*"/>
 					<xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
 					<xsl:attribute name="id">
-						<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
+						<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
 					</xsl:attribute>
 
 					<!-- <xsl:copy-of select="node()" /> -->
@@ -5564,7 +5639,7 @@
 					<xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
 					<xsl:copy>
 						<xsl:attribute name="id">
-							<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
+							<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
 						</xsl:attribute>
 						<xsl:copy-of select="node()"/>
 					</xsl:copy>
@@ -6091,6 +6166,12 @@
 				<xsl:when test="@updatetype = 'true'">
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
+				<xsl:when test="contains(@target, concat('_', $inputxml_filename_prefix, '_attachments'))">
+					<!-- link to the PDF attachment -->
+					<xsl:variable name="target_" select="translate(@target, '\', '/')"/>
+					<xsl:variable name="target__" select="substring-after($target_, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
+					<xsl:value-of select="concat('url(embedded-file:', $target__, ')')"/>
+				</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="normalize-space(@target)"/>
 				</xsl:otherwise>
@@ -6496,6 +6577,7 @@
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="figure-block-style">
+			<xsl:call-template name="refine_figure-block-style"/>
 
 			<xsl:call-template name="setTrackChangesStyles">
 				<xsl:with-param name="isAdded" select="$isAdded"/>
@@ -8366,7 +8448,7 @@
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'termexample']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
-
+			<xsl:call-template name="refine_termexample-style"/>
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:apply-templates select="*[local-name()='name']"/>
@@ -10864,10 +10946,10 @@
 
 	<xsl:template name="addPDFUAmeta">
 		<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
-				<pdf:dictionary type="normal" key="ViewerPreferences">
-					<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
-				</pdf:dictionary>
-			</pdf:catalog>
+			<pdf:dictionary type="normal" key="ViewerPreferences">
+				<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
+			</pdf:dictionary>
+		</pdf:catalog>
 		<x:xmpmeta xmlns:x="adobe:ns:meta/">
 			<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 				<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
@@ -10919,6 +11001,19 @@
 				</rdf:Description>
 			</rdf:RDF>
 		</x:xmpmeta>
+		<!-- add attachments -->
+		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
+			<xsl:choose>
+				<xsl:when test="normalize-space() != ''">
+					<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{.}" filename="{@name}"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<!-- _{filename}_attachments -->
+					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/>
+					<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
 	</xsl:template> <!-- addPDFUAmeta -->
 
 	<xsl:template name="getId">

data/lib/isodoc/cc/metadata.rb

@@ -14,7 +14,7 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+        main = isoxml.at(ns("//bibdata/title[@language='en']"))&.children&.to_xml
         set(:doctitle, main)
       end
 

data/lib/metanorma/cc/biblio.rng

@@ -338,29 +338,32 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <oneOrMore>
-        <ref name="orgname"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="subdivision"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="abbreviation"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="org-identifier"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="contact"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="logo"/>
-      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
+  <define name="OrganizationType">
+    <oneOrMore>
+      <ref name="orgname"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subdivision"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="abbreviation"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="uri"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="org-identifier"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contact"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="logo"/>
+    </optional>
+  </define>
   <define name="orgname">
     <element name="name">
       <choice>
@@ -371,10 +374,10 @@
   </define>
   <define name="subdivision">
     <element name="subdivision">
-      <choice>
-        <ref name="LocalizedString"/>
-        <ref name="NameWithVariants"/>
-      </choice>
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
   <define name="logo">

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.4.1".freeze
+    VERSION = "2.4.3".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(">= 2.7.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.6.0"
+  spec.add_dependency "metanorma-generic", "~> 2.6.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.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-03-04 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.6.0
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement