metanorma-ribose 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ea5eea884d1f312eb1d61021968e5f52c9dfa73e2abce1bb18c08851484436
-  data.tar.gz: c9b45439c5ab9fd0afe4cf7ad68585a7a6f05630841055f349c4a3e87d75a26d
+  metadata.gz: c88ab9038d3a80cbf8c20d212e778bcb511f47645e2c9231c62edc96c37d0ca2
+  data.tar.gz: 5b79a8ea5d3fdf73e54305653348d20aa3d014b4e9bf332e889921148cff232f
 SHA512:
-  metadata.gz: 79d78a621f1a379df14692eaa491726c4ed4750d794fcb379c711b198c40599dab55a26e32e8cb545013211ab96fd796bc790fb2346dfddb42ff2a99519e3bac
-  data.tar.gz: 54b348ae16bff0db1922456350040d073689be99619c4927bc364dd36918ec4a0e27b12f7215e4ac7abcbd885a0ee45f357bbb45df16cdec41248fcabad2a175
+  metadata.gz: 2b2b6cb53f348c088f7be8746350c9b2b4b88f928b105173361cb8a071efeef7375514185fbe5a6a0c4860c4cad1e1160194280d4780254838e3cbc271f83c71
+  data.tar.gz: 010c5a028a6b98a53f69162129728dae29c33211d246ca5adbb125921f129f7f739fb6aaf4e199e54fe8337cb3ca83394a06d07859656b3f95a716921a1aa8ba

data/lib/isodoc/ribose/ribose.standard.xsl

@@ -1526,11 +1526,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>
@@ -4128,21 +4143,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 -->
 
@@ -7272,8 +7287,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>
@@ -7306,7 +7325,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/ribose/xref.rb

@@ -14,9 +14,6 @@ module IsoDoc
       end
 
       def initial_anchor_names(doc)
-        if blank?(@parse_settings) || @parse_settings[:clauses]
-          preface_names(doc.at(ns("//executivesummary")))
-        end
         super
         if blank?(@parse_settings) || @parse_settings[:clauses]
           introduction_names(doc.at(ns("//introduction")))
@@ -24,7 +21,7 @@ module IsoDoc
         if blank?(@parse_settings)
           sequential_asset_names(
             doc.xpath(
-              ns("//preface/abstract | //foreword | //introduction | "\
+              ns("//preface/abstract | //foreword | //introduction | " \
                  "//preface/clause | //acknowledgements | //executivesummary"),
             ),
           )
@@ -36,7 +33,7 @@ module IsoDoc
           { label: num, level: level, xref: num }
         # subclauses are not prefixed with "Clause"
         i = Counter.new
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | " \
                         "./references")).each do |c|
           i.increment(c)
           section_names1(c, "#{num}.#{i.print}", level + 1)
@@ -45,15 +42,13 @@ module IsoDoc
 
       # we can reference 0-number clauses in introduction
       def introduction_names(clause)
-        return if clause.nil?
-
+        clause.nil? and return
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
         i = Counter.new
         clause.xpath(ns("./clause")).each do |c|
-          i.increment(c)
-          section_names1(c, "0.#{i.print}", 2)
+          section_names1(c, "0.#{i.increment(c).print}", 2)
         end
       end
     end

data/lib/metanorma/ribose/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/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.3.0".freeze
+    VERSION = "2.3.2".freeze
   end
 end

data/metanorma-ribose.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.5.0"
+  spec.add_dependency "metanorma-generic", "~> 2.5.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-ribose
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-09-11 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.5.0
+        version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement