metanorma-mpfd 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a024a386fce8074472a3bb908e74727c52d6207db2d3bd4d5c3993cdefd3af3
-  data.tar.gz: a15a85b4a09d731832a1aa569661572550fe64e23bf5d1e2aa5d9b921f748a65
+  metadata.gz: ca2562bc6c3b269e4bb9f055c588b7be139ca9cb6c974d066ef5b4d9ee50b3f5
+  data.tar.gz: d698a6d0691d5f8abf6865a946985248d5838047d4b6d6c4cd846d83460d6d64
 SHA512:
-  metadata.gz: dd77b4ba31e05d09a09ecdf58cbf320c8e3eb0cd51f321f699abf5307b2576f104ca2ef9602a086e6d48e1db5e3360de615347f84342636ff26629e61bb8ed28
-  data.tar.gz: 170f69b584bfc32a2ef55c44b9d921ba06af79ca3b5d5f251046c3a6962fc254f537841d6eeb585f2996401557b6c573fe5ac9e48caef8af740b1dc17cc4d013
+  metadata.gz: 2ef482901e312f0ecf7839ef8e6d3f365fe49fc2347d11d134f626fb800ef9ce495d4ee2a9473e957cf16be265143c432a8b6ed17c94d673b2ac3168bd3d5c6b
+  data.tar.gz: b98ae184d3304ff2c6124d67d3ca7f140d18b3501c8f9dc093e62011b6f729434583e860a666cb44cda7dca62674f90662f011b98ac6a89395833d0f68b1aa1a

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/mpfd/converter.rb

@@ -90,7 +90,6 @@ module Asciidoctor
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
-          pdf_converter(node).convert filename unless node.attr("nodoc")
         end
         @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
@@ -111,10 +110,6 @@ module Asciidoctor
         IsoDoc::Mpfd::HtmlConvert.new(html_extract_attributes(node))
       end
 
-      def pdf_converter(node)
-        IsoDoc::Mpfd::PdfConvert.new(html_extract_attributes(node))
-      end
-
       def word_converter(node)
         IsoDoc::Mpfd::WordConvert.new(doc_extract_attributes(node))
       end

data/lib/asciidoctor/mpfd/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/isodoc/mpfd/base_convert.rb

@@ -162,11 +162,15 @@ module IsoDoc
       def annex_names(clause, num)
         @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
                                    xref: "#{@annex_lbl} #{num}", level: 1 }
+        if a = single_annex_special_section(clause)
+        annex_names1(a, "#{num}", 1)
+        else
         i = 0
         clause.xpath(ns("./clause | ./references")).each do |c|
           container_names(c, 0)
           i = annex_naming(c, num, 1, i)
         end
+        end
         hierarchical_asset_names(clause, num)
       end
 

data/lib/metanorma-mpfd.rb

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

data/lib/metanorma/mpfd/processor.rb

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

data/lib/metanorma/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Mpfd
-    VERSION = "0.3.18"
+    VERSION = "0.3.19"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfd
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 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
@@ -245,7 +245,6 @@ files:
 - lib/isodoc/mpfd/i18n-en.yaml
 - lib/isodoc/mpfd/i18n-zh-Hans.yaml
 - lib/isodoc/mpfd/metadata.rb
-- lib/isodoc/mpfd/pdf_convert.rb
 - lib/isodoc/mpfd/word_convert.rb
 - lib/metanorma-mpfd.rb
 - lib/metanorma/mpfd.rb

data/lib/isodoc/mpfd/pdf_convert.rb

@@ -1,65 +0,0 @@
-require_relative "base_convert"
-require "isodoc"
-
-module IsoDoc
-  module Mpfd
-    # A {Converter} implementation that generates PDF HTML output, and a
-    # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      end
-
-      include BaseConvert
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Titillium Web",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Titillium Web",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
-        }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_rsd_titlepage.html"),
-          htmlintropage: html_doc_path("html_rsd_intro.html"),
-          scripts_pdf: html_doc_path("scripts.pdf.html"),
-        }
-      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">
-    <link href="https://fonts.googleapis.com/css?family=Titillium+Web:400,400i,700,700i" 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)
-        end
-      end
-
-      def html_toc(docxml)
-        docxml
-      end
-
-      def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
-          preface docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
-        end
-      end
-    end
-  end
-end
-