metanorma-m3aawg 1.5.6 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24f72496b09470f4ba51be8bab7dd660afe55d6992c0e796a62ab9cf55e827eb
-  data.tar.gz: 1ced435294ef6563be291a9f3819d6d7c0d56c7c052b158e92ca3fbefcc5302e
+  metadata.gz: c2fd3488774323dab01d7b10d584bae9492abebe8d22376a1a3a5351026cd8f2
+  data.tar.gz: f3d059e05c404ad418f7bce4251e36b00781dd8e7df08891957e8becd64477be
 SHA512:
-  metadata.gz: 88c4d252e305ed09ec1306ee4fc7a93450d61c548046e4cfcd2a71e5a17117f49a649c2e94e808582d9c9ea9cde10938e5cad417e97c9bfa81d5898724e2c534
-  data.tar.gz: 31ba0a8661ab3c840ab132710a0e440cb4a3ae9fb0a94b76a40eb48d8a73a431b89d589bc7d611cb6aab569888ab8bf3924c1dd4a09f4b67c366298dc79df4ee
+  metadata.gz: ce3566f1142e13b1e7643dff05304bfe46e00a45aefcd147fcc7b6c995cf390bf7ead57f1951aab95327408908611810f8a6b00abcd4231e5a66418de1953f21
+  data.tar.gz: f46acdf4f84b6a3c14cbe24c4ef9115254150afba1bda0dbc8583478a265eb9f1148f2bdacec040f8dcea820c9e270cf31b94660aaba49328318c810ac97ab80

data/.github/workflows/rake.yml

@@ -4,7 +4,8 @@ name: rake
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main  ]
+    tags: [ v* ]
   pull_request:
 
 jobs:
@@ -31,14 +32,32 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Use Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
 
-      - name: Update gems
-        run: bundle install --jobs 4 --retry 3
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+
+      - run: bundle config set path 'vendor/bundle'
+
+      - run: bundle install --jobs 4 --retry 3
 
-      - name: Run specs
-        run: bundle exec rake
+      - run: bundle exec rake
+
+  notify:
+    name: Trigger notify workflow
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger notify workflow
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{ secrets.GITHUB_TOKEN }}
+          context: 'tests-passed-successfully'
+          description: 'Tests passed successfully'
+          state: 'success'
+          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/README.adoc

@@ -1,9 +1,7 @@
 = Metanorma processor for M3AAWG documents 
 
 https://github.com/metanorma/metanorma-m3aawg[metanorma-m3aawg] image:https://img.shields.io/gem/v/metanorma-m3aawg.svg["Gem Version", link="https://rubygems.org/gems/metanorma-m3aawg"]::
-image:https://github.com/metanorma/metanorma-m3aawg/workflows/macos/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-m3aawg/actions?workflow=macos"]
-image:https://github.com/metanorma/metanorma-m3aawg/workflows/windows/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-m3aawg/actions?workflow=windows"]
-image:https://github.com/metanorma/metanorma-m3aawg/workflows/ubuntu/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-m3aawg/actions?workflow=ubuntu"]
+image:https://github.com/metanorma/metanorma-m3aawg/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-m3aawg/actions?workflow=rake"]
 image:https://codeclimate.com/github/metanorma/metanorma-m3aawg/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-m3aawg"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-m3aawg.svg["Pull Requests", link="https://github.com/metanorma/metanorma-m3aawg/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-m3aawg/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-m3aawg/releases"]
@@ -12,7 +10,7 @@ _Formerly known as_ `asciidoctor-m3d`.
 
 == Functionality
 
-This gem processes http://asciidoctor.org/[Asciidoctor] documents following
+This gem processes https://www.metanorma.com[Metanorma documents] following
 a template for generating M3AAWG documents.
 
 The gem currently inherits from the https://github.com/metanorma/metanorma-standoc

data/lib/asciidoctor/m3aawg/converter.rb

@@ -1,27 +1,14 @@
-require "asciidoctor"
-require "metanorma/m3aawg/version"
-require "isodoc/m3aawg/html_convert"
-require "isodoc/m3aawg/word_convert"
-require "isodoc/m3aawg/pdf_convert"
 require "asciidoctor/standoc/converter"
-require "fileutils"
-require_relative "./validate.rb"
+require 'asciidoctor/generic/converter'
 
 module Asciidoctor
   module M3AAWG
-
-    # A {Converter} implementation that generates M3D output, and a document
-    # schema encapsulation of the document for validation
-    class Converter < Standoc::Converter
+    class Converter < Asciidoctor::Generic::Converter
       XML_ROOT_TAG = "m3d-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/m3d".freeze
 
       register_for "m3aawg"
 
-      def default_publisher
-        "Messaging Malware and Mobile Anti-Abuse Working Group"
-      end
-
       def metadata_committee(node, xml)
         return unless node.attr("technical-committee")
         xml.editorialgroup do |a|
@@ -36,21 +23,8 @@ module Asciidoctor
         end
       end
 
-      def metadata_id(node, xml)
-        docstatus = node.attr("status")
-        dn = node.attr("docnumber")
-        if docstatus
-          abbr = IsoDoc::M3AAWG::Metadata.new("en", "Latn", @i18n).
-            stage_abbr(docstatus)
-          dn = "#{dn}(#{abbr})" unless abbr.empty?
-        end
-        node.attr("copyright-year") and dn += ":#{node.attr("copyright-year")}"
-        xml.docidentifier dn, **{type: "M3AAWG"}
-        xml.docnumber { |i| i << node.attr("docnumber") }
-      end
-
-      def title_validate(root)
-        nil
+       def configuration
+        Metanorma::M3AAWG.configuration
       end
 
       def makexml(node)
@@ -58,15 +32,6 @@ module Asciidoctor
         super
       end
 
-      def doctype(node)
-        d = super
-        unless %w{policy best-practices supporting-document report}.include? d
-          @log.add("Document Attributes", nil, "#{d} is not a legal document type: reverting to 'report'")
-          d = "report"
-        end
-        d
-      end
-
       def outputs(node, ret)
         File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert(@filename + ".xml")
@@ -75,12 +40,6 @@ module Asciidoctor
         pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
       end
 
-      def validate(doc)
-        content_validate(doc)
-        schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), "m3d.rng"))
-      end
-
       def sections_cleanup(x)
         super
         x.xpath("//*[@inline-header]").each do |h|
@@ -88,10 +47,6 @@ module Asciidoctor
         end
       end
 
-      def style(n, t)
-        return
-      end
-
       def presentation_xml_converter(node)
         IsoDoc::M3AAWG::PresentationXMLConvert.new(html_extract_attributes(node))
       end

data/lib/asciidoctor/m3aawg/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -141,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>

data/lib/isodoc/m3aawg/base_convert.rb

@@ -3,18 +3,8 @@ require "fileutils"
 module IsoDoc
   module M3AAWG
     module BaseRender
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child(" ")
-          h2.add_child(d.remove)
-        end
-        docxml
+      def configuration
+        Metanorma::M3AAWG.configuration
       end
     end
   end

data/lib/isodoc/m3aawg/html_convert.rb

@@ -1,35 +1,18 @@
 require "isodoc"
+require "isodoc/generic/html_convert"
 require_relative "base_convert"
 require_relative "init"
 
 module IsoDoc
   module M3AAWG
-    # A {Converter} implementation that generates CSAND 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::Generic::HtmlConvert
+      def configuration
+        Metanorma::M3AAWG.configuration
       end
 
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_m3d_titlepage.html"),
-          htmlintropage: html_doc_path("html_m3d_intro.html"),
-          standardstylesheet: nil,
-          scripts: html_doc_path("scripts.html"),
-        }
+      def initialize(options)
+        #require "byebug"; byebug
+        super
       end
 
       def colophon(body, docxml)
@@ -45,13 +28,6 @@ module IsoDoc
         end
       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" }

data/lib/isodoc/m3aawg/i18n.rb

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

data/lib/isodoc/m3aawg/init.rb

@@ -11,16 +11,13 @@ module IsoDoc
       end
 
       def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, HtmlConvert.new(language: lang, script: script), labels, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, labels, options)
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
         @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
       end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
     end
   end
 end

data/lib/isodoc/m3aawg/m3d.report.xsl

@@ -908,13 +908,22 @@
 		<title-part lang="en">
 			
 			
+			
 		</title-part>
 		<title-part lang="fr">
 			
 			
+			
 		</title-part>		
 		<title-part lang="zh">第 # 部分:</title-part>
 		
+		<title-subpart lang="en">			
+			
+		</title-subpart>
+		<title-subpart lang="fr">		
+			
+		</title-subpart>
+		
 		<title-modified lang="en">modified</title-modified>
 		<title-modified lang="fr">modifiée</title-modified>
 		
@@ -1380,7 +1389,9 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'bipm'">
+			<fo:block>&#xA0;</fo:block>				
+		</xsl:if> -->
 		
 		<!-- $namespace = 'iso' or  -->
 		
@@ -1543,6 +1554,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -1896,6 +1908,7 @@
 				
 				
 				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -1981,7 +1994,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -2193,7 +2207,11 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='dl']">
-		<fo:block-container margin-left="0mm">
+		<fo:block-container>
+			
+				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+			
+			
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -2203,8 +2221,11 @@
 				</xsl:attribute>
 				
 			</xsl:if>
-			<fo:block-container margin-left="0mm">
-	
+			<fo:block-container>
+				
+					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+				
+				
 				<xsl:variable name="parent" select="local-name(..)"/>
 				
 				<xsl:variable name="key_iso">
@@ -2218,9 +2239,12 @@
 							<fo:block margin-bottom="12pt" text-align="left">
 								
 								<xsl:variable name="title-where">
-									<xsl:call-template name="getTitle">
-										<xsl:with-param name="name" select="'title-where'"/>
-									</xsl:call-template>
+									
+									
+										<xsl:call-template name="getTitle">
+											<xsl:with-param name="name" select="'title-where'"/>
+										</xsl:call-template>
+									
 								</xsl:variable>
 								<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
 								<xsl:apply-templates select="*[local-name()='dt']/*"/>
@@ -2236,9 +2260,12 @@
 							
 							
 							<xsl:variable name="title-where">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-where'"/>
-								</xsl:call-template>
+								
+								
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-where'"/>
+									</xsl:call-template>
+																
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/>
 						</fo:block>
@@ -2249,9 +2276,12 @@
 							
 							
 							<xsl:variable name="title-key">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-key'"/>
-								</xsl:call-template>
+								
+								
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-key'"/>
+									</xsl:call-template>
+								
 							</xsl:variable>
 							<xsl:value-of select="$title-key"/>
 						</fo:block>
@@ -2827,7 +2857,18 @@
 				<xsl:with-param name="previousRow" select="$newRow"/>
 		</xsl:apply-templates>
 	</xsl:template><xsl:template name="getLang">
-		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+		<xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
+		<xsl:variable name="language">
+			<xsl:choose>
+				<xsl:when test="$language_current != ''">
+					<xsl:value-of select="$language_current"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
 		<xsl:choose>
 			<xsl:when test="$language = 'English'">en</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
@@ -2862,6 +2903,7 @@
 		<xsl:value-of select="substring($str, 2)"/>		
 	</xsl:template><xsl:template match="mathml:math">
 		<fo:inline font-family="STIX Two Math"> <!--  -->
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
@@ -2944,10 +2986,14 @@
 		</fo:inline>		
 	</xsl:template><xsl:template match="*[local-name() = 'modification']">
 		<xsl:variable name="title-modified">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-modified'"/>
-			</xsl:call-template>
+			
+			
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-modified'"/>
+				</xsl:call-template>
+			
 		</xsl:variable>
+		
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
 			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
@@ -3824,9 +3870,12 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
 		<xsl:variable name="title-deprecated">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-deprecated'"/>
-			</xsl:call-template>
+			
+			
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-deprecated'"/>
+				</xsl:call-template>
+			
 		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
 			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -4194,13 +4243,22 @@
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
+		<xsl:param name="normalize-space" select="'true'"/>
 		<xsl:if test="string-length($pText) &gt;0">
 		<item>
-			<xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
+			<xsl:choose>
+				<xsl:when test="$normalize-space = 'true'">
+					<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</item>
 		<xsl:call-template name="split">
 			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
 			<xsl:with-param name="sep" select="$sep"/>
+			<xsl:with-param name="normalize-space" select="$normalize-space"/>
 		</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
@@ -4266,4 +4324,23 @@
 				<xsl:with-param name="letter-spacing" select="$letter-spacing"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template name="repeat">
+		<xsl:param name="char" select="'*'"/>
+		<xsl:param name="count"/>
+		<xsl:if test="$count &gt; 0">
+			<xsl:value-of select="$char"/>
+			<xsl:call-template name="repeat">
+				<xsl:with-param name="char" select="$char"/>
+				<xsl:with-param name="count" select="$count - 1"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template><xsl:template name="getLocalizedString">
+		<xsl:param name="key"/>		
+		
+		<xsl:variable name="curr_lang">
+			<xsl:call-template name="getLang"/>
+		</xsl:variable>
+		
+		<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+		
 	</xsl:template></xsl:stylesheet>

data/lib/isodoc/m3aawg/metadata.rb

@@ -2,9 +2,11 @@ require "isodoc"
 
 module IsoDoc
   module M3AAWG
-    # A {Converter} implementation that generates CSAND output, and a document
-    # schema encapsulation of the document for validation
-    class Metadata < IsoDoc::Metadata
+    class Metadata < IsoDoc::Generic::Metadata
+       def configuration
+        Metanorma::M3AAWG.configuration
+      end
+
       def initialize(lang, script, labels)
         super
         here = File.dirname(__FILE__)
@@ -34,20 +36,6 @@ module IsoDoc
         docnumber = isoxml.at(ns("//bibdata/docidentifier"))
         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 unpublished(status)
-        !%w(published withdrawn).include? status.downcase
-      end
     end
   end
 end

data/lib/isodoc/m3aawg/presentation_xml_convert.rb

@@ -1,16 +1,21 @@
 require_relative "init"
+require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc
   module M3AAWG
-    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      def configuration
+        Metanorma::M3AAWG.configuration
+      end
+
       def annex1(f)
-      lbl = @xrefs.anchor(f['id'], :label)
-      if t = f.at(ns("./title"))
-        t.children = "<strong>#{t.children.to_xml}</strong>"
+        lbl = @xrefs.anchor(f['id'], :label)
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(f, "<br/>", lbl, "title")
       end
-      prefix_name(f, "<br/>", lbl, "title")
-    end
 
       include Init
     end

data/lib/isodoc/m3aawg/word_convert.rb

@@ -1,39 +1,13 @@
 require "isodoc"
 require_relative "base_convert"
+require "isodoc/generic/word_convert"
 require_relative "init"
 
 module IsoDoc
   module M3AAWG
-    # A {Converter} implementation that generates GB 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' : '"Garamond",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Garamond",serif'),
-          monospacefont: '"Courier New",monospace'
-        }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_m3d_titlepage.html"),
-          htmlintropage: html_doc_path("html_m3d_intro.html"),
-          scripts: html_doc_path("scripts.html"),
-          wordstylesheet: html_doc_path("wordstyle.scss"),
-          standardstylesheet: html_doc_path("m3d.scss"),
-          header: html_doc_path("header.html"),
-          wordintropage: html_doc_path("word_m3d_intro.html"),
-          ulstyle: "l3",
-          olstyle: "l2",
-        }
+    class WordConvert < IsoDoc::Generic::WordConvert
+      def configuration
+        Metanorma::M3AAWG.configuration
       end
 
       def colophon(body, docxml)
@@ -51,11 +25,6 @@ module IsoDoc
         end
       end
 
-      def title(isoxml, _out)
-        main = isoxml&.at(ns("//title[@language='en']"))&.text
-        set_metadata(:doctitle, main)
-      end
-
       include BaseRender
       include Init
     end

data/lib/isodoc/m3aawg/xref.rb

@@ -1,6 +1,11 @@
+require "metanorma-generic"
+
 module IsoDoc
   module M3AAWG
     class Xref < IsoDoc::Xref
+      def configuration
+        Metanorma::M3AAWG.configuration
+      end
     end
   end
 end

data/lib/metanorma/m3aawg.rb

@@ -1,7 +1,33 @@
-require_relative "./m3aawg/processor"
+require "metanorma"
+require "metanorma-generic"
+require "metanorma/m3aawg/processor"
 
 module Metanorma
-  module M3AWWG
+  module M3AAWG
 
+    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::M3AAWG::Processor)
+

data/lib/metanorma/m3aawg/processor.rb

@@ -10,7 +10,10 @@ module Metanorma
       }
     end
 
-    class Processor < Metanorma::Processor
+    class Processor < Metanorma::Generic::Processor
+       def configuration
+        Metanorma::Ribose.configuration
+      end
 
       def initialize
         @short = [:m3d, :m3aawg]

data/lib/metanorma/m3aawg/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3AAWG
-    VERSION = "1.5.6"
+    VERSION = "1.6.0"
   end
 end

data/metanorma-m3d.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "thread_safe"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
+  spec.add_dependency "metanorma-generic", "~> 1.7.0"
   spec.add_dependency "isodoc", "~> 1.2.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

data/metanorma.yml

@@ -0,0 +1,45 @@
+metanorma_name: m3aawg
+organization_name_short: M3AAWG
+organization_name_long: Messaging Malware and Mobile Anti-Abuse Working Group
+document_namespace: https://www.metanorma.org/ns/m3d
+xml_root_tag: m3d-standard
+html_bodyfont: '"Overpass",sans-serif'
+html_headerfont: '"Overpass",sans-serif'
+html_monospacefont: '"Space Mono",monospace'
+i18nyaml: lib/isodoc/m3aawg/i18n-en.yaml
+validate_rng_file: lib/asciidoctor/m3aawg/m3d.rng
+htmlcoverpage: lib/isodoc/m3aawg/html/html_m3d_titlepage.html
+htmlintropage: lib/isodoc/m3aawg/html/html_m3d_intro.html
+htmlstylesheet: lib/isodoc/m3aawg/html/htmlstyle.scss
+scripts: lib/isodoc/m3aawg/html/scripts.html
+word_bodyfont: '"Garamond",serif'
+word_headerfont: '"Garamond",serif'
+word_monospacefont: '"Courier New",monospace'
+standardstylesheet: lib/isodoc/m3aawg/html/m3d.scss
+header: lib/isodoc/m3aawg/html/header.html
+wordcoverpage: ""
+wordintropage: lib/isodoc/m3aawg/html/word_m3d_intro.html
+wordstylesheet: lib/isodoc/m3aawg/html/wordstyle.scss
+webfont:
+  - "https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900"
+  - "https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700"
+docid_template: "{{ docnumeric }}{% if stageabbr %}({{ stageabbr }}){%endif%}{% if docyear %}:{{docyear}}{%endif%}"
+doctypes:
+  - policy
+  - best-practices
+  - supporting-document
+  - report
+default_doctype: report
+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: ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3aawg
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: metanorma-standoc
+  name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,6 @@ files:
 - lib/asciidoctor/m3aawg/isodoc.rng
 - lib/asciidoctor/m3aawg/m3d.rng
 - lib/asciidoctor/m3aawg/reqt.rng
-- lib/asciidoctor/m3aawg/validate.rb
 - lib/isodoc/m3aawg/base_convert.rb
 - lib/isodoc/m3aawg/html/dots-w@2x.png
 - lib/isodoc/m3aawg/html/dots@2x.png
@@ -271,6 +270,7 @@ files:
 - lib/metanorma/m3aawg/processor.rb
 - lib/metanorma/m3aawg/version.rb
 - metanorma-m3d.gemspec
+- metanorma.yml
 homepage: https://github.com/metanorma/metanorma-m3aawg
 licenses:
 - BSD-2-Clause

data/lib/asciidoctor/m3aawg/validate.rb

@@ -1,22 +0,0 @@
-module Asciidoctor
-  module M3AAWG
-    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
-