metanorma-sample 1.0.10 → 1.3.8

data/lib/isodoc/sample/html/scripts.pdf.html

@@ -1,7 +1,7 @@
   <script>
     //TOC generation
       $('#toc').toc({
-          'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
+          'selectors': toclevel(), //elements to use as headings
           'container': 'main', //element to find all selectors in
           'smoothScrolling': true, //enable or disable smooth scrolling on click
           'prefix': 'toc', //prefix for anchor tags and class names
@@ -58,6 +58,7 @@ $('#toggle').on('click', function(){
     </script>
 
   <script>
+/*
   $(document).ready(function() {
           $('[id^=toc]').each(function ()
           {
@@ -66,5 +67,6 @@ $('#toggle').on('click', function(){
              currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
           });
 });
+*/
 </script>
 

data/lib/isodoc/sample/html/word_sample_titlepage.html

@@ -18,7 +18,7 @@ margin-left:4.25pt;margin-right:4.25pt'>
 
 <p class="MsoNormal" align="center" style='text-align:center;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:16.0pt'>{{ status }} {{ doctype }}</span></p>
+                     lang="EN-GB" style='font-size:16.0pt'>{{ stage }} {{ doctype }}</span></p>
 
 {% if security %}
 <p class="MsoNormal" align="center" style='text-align:center;border:none;

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

@@ -312,7 +312,7 @@ span.blackgraphtx
 .MsoChpDefault
 	{mso-style-type:export-only;
 	mso-default-props:yes;}
-div.figure 
+div.figure, p.figure
         {text-align: center;}
 
 
@@ -1075,6 +1075,44 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
 
+div.ListContLevel1
+        {mso-style-priority:34;
+        margin-left:18.0pt;
+        margin-right:0cm;}
+div.ListContLevel2
+        {mso-style-priority:34;
+        margin-top:0cm;
+        margin-left:36.0pt;
+        margin-right:0cm;}
+div.ListContLevel3
+        {mso-style-priority:34;
+        margin-left:54.0pt;
+        margin-right:0cm;}
+div.ListContLevel4
+        {mso-style-priority:34;
+        margin-left:72.0pt;
+        margin-right:0cm;}
+div.ListContLevel5
+        {mso-style-priority:34;
+        margin-left:90.0pt;
+        margin-right:0cm;}
+div.ListContLevel6
+        {mso-style-priority:34;
+        margin-left:108.0pt;
+        margin-right:0cm;}
+div.ListContLevel7
+        {mso-style-priority:34;
+        margin-left:126.0pt;
+        margin-right:0cm;}
+div.ListContLevel8
+        {mso-style-priority:34;
+        margin-left:144.0pt;
+        margin-right:0cm;}
+div.ListContLevel9
+        {mso-style-priority:34;
+        margin-left:162.0pt;
+        margin-right:0cm;}
+
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";
 	mso-tstyle-rowband-size:0;
@@ -1086,16 +1124,8 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-br.section
-    {page-break-before:always;
-    mso-break-type:section-break;}
-br.pagebreak
-    {page-break-before:always;
-    mso-special-character:line-break;}
 ol
 	{margin-bottom:0cm;
 	margin-left:18pt;}

data/lib/isodoc/sample/html_convert.rb

@@ -1,6 +1,5 @@
+require_relative "base_convert"
 require "isodoc"
-require_relative "metadata"
-require "fileutils"
 
 module IsoDoc
   module Sample
@@ -12,8 +11,6 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
-        @files_to_delete << "logo.jpg"
       end
 
       def default_fonts(options)
@@ -33,26 +30,10 @@ module IsoDoc
         }
       end
 
-
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def html_head
+      def googlefonts
         <<~HEAD.freeze
-        <title>{{ doctitle }}</title>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-
-    <!--TOC script import-->
-    <script type="text/javascript" src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
-
-    <!--Google fonts-->
     <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">
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-    <style class="anchorjs"></style>
         HEAD
       end
 
@@ -65,55 +46,7 @@ module IsoDoc
         end
       end
 
-      def html_toc(docxml)
-        docxml
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
-      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("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/sample/metadata.rb

@@ -6,28 +6,15 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
-        set(:status, "XXX")
-      end
-
-      def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
-        set(:doctitle, main)
-      end
-
-      def subtitle(_isoxml, _out)
-        nil
+        here = File.dirname(__FILE__)
+        set(:logo, File.expand_path(File.join(here, "html", "logo.jpg")))
       end
 
       def author(isoxml, _out)
-        tc = isoxml.at(ns("//bibdata/editorialgroup/committee"))
+        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"
@@ -66,7 +53,7 @@ module IsoDoc
       end
 
       def security(isoxml, _out)
-        security = isoxml.at(ns("//bibdata/security")) || return
+        security = isoxml.at(ns("//bibdata/ext/security")) || return
         set(:security, security.text)
       end
     end

data/lib/isodoc/sample/pdf_convert.rb

@@ -1,6 +1,5 @@
+require_relative "base_convert"
 require "isodoc"
-require_relative "metadata"
-require "fileutils"
 
 module IsoDoc
   module Sample
@@ -10,8 +9,6 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
-        @files_to_delete << "logo.jpg"
       end
 
       def default_fonts(options)
@@ -31,25 +28,10 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def html_head()
+      def googlefonts()
         <<~HEAD.freeze
-        <title>{{ doctitle }}</title>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-
-    <!--TOC script import-->
-    <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
-
-    <!--Google fonts-->
     <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">
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-<style class="anchorjs"></style>
         HEAD
       end
 
@@ -66,51 +48,7 @@ module IsoDoc
         docxml
       end
 
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
-      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("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/sample/word_convert.rb

@@ -1,6 +1,5 @@
+require_relative "base_convert"
 require "isodoc"
-require_relative "metadata"
-require "fileutils"
 
 module IsoDoc
   module Sample
@@ -11,7 +10,6 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
       end
 
       def default_fonts(options)
@@ -34,10 +32,6 @@ module IsoDoc
         }
       end
 
-      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|
@@ -46,53 +40,8 @@ module IsoDoc
           make_body3(body, docxml)
         end
       end
-
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
-      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("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
+      
+      include BaseConvert
     end
   end
 end

data/lib/metanorma/sample/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Sample
-    VERSION = "1.0.10"
+    VERSION = "1.3.8"
   end
 end

data/{asciidoctor-metanorma_sample.gemspec → metanorma-sample.gemspec}

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
     This gem is meant to be customised for any downstream use.
   DESCRIPTION
 
-  spec.homepage      = "https://github.com/riboseinc/metanorma-sample"
+  spec.homepage      = "https://github.com/metanorma/metanorma-sample"
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -24,15 +24,14 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
-  spec.add_dependency "isodoc", "~> 0.9.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "isodoc", "~> 1.0.0"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"