metanorma-cc 2.4.12 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: facd0c9522de467534082219cf82fc6c1bcc871defebf31aaf01b6349d144097
-  data.tar.gz: c15ab9ee72453f2ae9ee1143f94c45d878a3758c581d268eabcc382d59eeb180
+  metadata.gz: 666df502f026573721a3c2207bf91d92f4b1da3e2a1e5efe6414f428bbda79bc
+  data.tar.gz: e64eb03f34664c9d0a843b926b3c215b69e0e61fa6cd0d58c34f93db5092caa8
 SHA512:
-  metadata.gz: 1fcc4a4554181abcabc75f6b4a1e7ef55507f199fc2ff7dc95bbcb04296300b9ddc931d2c84c493f923dd1e9772ede691a68ee829b679e3f947ae036897b945c
-  data.tar.gz: cfebbfd36efc24ca4ef056368bb96c08b5fe5beec55e4e8393891130a2585dd355b6d3455b229eff8a816ccb6fae65cf4fe11aea4edc10475df9d4d2aa403fe0
+  metadata.gz: 1f9cc2d751b5a75d0031e0d4d8c52c7854f679c802dc0d091ec6f377e38030a36825eff425742adf1bb368d1915a61e434c162e22ae374a548c39e39f19f714e
+  data.tar.gz: 89039c710247e68dcd23cd7c49153734e5d3acc8f96ee2d87e3e939dcc187c37e5c0e32333b0018f273f2cf7b5e5a96344e134d3b7bfc63a0c46dc4e29b37c3c

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

@@ -2445,13 +2445,35 @@
 			</xsl:for-each>
 		</xsl:element>
 
-		<xsl:call-template name="insertAnnexInSeparatePageSequences"/>
+		<xsl:call-template name="insertAnnexAndBibliographyInSeparatePageSequences"/>
 
-		<xsl:call-template name="insertBibliographyInSeparatePageSequences"/>
+		<!-- <xsl:call-template name="insertBibliographyInSeparatePageSequences"/> -->
 
 		<!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
 	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
 
+	<xsl:template name="insertAnnexAndBibliographyInSeparatePageSequences">
+		<xsl:for-each select="/*/*[local-name()='annex'] |           /*/*[local-name()='bibliography']/*[not(@normative='true')] |           /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]] |          /*/*[local-name()='indexsect']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'annex' or local-name() = 'indexsect'">
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:attribute name="main_page_sequence"/>
+						<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+					</xsl:element>
+				</xsl:when>
+				<xsl:otherwise> <!-- bibliography -->
+					<xsl:element name="bibliography" namespace="{$namespace_full}"> <!-- save context element -->
+						<xsl:element name="page_sequence" namespace="{$namespace_full}">
+							<xsl:attribute name="main_page_sequence"/>
+							<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+						</xsl:element>
+					</xsl:element>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="insertAnnexInSeparatePageSequences">
 		<xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -11265,10 +11287,12 @@
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
-			<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
-			<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
-			<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
-				<xsl:value-of select="."/>
+			<xsl:if test="1 = 2"> <!-- remove attachment/text(), because attachments added in the template 'addPDFUAmeta' before applying 'update_xml_step1' -->
+				<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
+				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
+				<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
+					<xsl:value-of select="normalize-space(.)"/>
+				</xsl:if>
 			</xsl:if>
 		</xsl:copy>
 	</xsl:template>
@@ -12143,7 +12167,8 @@
 		<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:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
+					<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$src_attachment}" filename="{@name}"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- _{filename}_attachments -->

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

@@ -222,6 +222,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 

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

@@ -222,6 +222,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 
@@ -547,6 +587,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 

data/lib/isodoc/cc/pdf_convert.rb

@@ -4,17 +4,14 @@ require "isodoc"
 
 module IsoDoc
   module CC
-    # A {Converter} implementation that generates CSD output, and a document
-    # schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::XslfoPdfConvert
+    class PdfConvert < IsoDoc::Generic::PdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
       end
 
-      def pdf_stylesheet(docxml)
-        "cc.standard.xsl"
-      end
+      include BaseConvert
+      include Init
     end
   end
 end

data/lib/metanorma/cc/converter.rb

@@ -10,9 +10,6 @@ require_relative "validate_section"
 module Metanorma
   module CC
     class Converter < Metanorma::Generic::Converter
-      XML_ROOT_TAG = "csd-standard".freeze
-      XML_NAMESPACE = "https://www.metanorma.org/ns/csd".freeze
-
       register_for "cc"
 
       def configuration

data/lib/metanorma/cc/processor.rb

@@ -3,6 +3,9 @@ require "metanorma/processor"
 module Metanorma
   module CC
     class Processor < Metanorma::Generic::Processor
+      def configuration
+        Metanorma::CC.configuration
+      end
 
       def initialize
         @short = [:csd, :cc]
@@ -18,16 +21,6 @@ module Metanorma
         )
       end
 
-      def fonts_manifest
-        {
-          "Source Sans Pro" => nil,
-          "Source Serif Pro" => nil,
-          "Source Code Pro" => nil,
-          "Source Han Sans" => nil,
-          "STIX Two Math" => nil,
-        }
-      end
-
       def version
         "Metanorma::CC #{Metanorma::CC::VERSION}"
       end

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.4.12".freeze
+    VERSION = "2.5.0".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(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.6.2"
+  spec.add_dependency "metanorma-generic", "~> 2.7.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/metanorma.yml

@@ -21,6 +21,7 @@ word_smallerfontsize: "10.0pt"
 word_monospacefontsize: "10.0pt"
 word_footnotefontsize: "10.0pt"
 standardstylesheet: lib/isodoc/cc/html/cc.scss
+pdf_stylesheet: lib/isodoc/cc/cc.standard.xsl
 header: lib/isodoc/cc/html/header.html
 wordcoverpage: lib/isodoc/cc/html/word_cc_titlepage.html
 wordintropage: lib/isodoc/cc/html/word_cc_intro.html
@@ -55,4 +56,10 @@ stage_abbreviations:
   cancelled:
   withdrawn:
 logo_path: ""
+fonts_manifest:
+  Source Sans Pro:
+  Source Serif Pro:
+  Source Code Pro:
+  Source Han Sans:
+  STIX Two Math:
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.4.12
+  version: 2.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-19 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.2
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement