metanorma-ribose 1.6.10 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25b2357a2bb9c00be5cf07d097618593f934e024e00624bba8dfeb620745d082
-  data.tar.gz: a15ef2944d344cd69ffd7c3d866649798925de0aa1c3b57041b1eed684e4307f
+  metadata.gz: '09692ec54e7186049ced9245aa545eec4014cef2ed4870c3b2316ddb5baa9c26'
+  data.tar.gz: 9bae1a6920887f47f736c29af7eb769a941a1874a70624e125951a23824481b3
 SHA512:
-  metadata.gz: fe83e2e765f0ec8eaaad9496fa3da2451fb6a58773e025fb63a1fc7ac94c3d6de412bc94bde715d2a2da5705cd03b702f2bccf0329faf90d6fe923ab9f6b497f
-  data.tar.gz: 0e4ee8adea90d49fb8d43d719567d98cdedf21048e0d8357a37fa2cfdabe5bc15c38344a98fe9ea5d0cdf9b30d167547700ebdb9536fe952d3b061f8831a134b
+  metadata.gz: 751876bd18696125f64ddff27d8965c752653d69cde5816278cc9f1939521eedf7b5d456a99b7beb25bc6b5846bcdbe72a99298a70196aec0a2a50fb816e17cf
+  data.tar.gz: 1693d7cb5bd93863b3b685cbc25ee3209a0e60d545d78b3041eb3ad5f438e2fad7e314f879f89d12fb8637a2c326b60ebef7facf076eacf30140f9e0dc9e2989

data/.github/workflows/rake.yml

@@ -36,6 +36,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
+      - if: matrix.os == 'macos-latest'
+        run: brew install autoconf automake libtool
+
       - uses: actions/cache@v2
         with:
           path: vendor/bundle
@@ -63,4 +66,21 @@ jobs:
       - if: matrix.os == 'windows-latest'
         run: cinst -y plantuml
 
+      - if: matrix.os == 'macos-latest'
+        run: brew install autoconf automake libtool
+
       - run: bundle exec rake
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Trigger tests passed event
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          context: 'tests-passed-successfully'
+          description: 'Tests passed successfully'
+          state: 'success'
+          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/lib/asciidoctor/ribose/isodoc.rng

@@ -253,6 +253,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="width"/>
+        </optional>
         <optional>
           <ref name="colgroup"/>
         </optional>
@@ -836,6 +839,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -891,9 +897,11 @@
       <element name="code">
         <text/>
       </element>
-      <element name="text">
-        <text/>
-      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
     </element>
   </define>
   <define name="standard-document">
@@ -1063,6 +1071,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1116,6 +1127,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1218,6 +1232,9 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1546,6 +1563,7 @@
           <value>add</value>
           <value>modify</value>
           <value>delete</value>
+          <value>replace</value>
         </choice>
       </attribute>
       <optional>
@@ -1576,6 +1594,11 @@
       </optional>
       <optional>
         <element name="newcontent">
+          <optional>
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
           <zeroOrMore>
             <ref name="BasicBlock"/>
           </zeroOrMore>

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

@@ -1528,7 +1528,12 @@
 			
 			<xsl:variable name="table_attributes">
 				<attribute name="table-layout">fixed</attribute>
-				<attribute name="width">100%</attribute>
+				<attribute name="width">
+					<xsl:choose>
+						<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
+						<xsl:otherwise>100%</xsl:otherwise>
+					</xsl:choose>
+				</attribute>
 				<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
 				<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
 				
@@ -2678,6 +2683,10 @@
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='underline']">
+		<fo:inline text-decoration="underline">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
 		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
 			<xsl:apply-templates/>
@@ -4246,6 +4255,8 @@
 		<xsl:value-of select="translate(.,'. ','')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
 		<xsl:value-of select="substring(.,1,1)"/>
+	</xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -4523,6 +4534,11 @@
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
 		
-		<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+		<xsl:choose>
+			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
+				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+		</xsl:choose>
 		
 	</xsl:template></xsl:stylesheet>

data/lib/isodoc/ribose/xref.rb

@@ -2,6 +2,9 @@ require "metanorma-generic"
 
 module IsoDoc
   module Ribose
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Generic::Xref
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
@@ -21,9 +24,11 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: num, level: level, xref: num }
         # subclauses are not prefixed with "Clause"
+        i = Counter.new
         clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
-          each_with_index do |c, i|
-          section_names1(c, "#{num}.#{i + 1}", level + 1)
+          each do |c|
+          i.increment(c)
+          section_names1(c, "#{num}.#{i.print}", level + 1)
         end
       end
     end

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "1.6.10"
+    VERSION = "1.6.11"
   end
 end

data/metanorma-ribose.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency 'metanorma-generic', '~> 1.8.1'
+  spec.add_dependency 'metanorma-generic', '~> 1.8.2'
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-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: 1.8.1
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement