metanorma-un 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 633ea5daa3f540bef45566dd48c57acf9b736477bb2b4264faea2c30cab0c3b3
-  data.tar.gz: d1b1f2e6fc90eeb24bf51be943dc0cfcd1afa7730d0d37539b24d70bf297078e
+  metadata.gz: 4bb7f5e0507e6121b00bb9c0a77de939bef65ffd3d0430abefb46a9755989f1e
+  data.tar.gz: 1fbf3cc1f9e13c7b349f6dc5964f005247f17a6df0cf016e6af1d35c29929df2
 SHA512:
-  metadata.gz: dd675bedc775517e9483799880bf57c31c967788938d62bbe32eb7a975837c973b1849e6f867841763b9e3f2027ad039fbb51981d729487087b3e654894c7a39
-  data.tar.gz: dac9c0da31d353fdc028dd018d6273e4506ebacd5223e212baa0b72c814f0a243cd7644099afbf2fba0ad9ed3ff3410026ff34c70c2e04c7a412ad51f25a567d
+  metadata.gz: 466ee743e3a9cfac771aa8f25419b9032e12f0de5a7141da4ed5f138b769ec1840f6fb0110c8dc5b80b3acbcc9ad489b4f00a4d363b4d4742e5b71f691511b43
+  data.tar.gz: 5a1175c0a0049a6e3c24bd3044297bd11506f9ebe3fb60b06e8a76e36449081cde0ea33219a30ec5a1a6373b4080e99db3b2492e137e63f4716ec244561626e7

data/lib/isodoc/un/presentation_xml_convert.rb

@@ -46,6 +46,8 @@ module IsoDoc
         super
       end
 
+      def move_norm_ref_to_sections(docxml); end
+
       include Init
     end
   end

data/lib/isodoc/un/un.plenary-attachment.xsl

@@ -1046,11 +1046,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -3549,21 +3564,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -6688,8 +6703,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -6722,7 +6741,7 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:if test="@width != '' and @width != 'auto'">
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
 											<xsl:value-of select="@width"/>
 										</xsl:attribute>

data/lib/isodoc/un/un.plenary.xsl

@@ -1046,11 +1046,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -3549,21 +3564,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -6688,8 +6703,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -6722,7 +6741,7 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:if test="@width != '' and @width != 'auto'">
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
 											<xsl:value-of select="@width"/>
 										</xsl:attribute>

data/lib/isodoc/un/un.recommendation.xsl

@@ -1152,11 +1152,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -3676,21 +3691,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -6815,8 +6830,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -6849,7 +6868,7 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:if test="@width != '' and @width != 'auto'">
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
 											<xsl:value-of select="@width"/>
 										</xsl:attribute>

data/lib/isodoc/un/xref.rb

@@ -3,59 +3,36 @@ require "roman-numerals"
 module IsoDoc
   module UN
     class Xref < IsoDoc::Xref
-      def initial_anchor_names(doc)
-        if @parse_settings.empty? || @parse_settings[:clauses]
-          preface_names(doc.at(ns("//preface/abstract")))
-          preface_names(doc.at(ns("//foreword")))
-          preface_names(doc.at(ns("//introduction")))
-          doc.xpath(ns("//preface/clause")).each do |c|
-            preface_names(c)
-          end
-          preface_names(doc.at(ns("//acknowledgements")))
-          clause_names(doc, 0)
-        end
-        if @parse_settings.empty?
-          sequential_asset_names(
-            doc.xpath(ns("//preface/abstract | //foreword | //introduction | "\
-                         "//preface/clause | //acknowledgements")),
-          )
-          middle_section_asset_names(doc)
-          termnote_anchor_names(doc)
-          termexample_anchor_names(doc)
-        end
+      def clause_order_main(_docxml)
+        [{ path: "//sections/clause | //sections/terms | //sections/definitions", multi: true }]
       end
 
       def asset_anchor_names(doc)
         super
         @parse_settings.empty? or return
         sequential_asset_names(
-          doc.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+          doc.xpath(ns("//preface/abstract | //foreword | //introduction | " \
                        "//preface/clause | //acknowledgements")),
         )
       end
 
-      def clause_names(docxml, _sect_num)
-        q = "//clause[parent::sections]"
+      def main_anchor_names(xml)
         @paranumber = 0
-        i = 0
-        docxml.xpath(ns(q)).each do |c|
-          section_names(c, i, 1)
-          i += 1
-        end
+        super
       end
 
       def levelnumber(num, lvl)
         case lvl % 3
-        when 1 then RomanNumerals.to_roman(num)
-        when 2 then ("A".ord + num - 1).chr
+        when 1 then RomanNumerals.to_roman(num.to_i)
+        when 2 then ("A".ord + num.to_i - 1).chr
         when 0 then num.to_s
         end
       end
 
       def annex_levelnum(num, lvl)
         case lvl % 3
-        when 0 then RomanNumerals.to_roman(num)
-        when 1 then ("A".ord + num - 1).chr
+        when 0 then RomanNumerals.to_roman(num.to_i)
+        when 1 then ("A".ord + num.to_i - 1).chr
         when 2 then num.to_s
         end
       end
@@ -70,6 +47,7 @@ module IsoDoc
       end
 
       def label_leaf_section(clause, lvl)
+        @paranumber.nil? and @paranumber = 0
         @paranumber += 1
         @anchors[clause["id"]] =
           { label: @paranumber.to_s, elem: @labels["paragraph"],
@@ -86,11 +64,9 @@ module IsoDoc
       end
 
       def section_names(clause, num, lvl)
-        return num if clause.nil?
-
+        clause.nil? and return num
         leaf_section?(clause) and label_leaf_section(clause, lvl) and return
-        num = num + 1
-        lbl = levelnumber(num, 1)
+        lbl = levelnumber(num.increment(clause).print, 1)
         @anchors[clause["id"]] = { label: lbl, level: lvl, type: "clause",
                                    elem: @labels["clause"],
                                    xref: l10n("#{@labels['clause']} #{lbl}") }
@@ -116,6 +92,16 @@ module IsoDoc
         end
       end
 
+      def annex_anchor_names(xml)
+        i = ::IsoDoc::XrefGen::Counter.new
+        clause_order_annex(xml).each do |a|
+          xml.xpath(ns(a[:path])).each do |c|
+            annex_names(c, i.increment(c).print)
+            a[:multi] or break
+          end
+        end
+      end
+
       def annex_name_lbl(_clause, num)
         l10n("<strong>#{@labels['annex']} #{num}</strong>")
       end
@@ -130,7 +116,9 @@ module IsoDoc
           xref: "#{@labels['annex']} #{num}" }
       end
 
-      def annex_names(clause, num)
+      def annex_names(clause, number)
+        @paranumber = 0
+        num = annex_levelnum(number, 0)
         hierarchical_asset_names(clause, num)
         leaf_section?(clause) and
           label_annex_leaf_section(clause, num, 1) and return
@@ -141,8 +129,7 @@ module IsoDoc
         else
           i = 1
           clause.xpath(ns(SUBCLAUSES)).each do |c|
-            next if c["unnumbered"] == "true"
-
+            c["unnumbered"] == "true" and next
             annex_names1(c, "#{num}.#{annex_levelnum(i, 2)}", 2)
             i += 1 if !leaf_section?(c)
           end
@@ -157,32 +144,24 @@ module IsoDoc
                                    level: level, type: "clause", elem: @labels["annex"] }
         i = 1
         clause.xpath(ns("./clause | ./references")).each do |c|
-          next if c["unnumbered"] == "true"
-
+          c["unnumbered"] == "true" and next
           annex_names1(c, "#{num}.#{annex_levelnum(i, level + 1)}", level + 1)
           i += 1 if !leaf_section?(c)
         end
       end
 
-      def back_anchor_names(docxml)
-        docxml.xpath(ns("//annex")).each_with_index do |c, i|
-          @paranumber = 0
-          annex_names(c, RomanNumerals.to_roman(i + 1))
-        end
-        docxml.xpath(ns("//bibliography/clause |"\
-                        "//bibliography/references")).each do |b|
-          preface_names(b)
-        end
-        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-          reference_names(ref)
-        end
+      def clause_order_back(_docxml)
+        [
+          { path: "//bibliography/references | //bibliography/clause",
+            multi: true },
+          { path: "//indexsect", multi: true },
+          { path: "//colophon/*", multi: true },
+        ]
       end
 
       def sequential_admonition_names(clause)
         i = 0
-        clause.xpath(ns(".//admonition")).each do |t|
-          next if t["id"].nil? || t["id"].empty?
-
+        clause.xpath(ns(".//admonition")).noblank.each do |t|
           i += 1 unless t["unnumbered"] == "true"
           @anchors[t["id"]] = anchor_struct(i.to_s, nil, @labels["admonition"],
                                             "box", t["unnumbered"])
@@ -191,9 +170,7 @@ module IsoDoc
 
       def hierarchical_admonition_names(clause, num)
         i = 0
-        clause.xpath(ns(".//admonition")).each do |t|
-          next if t["id"].nil? || t["id"].empty?
-
+        clause.xpath(ns(".//admonition")).noblank.each do |t|
           i += 1 unless t["unnumbered"] == "true"
           @anchors[t["id"]] =
             anchor_struct("#{num}.#{i}", nil, @labels["admonition"], "box",

data/lib/metanorma/un/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.3 -->
+<!-- VERSION v1.2.4 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -2068,6 +2068,9 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <choice>
         <ref name="verbaldefinition"/>
         <ref name="nonverbalrep"/>

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.11.0".freeze
+    VERSION = "0.11.1".freeze
   end
 end

data/metanorma-un.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roman-numerals"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_dependency "metanorma-standoc", "~> 2.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.4"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement