metanorma-cc 1.5.4 → 1.6.2

data/lib/isodoc/cc/html/htmlstyle.scss

@@ -24,13 +24,14 @@ $docstage-colors-list: (
 
 
 @import 'base_style/all';
+@import 'coverpage';
 
 
 body {
   // line-height: 1;
 
   @include bodyStyle1(
-    $fontSize: 15px, $fontWeight: 300, $lineHeight: 1.4em,
+    $fontSize: $normalfontsize, $fontWeight: 300, $lineHeight: 1.4em,
     $colorText: #1d1d1d, $colorBackground: #fff);
 }
 
@@ -320,7 +321,7 @@ a.footnote-number {
 }
 
 .footnote {
-  font-size: 0.9em;
+  font-size: $footnotefontsize;
 }
 
 
@@ -379,8 +380,6 @@ span.keyword {
 }
 
 
-@import 'coverpage';
-
 
 // To top button
 

data/lib/isodoc/cc/html/wordstyle.css

@@ -81,7 +81,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
   margin: 0cm;
   margin-bottom: 12.0pt;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -97,7 +97,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -113,7 +113,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -129,7 +129,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -145,7 +145,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -156,7 +156,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   margin: 0cm;
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -168,7 +168,7 @@ 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: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -180,7 +180,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
   tab-stops: center 367.0pt right 734.0pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -192,7 +192,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
   tab-stops: right 482.0pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -204,7 +204,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
   tab-stops: right 734.0pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -333,7 +333,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
   margin: 0cm;
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -605,7 +605,7 @@ 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: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -629,7 +629,7 @@ 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: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -653,7 +653,7 @@ 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: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -677,7 +677,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 10.0pt;
+  font-size: {{footnotefontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -696,7 +696,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
   text-align: justify;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -812,9 +812,9 @@ p.Tablebody, li.Tablebody, div.Tablebody {
   margin-right: 0cm;
   margin-bottom: 3.0pt;
   margin-left: 0cm;
-  line-height: 10.5pt;
+  line-height: {{normalfontsize}};
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   mso-bidi-font-size: 11.0pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
@@ -1241,7 +1241,7 @@ table.MsoNormalTable {
   mso-para-margin: 0cm;
   mso-para-margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 ol {

data/lib/isodoc/cc/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:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -86,7 +86,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -101,7 +101,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -116,7 +116,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -131,7 +131,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -142,7 +142,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -153,7 +153,7 @@ 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:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -164,7 +164,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
         tab-stops:center 367.0pt right 734.0pt;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -175,7 +175,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:right 482.0pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -186,7 +186,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
         tab-stops:right 734.0pt;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -306,7 +306,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -567,7 +567,7 @@ 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:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -590,7 +590,7 @@ 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:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -613,7 +613,7 @@ 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:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -635,7 +635,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -653,7 +653,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	text-align:justify;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -762,9 +762,9 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	margin-right:0cm;
 	margin-bottom:3.0pt;
 	margin-left:0cm;
-	line-height:10.5pt;
+	line-height:$normalfontsize;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
@@ -1146,7 +1146,7 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;}
 ol
 	{margin-bottom:0cm;

data/lib/isodoc/cc/html_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require "isodoc/generic/html_convert"
 require_relative "init"
 require "isodoc"
 
@@ -6,44 +7,7 @@ module IsoDoc
   module CC
     # A {Converter} implementation that generates CC 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' : '"Source Sans Pro",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Source Sans Pro",sans-serif'),
-          monospacefont: '"Source Code Pro",monospace'
-        }
-      end
-
-      def default_file_locations(options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_cc_titlepage.html"),
-          htmlintropage: html_doc_path("html_cc_intro.html"),
-          scripts: html_doc_path("scripts.html"),
-        }
-      end
-
-      def googlefonts()
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,700&display=swap" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,400;0,700;1,400;1,700&display=swap" 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
+    class HtmlConvert < IsoDoc::Generic::HtmlConvert
 
       include BaseConvert
       include Init

data/lib/isodoc/cc/i18n.rb

@@ -1,9 +1,8 @@
 module IsoDoc
   module CC
-    class I18n < IsoDoc::I18n
-      def load_yaml1(lang, script)
-        y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-        super.merge(y)
+    class I18n < IsoDoc::Generic::I18n
+      def configuration
+        Metanorma::CC.configuration
       end
     end
   end

data/lib/isodoc/cc/init.rb

@@ -11,7 +11,8 @@ module IsoDoc
       end
 
       def xref_init(lang, script, klass, i18n, options)
-        @xrefs = Xref.new(lang, script, HtmlConvert.new(language: lang, script: script), i18n, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, i18n, options)
       end
 
       def i18n_init(lang, script, i18nyaml = nil)

data/lib/isodoc/cc/metadata.rb

@@ -3,9 +3,11 @@ require "metanorma/cc"
 
 module IsoDoc
   module CC
-    # A {Converter} implementation that generates CC output, and a document
-    # schema encapsulation of the document for validation
-    class Metadata < IsoDoc::Metadata
+    class Metadata < IsoDoc::Generic::Metadata
+      def configuration
+        Metanorma::CC.configuration
+      end
+
       def initialize(lang, script, labels)
         super
         set(:tc, "XXXX")
@@ -21,7 +23,7 @@ module IsoDoc
       end
 
       def author(isoxml, _out)
-        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/technical-committee"))
+        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text) if tc
         super
       end
@@ -38,24 +40,6 @@ module IsoDoc
         set(:roles_authors_affiliations, persons)
         super
       end
-
-      def docid(isoxml, _out)
-        docnumber = isoxml.at(ns("//bibdata/docidentifier"))
-        prefix = "CC"
-        if docnumber.nil?
-          set(:docnumber, prefix)
-        else
-          set(:docnumber, docnumber.text)
-        end
-      end
-
-      def stage_abbr(status)
-        ::Metanorma::CC::DOCSTATUS[status] || ""
-      end
-
-      def unpublished(status)
-        !%w(published withdrawn).include? status.downcase
-      end
     end
   end
 end