metanorma-plateau 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8e1f42a81f5dd4e4bd6d068002e4499e15c467d1961331ff42555588b1c776
-  data.tar.gz: e760543b322da439d2115e7600482c4b942896d428be685cbed845444a7c61c0
+  metadata.gz: 838839bc86469a328f7252f84d236687d5584c0d59633746756a445a40e063fb
+  data.tar.gz: 816088c99147f784b587d3c8b4c32c357aaa049340dc27e7fe0d09235dc810c0
 SHA512:
-  metadata.gz: 574d4e9c2e8c9160a7ef8244d04faff7f8c2ea9d6280fc4ca3fdadc326ad859954361c7f21fdaf87e365fef58c4496d089b39650a78c1cb488a4288d672dace7
-  data.tar.gz: b15a8dca0976d5a6360b15da39d33934eeca5dedcba5b36e19c224cd4b885b65eb96358fb346a39c40e46f3d0a0370fe03365da1e629b49675f6c55292312a08
+  metadata.gz: 599842b641f909db3fbbb804de614a340f5cf1b3699ba64d0c36a1b99b857cce80686e5a7babb87ce0fd453618d1037fe7fd707c93c4151b8291cc7e95b20782
+  data.tar.gz: 266668f37b4ab39f4dc7f7b72659f7c7a5dd31184c9bac10a210f378619af9c0d0bd6424e09a85b6c582700c107571835fb34cfd7203b375dee4aeb803fc093a

data/lib/isodoc/plateau/plateau.international-standard.xsl

@@ -3521,13 +3521,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"/>
@@ -12335,10 +12357,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>
@@ -13320,7 +13344,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 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 src="{$src_attachment}" filename="{@name}"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- _{filename}_attachments -->

data/lib/isodoc/plateau/presentation_xml_convert.rb

@@ -3,6 +3,11 @@ require_relative "init"
 module IsoDoc
   module Plateau
     class PresentationXMLConvert < IsoDoc::JIS::PresentationXMLConvert
+      def initialize(options)
+        @iso = ::IsoDoc::Iso::PresentationXMLConvert.new(options)
+        super
+      end
+
       def toc_title_insert_pt(docxml)
         i = preface_init_insert_pt(docxml) or return nil
         a = i.at(ns("./abstract[last()] | ./clause[@type = 'revhistory']")) and
@@ -70,6 +75,14 @@ module IsoDoc
         elem.previous = ret
       end
 
+      def ol_depth(node)
+        @iso.ol_depth(node)
+      end
+
+      def bibliography_bibitem_number(docxml)
+        super
+      end
+
       include Init
     end
   end

data/lib/isodoc/plateau/xref.rb

@@ -4,6 +4,11 @@ module IsoDoc
     end
 
     class Xref < IsoDoc::JIS::Xref
+      def initialize(lang, script, klass, i18n, options)
+        @iso = ::IsoDoc::Iso::Xref.new(lang, script, klass, i18n, options)
+        super
+      end
+
       def clause_order_main(_docxml)
         [
           {
@@ -39,42 +44,6 @@ module IsoDoc
         end
       end
 
-      def section_name_anchors(clause, num, level)
-        super
-        if level >= 4 && level <= 6
-          label, xref = section_name_anchors_deep(num, level)
-          @anchors[clause["id"]][:label] = label
-          @anchors[clause["id"]][:xref] = l10n(xref)
-        end
-      end
-
-      def section_name_anchors_deep(num, level)
-        numparts = num.split(".")
-        core = numparts[0..2].join(".")
-        (4..level).each do |l|
-          core += " #{section_name_label_deep(numparts[l - 1], l)}"
-        end
-        [section_name_label_deep(numparts[-1], level), l10n(core)]
-      end
-
-      def section_name_label_deep(num, level)
-        case level
-        when 4 then l10n("(#{num})")
-        when 5 then l10n("#{num})")
-        when 6
-          ("" << (num.to_i + 0x245f))
-        end
-      end
-
-      def annex_name_anchors1(clause, num, level)
-        super
-        if level >= 4 && level <= 6
-          label, xref = section_name_anchors_deep(num, level)
-          @anchors[clause["id"]][:label] = label
-          @anchors[clause["id"]][:xref] = l10n(xref)
-        end
-      end
-
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         j = 0
@@ -102,6 +71,14 @@ module IsoDoc
         end
       end
 
+      def list_item_anchor_names(list, list_anchor, depth, prev_label,
+refer_list)
+        @iso.list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
+      end
+
+      def list_item_value(entry, counter, depth, opts)
+        @iso.list_item_value(entry, counter, depth, opts)
+      end
     end
   end
 end

data/lib/metanorma/plateau/cleanup.rb

@@ -28,13 +28,20 @@ module Metanorma
         super
       end
 
-      def pub_class(bib)
-        return 1 if bib.at("#{PUBLISHER}[name = '#{pub_hash['en']}']") ||
-          bib.at("#{PUBLISHER}[name = '#{pub_hash['ja']}']") ||
-          bib.at("#{PUBLISHER}[abbreviation = 'MLIT']")
-        return 2 if bib["type"] == "standard"
+      # Abandoned in favour of JIS ordering
+      #       def pub_class(bib)
+      #         return 1 if bib.at("#{PUBLISHER}[name = '#{pub_hash['en']}']") ||
+      #           bib.at("#{PUBLISHER}[name = '#{pub_hash['ja']}']") ||
+      #           bib.at("#{PUBLISHER}[abbreviation = 'MLIT']")
+      #         return 2 if bib["type"] == "standard"
+      #
+      #         3
+      #       end
 
-        3
+      def biblio_reorder(xmldoc)
+        xmldoc.xpath("//references").each do |r|
+          biblio_reorder1(r)
+        end
       end
     end
   end

data/lib/metanorma/plateau/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "0.1.2".freeze
+    VERSION = "0.1.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 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-jis