metanorma-jis 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee0f607f2c8574957f29235f1275f1429da187b745f4ddb33b2ddb56df963df
-  data.tar.gz: 2c701b9b9a847ab56e541bfa89071811524ac8aa8b91e23af6aa52d5221e4988
+  metadata.gz: 69d84c2a4a93bd07e8cc03bb17f85b74d5240fe452a221f51633879b49619c59
+  data.tar.gz: 0af70c6c8597a621929ba2c67479f1b4eee6c9cd6543f34d5e20bb6c8508a2b7
 SHA512:
-  metadata.gz: 7f6f2229ed80159a55fac331a60a9562dcd5dc35d64f74f668d65fe4e357717fe19be77d8e206f8c54a5bd4a846dbfb498c48deec06cc8efc2a5aa81855a706d
-  data.tar.gz: 8910abb49ac749e5452324f238b3841213f3f1895faf0301e34e274916f5d483a26a8a5250227f087d346c26465646217816603e765d84d61e46399196345ec6
+  metadata.gz: ce10805206a513ac7b8a60a309347d509cdca78d7b6ac42fe9793b2c483c3e33dd671c06539a5c9339cd3dc3df5e85ca903e44821cc9d889514c297255ee7d27
+  data.tar.gz: 1abd0d8a03a44699f47f7c5724c2478cd819dcf97cb90e7d67de677585b3e5e0a3aa28bd80496244429677ac0be702f050d4779af60031e0eb2502fb1b7b7953

data/lib/isodoc/jis/base_convert.rb

@@ -4,7 +4,8 @@ require "metanorma-iso"
 module IsoDoc
   module Jis
     module BaseConvert
-      def termnote_parse(node, out)
+      # KILL
+      def termnote_parsex(node, out)
         name = node.at(ns("./name"))&.remove
         out.div **note_attrs(node) do |div|
           div.p do |p|
@@ -30,7 +31,7 @@ module IsoDoc
         page_break(out)
         out.div **attr_code(annex_attrs(node)) do |s|
           node.elements.each do |c1|
-            if c1.name == "title" then annex_name(node, c1, s)
+            if c1.name == "fmt-title" then annex_name(node, c1, s)
             else parse(c1, s) end
           end
         end
@@ -41,7 +42,7 @@ module IsoDoc
         page_break(out)
         out.div **attr_code(annex_attrs(node)) do |s|
           node.elements.each do |c1|
-            if c1.name == "title" then annex_name(node, c1, s)
+            if c1.name == "fmt-title" then annex_name(node, c1, s)
             else parse(c1, s)
             end
           end
@@ -50,7 +51,7 @@ module IsoDoc
 
       def table_parse(node, out)
         cols = table_cols_count(node)
-        name = node.at(ns("./name"))
+        name = node.at(ns("./fmt-name"))
         thead = table_thead_pt(node, name)
         table_name(name, thead, cols)
         super

data/lib/isodoc/jis/figure.rb

@@ -14,7 +14,7 @@ module IsoDoc
         { units: node.at(ns("./note[@type = 'units']")),
           notes_etc: figure_notes_examples_paras(node
           .xpath(ns("./note[not(@type = 'units')] | ./example | ./p"))),
-          name: node.at(ns("./name")),
+          name: node.at(ns("./fmt-name")),
           key: node.xpath(ns("./p[@class = 'ListTitle' or @class = 'dl']")),
           img: node.at(ns("./image")),
           aside: node.at(ns("./aside")),

data/lib/isodoc/jis/html/isodoc.css

@@ -1393,7 +1393,7 @@ div.Note table.dl {
   font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
-span.note_label, span.example_label, td.example_label, td.note_label {
+span.note_label, span.example_label, td.example_label, td.note_label, span.termnote_label, td.termnote_label {
   font-size: {{smallerfontsize}};
   font-family: {{headerfont}}; }
 

data/lib/isodoc/jis/html/isodoc.scss

@@ -1352,7 +1352,7 @@ div.Note table.dl  {
   margin-left: 1.0cm;
 }
 
-span.note_label, span.example_label, td.example_label, td.note_label
+span.note_label, span.example_label, td.example_label, td.note_label, span.termnote_label, td.termnote_label
 {
 font-size: $smallerfontsize;
 font-family:$headerfont;

data/lib/isodoc/jis/init.rb

@@ -20,13 +20,21 @@ module IsoDoc
       end
 
       def bibrenderer(options = {})
-        ::Relaton::Render::Jis::General.new(options.merge(language: @lang,
-                                                          i18nhash: @i18n.get))
+        ::Relaton::Render::Jis::General.new(options
+          .merge(language: @lang, i18nhash: @i18n.get))
       end
 
       def std_docid_semantic(text)
         text
       end
+
+      def convert_i18n_init1(docxml)
+        b = docxml.at("//xmlns:bibdata") or return
+        lang = docxml.at("//xmlns:bibdata/xmlns:language") ||
+        (docxml << "<language/>")
+        %w(en ja).include?(lang&.text) or lang.content = "ja"
+        super
+      end
     end
   end
 end