metanorma-rsd 1.3.11 → 1.4.4

data/lib/isodoc/rsd/pdf_convert.rb

@@ -1,52 +1,30 @@
-require_relative "base_convert"
 require "isodoc"
+require "isodoc/generic/pdf_convert"
+require "isodoc/rsd/metadata"
 
 module IsoDoc
   module Rsd
     # 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
+    class PdfConvert < IsoDoc::Generic::PdfConvert
+      def configuration
+        Metanorma::Rsd.configuration
       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_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">
-        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
+       def make_body3(body, docxml)
+      body.div **{ class: "main-section" } do |div3|
+        boilerplate docxml, div3
+        abstract docxml, div3
+        foreword docxml, div3
+        executivesummary docxml, div3
+        introduction docxml, div3
+        preface docxml, div3
+        acknowledgements docxml, div3
+        middle docxml, div3
+        footnotes div3
+        comments div3
       end
+    end
 
       include BaseConvert
     end

data/lib/isodoc/rsd/word_convert.rb

@@ -1,45 +1,28 @@
-require_relative "base_convert"
 require "isodoc"
+require "isodoc/generic/word_convert"
+require "isodoc/rsd/metadata"
 
 module IsoDoc
   module Rsd
     # A {Converter} implementation that generates Word 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' : '"Arial",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
-          monospacefont: '"Courier New",monospace'
-        }
+    class WordConvert < IsoDoc::Generic::WordConvert
+      def configuration
+        Metanorma::Rsd.configuration
       end
 
-      def default_file_locations(options)
-        {
-          wordstylesheet: html_doc_path("wordstyle.scss"),
-          standardstylesheet: html_doc_path("rsd.scss"),
-          header: html_doc_path("header.html"),
-          wordcoverpage: html_doc_path("word_rsd_titlepage.html"),
-          wordintropage: html_doc_path("word_rsd_intro.html"),
-          ulstyle: "l3",
-          olstyle: "l2",
-        }
-      end
-
-
-      def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
-        xml.body **body_attr do |body|
-          make_body1(body, docxml)
-          make_body2(body, docxml)
-          make_body3(body, docxml)
+      def make_body2(body, docxml)
+        body.div **{ class: "WordSection2" } do |div2|
+          boilerplate docxml, div2
+          abstract docxml, div2
+          foreword docxml, div2
+          executivesummary docxml, div2
+          introduction docxml, div2
+          preface docxml, div2
+          acknowledgements docxml, div2
+          div2.p { |p| p << "&nbsp;" } # placeholder
         end
+        section_break(body)
       end
 
       include BaseConvert

data/lib/metanorma-rsd.rb

@@ -1,5 +1,6 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/rsd/converter"
+require_relative "isodoc/rsd/base_convert"
 require_relative "isodoc/rsd/html_convert"
 require_relative "isodoc/rsd/word_convert"
 require_relative "isodoc/rsd/pdf_convert"

data/lib/metanorma/rsd.rb

@@ -1,7 +1,32 @@
-require_relative "./rsd/processor"
+require "metanorma"
+require "metanorma-generic"
+require "metanorma/rsd/processor"
 
 module Metanorma
   module Rsd
 
+    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::Rsd::Processor)

data/lib/metanorma/rsd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Rsd
-    VERSION = "1.3.11"
+    VERSION = "1.4.4"
   end
 end

data/metanorma-rsd.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   #spec.add_dependency "nokogiri"
   spec.add_dependency "metanorma-standoc", "~> 1.3.0"
   spec.add_dependency "isodoc", "~> 1.0.0"
+  spec.add_dependency 'metanorma-generic', '~> 1.4.0'
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -42,5 +43,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.3.0"
 end

data/metanorma.yml

@@ -0,0 +1,26 @@
+organization_name_short: Ribose
+organization_name_long: Ribose
+document_namespace: https://www.metanorma.org/ns/rsd
+xml_root_tag: 'rsd-standard'
+logo_path: lib/isodoc/rsd/html/logo.png
+validate_rng_file: lib/asciidoctor/rsd/rsd.rng
+htmlcoverpage: lib/isodoc/rsd/html/html_rsd_titlepage.html
+htmlintropage: lib/isodoc/rsd/html/html_rsd_intro.html
+htmlstylesheet: lib/isodoc/rsd/html/htmlstyle.scss
+scripts: lib/isodoc/rsd/html/scripts.html
+scripts_pdf: lib/isodoc/rsd/html/scripts.pdf.html
+standardstylesheet: lib/isodoc/rsd/html/rsd.scss
+header: lib/isodoc/rsd/html/header.html
+wordcoverpage: lib/isodoc/rsd/html/word_rsd_titlepage.html
+wordintropage: lib/isodoc/rsd/html/word_rsd_intro.html
+wordstylesheet: lib/isodoc/rsd/html/wordstyle.scss
+word_bodyfont: '"Source Sans Pro",sans-serif'
+word_headerfont: '"Source Sans Pro",sans-serif'
+word_monospacefont: '"Courier New",monospace'
+docid_template: "{{ docnumeric }}{% if stageabbr %}({{ stageabbr }}){%endif%}"
+published_stages:
+  - published
+stage_abbreviations:
+  working-draft: wd
+  committee-draft: cd
+  draft-standard: d

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-rsd
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-generic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: metanorma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: |
   metanorma-rsd lets you write RSD in AsciiDoc syntax.
 
@@ -232,6 +232,7 @@ files:
 - lib/isodoc/rsd/html/html_rsd_intro.html
 - lib/isodoc/rsd/html/html_rsd_titlepage.html
 - lib/isodoc/rsd/html/htmlstyle.scss
+- lib/isodoc/rsd/html/logo.png
 - lib/isodoc/rsd/html/logo.svg
 - lib/isodoc/rsd/html/rsd.scss
 - lib/isodoc/rsd/html/scripts.html
@@ -248,6 +249,7 @@ files:
 - lib/metanorma/rsd/processor.rb
 - lib/metanorma/rsd/version.rb
 - metanorma-rsd.gemspec
+- metanorma.yml
 homepage: https://github.com/metanorma/metanorma-rsd
 licenses:
 - BSD-2-Clause