metanorma-rsd 1.4.3 → 1.4.8

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/processor.rb

@@ -2,12 +2,9 @@ require "metanorma/processor"
 
 module Metanorma
   module Rsd
-    class Processor < Metanorma::Processor
-
-      def initialize
-        @short = :rsd
-        @input_format = :asciidoc
-        @asciidoctor_backend = :rsd
+    class Processor < Metanorma::Generic::Processor
+      def configuration
+        Metanorma::Rsd.configuration
       end
 
       def output_formats

data/lib/metanorma/rsd/version.rb

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

data/metanorma-rsd.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   #spec.add_dependency "nokogiri"
-  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.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

@@ -1,12 +1,16 @@
+metanorma_name: rsd
 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
 htmlstylesheet: lib/isodoc/rsd/html/htmlstyle.scss
+html_bodyfont: '"Source Sans Pro",sans-serif'
+html_headerfont: '"Source Sans Pro",sans-serif'
+html_monospacefont: '"Source Code Pro",monospace'
 scripts: lib/isodoc/rsd/html/scripts.html
 scripts_pdf: lib/isodoc/rsd/html/scripts.pdf.html
 standardstylesheet: lib/isodoc/rsd/html/rsd.scss
@@ -14,6 +18,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","Arial",sans-serif'
+word_headerfont: '"Source Sans Pro","Arial",sans-serif'
+word_monospacefont: '"Source Code Pro",monospace'
 docid_template: "{{ docnumeric }}{% if stageabbr %}({{ stageabbr }}){%endif%}"
 published_stages:
   - published
@@ -21,3 +28,9 @@ stage_abbreviations:
   working-draft: wd
   committee-draft: cd
   draft-standard: d
+metadata_extensions:
+ - security
+ - recipient
+webfont:
+  - "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,600,600i&display=swap"
+  - "https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,600;1,300;1,600&display=swap" 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-rsd
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -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:
     - - "~>"
@@ -226,21 +226,22 @@ files:
 - lib/asciidoctor/rsd/isodoc.rng
 - 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
-- lib/isodoc/rsd/html/scripts.pdf.html
 - lib/isodoc/rsd/html/word_rsd_intro.html
 - lib/isodoc/rsd/html/word_rsd_titlepage.html
 - lib/isodoc/rsd/html/wordstyle.scss
 - lib/isodoc/rsd/html_convert.rb
 - lib/isodoc/rsd/metadata.rb
 - lib/isodoc/rsd/pdf_convert.rb
+- lib/isodoc/rsd/rsd.standard.xsl
 - lib/isodoc/rsd/word_convert.rb
 - lib/metanorma-rsd.rb
 - lib/metanorma/rsd.rb

data/lib/asciidoctor/rsd/validate.rb

@@ -1,22 +0,0 @@
-module Asciidoctor
-  module Rsd
-    class Converter < Standoc::Converter
-      def content_validate(doc)
-        super
-        bibdata_validate(doc.root)
-      end
-
-      def bibdata_validate(doc)
-        stage_validate(doc)
-      end
-
-      def stage_validate(xmldoc)
-        stage = xmldoc&.at("//bibdata/status/stage")&.text
-        %w(proposal working-draft committee-draft draft-standard final-draft
-        published withdrawn).include? stage or
-        @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
-      end
-    end
-  end
-end
-

data/lib/isodoc/rsd/html/scripts.pdf.html

@@ -1,72 +0,0 @@
-  <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'main', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': false, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
-  </script>
-
-<script>
-  //TOC toggle animation
-$('#toggle').on('click', function(){
-    if( $('nav').is(':visible') ) {
-        $('nav').animate({ 'left': '-353px' }, 'slow', function(){
-            $('nav').hide();
-        });
-        $('.container').animate({ 'padding-left': '31px' }, 'slow');
-    }
-    else {
-        $('nav').show();
-        $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
-    }
-});
-</script>
-
-<script>
-    // Scroll to top button
-    window.onscroll = function() {scrollFunction()};
-    
-    function scrollFunction() {
-        if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
-            document.getElementById("myBtn").style.display = "block";
-        } else {
-            document.getElementById("myBtn").style.display = "none";
-        }
-    }
-    
-    // When the user clicks on the button, scroll to the top of the document
-    function topFunction() {
-        document.body.scrollTop = 0;
-        document.documentElement.scrollTop = 0;
-    }
-    </script>
-
-  <script>
-/*
-  $(document).ready(function() {
-          $('[id^=toc]').each(function ()
-          {
-             var currentToc = $(this);
-       var url = window.location.href;
-             currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
-          });
-});
-*/
-</script>
-