metanorma-iso 2.3.6 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a1965b8adf5207ea4a7c1d65561a0c8762b2b9f939aefb88594bb5995441ad
-  data.tar.gz: 4388b4df33214b2fe2ec7823951a711dd13dfe4d6d426dfd4455c098f7996060
+  metadata.gz: 63f76b4a2d9cc268099b20ca2fa32965d1baa2573dbd696170412ba717ae726b
+  data.tar.gz: 4d7c46a0cedf41d5466030d6e4e5ea8956cdce2081d4d24be581eafae3a71c4d
 SHA512:
-  metadata.gz: 1ee61e3f2e61001ce759bbf13b274d63191595549e31189a8fcda25b8d6edad351df426aaa77b6187adb99ca742d39be6b8ad883a7336e3029ed80fedd25397b
-  data.tar.gz: 13b953974daeeaf1f88696a36f752218bdb9034a653d2f13404d9667ee1a91ef58f466ac58a84ffa9acb379f90231499249c9a178e05b4e1fff90eec1a21b953
+  metadata.gz: 1651fd7ed1c7216292a542dd4a1e5be937807afe1728675633287e507100b0c9979fd58afb682e6ba271d0021313ef1e92f04dc8a14f6d9ad2778fc6cd7eed2a
+  data.tar.gz: 5c195c5207ca60ea89789d9ba82723788f01e85ac9e576d03d27c2449a2fe6ee1bf2fd479809a7813865821e1107b257cc64cdf0f7bb6e59603696602bc30b28

data/lib/isodoc/iso/base_convert.rb

@@ -86,20 +86,6 @@ module IsoDoc
         end
       end
 
-      def formula_where(dlist, out)
-        return if dlist.nil?
-        return super unless dlist.xpath(ns("./dt"))&.size == 1 &&
-          dlist.at(ns("./dd"))&.elements&.size == 1 &&
-          dlist.at(ns("./dd/p"))
-
-        out.span class: "zzMoveToFollowing" do |s|
-          s << "#{@i18n.where} "
-          dlist.at(ns("./dt")).children.each { |n| parse(n, s) }
-          s << " "
-        end
-        parse(dlist.at(ns("./dd/p")), out)
-      end
-
       def admonition_parse(node, out)
         type = node["type"]
         name = admonition_name(node, type)
@@ -168,7 +154,7 @@ module IsoDoc
           class: clause.name == "definitions" ? "Symbols" : nil,
         ) do |div|
           num = num + 1
-          clause_name(num, clause&.at(ns("./title")), div, nil)
+          clause_name(clause, clause&.at(ns("./title")), div, nil)
           clause.elements.each do |e|
             parse(e, div) unless %w{title source}.include? e.name
           end

data/lib/isodoc/iso/html/style-human.css

@@ -124,6 +124,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef + a.TableFootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

data/lib/isodoc/iso/html/style-iso.css

@@ -124,6 +124,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef + a.TableFootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

data/lib/isodoc/iso/html_convert.rb

@@ -61,6 +61,7 @@ module IsoDoc
         content = header.at("./following-sibling::p" \
                             "[@class = 'variant-title-toc']") || header
         if level == "h1" &&
+            header.parent.name != "main" &&
             header.parent.at(".//h2#{toc_exclude_class}")
           <<~HDR
             <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a>
@@ -83,9 +84,9 @@ module IsoDoc
       def middle(isoxml, out)
         middle_title(isoxml, out)
         middle_admonitions(isoxml, out)
-        i = scope isoxml, out, 0
-        i = norm_ref isoxml, out, i
-        clause_etc isoxml, out, i
+        scope isoxml, out, 0
+        norm_ref isoxml, out, 0
+        clause_etc isoxml, out, 0
         annex isoxml, out
         bibliography isoxml, out
         indexsect isoxml, out

data/lib/isodoc/iso/i18n-ja.yaml

@@ -0,0 +1,39 @@
+stage_dict:
+  "00": Preliminary work item
+  "10": New work item proposal
+  "20": Working draft
+  "30": Committee draft
+  "40": 
+    international-standard: Draft International Standard
+    technical-specification: Draft Technical Specification
+    technical-report: Draft Technical Report
+    publicly-available-specification: Draft Publicly Available Specification
+    international-workshop-agreement: Draft International Workshop Agreement
+    guide: Draft Guide
+    amendment: Draft Amendment
+    technical-corrigendum: Draft Technical Corrigendum
+    directive: Draft Directive
+  "50": 
+    international-standard: Final Draft International Standard
+    technical-specification: Final Draft Technical Specification
+    technical-report: Final Draft Technical Report
+    publicly-available-specification: Final Draft Publicly Available Specification
+    international-workshop-agreement: Final Draft International Workshop Agreement
+    guide: Final Draft Guide
+    amendment: Final Draft Amendment
+    technical-corrigendum: Final Draft Technical Corrigendum
+    directive: Final Draft Directive
+  "60": 
+    international-standard: International Standard
+    technical-specification: Technical Specification
+    technical-report: Technical Report
+    publicly-available-specification: Publicly Available Specification
+    international-workshop-agreement: International Workshop Agreement
+    guide: Guide
+    amendment: Amendment
+    technical-corrigendum: Technical Corrigendum
+    directive: Directive
+  "90": Review
+  "95": Withdrawal
+
+

data/lib/isodoc/iso/i18n.rb

@@ -2,13 +2,18 @@ module IsoDoc
   module Iso
     class I18n < IsoDoc::I18n
       def load_file(fname)
-        YAML.load_file(File.join(File.dirname(__FILE__), fname))
+        YAML.load_file(File.join(File.dirname(__FILE__), fname)) ||
+          {}
       end
 
+      # all gems inheriting from ISO need to be represented here,
+      # even if the file is empty
+      # e.g. JA for metanorma-jis
       def load_yaml1(lang, script)
         y = if lang == "en" then load_file("i18n-en.yaml")
             elsif lang == "fr" then load_file("i18n-fr.yaml")
             elsif lang == "ru" then load_file("i18n-ru.yaml")
+            elsif lang == "ja" then load_file("i18n-ja.yaml")
             elsif lang == "zh" && script == "Hans"
               load_file("i18n-zh-Hans.yaml")
             else load_file("i18n-en.yaml")