metanorma-rsd 1.3.8 → 1.4.1

data/lib/isodoc/rsd/html/rsd.scss

@@ -86,7 +86,7 @@ p.SourceTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.AdmonitionTitle
+p.AdmonitionTitle, p.RecommendationTitle
         {mso-style-unhide:no;
         mso-style-qformat:yes;
         mso-style-parent:"";
@@ -250,13 +250,36 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
 	tab-stops:20.15pt;
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
-	page-break-before:always;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
+        page-break-before:always;
 	mso-bidi-font-weight:normal;}
+p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
+ mso-style-noshow:yes;
+        mso-style-unhide:no;
+        mso-style-parent:"Foreword Title";
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:15.5pt;
+        margin-left:0cm;
+        text-align:center;
+        line-height:15.5pt;
+        mso-pagination:widow-orphan;
+        page-break-after:avoid;
+        mso-hyphenate:none;
+        tab-stops:20.15pt;
+        font-size:14.0pt;
+        mso-bidi-font-size:11.0pt;
+        font-family:$headerfont;
+        mso-fareast-font-family:$headerfont;
+        mso-bidi-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;
+}
 p.Terms, li.Terms, div.Terms
         {mso-style-name:"Term\(s\)";
         mso-style-priority:8;
@@ -555,6 +578,26 @@ div.WordSection1
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
 	mso-paper-source:0;}
+@page WordSection2L
+        {size:841.9pt 595.3pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:50pt;
+        mso-footer-margin:50pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2l;
+        mso-paper-source:0;}
+@page WordSection2P
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:50pt;
+        mso-footer-margin:50pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-paper-source:0;}
 div.WordSection2
 	{page:WordSection2;}
 @page WordSection3
@@ -568,6 +611,26 @@ div.WordSection2
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
 	mso-paper-source:0;}
+@page WordSection3L
+        {size:841.9pt 595.3pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:50pt;
+        mso-footer-margin:50pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3l;
+        mso-paper-source:0;}
+@page WordSection3P
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:50pt;
+        mso-footer-margin:50pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-paper-source:0;}
 div.WordSection3
 	{page:WordSection3;}
 table.MsoISOTable

data/lib/isodoc/rsd/html/word_rsd_intro.html

@@ -1,15 +1,6 @@
 <div class="zzCopyright">
-  <p class="zzCopyright" align="left">
-    <span lang="EN-GB" style='color:windowtext'>© {{ agency }} {{ docyear }} Ribose Group Inc.<o:p></o:p></span>
-    <span lang="EN-GB" style='color:windowtext'>Suite 1, 8/F, New Henry House<o:p></o:p></span>
-    <span lang="EN-GB" style='color:windowtext'>10 Ice House Street<o:p></o:p></span>
-    <span lang="EN-GB" style='color:windowtext'>Central<o:p></o:p></span>
-    <span lang="EN-GB" style='color:windowtext'>Hong Kong<o:p></o:p></span>
-    <br />
-    <span lang="EN-GB" style='color:windowtext'><a href="mailto:copyright@ribose.com">copyright@ribose.com</a><o:p></o:p></span><br />
-    <span lang="EN-GB" style='color:windowtext'><a href="https://www.ribose.com">www.ribose.com</a><o:p></o:p></span>
-  </p>
-
+  <div id="boilerplate-copyright-destination" style='color:windowtext'/>
+  <div id="boilerplate-feedback-destination" style='color:windowtext'/>
 </div>
 
 <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>

data/lib/isodoc/rsd/html/word_rsd_titlepage.html

@@ -50,35 +50,14 @@ mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
 margin-left:4.25pt;margin-right:4.25pt'>
 
 {% if unpublished %}
-<p class="MsoNormal" align="center" style='margin-bottom:6.0pt;text-align:center;
-border:none;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><b style='mso-bidi-font-weight:normal'><span
-lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>Warning for drafts<o:p></o:p></span></b></p>
-
-<p class="MsoNormal" style='margin-bottom:6.0pt;border:none;mso-border-alt:solid windowtext .5pt;
-padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang="EN-GB"
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>This document
-is not a Ribose Standard. It is distributed for review and
-    comment, and is subject to change without notice and may not be referred to as
-    a Standard. Recipients of this draft are invited to submit, with their
-    comments, notification of any relevant patent rights of which they are aware
-    and to provide supporting documentation.<o:p></o:p></span></p>
-
-<p class="MsoNormal" style='border:none;mso-border-alt:solid windowtext .5pt;
-padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang="EN-GB"
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>Recipients
-of this draft are invited to submit, with their comments, notification of any
-relevant patent rights of which they are aware and to provide supporting
-documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:
-11.0pt'><o:p></o:p></span></p>
-
+<div id="boilerplate-license-destination"/>
 {% endif %}
 
 </div>
 
-<p class="MsoNormal" align="center" style='text-align:center'><span lang="EN-GB"
-style='mso-no-proof:yes'>Ribose Group Inc.&nbsp;</span><span lang="EN-GB"><span
-                                                             style='mso-no-proof:yes'>{{ docyear }}</span></p>
+<div align="center" style='text-align:center'>
+  <div id=boilerplate-copyright-destination"/>
+  </div>
 
 
 

data/lib/isodoc/rsd/html/wordstyle.scss

@@ -158,6 +158,17 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
 	mso-fareast-language:EN-US;}
+p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
+        {mso-style-unhide:no;
+        margin:0cm;
+        margin-bottom:.0001pt;
+        mso-pagination:widow-orphan;
+        tab-stops:center 367.0pt right 734.0pt;
+        font-size:10.5pt;
+        font-family:$bodyfont;
+        mso-fareast-font-family:"Times New Roman";
+        mso-ansi-language:EN-US;
+        mso-fareast-language:EN-US;}
 p.MsoFooter, li.MsoFooter, div.MsoFooter
 	{mso-style-unhide:no;
 	margin:0cm;
@@ -169,6 +180,17 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
 	mso-fareast-language:EN-US;}
+p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
+        {mso-style-unhide:no;
+        margin:0cm;
+        margin-bottom:.0001pt;
+        mso-pagination:widow-orphan;
+        tab-stops:right 734.0pt;
+        font-size:10.5pt;
+        font-family:$bodyfont;
+        mso-fareast-font-family:"Times New Roman";
+        mso-ansi-language:EN-US;
+        mso-fareast-language:EN-US;}
 span.MsoCommentReference
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;

data/lib/isodoc/rsd/html_convert.rb

@@ -1,52 +1,25 @@
-require_relative "base_convert"
 require "isodoc"
+require "isodoc/acme/html_convert"
+require "isodoc/rsd/metadata"
 
 module IsoDoc
   module Rsd
-
     # A {Converter} implementation that generates HTML output, and a document
     # schema encapsulation of the document for validation
     #
-    class HtmlConvert < IsoDoc::HtmlConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      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'
-        }
+    class HtmlConvert < IsoDoc::Acme::HtmlConvert
+      def configuration
+        Metanorma::Rsd.configuration
       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: html_doc_path("scripts.html"),
-        }
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
       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
+      def info(isoxml, out)
+        @meta.security isoxml, out
+        super
       end
-
-      include BaseConvert
     end
   end
 end

data/lib/isodoc/rsd/metadata.rb

@@ -3,45 +3,14 @@ require "isodoc"
 module IsoDoc
   module Rsd
 
-    class Metadata < IsoDoc::Metadata
-      def initialize(lang, script, labels)
-        super
-                here = File.dirname(__FILE__)
-        set(:logo_svg,
-            File.expand_path(File.join(here, "html", "logo.svg")))
-      end
-
-      def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
-        set(:doctitle, main)
-      end
-
-      def subtitle(_isoxml, _out)
-        nil
+    class Metadata < IsoDoc::Acme::Metadata
+      def configuration
+        Metanorma::Rsd.configuration
       end
 
-      def author(isoxml, _out)
-        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
-        set(:tc, tc.text) if tc
-      end
-
-      def docid(isoxml, _out)
-        docnumber = isoxml.at(ns("//bibdata/docidentifier"))
-        set(:docnumber, docnumber&.text)
-      end
-
-      def status_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
+      def security(isoxml, _out)
+        security = isoxml.at(ns("//bibdata/ext/security")) || return
+        set(:security, security.text)
       end
 
       def version(isoxml, _out)
@@ -70,11 +39,6 @@ module IsoDoc
         return isodate unless m && m[:yr] && m[:mo]
         return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
       end
-
-      def security(isoxml, _out)
-        security = isoxml.at(ns("//bibdata/ext/security")) || return
-        set(:security, security.text)
-      end
     end
   end
 end

data/lib/isodoc/rsd/pdf_convert.rb

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

data/lib/isodoc/rsd/word_convert.rb

@@ -1,48 +1,24 @@
-require_relative "base_convert"
 require "isodoc"
+require "isodoc/acme/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::Acme::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",
-        }
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
       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)
-        end
+      def info(isoxml, out)
+        @meta.security isoxml, out
+        super
       end
-
-      include BaseConvert
     end
   end
 end

data/lib/metanorma/rsd.rb

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