metanorma-m3aawg 1.5.4 → 1.6.2

data/lib/isodoc/m3aawg/metadata.rb

@@ -2,9 +2,11 @@ require "isodoc"
 
 module IsoDoc
   module M3AAWG
-    # A {Converter} implementation that generates CSAND output, and a document
-    # schema encapsulation of the document for validation
-    class Metadata < IsoDoc::Metadata
+    class Metadata < IsoDoc::Generic::Metadata
+       def configuration
+        Metanorma::M3AAWG.configuration
+      end
+
       def initialize(lang, script, labels)
         super
         here = File.dirname(__FILE__)
@@ -34,20 +36,6 @@ module IsoDoc
         docnumber = isoxml.at(ns("//bibdata/docidentifier"))
         set(:docnumber, docnumber&.text)
       end
-
-      def stage_abbr(status)
-        case status
-        when "working-draft" then "wd"
-        when "committee-draft" then "cd"
-        when "draft-standard" then "d"
-        else
-          ""
-        end
-      end
-
-      def unpublished(status)
-        !%w(published withdrawn).include? status.downcase
-      end
     end
   end
 end

data/lib/isodoc/m3aawg/presentation_xml_convert.rb

@@ -1,16 +1,21 @@
 require_relative "init"
+require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc
   module M3AAWG
-    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      def configuration
+        Metanorma::M3AAWG.configuration
+      end
+
       def annex1(f)
-      lbl = @xrefs.anchor(f['id'], :label)
-      if t = f.at(ns("./title"))
-        t.children = "<strong>#{t.children.to_xml}</strong>"
+        lbl = @xrefs.anchor(f['id'], :label)
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(f, "<br/>", lbl, "title")
       end
-      prefix_name(f, "<br/>", lbl, "title")
-    end
 
       include Init
     end

data/lib/isodoc/m3aawg/word_convert.rb

@@ -1,39 +1,13 @@
 require "isodoc"
 require_relative "base_convert"
+require "isodoc/generic/word_convert"
 require_relative "init"
 
 module IsoDoc
   module M3AAWG
-    # A {Converter} implementation that generates GB output, and a document
-    # schema encapsulation of the document for validation
-
-    class WordConvert < IsoDoc::WordConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      end
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Garamond",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Garamond",serif'),
-          monospacefont: '"Courier New",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"),
-          scripts: html_doc_path("scripts.html"),
-          wordstylesheet: html_doc_path("wordstyle.scss"),
-          standardstylesheet: html_doc_path("m3d.scss"),
-          header: html_doc_path("header.html"),
-          wordintropage: html_doc_path("word_m3d_intro.html"),
-          ulstyle: "l3",
-          olstyle: "l2",
-        }
+    class WordConvert < IsoDoc::Generic::WordConvert
+      def configuration
+        Metanorma::M3AAWG.configuration
       end
 
       def colophon(body, docxml)
@@ -51,11 +25,6 @@ module IsoDoc
         end
       end
 
-      def title(isoxml, _out)
-        main = isoxml&.at(ns("//title[@language='en']"))&.text
-        set_metadata(:doctitle, main)
-      end
-
       include BaseRender
       include Init
     end

data/lib/isodoc/m3aawg/xref.rb

@@ -1,6 +1,11 @@
+require "metanorma-generic"
+
 module IsoDoc
   module M3AAWG
     class Xref < IsoDoc::Xref
+      def configuration
+        Metanorma::M3AAWG.configuration
+      end
     end
   end
 end

data/lib/metanorma/m3aawg.rb

@@ -1,7 +1,33 @@
-require_relative "./m3aawg/processor"
+require "metanorma"
+require "metanorma-generic"
+require "metanorma/m3aawg/processor"
 
 module Metanorma
-  module M3AWWG
+  module M3AAWG
 
+    class Configuration < Metanorma::Generic::Configuration
+      def initialize(*args)
+        super
+      end
+    end
+
+    class << self
+      extend Forwardable
+
+      attr_accessor :configuration
+
+      Configuration::CONFIG_ATTRS.each do |attr_name|
+        def_delegator :@configuration, attr_name
+      end
+
+      def configure
+        self.configuration ||= Configuration.new
+        yield(configuration)
+      end
+    end
+
+    configure {}
   end
 end
+Metanorma::Registry.instance.register(Metanorma::M3AAWG::Processor)
+

data/lib/metanorma/m3aawg/fonts_manifest.yaml

@@ -0,0 +1,5 @@
+---
+Overpass:
+Space Mono:
+Garamond:
+Courier New:

data/lib/metanorma/m3aawg/processor.rb

@@ -2,15 +2,10 @@ require "metanorma/processor"
 
 module Metanorma
   module M3AAWG
-    def self.fonts_used
-      {
-        html: ["Overpass", "Space Mono"],
-        doc: ["Garamond", "Courier New"],
-        pdf: ["Garamond", "Courier New"]
-      }
-    end
-
-    class Processor < Metanorma::Processor
+    class Processor < Metanorma::Generic::Processor
+       def configuration
+        Metanorma::Ribose.configuration
+      end
 
       def initialize
         @short = [:m3d, :m3aawg]

data/lib/metanorma/m3aawg/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3AAWG
-    VERSION = "1.5.4"
+    VERSION = "1.6.2"
   end
 end

data/metanorma-m3d.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "thread_safe"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-generic", "~> 1.8.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "~> 2.4.0"

data/metanorma.yml

@@ -0,0 +1,51 @@
+metanorma_name: m3aawg
+organization_name_short: M3AAWG
+organization_name_long: Messaging Malware and Mobile Anti-Abuse Working Group
+document_namespace: https://www.metanorma.org/ns/m3d
+xml_root_tag: m3d-standard
+html_bodyfont: '"Overpass",sans-serif'
+html_headerfont: '"Overpass",sans-serif'
+html_monospacefont: '"Space Mono",monospace'
+html_normalfontsize: "15px"
+html_footnotefontsize: "0.9em"
+i18nyaml: lib/isodoc/m3aawg/i18n-en.yaml
+validate_rng_file: lib/asciidoctor/m3aawg/m3d.rng
+htmlcoverpage: lib/isodoc/m3aawg/html/html_m3d_titlepage.html
+htmlintropage: lib/isodoc/m3aawg/html/html_m3d_intro.html
+htmlstylesheet: lib/isodoc/m3aawg/html/htmlstyle.scss
+scripts: lib/isodoc/m3aawg/html/scripts.html
+word_bodyfont: '"Garamond",serif'
+word_headerfont: '"Garamond",serif'
+word_monospacefont: '"Courier New",monospace'
+word_normalfontsize: "11.0pt"
+word_monospacefontsize: "9.0pt"
+word_smallerfontsize: "10.0pt"
+word_footnotefontsize: "10.0pt"
+standardstylesheet: lib/isodoc/m3aawg/html/m3d.scss
+header: lib/isodoc/m3aawg/html/header.html
+wordcoverpage: ""
+wordintropage: lib/isodoc/m3aawg/html/word_m3d_intro.html
+wordstylesheet: lib/isodoc/m3aawg/html/wordstyle.scss
+webfont:
+  - "https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900"
+  - "https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700"
+docid_template: "{{ docnumeric }}{% if stageabbr %}({{ stageabbr }}){%endif%}{% if docyear %}:{{docyear}}{%endif%}"
+doctypes:
+  - policy
+  - best-practices
+  - supporting-document
+  - report
+default_doctype: report
+published_stages:
+  - published
+  - withdrawn
+default_stage: published
+stage_abbreviations:
+  proposal:
+  working-draft: wd
+  committee-draft: cd
+  draft-standard: d
+  final-draft:
+  published:
+  withdrawn:
+logo_path: ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3aawg
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -39,33 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: metanorma-standoc
+  name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -218,9 +204,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -240,7 +224,6 @@ files:
 - lib/asciidoctor/m3aawg/isodoc.rng
 - lib/asciidoctor/m3aawg/m3d.rng
 - lib/asciidoctor/m3aawg/reqt.rng
-- lib/asciidoctor/m3aawg/validate.rb
 - lib/isodoc/m3aawg/base_convert.rb
 - lib/isodoc/m3aawg/html/dots-w@2x.png
 - lib/isodoc/m3aawg/html/dots@2x.png
@@ -270,9 +253,11 @@ files:
 - lib/isodoc/m3aawg/xref.rb
 - lib/metanorma-m3aawg.rb
 - lib/metanorma/m3aawg.rb
+- lib/metanorma/m3aawg/fonts_manifest.yaml
 - lib/metanorma/m3aawg/processor.rb
 - lib/metanorma/m3aawg/version.rb
 - metanorma-m3d.gemspec
+- metanorma.yml
 homepage: https://github.com/metanorma/metanorma-m3aawg
 licenses:
 - BSD-2-Clause

data/.github/workflows/macos.yml

@@ -1,38 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,56 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Trigger repositories
-        if: matrix.ruby == '2.6'
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done