metanorma-m3d 1.3.17 → 1.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d2777cd44148b1013ee17e76fc99c96d1e4e1012f0080f33157abe8bf2f61d
-  data.tar.gz: 840704b427a3f2f09daaaddcd53a2d9552e717518b864377c9dccff7165de91a
+  metadata.gz: 7207ea105a70b39bd791ed45cbf56ba879223951c9e337d7ed17270c27f49940
+  data.tar.gz: 5f023a5278edb3b90be8c66821e2ed716039a14d17503163149446f9c17cbfff
 SHA512:
-  metadata.gz: b20336265f238b8b4d8aa2d80be6a61aca961693331b86ddad4579c3064664865a9984adac451701cda5b16b10c8b2315129a02f0274bf1e30a4196ebadf9b27
-  data.tar.gz: '091eedc6284f633bfd626bea725d43a8df9b4a99c1f7d770f4fa25c6a006cb310265def6e2602b735cb7d8a1930a6e2ad3074d7914359245180f37dfa2b634b5'
+  metadata.gz: 75bccb7b7358c7a7c64cb4393c0114d7647bbda5413e2ae8b8a7adffde7452eabd8674066353ffac482a090c44c07e5156b973c217ddc41d19090355e46a2f0b
+  data.tar.gz: 4ee99a978347d4a6da82c13673f08ee805f4d1ac081e3421cb588b44b25273ad0c45e7b02fe696a0b45187e625a54db16376cdccc6488400b7397248003f30c9

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: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -26,18 +26,11 @@ jobs:
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - 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 }}
@@ -46,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

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

data/README.adoc

@@ -45,7 +45,7 @@ The preferred way to invoke this gem is via the `metanorma` script:
 ----
 $ metanorma --type m3d a.adoc                   # output HTML and DOC
 $ metanorma --type m3d --extensions html a.adoc # output just HTML
-$ metanorma --type m3d --extensions pdf a.adoc  # output just DOC
+$ metanorma --type m3d --extensions doc a.adoc  # output just DOC
 $ metanorma --type m3d --extensions xml a.adoc  # output M3D XML
 ----
 
@@ -55,7 +55,7 @@ reported to console against the XML, and are intended for users to
 check that they have provided all necessary components of the
 document.
 
-The gem then converts the XML into HTML and PDF.
+The gem then converts the XML into HTML and DOC.
 
 The gem can also be invoked directly within asciidoctor, though this is deprecated:
 

data/lib/asciidoctor/m3d/biblio.rng

@@ -767,6 +767,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -1019,38 +1021,63 @@
   </define>
   <define name="DocRelationType">
     <choice>
-      <value>obsoletes</value>
-      <value>obsoletedBy</value>
-      <value>supersedes</value>
-      <value>supersededBy</value>
-      <value>updates</value>
-      <value>updatedBy</value>
-      <value>complements</value>
-      <value>derivedFrom</value>
-      <value>translatedFrom</value>
-      <value>hasTranslation</value>
-      <value>adoptedFrom</value>
-      <value>equivalent</value>
-      <value>identical</value>
-      <value>nonequivalent</value>
-      <value>includedIn</value>
       <value>includes</value>
-      <value>instance</value>
-      <value>instanceOf</value>
-      <value>partOf</value>
+      <value>includedIn</value>
       <value>hasPart</value>
-      <value>hasDraft</value>
-      <value>draftOf</value>
+      <value>partOf</value>
       <value>merges</value>
+      <value>mergedInto</value>
       <value>splits</value>
-      <value>amends</value>
-      <value>amendedBy</value>
-      <value>corrects</value>
-      <value>correctedBy</value>
-      <value>revises</value>
-      <value>revisedBy</value>
+      <value>splitInto</value>
+      <value>instance</value>
+      <value>hasInstance</value>
+      <value>exemplarOf</value>
+      <value>hasExemplar</value>
+      <value>manifestationOf</value>
+      <value>hasManifestation</value>
+      <value>reproductionOf</value>
+      <value>hasReproduction</value>
+      <value>reprintOf</value>
+      <value>hasReprint</value>
+      <value>expressionOf</value>
+      <value>hasExpression</value>
+      <value>translatedFrom</value>
+      <value>hasTranslation</value>
+      <value>arrangementOf</value>
+      <value>hasArrangement</value>
+      <value>abridgementOf</value>
+      <value>hasAbridgement</value>
+      <value>annotationOf</value>
+      <value>hasAnnotation</value>
+      <value>draftOf</value>
+      <value>hasDraft</value>
+      <value>editionOf</value>
+      <value>hasEdition</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>derivedFrom</value>
+      <value>derives</value>
       <value>describes</value>
       <value>describedBy</value>
+      <value>catalogues</value>
+      <value>cataloguedBy</value>
+      <value>hasSuccessor</value>
+      <value>successorOf</value>
+      <value>adaptedFrom</value>
+      <value>hasAdaptation</value>
+      <value>adoptedFrom</value>
+      <value>adoptedAs</value>
+      <value>reviewOf</value>
+      <value>hasReview</value>
+      <value>commentaryOf</value>
+      <value>hasCommentary</value>
+      <value>related</value>
+      <value>complements</value>
+      <value>complementOf</value>
+      <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>cited</value>
+      <value>isCitedIn</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/m3d/converter.rb

@@ -2,7 +2,6 @@ require "asciidoctor"
 require "metanorma/m3d/version"
 require "isodoc/m3d/html_convert"
 require "isodoc/m3d/word_convert"
-require "isodoc/m3d/pdf_convert"
 require "asciidoctor/standoc/converter"
 require "fileutils"
 require_relative "./validate.rb"
@@ -105,7 +104,6 @@ module Asciidoctor
             gsub(%r{^.*/}, "")
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
-          pdf_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
         end
         @log.write(@localdir + @filename + ".err") unless @novalid
@@ -137,10 +135,6 @@ module Asciidoctor
       def word_converter(node)
         IsoDoc::M3d::WordConvert.new(doc_extract_attributes(node))
       end
-
-      def pdf_converter(node)
-        IsoDoc::M3d::PdfConvert.new(html_extract_attributes(node))
-      end
     end
   end
 end

data/lib/asciidoctor/m3d/isodoc.rng

@@ -303,8 +303,23 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="TextElement" combine="choice">
+      <ref name="concept"/>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -911,7 +926,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -919,6 +937,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>

data/lib/isodoc/m3d/html/scripts.html

@@ -1,24 +1,8 @@
   <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'main', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': true, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
+    $("#toc").on('click', 'li', function(e) {
+    $(this).parent().find('li.toc-active').removeClass('toc-active');
+    $(this).addClass('toc-active');
+});
   </script>
 
 <script>

data/lib/metanorma/m3d/processor.rb

@@ -13,8 +13,7 @@ module Metanorma
       def output_formats
         super.merge(
           html: "html",
-          doc: "doc",
-          pdf: "pdf"
+          doc: "doc"
         )
       end
 
@@ -30,8 +29,6 @@ module Metanorma
         case format
         when :html
           IsoDoc::M3d::HtmlConvert.new(options).convert(outname, isodoc_node)
-        when :pdf
-          IsoDoc::M3d::PdfConvert.new(options).convert(outname, isodoc_node)
         when :doc
           IsoDoc::M3d::WordConvert.new(options).convert(outname, isodoc_node)
         else

data/lib/metanorma/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.3.17"
+    VERSION = "1.3.18"
   end
 end

data/lib/metanorma-m3d.rb

@@ -1,7 +1,6 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/m3d/converter"
 require_relative "isodoc/m3d/html_convert"
-require_relative "isodoc/m3d/pdf_convert"
 require_relative "isodoc/m3d/word_convert"
 require_relative "metanorma/m3d/version"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.3.17
+  version: 1.3.18
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -314,7 +314,6 @@ files:
 - lib/isodoc/m3d/html/wordstyle.scss
 - lib/isodoc/m3d/html_convert.rb
 - lib/isodoc/m3d/metadata.rb
-- lib/isodoc/m3d/pdf_convert.rb
 - lib/isodoc/m3d/word_convert.rb
 - lib/metanorma-m3d.rb
 - lib/metanorma/m3d.rb

data/lib/isodoc/m3d/pdf_convert.rb

@@ -1,72 +0,0 @@
-require "isodoc"
-require_relative "base_convert"
-
-module IsoDoc
-  module M3d
-    # A {Converter} implementation that generates CSAND output, and a document
-    # schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      end
-
-      #def convert1(docxml, filename, dir)
-        #add_image(%w(logo.jpg m3-logo.png))
-        #super
-      #end
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
-        }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_m3d_titlepage.html"),
-          htmlintropage: html_doc_path("html_m3d_intro.html"),
-          standardstylesheet: nil,
-          scripts_pdf: html_doc_path("scripts.pdf.html"),
-        }
-      end
-
-      def colophon(body, docxml)
-        body.div **{ class: "colophon" } do |div|
-          div << <<~"COLOPHON"
-          <p>As with all M3AAWG documents that we publish, please check the M3AAWG website
-          (<a href="http://www.m3aawg.org">www.m3aawg.org</a>) for updates to this paper.</p>
-          <p>&copy; {{ docyear }} copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
-          COLOPHON
-        end
-      end
-
-      def googlefonts()
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-        HEAD
-      end
-
-      def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
-        xml.body **body_attr do |body|
-          make_body1(body, docxml)
-          make_body2(body, docxml)
-          make_body3(body, docxml)
-          colophon(body, docxml)
-        end
-      end
-
-      def html_toc(docxml)
-        docxml
-      end
-
-      include BaseRender
-    end
-  end
-end
-