metanorma-csa 2.4.12 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16f333348982316e9e48357f5160eeeb6165df8d6a45c1cbe473e09545f831b8
-  data.tar.gz: 5e84c06e9cf1d6725b18b961575549fb6f8a0cbe6fc13d31876cfd70b1d7065e
+  metadata.gz: d7c765f707e3838f49083d78a1c49a1821fdbcfe7e25a9f21306b0b6adbb4511
+  data.tar.gz: ffe390ab5accb247bd72220bc8b43898bdd5247dfffa1f3dbdebda9a716022c7
 SHA512:
-  metadata.gz: 704c0a9144835e2b2afeeec424a4cc9edac06dfefb3590bfdf2533051ee48a024064812209ad48869dd2995d0ba0bee134e9febecb90aee36ff7d6530d5e1977
-  data.tar.gz: d960839132b96fe45bba8e84c96897e0e10a07f6be954adf49719de64e947a71d5e1c3f4b6ec9183b00bddc2539d8151aecc4532b6bdb27b866bd40787987f8f
+  metadata.gz: 94f56e6d4e2471ea54ac1742cd8472e11e8378ce60b40e771e87c74ee55ec4ce99c435dd55a542e97b9d472704590fb9b52ffc973f4d5c7e62ffde55023cd651
+  data.tar.gz: 4836233b4f7243987e27045f8c7e965a005f85cd5ca7f0f280fe9a419d0254c6eddb1eb6234c4a9442e1d64fc7502e609336da56f1a3aae0f100a49f4ea4ae09

data/lib/isodoc/csa/base_convert.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "isodoc"
 
 module IsoDoc

data/lib/isodoc/csa/csa.standard.xsl

@@ -2460,13 +2460,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"/>
@@ -11249,10 +11271,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>
@@ -12127,7 +12151,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/csa/html/htmlstyle.css

@@ -229,6 +229,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/csa/pdf_convert.rb

@@ -1,22 +1,17 @@
-# frozen_string_literal: true
-
-require 'isodoc'
+require_relative "base_convert"
+require "isodoc"
+require "metanorma-generic"
 
 module IsoDoc
   module Csa
-    # A {Converter} implementation that generates CSA 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)
-        "csa.standard.xsl"
-      end
+      include BaseConvert
+      include Init
     end
   end
 end
-

data/lib/metanorma/csa/processor.rb

@@ -20,15 +20,6 @@ module Metanorma
         )
       end
 
-      def fonts_manifest
-        {
-          #"AzoSans" => nil,
-          "Lato" => nil,
-          "STIX Two Math" => nil,
-          "Source Code Pro" => nil,
-        }
-      end
-
       def version
         "Metanorma::Csa #{Metanorma::Csa::VERSION}"
       end

data/lib/metanorma/csa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csa
-    VERSION = "2.4.12".freeze
+    VERSION = "2.5.0".freeze
   end
 end

data/lib/metanorma-csa.rb

@@ -1,12 +1,12 @@
-require 'asciidoctor' unless defined? Asciidoctor::Converter
-require_relative 'metanorma/csa/converter'
-require_relative 'isodoc/csa/html_convert'
-require_relative 'isodoc/csa/pdf_convert'
-require_relative 'isodoc/csa/word_convert'
-require_relative 'metanorma/csa/version'
+require "asciidoctor" unless defined? Asciidoctor::Converter
+require_relative "metanorma/csa/converter"
+require_relative "isodoc/csa/html_convert"
+require_relative "isodoc/csa/pdf_convert"
+require_relative "isodoc/csa/word_convert"
+require_relative "metanorma/csa/version"
 require "metanorma"
 
 if defined? Metanorma::Registry
-  require_relative 'metanorma/csa'
+  require_relative "metanorma/csa"
   Metanorma::Registry.instance.register(Metanorma::Csa::Processor)
 end

data/metanorma-csa.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

@@ -26,6 +26,7 @@ header: lib/isodoc/csa/html/header.html
 wordcoverpage: lib/isodoc/csa/html/word_csa_titlepage.html
 wordintropage: lib/isodoc/csa/html/word_csa_intro.html
 wordstylesheet: lib/isodoc/csa/html/wordstyle.scss
+pdf_stylesheet: lib/isodoc/csa/csa.standard.xsl
 boilerplate: lib/metanorma/csa/boilerplate.adoc
 webfont:
   - "https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700"
@@ -58,4 +59,7 @@ stage_abbreviations:
   published:
   withdrawn:
 logo_path: ""
-
+fonts_manifest:
+  Lato:
+  STIX Two Math:
+  Source Code Pro:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csa
 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