metanorma-csa 1.6.6 → 1.7.2

data/lib/isodoc/csa/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:$footnotefontsize;
 	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:$footnotefontsize;
 	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;
@@ -1147,7 +1147,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/csa/html_convert.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base_convert'
+require "isodoc/generic/html_convert"
 require_relative 'init'
 require 'isodoc'
 
@@ -8,49 +9,7 @@ module IsoDoc
   module Csa
     # A {Converter} implementation that generates CSA 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)
-        is_hans = options[:script] == 'Hans'
-        {
-          bodyfont: (is_hans ? '"SimSun",serif' : 'AzoSans,"Source Sans Pro",sans-serif'),
-          headerfont: (is_hans ? '"SimHei",sans-serif'
-                              : 'AzoSans,"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_csa_titlepage.html'),
-          htmlintropage: html_doc_path('html_csa_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=Rubik:300,300i,500" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,700,900" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,600;1,300;1,600&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/csa/i18n.rb

@@ -1,9 +1,8 @@
 module IsoDoc
   module Csa
-    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::Csa.configuration
       end
     end
   end

data/lib/isodoc/csa/metadata.rb

@@ -6,9 +6,9 @@ module IsoDoc
   module Csa
     # A {Converter} implementation that generates CSA output, and a document
     # schema encapsulation of the document for validation
-    class Metadata < IsoDoc::Metadata
-      def initialize(lang, script, labels)
-        super
+    class Metadata < IsoDoc::Generic::Metadata
+      def configuration
+        Metanorma::Csa.configuration
       end
 
       def title(isoxml, _out)
@@ -27,22 +27,11 @@ module IsoDoc
         super
       end
 
-
       def docid(isoxml, _out)
         docnumber = isoxml.at(ns("//bibdata/docidentifier[@type = 'csa']"))
         set(:docnumber, docnumber&.text)
       end
 
-      def stage_abbr(status)
-        case status
-        when "working-draft" then "wd"
-        when "committee-draft" then "cd"
-        when "draft-standard" then "d"
-        else
-          ""
-        end
-      end
-
       def personal_authors(isoxml)
         persons = auth_roles(isoxml, nonauth_roles(isoxml, {}))
         set(:roles_authors_affiliations, persons)
@@ -72,10 +61,6 @@ module IsoDoc
         end
         persons
       end
-
-      def unpublished(status)
-        !%w(published withdrawn).include? status.downcase
-      end
     end
   end
 end

data/lib/isodoc/csa/presentation_xml_convert.rb

@@ -1,9 +1,10 @@
 require_relative "init"
+require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc
   module Csa
-    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def annex1(f)
         lbl = @xrefs.anchor(f['id'], :label)
         if t = f.at(ns("./title"))

data/lib/isodoc/csa/word_convert.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base_convert'
+require "isodoc/generic/word_convert"
 require_relative 'init'
 require 'isodoc'
 
@@ -9,31 +10,6 @@ module IsoDoc
     # A {Converter} implementation that generates CSA 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)
-        is_hans = options[:script] == 'Hans'
-        {
-          bodyfont: (is_hans ? '"SimSun",serif' : 'AzoSans,Arial,sans-serif'),
-          headerfont: (is_hans ? '"SimHei",sans-serif' : 'AzoSans,Arial,sans-serif'),
-          monospacefont: '"Source Code Pro","Courier New",monospace'
-        }
-      end
-
-      def default_file_locations(options)
-        {
-          wordstylesheet: html_doc_path('wordstyle.scss'),
-          standardstylesheet: html_doc_path('csa.scss'),
-          header: html_doc_path('header.html'),
-          wordcoverpage: html_doc_path('word_csa_titlepage.html'),
-          wordintropage: html_doc_path('word_csa_intro.html'),
-          ulstyle: 'l3',
-          olstyle: 'l2'
-        }
-      end
 
       include BaseConvert
       include Init

data/lib/isodoc/csa/xref.rb

@@ -1,6 +1,6 @@
 module IsoDoc
   module Csa
-    class Xref < IsoDoc::Xref
+    class Xref < IsoDoc::Generic::Xref
     end
   end
 end

data/lib/metanorma/csa.rb

@@ -1,7 +1,32 @@
-require_relative 'csa/processor'
+require "metanorma"
+require "metanorma-generic"
+require_relative './csa/processor'
 
 module Metanorma
   module Csa
+     class Configuration < Metanorma::Generic::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::Csa::Processor)
+

data/lib/metanorma/csa/processor.rb

@@ -1,24 +1,15 @@
 # frozen_string_literal: true
 
 require 'metanorma/processor'
-require 'asciidoctor/csa/converter'
 
 module Metanorma
   module Csa
-    def self.fonts_used
-      {
-        html: %w(AzoSans AzoSans-Light SourceCodePro-Light),
-        doc: %w(AzoSans AzoSans-Light SourceCodePro-Light),
-        pdf: %w(AzoSans AzoSans-Light SourceCodePro-Light)
-      }
-    end
-
     class Processor < Metanorma::Processor
 
       def initialize
         @short = :csa
         @input_format = :asciidoc
-        @asciidoctor_backend = Asciidoctor::Csa::CSA_TYPE.to_sym
+        @asciidoctor_backend = :csa
       end
 
       def output_formats
@@ -29,6 +20,14 @@ module Metanorma
         )
       end
 
+      def fonts_manifest
+        {
+          "AzoSans" => nil,
+          "STIX Two Math" => nil,
+          "Source Code Pro" => nil,
+        }
+      end
+
       def version
         "Metanorma::Csa #{Metanorma::Csa::VERSION}"
       end

data/lib/metanorma/csa/version.rb

@@ -2,6 +2,6 @@
 
 module Metanorma
   module Csa
-    VERSION = '1.6.6'
+    VERSION = '1.7.2'
   end
 end

data/metanorma-csa.gemspec

@@ -28,16 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "image_size"
-  spec.add_dependency "mime-types"
-  #spec.add_dependency "nokogiri"
-  spec.add_dependency "ruby-jing"
-  spec.add_dependency "thread_safe"
-  spec.add_dependency "uuidtools"
-
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-generic", "~> 1.8.2"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

data/metanorma.yml

@@ -0,0 +1,60 @@
+metanorma_name: csa
+organization_name_short: CSA
+organization_name_long: Cloud Security Alliance
+document_namespace: https://www.metanorma.org/ns/csa
+xml_root_tag: csa-standard
+html_bodyfont: 'AzoSans,"Source Sans Pro",sans-serif'
+html_headerfont: 'AzoSans,"Source Sans Pro",sans-serif'
+html_monospacefont: '"Source Code Pro",monospace'
+validate_rng_file: lib/asciidoctor/csa/csa.rng
+htmlcoverpage: lib/isodoc/csa/html/html_csa_titlepage.html
+htmlintropage: lib/isodoc/csa/html/html_csa_intro.html
+htmlstylesheet: lib/isodoc/csa/html/htmlstyle.scss
+html_normalfontsize: "1.2em"
+html_monospacefontsize: "1.0em"
+html_footnotefontsize: "0.9em"
+scripts: lib/isodoc/csa/html/scripts.html
+i18nyaml: lib/isodoc/csa/i18n-en.yaml
+word_bodyfont: 'AzoSans,Arial,sans-serif'
+word_headerfont: 'AzoSans,Arial,sans-serif'
+word_monospacefont: '"Source Code Pro","Courier New",monospace'
+word_normalfontsize: "10.5pt"
+word_smallerfontsize: "10.0pt"
+word_monospacefontsize: "10.0pt"
+word_footnotefontsize: "10.0pt"
+standardstylesheet: lib/isodoc/csa/html/csa.scss
+header: lib/isodoc/csa/html/header.html
+wordcoverpage: lib/isodoc/csa/html/word_csa_titlepage.html
+wordintropage: lib/isodoc/csa/html/word_csa_intro.html
+wordstylesheet: lib/isodoc/csa/html/wordstyle.scss
+webfont:
+  - "https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700"
+  - "https://fonts.googleapis.com/css?family=Rubik:300,300i,500"
+  - "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,700,900"
+  - "https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,600;1,300;1,600&display=swap"
+docid_template: "{{ docnumeric }}{% if stageabbr %}({{ stageabbr }}){%endif%}{% if docyear %}:{{docyear}}{%endif%}"
+doctypes:
+  standard:
+  guidance:
+  proposal:
+  report:
+  whitepaper:
+  charter:
+  policy:
+  glossary:
+  case-study:
+default_doctype: standard
+published_stages:
+  - published
+  - withdrawn
+default_stage: published
+stage_abbreviations:
+  proposal:
+  working-draft: wd
+  committee-draft: cd
+  draft-standard: d
+  final-draft: 
+  published:
+  withdrawn:
+logo_path: ""
+