metanorma-bsi 0.0.1 → 0.1.0

data/lib/isodoc/bsi/html/htmlstyle.css

@@ -224,6 +224,27 @@ a.FootnoteRef + a.FootnoteRef:before {
 #cancelled {
   border-bottom: solid 3px #2E382E; }
 
+@font-face {
+  font-family: 'Gesta';
+  src: url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.eot");
+  src: url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.eot?#iefix") format("embedded-opentype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.woff") format("woff"), url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.ttf") format("truetype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.svg#GestaLtRegular") format("svg");
+  font-weight: 300;
+  font-style: normal; }
+
+@font-face {
+  font-family: 'Gesta';
+  src: url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.eot");
+  src: url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.eot?#iefix") format("embedded-opentype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.woff") format("woff"), url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.ttf") format("truetype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.svg#GestaRegular") format("svg");
+  font-weight: 400;
+  font-style: normal; }
+
+@font-face {
+  font-family: 'Gesta';
+  src: url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.eot");
+  src: url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.eot?#iefix") format("embedded-opentype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.woff") format("woff"), url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.ttf") format("truetype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.svg#GestaMdRegular") format("svg");
+  font-weight: 500;
+  font-style: normal; }
+
 body {
   line-height: 1.3; }
 
@@ -655,34 +676,34 @@ ul, ol {
   list-style-type: none; }
 
 /* https://github.com/metanorma/metanorma-iso/issues/319 : ordered list rendering */
-ol[type="alphabet"] {
+ol[type="a"] {
   counter-reset: alphabet; }
 
-ol[type="arabic"] {
+ol[type="1"] {
   counter-reset: arabic; }
 
-ol[type="roman"] {
+ol[type="i"] {
   counter-reset: roman; }
 
-ol[type="alphabet_upper"] {
+ol[type="A"] {
   counter-reset: alphabet_upper; }
 
-ol[type="roman_upper"] {
+ol[type="I"] {
   counter-reset: roman_upper; }
 
-ol[type="alphabet"] ol[type="alphabet"] {
+ol[type="a"] ol[type="a"] {
   counter-reset: alphabet2; }
 
-ol[type="arabic"] ol[type="arabic"] {
+ol[type="1"] ol[type="1"] {
   counter-reset: arabic2; }
 
-ol[type="roman"] ol[type="roman"] {
+ol[type="i"] ol[type="i"] {
   counter-reset: roman2; }
 
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
+ol[type="A"] ol[type="A"] {
   counter-reset: alphabet_upper2; }
 
-ol[type="roman_upper"] ol[type="roman_upper"] {
+ol[type="I"] ol[type="I"] {
   counter-reset: roman_upper2; }
 
 ol {
@@ -696,29 +717,29 @@ ol > li:before {
   position: absolute;
   left: -1.4em; }
 
-ol[type="roman"] > li:before {
+ol[type="i"] > li:before {
   left: -2.0em; }
 
-ol[type="roman_upper"] > li:before {
+ol[type="I"] > li:before {
   left: -2.3em; }
 
-ol[type="alphabet"] > li:before {
+ol[type="a"] > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[type="arabic"] > li:before {
+ol[type="1"] > li:before {
   counter-increment: arabic;
   content: counter(arabic, decimal) ") "; }
 
-ol[type="roman"] > li:before {
+ol[type="i"] > li:before {
   counter-increment: roman;
   content: counter(roman, lower-roman) ") "; }
 
-ol[type="alphabet_upper"] > li:before {
+ol[type="A"] > li:before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha) ") "; }
 
-ol[type="roman_upper"] > li:before {
+ol[type="I"] > li:before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman) ") "; }
 
@@ -726,23 +747,23 @@ ol > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[type="alphabet"] ol[type="alphabet"] > li:before {
+ol[type="a"] ol[type="a"] > li:before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha) ") "; }
 
-ol[type="arabic"] ol[type="arabic"] > li:before {
+ol[type="1"] ol[type="1"] > li:before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal) ") "; }
 
-ol[type="roman"] ol[type="roman"] > li:before {
+ol[type="i"] ol[type="i"] > li:before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman) ") "; }
 
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
+ol[type="A"] ol[type="A"] > li:before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha) ") "; }
 
-ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
+ol[type="I"] ol[type="I"] > li:before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman) ") "; }
 

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

@@ -9,6 +9,30 @@
 
 @import 'base_style/all';
 
+@font-face {
+    font-family: 'Gesta';
+    src: url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.eot");
+    src: url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.eot?#iefix") format("embedded-opentype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.woff") format("woff"), url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.ttf") format("truetype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-light-webfont.svg#GestaLtRegular") format("svg");
+    font-weight: 300;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Gesta';
+    src: url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.eot");
+    src: url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.eot?#iefix") format("embedded-opentype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.woff") format("woff"), url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.ttf") format("truetype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-webfont.svg#GestaRegular") format("svg");
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Gesta';
+    src: url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.eot");
+    src: url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.eot?#iefix") format("embedded-opentype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.woff") format("woff"), url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.ttf") format("truetype"), url("https://www.bsigroup.com/ui/fonts/bsigesta-medium-webfont.svg#GestaMdRegular") format("svg");
+    font-weight: 500;
+    font-style: normal;
+}
+
 body {
     line-height: 1.3;
 }
@@ -393,34 +417,34 @@ ul, ol {margin-left: 2em;}
 
 /* https://github.com/metanorma/metanorma-iso/issues/319 : ordered list rendering */
 
-ol[type="alphabet"] {
+ol[type="a"] {
   counter-reset: alphabet;
 }
-ol[type="arabic"] {
+ol[type="1"] {
   counter-reset: arabic;
 }
-ol[type="roman"] {
+ol[type="i"] {
   counter-reset: roman;
 }
-ol[type="alphabet_upper"] {
+ol[type="A"] {
   counter-reset: alphabet_upper;
 }
-ol[type="roman_upper"] {
+ol[type="I"] {
   counter-reset: roman_upper;
 }
-ol[type="alphabet"] ol[type="alphabet"] {
+ol[type="a"] ol[type="a"] {
   counter-reset: alphabet2;
 }
-ol[type="arabic"] ol[type="arabic"] {
+ol[type="1"] ol[type="1"] {
   counter-reset: arabic2;
 }
-ol[type="roman"] ol[type="roman"] {
+ol[type="i"] ol[type="i"] {
   counter-reset: roman2;
 }
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
+ol[type="A"] ol[type="A"] {
   counter-reset: alphabet_upper2;
 }
-ol[type="roman_upper"] ol[type="roman_upper"] {
+ol[type="I"] ol[type="I"] {
   counter-reset: roman_upper2;
 }
 ol {
@@ -435,29 +459,29 @@ ol > li:before {
   position: absolute;
   left: -1.4em;
 }
-ol[type="roman"] > li:before {
+ol[type="i"] > li:before {
   left: -2.0em;
 }
-ol[type="roman_upper"] > li:before {
+ol[type="I"] > li:before {
   left: -2.3em;
 }
-ol[type="alphabet"] > li:before {
+ol[type="a"] > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[type="arabic"] > li:before {
+ol[type="1"] > li:before {
   counter-increment: arabic;
   content: counter(arabic, decimal)") "
 }
-ol[type="roman"] > li:before {
+ol[type="i"] > li:before {
   counter-increment: roman;
   content: counter(roman, lower-roman)") "
 }
-ol[type="alphabet_upper"] > li:before {
+ol[type="A"] > li:before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha)") "
 }
-ol[type="roman_upper"] > li:before {
+ol[type="I"] > li:before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman)") "
 }
@@ -465,23 +489,23 @@ ol > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[type="alphabet"] ol[type="alphabet"] > li:before {
+ol[type="a"] ol[type="a"] > li:before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha)") "
 }
-ol[type="arabic"] ol[type="arabic"] > li:before {
+ol[type="1"] ol[type="1"] > li:before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal)") "
 }
-ol[type="roman"] ol[type="roman"] > li:before {
+ol[type="i"] ol[type="i"] > li:before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman)") "
 }
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
+ol[type="A"] ol[type="A"] > li:before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha)") "
 }
-ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
+ol[type="I"] ol[type="I"] > li:before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman)") "
 }

data/lib/isodoc/bsi/html_convert.rb

@@ -14,8 +14,8 @@ module IsoDoc
       # TODO : true font is BSI Gesta, which is a webfont
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : '"Tahoma",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Tahoma",sans-serif'),
+          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : '"Gesta","Tahoma",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Gesta","Tahoma",sans-serif'),
           monospacefont: '"Courier New",monospace',
           monospacefontsize: "1.0em",
           footnotefontsize: "0.9em",

data/lib/isodoc/bsi/i18n-en.yaml

@@ -1,7 +1,6 @@
-introduction: INTRODUCTION
-introduction_iev: INTRODUCTION<br/>Principles and rules followed
-foreword: FOREWORD
-BSI: BRITISH STANDARDS INSTITUTE
+introduction: Introduction
+foreword: Foreword
+BSI: BRITISH STANDARDS INSTITUTION
 formula: Equation
 inequality: Inequality
 section_iev: Section
@@ -38,6 +37,7 @@ internal_external_terms_boilerplate: |
             given in % and the following apply.</p>
 commentary: COMMENTARY %1 ON %2
 commentary_xref: Commentary %1 on %2
+related_refs: "The following BSI references relate to the work on this document:"
 doctype_dict:
   international-standard: International Standard
   technical-specification: Technical Specification

data/lib/isodoc/bsi/metadata.rb

@@ -16,7 +16,7 @@ module IsoDoc
           unpublished(docstatus.text) and
             set(:stageabbr, docstatus["abbreviation"])
         end
-        revdate = isoxml.at(ns("//version/revision-date"))
+        revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
       end
 
@@ -24,7 +24,7 @@ module IsoDoc
         status.to_i.positive? && status.to_i < 60
       end
 
-       def docid(isoxml, _out)
+      def docid(isoxml, _out)
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'BS']"))
         set(:docnumber, dn&.text)
       end

data/lib/isodoc/bsi/presentation_xml_convert.rb

@@ -25,7 +25,7 @@ module IsoDoc
         prefix_name(node, "", n[:label].upcase, "name")
       end
 
-      def eref_localities1_zh(target, type, from, to, n, delim)
+      def eref_localities1_zh(target, type, from, to, node, delim)
         subsection = from&.text&.match(/\./)
         ret = if delim == ";"
                 ";"
@@ -38,24 +38,24 @@ module IsoDoc
         loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize)
         ret += " #{loc}" unless subsection && type == "clause" ||
           type == "list" || target.match(/^IEV$|^IEC 60050-/) ||
-          n["droploc"] == "true"
+          node["droploc"] == "true"
         ret += ")" if type == "list"
         ret
       end
 
-      def eref_localities1(target, type, from, to, delim, n, lang = "en")
+      def eref_localities1(target, type, from, to, delim, node, lang = "en")
         return "" if type == "anchor"
 
         subsection = from&.text&.match(/\./)
         type = type.downcase
         lang == "zh" and
-          return l10n(eref_localities1_zh(target, type, from, to, n, delim))
+          return l10n(eref_localities1_zh(target, type, from, to, node, delim))
         ret = if delim == ";"
                 ";"
               else
                 type == "list" ? "" : delim
               end
-        ret += eref_locality_populate(type, n) unless subsection &&
+        ret += eref_locality_populate(type, node) unless subsection &&
           type == "clause" || type == "list" ||
           target.match(/^IEV$|^IEC 60050-/)
         range = " #{from.text}" if from
@@ -66,6 +66,27 @@ module IsoDoc
         l10n(ret)
       end
 
+      def clause(docxml)
+        super
+        ids = docxml.xpath(ns("//bibdata/relation[@type = 'related']/bibitem"))
+          .each_with_object([]) { |x, m| m << x.at(ns("./docidentifier")).text }
+        return if ids.empty?
+
+        docxml.at(ns("//preface")).elements.first.previous = <<~SECTION
+          <clause type="related-refs">
+          <p>#{@i18n.related_refs}<br/>#{ids.join('<br/>')}</p>
+          </clause>
+        SECTION
+      end
+
+      def annex1(elem)
+        lbl = @xrefs.anchor(elem["id"], :label)
+        if t = elem.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(elem, "<br/>", lbl, "title")
+      end
+
       include Init
     end
   end

data/lib/isodoc/bsi/xref.rb

@@ -20,8 +20,9 @@ module IsoDoc
 
       def commentary_link(target, docxml)
         link = @anchors.dig(target, :xref) || "???"
-        if @anchors.dig(target, :type) == "clause" ||
-            docxml.at(ns("//clause[@id = '#{target}']"))
+        if (@anchors.dig(target, :type) == "clause" ||
+            docxml.at(ns("//clause[@id = '#{target}']"))) &&
+          @anchors.dig(target, :subtype) != "annex"
           link = "#{@labels['clause']} #{@anchors[target][:label]}"
         end
         link
@@ -41,7 +42,7 @@ module IsoDoc
               else
                 l10n("(#{@labels['inform_annex']})")
               end
-        l10n("<strong>#{@labels['annex']} #{num}</strong><br/>#{obl}")
+        l10n("<strong>#{@labels['annex']} #{num}</strong><tab/>#{obl}")
       end
 
       def termnote_anchor_names(docxml)
@@ -87,6 +88,11 @@ module IsoDoc
         end
       end
 
+      def annex_names(clause, num)
+        super
+        @anchors[clause["id"]][:subtype] = "annex"
+      end
+
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] =
           { xref: "<strong>#{num}</strong>", label: num, level: level }
@@ -105,7 +111,8 @@ module IsoDoc
           notes.each do |n|
             next if n["id"].nil? || n["id"].empty?
 
-            idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
+            idx =
+              notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
             @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list",
                                               false)
             list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size > 3)

data/lib/metanorma/bsi/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module BSI
-    VERSION = "0.0.1".freeze
+    VERSION = "0.1.0".freeze
   end
 end
 

data/metanorma-bsi.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "metanorma-iso", "~> 1.8.0"
-  spec.add_dependency "mn2sts", "~> 1.5.0"
+  spec.add_dependency "mn2sts", "~> 1.8.0"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "byebug"