metanorma-rsd 1.3.11 → 1.4.4

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

@@ -71,7 +71,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
 	margin:0cm;
 	margin-bottom:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -84,9 +84,9 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
         margin-right:0cm;
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        mso-add-space:auto;
+        /*mso-add-space:auto;*/
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -99,9 +99,9 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         margin-right:0cm;
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        mso-add-space:auto;
+        /*mso-add-space:auto;*/
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -114,9 +114,9 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         margin-right:0cm;
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        mso-add-space:auto;
+        /*mso-add-space:auto;*/
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -129,9 +129,9 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         margin-right:0cm;
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        mso-add-space:auto;
+        /*mso-add-space:auto;*/
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -153,22 +153,44 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:center 216.0pt right 482.0pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	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:12.0pt;
+        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;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:right 482.0pt;
-	font-size:10.5pt;
+	font-size:10.0pt;
 	font-family:$bodyfont;
 	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.0pt;
+        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;
@@ -267,7 +289,7 @@ p.MsoTitleCxSpLast, li.MsoTitleCxSpLast, div.MsoTitleCxSpLast
 a:link, span.MsoHyperlink
 	{mso-style-unhide:no;
 	mso-style-parent:"";
-	color:blue;
+	color:#ED7D31;
 	text-decoration:underline;
 	text-underline:single;}
 a:visited, span.MsoHyperlinkFollowed
@@ -340,6 +362,7 @@ h1
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
+        font-weight:normal;
 	mso-font-kerning:0pt;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -364,9 +387,10 @@ h1.Annex
 	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
-	font-size:12.0pt;
+	font-size:13.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
 	mso-font-kerning:0pt;
@@ -394,7 +418,7 @@ h1.Annex
         font-size:12.0pt;
         mso-bidi-font-size:11.0pt;
         font-family:$headerfont;
-        font-weight:bold;
+        font-weight:normal;
         mso-fareast-font-family:$headerfont;
         color:#0E1A85;
         mso-ansi-language:EN-GB;
@@ -422,6 +446,7 @@ h2
 	font-size:12.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
 	mso-ansi-language:EN-GB;
@@ -448,6 +473,7 @@ h3
 	tab-stops:list 36.0pt left 44.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
         color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -474,6 +500,7 @@ h4
 	tab-stops:51.05pt 57.0pt 68.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
         color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -500,6 +527,7 @@ h5
 	tab-stops:51.05pt list 54.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
 	mso-ansi-language:EN-GB;
@@ -526,6 +554,7 @@ h6
 	tab-stops:51.05pt list 72.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
         color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -545,12 +574,12 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
+	font-weight:normal;
 	mso-bidi-font-weight:normal;}
 p.MsoToc2, li.MsoToc2, div.MsoToc2
 	{mso-style-noshow:yes;
@@ -568,12 +597,12 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
+	font-weight:normal;
 	mso-bidi-font-weight:normal;}
 p.MsoToc3, li.MsoToc3, div.MsoToc3
 	{mso-style-noshow:yes;
@@ -591,12 +620,12 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
+	font-weight:normal;
 	mso-bidi-font-weight:normal;}
 span.MsoFootnoteReference
 	{mso-style-priority:99;
@@ -631,7 +660,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	text-align:justify;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -645,12 +674,13 @@ span.Heading1Char
 	mso-style-link:"Heading 1";
 	mso-ansi-font-size:13.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:Cambria;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading2Char
 	{mso-style-name:"Heading 2 Char";
@@ -661,12 +691,13 @@ span.Heading2Char
 	mso-style-link:"Heading 2";
 	mso-ansi-font-size:12.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:Cambria;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading3Char
 	{mso-style-name:"Heading 3 Char";
@@ -677,12 +708,13 @@ span.Heading3Char
 	mso-style-link:"Heading 3";
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading4Char
 	{mso-style-name:"Heading 4 Char";
@@ -693,12 +725,13 @@ span.Heading4Char
 	mso-style-link:"Heading 4";
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading5Char
 	{mso-style-name:"Heading 5 Char";
@@ -709,12 +742,13 @@ span.Heading5Char
 	mso-style-link:"Heading 5";
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading6Char
 	{mso-style-name:"Heading 6 Char";
@@ -725,12 +759,13 @@ span.Heading6Char
 	mso-style-link:"Heading 6";
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.Tablebody, li.Tablebody, div.Tablebody
 	{mso-style-name:"Table body";
@@ -1124,7 +1159,7 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;}
 ol
 	{margin-bottom:0cm;

data/lib/isodoc/rsd/html_convert.rb

@@ -1,50 +1,31 @@
-require_relative "base_convert"
 require "isodoc"
+require "isodoc/generic/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'
-        }
-      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"),
-        }
-      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
+    class HtmlConvert < IsoDoc::Generic::HtmlConvert
+      def configuration
+        Metanorma::Rsd.configuration
       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 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/metadata.rb

@@ -3,77 +3,37 @@ 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::Generic::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
+      def security(isoxml, _out)
+        security = isoxml.at(ns("//bibdata/ext/security")) || return
+        set(:security, security.text)
       end
 
-      def unpublished(status)
-        !%w(published withdrawn).include? status.downcase
+      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))
-      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]}"
-      end
-
-      def security(isoxml, _out)
-        security = isoxml.at(ns("//bibdata/ext/security")) || return
-        set(:security, security.text)
+        set(:revdate_MMMddyyyy, MMMddyyyy(revdate))
+      end
+
+      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