metanorma-cc 1.5.4 → 1.6.2

data/lib/isodoc/cc/pdf_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc

data/lib/isodoc/cc/presentation_xml_convert.rb

@@ -1,9 +1,10 @@
 require_relative "init"
+require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc
   module CC
-    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def annex1(f)
         lbl = @xrefs.anchor(f['id'], :label)
         if t = f.at(ns("./title"))

data/lib/isodoc/cc/word_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require "isodoc/generic/word_convert"
 require_relative "init"
 require "isodoc"
 
@@ -6,31 +7,7 @@ module IsoDoc
   module CC
     # A {Converter} implementation that generates CSD 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' : '"Source Sans Pro","Arial",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Source Sans Pro","Arial",sans-serif'),
-          monospacefont: '"Source Code Pro","Courier New",monospace'
-        }
-      end
-
-      def default_file_locations(options)
-        {
-          wordstylesheet: html_doc_path("wordstyle.scss"),
-          standardstylesheet: html_doc_path("cc.scss"),
-          header: html_doc_path("header.html"),
-          wordcoverpage: html_doc_path("word_cc_titlepage.html"),
-          wordintropage: html_doc_path("word_cc_intro.html"),
-          ulstyle: "l3",
-          olstyle: "l2",
-        }
-      end
+    class WordConvert < IsoDoc::Generic::WordConvert
 
       include BaseConvert
       include Init

data/lib/isodoc/cc/xref.rb

@@ -1,6 +1,6 @@
 module IsoDoc
   module CC
-    class Xref < IsoDoc::Xref
+    class Xref < IsoDoc::Generic::Xref
     end
   end
 end

data/lib/metanorma/cc.rb

@@ -1,29 +1,32 @@
+require "metanorma"
+require "metanorma-generic"
 require_relative "./cc/processor"
 
 module Metanorma
   module CC
+    class Configuration < Metanorma::Generic::Configuration
+      def initialize(*args)
+        super
+      end
+    end
 
-    DOCSUFFIX = {
-      "standard" => "",
-      "directive" => "DIR",
-      "guide" => "Guide",
-      "specification" => "S",
-      "report" => "R",
-      "amendment" => "Amd",
-      "technical-corrigendum" => "Cor",
-      "administrative" => "A",
-      "advisory" => "Adv",
-    }
+    class << self
+      extend Forwardable
 
-    DOCSTATUS = {
-      "working-draft" => "WD",
-      "committee-draft" => "CD",
-      "draft-standard" => "DS",
-      "final-draft" => "FDS",
-      "published" => "",
-      "cancelled" => "",
-      "withdrawn" => "",
-    }
+      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::CC::Processor)
+

data/lib/metanorma/cc/fonts_manifest.yaml

@@ -0,0 +1,5 @@
+---
+Source Sans Pro:
+Source Serif Pro:
+Source Code Pro:
+Source Han Sans:

data/lib/metanorma/cc/processor.rb

@@ -2,15 +2,7 @@ require "metanorma/processor"
 
 module Metanorma
   module CC
-    def self.fonts_used
-      {
-        html: %w(SourceSansPro SourceSerifPro SourceCodePro HanSans),
-        doc: %w(SourceSansPro SourceSerifPro SourceCodePro HanSans),
-        pdf: %w(SourceSansPro SourceSerifPro SourceCodePro HanSans)
-      }
-    end
-
-    class Processor < Metanorma::Processor
+    class Processor < Metanorma::Generic::Processor
 
       def initialize
         @short = [:csd, :cc]

data/lib/metanorma/cc/version.rb

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

data/metanorma-cc.gemspec

@@ -28,8 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  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,58 @@
+metanorma_name: cc
+organization_name_short: CalConnect
+organization_name_long: CalConnect
+document_namespace: https://www.metanorma.org/ns/csd
+xml_root_tag: csd-standard
+html_bodyfont: '"Source Sans Pro",sans-serif'
+html_headerfont: '"Source Sans Pro",sans-serif'
+html_monospacefont: '"Source Code Pro",monospace'
+validate_rng_file: lib/asciidoctor/cc/cc.rng
+htmlcoverpage: lib/isodoc/cc/html/html_cc_titlepage.html
+htmlintropage: lib/isodoc/cc/html/html_cc_intro.html
+htmlstylesheet: lib/isodoc/cc/html/htmlstyle.scss
+html_normalfontsize: "15px"
+html_footnotefontsize: "0.9em"
+scripts: lib/isodoc/cc/html/scripts.html
+i18nyaml: lib/isodoc/cc/i18n-en.yaml
+word_bodyfont: '"Source Sans Pro","Arial",sans-serif'
+word_headerfont: '"Source Sans Pro","Arial",sans-serif'
+word_monospacefont: '"Source Code Pro","Courier New",monospace'
+word_normalfontsize: "10.5pt"
+word_smallerfontsize: "10.0pt"
+word_monospacefontsize: "10.0pt"
+word_footnotefontsize: "10.0pt"
+standardstylesheet: lib/isodoc/cc/html/cc.scss
+header: lib/isodoc/cc/html/header.html
+wordcoverpage: lib/isodoc/cc/html/word_cc_titlepage.html
+wordintropage: lib/isodoc/cc/html/word_cc_intro.html
+wordstylesheet: lib/isodoc/cc/html/wordstyle.scss
+webfont:
+  - "https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,700"
+  - "https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,400;0,700;1,400;1,700"
+docid_template: "CC{% if doctype_abbr %}/{{ doctype_abbr }}{%endif%}{% if stageabbr %}/{{ stageabbr }}{%endif%} {{ docnumeric }}{% if docyear %}:{{docyear}}{%endif%}"
+doctypes:
+  standard: 
+  directive: DIR
+  guide: Guide
+  specification: S
+  report: R
+  amendment: Amd
+  technical-corrigendum: Cor
+  administrative: A
+  advisory: Adv
+default_doctype: standard
+published_stages:
+  - published
+  - cancelled
+  - withdrawn
+default_stage: published
+stage_abbreviations:
+  working-draft: WD
+  committee-draft: CD
+  draft-standard: DS
+  final-draft: FDS
+  published:
+  cancelled:
+  withdrawn:
+logo_path: ""
+

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 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: 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
@@ -190,9 +176,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"
@@ -212,10 +196,8 @@ files:
 - lib/asciidoctor/cc/boilerplate.xml
 - lib/asciidoctor/cc/cc.rng
 - lib/asciidoctor/cc/converter.rb
-- lib/asciidoctor/cc/front.rb
 - lib/asciidoctor/cc/isodoc.rng
 - lib/asciidoctor/cc/reqt.rng
-- lib/asciidoctor/cc/validate.rb
 - lib/asciidoctor/cc/validate_section.rb
 - lib/isodoc/cc/base_convert.rb
 - lib/isodoc/cc/csd.standard.xsl
@@ -246,9 +228,11 @@ files:
 - lib/isodoc/cc/xref.rb
 - lib/metanorma-cc.rb
 - lib/metanorma/cc.rb
+- lib/metanorma/cc/fonts_manifest.yaml
 - lib/metanorma/cc/processor.rb
 - lib/metanorma/cc/version.rb
 - metanorma-cc.gemspec
+- metanorma.yml
 homepage: https://github.com/metanorma/metanorma-cc
 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

data/.github/workflows/windows.yml

@@ -1,40 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-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
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/lib/asciidoctor/cc/front.rb

@@ -1,67 +0,0 @@
-require "asciidoctor"
-require "asciidoctor/standoc/converter"
-require "fileutils"
-
-module Asciidoctor
-  module CC
-    class Converter < Standoc::Converter
-      def default_publisher
-        "CalConnect"
-      end
-
-      def metadata_committee(node, xml)
-        return unless node.attr("technical-committee")
-        xml.editorialgroup do |a|
-          a.technical_committee node.attr("technical-committee"),
-            **attr_code(type: node.attr("technical-committee-type"))
-          i = 2
-          while node.attr("technical-committee_#{i}") do
-            a.technical_committee node.attr("technical-committee_#{i}"),
-              **attr_code(type: node.attr("technical-committee-type_#{i}"))
-            i += 1
-          end
-        end
-      end
-
-      def metadata_status(node, xml)
-        status = node.attr("status")
-        unless status && ::Metanorma::CC::DOCSTATUS.keys.include?(status)
-          @log.add("Document Attributes", nil, "#{status} is not a legal status")
-        end
-        super
-      end
-
-      def prefix_id(node)
-        prefix = "CC"
-        typesuffix = ::Metanorma::CC::DOCSUFFIX[doctype(node)] || ""
-        prefix += "/#{typesuffix}" unless typesuffix.empty?
-        status = ::Metanorma::CC::DOCSTATUS[node.attr("status")] || ""
-        prefix += "/#{status}" unless status.empty?
-        prefix
-      end
-
-      def metadata_id(node, xml)
-        id = node.attr("docnumber") || "???"
-        prefix = prefix_id(node)
-        id = "#{prefix} #{id}"
-        year = node.attr("copyright-year")
-        id += ":#{year}" if year
-        xml.docidentifier id, **{type: "CalConnect"}
-        xml.docnumber node.attr("docnumber")
-      end
-
-      @log_doctype = false
-
-      def doctype(node)
-        d = super
-        unless ::Metanorma::CC::DOCSUFFIX.keys.include?(d) && !@log_doctype
-          @log.add("Document Attributes", nil,
-                   "#{d} is not a legal document type: reverting to 'standard'")
-          @log_doctype = true
-          d = "standard"
-        end
-        d
-      end
-    end
-  end
-end