metanorma-rsd 1.4.3 → 1.4.4

data/lib/isodoc/rsd/metadata.rb

@@ -3,7 +3,7 @@ require "isodoc"
 module IsoDoc
   module Rsd
 
-    class Metadata < IsoDoc::Acme::Metadata
+    class Metadata < IsoDoc::Generic::Metadata
       def configuration
         Metanorma::Rsd.configuration
       end
@@ -13,31 +13,27 @@ module IsoDoc
         set(:security, security.text)
       end
 
+      def recipient(isoxml, _out)
+        recipient = isoxml.at(ns("//bibdata/ext/recipient")) || return
+        set(:recipient, recipient.text)
+      end
+
       def version(isoxml, _out)
         super
         revdate = get[:revdate]
-        set(:revdate_monthyear, monthyr(revdate))
+        set(:revdate_MMMddyyyy, MMMddyyyy(revdate))
       end
 
-      MONTHS = {
-        "01": "January",
-        "02": "February",
-        "03": "March",
-        "04": "April",
-        "05": "May",
-        "06": "June",
-        "07": "July",
-        "08": "August",
-        "09": "September",
-        "10": "October",
-        "11": "November",
-        "12": "December",
-      }.freeze
-
-      def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-        return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
+      def MMMddyyyy(isodate)
+        return nil if isodate.nil?
+        arr = isodate.split("-")
+        date = if arr.size == 1 and (/^\d+$/.match isodate)
+                 Date.new(*arr.map(&:to_i)).strftime("%Y")
+               elsif arr.size == 2
+                 Date.new(*arr.map(&:to_i)).strftime("%B %Y")
+               else
+                 Date.parse(isodate).strftime("%B %d, %Y")
+               end
       end
     end
   end

data/lib/isodoc/rsd/pdf_convert.rb

@@ -1,24 +1,32 @@
 require "isodoc"
-require "isodoc/acme/pdf_convert"
+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::Acme::PdfConvert
+    class PdfConvert < IsoDoc::Generic::PdfConvert
       def configuration
         Metanorma::Rsd.configuration
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
+       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
 
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/rsd/word_convert.rb

@@ -1,24 +1,31 @@
 require "isodoc"
-require "isodoc/acme/word_convert"
+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::Acme::WordConvert
+    class WordConvert < IsoDoc::Generic::WordConvert
       def configuration
         Metanorma::Rsd.configuration
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
+      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
 
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
+      include BaseConvert
     end
   end
 end

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,11 +1,11 @@
 require "metanorma"
-require "metanorma-acme"
+require "metanorma-generic"
 require "metanorma/rsd/processor"
 
 module Metanorma
   module Rsd
 
-    class Configuration < Metanorma::Acme::Configuration
+    class Configuration < Metanorma::Generic::Configuration
       def initialize(*args)
         super
       end

data/lib/metanorma/rsd/version.rb

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

data/metanorma-rsd.gemspec

@@ -32,7 +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-acme', '~> 1.4.0'
+  spec.add_dependency 'metanorma-generic', '~> 1.4.0'
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/metanorma.yml

@@ -2,7 +2,7 @@ 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.svg
+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
@@ -14,6 +14,9 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-rsd
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: metanorma-acme
+  name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -227,10 +227,12 @@ files:
 - lib/asciidoctor/rsd/reqt.rng
 - lib/asciidoctor/rsd/rsd.rng
 - lib/asciidoctor/rsd/validate.rb
+- lib/isodoc/rsd/base_convert.rb
 - lib/isodoc/rsd/html/header.html
 - 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