metanorma-vsd 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5e57d1184b15477090a588ce289158ab50dbae90a8c3afa3f2073976d36fff6
-  data.tar.gz: a5426b390e7fc6a4c586113a9b2bdfe7945d101fecf5b07da8ed12d077deb0ed
+  metadata.gz: 7d41164d393fbc155694a3c01b73faada902d82bc448a1a61d579ff90164b6db
+  data.tar.gz: 280be8bdaf2bd304e0e50e862bf2b85f8d20623bf1f93ab87520e05c665749aa
 SHA512:
-  metadata.gz: '087d9d81130dcab02d8b4703335f596a7cfb06baa3023c909d260cfe062a907d8b8f7d211c9033617f692c6cf067bbd6ff9d6d73c4b58fc8f776d56d06e55e32'
-  data.tar.gz: ec3f721df20bf2c337b1151318d4575bdfdc4b0e1a3b5496aef0a2fc2b3dc8f5a3dc5c2476153b18d3e44fedfbf98e571fe266bbc4617b36007b2b5881294c31
+  metadata.gz: ca8c593fa84b60d56ac13a0782d4cafff01003868e085a54da086cf2b69e87fe29fea3a3a181f2e1b57b5f9b359f06524d234a4a69e6a4b00f0887c118190c68
+  data.tar.gz: fddf2201b9ec925627bc34677232c173a39d3ab35d6ec8d7637808f774f08f98d4189e4bcf7aeb8900007250f2457139e4424e3613e6403b3b8c696bac70465c

data/.github/workflows/macos.yml

@@ -26,13 +26,6 @@ jobs:
         run: |
           sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -26,20 +26,11 @@ jobs:
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-      - name: Install Puppeteer
-        run: |
-          sudo apt-get update
-          sudo apt-get install libgbm1
-          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake
       - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
         env:
           GH_USERNAME: ${{ secrets.PAT_USERNAME }}
           GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
@@ -48,5 +39,5 @@ jobs:
           [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
           for repo in $DEPENDENT_REPOS
           do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
           done

data/.github/workflows/windows.yml

@@ -28,13 +28,6 @@ jobs:
           gem install bundler
           bundle config --local path vendor/bundle
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/lib/asciidoctor/vsd/isodoc.rng

@@ -129,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +306,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/vsd/processor.rb

@@ -2,18 +2,16 @@ require "metanorma/processor"
 
 module Metanorma
   module Vsd
-    class Processor < Metanorma::Processor
-      def initialize
-        @short = :vsd
-        @input_format = :asciidoc
-        @asciidoctor_backend = :vsd
+    class Processor < Metanorma::Generic::Processor
+      def configuration
+        Metanorma::Vsd.configuration
       end
 
       def output_formats
         super.merge(
           html: "html",
           doc: "doc"
-        )
+        ).tap { |hs| hs.delete(:pdf) }
       end
 
       def version

data/lib/metanorma/vsd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Vsd
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

data/metanorma.yml

@@ -1,3 +1,4 @@
+metanorma_name: vsd
 organization_name_short: Vita Green
 organization_name_long: Vita Green
 document_namespace: https://www.metanorma.org/ns/vsd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-vsd
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities