metanorma-iso 1.3.12 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e6a622fc30a0c5f9fade1a3254a3c3974d15903012285831f7ee91a5bb6c11
-  data.tar.gz: e67f2fefc81ca9f31242310f12c42e9ff1c92d77aafb1c5d3c22e11dc203e49b
+  metadata.gz: d8d658a670c0afe45a4654242f2a38c9d422caee47b9ae7a769d1e6242d60574
+  data.tar.gz: 8bd58c910ff26cb03ec777c317c3b4471f3c891273b84af2d33a5e12efcb4b76
 SHA512:
-  metadata.gz: a98c201ef6c47d5033f33e277702c01eac7ad955ec99b64ee8f5bb5702c1b34aabef89fb7370c20e13401182d0b79fac2b8ea541725370b7befa643769617be6
-  data.tar.gz: 4cbc80fb22e0102aba955881bb6f9093a4f9ae610817afb86292feadbfd15de6d73ecbfba5ffc64abeaaebef877a447ed6275fad2488bb6394a5faf902a06e91
+  metadata.gz: d4c2d8d81ecaa9a99066c05b4b3a9b3c936f6d618fe55f382a31d5299f15f7acf50abe0b417b0dc9d28e6b10aef5d6a0edfe900d54de132fed1cc3ac6c988cbe
+  data.tar.gz: fa1ed4243a0be7e319d07e27671ab54ec58be122a71353798a2fbcc902e87a2e0627fd09c81a981f58938ada293b51cb12c9be8d86ff0d5725b579b3c88e0363

data/.github/workflows/macos.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: macos
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +21,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          sudo gem install bundler -v "~> 2" --force
+          sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1

data/.github/workflows/ubuntu.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: ubuntu
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +21,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler 
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1

data/.github/workflows/windows.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: windows
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -21,7 +22,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler 
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/lib/asciidoctor/iso/biblio.rng

@@ -638,9 +638,9 @@
     <zeroOrMore>
       <ref name="license"/>
     </zeroOrMore>
-    <optional>
+    <zeroOrMore>
       <ref name="bclassification"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bkeyword"/>
     </zeroOrMore>

data/lib/asciidoctor/iso/reqt.rng

@@ -39,6 +39,12 @@
     <optional>
       <attribute name="filename"/>
     </optional>
+    <optional>
+      <attribute name="model"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>

data/lib/asciidoctor/iso/validate.rb

@@ -67,7 +67,7 @@ module Asciidoctor
       def locality_erefs_validate(root)
         root.xpath("//eref[locality]").each do |t|
           if /^(ISO|IEC)/.match t["citeas"]
-            unless /:[ ]?(\d+{4}|--)$/.match t["citeas"]
+            unless /:[ ]?(\d+{4}|–)$/.match t["citeas"]
               warn "ISO: undated reference #{t['citeas']} should not contain "\
                 "specific elements"
             end
@@ -157,7 +157,7 @@ module Asciidoctor
       end
 
       def bibitem_validate(xmldoc)
-        xmldoc.xpath("//bibitem[date/on = '--']").each do |b|
+        xmldoc.xpath("//bibitem[date/on = '–']").each do |b|
           found = false
           b.xpath("./note").each do |n|
             found = true if /^ISO DATE:/.match n.text

data/lib/isodoc/iso/html/isodoc.scss

@@ -85,7 +85,7 @@ p.FigureTitle
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
-p.AdmonitionTitle
+p.AdmonitionTitle, p.RecommendationTitle
         {mso-style-unhide:no;
         mso-style-qformat:yes;
         mso-style-parent:"";

data/lib/isodoc/iso/html/style-human.scss

@@ -639,7 +639,7 @@ margin: 2em 0 1em 0;
 overflow: auto;
 }
 
-.figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle {
+.figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
 font-weight: 700;
 font-size: 1em;
 text-align: center;

data/lib/isodoc/iso/html/style-iso.scss

@@ -633,7 +633,7 @@ margin: 2em 0 1em 0;
 overflow: auto;
 }
 
-.figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle {
+.figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
 font-weight: 700;
 font-size: 1em;
 text-align: center;

data/lib/isodoc/iso/html/wordstyle.scss

@@ -502,14 +502,16 @@ a:link, span.MsoHyperlink
 	mso-style-unhide:no;
 	mso-style-parent:"";
 	mso-ansi-language:EN;
-	color:black;
-	text-decoration:none;}
+	color:blue;
+        text-decoration:underline;
+        text-underline:single;}
 a:visited, span.MsoHyperlinkFollowed
 	{mso-style-noshow:yes;
 	mso-style-priority:99;
 	mso-themecolor:followedhyperlink;
-    text-decoration:none;
-    color:black;}
+        text-decoration:underline;
+        text-underline:single;
+        color:purple;}
 span.MsoPlaceholderText
 	{mso-style-noshow:yes;
 	mso-style-priority:99;

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.12".freeze
+    VERSION = "1.3.13".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isodoc", "~> 1.0.0"
   spec.add_dependency "metanorma-standoc", "~> 1.3.0"
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -631,9 +631,9 @@ RSpec.describe Asciidoctor::ISO do
         <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123:–</docidentifier>
+         <docidentifier>ISO 123:—</docidentifier>
          <date type="published">
-           <on>--</on>
+           <on>–</on>
          </date>
          <contributor>
            <role type="publisher"/>

data/spec/asciidoctor-iso/refs_spec.rb

@@ -20,9 +20,9 @@ RSpec.describe Asciidoctor::ISO do
          <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123:–</docidentifier>
+         <docidentifier>ISO 123:—</docidentifier>
          <date type="published">
-           <on>--</on>
+           <on>–</on>
          </date>
          <contributor>
            <role type="publisher"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement