metanorma-jis 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 143689fe642bbafd3b997d46a587850eec0af4af80a0f30e302cfa2451c9cff1
-  data.tar.gz: c4f55a36d8c9279500128f725553473180c6574c44657e326990b5bfcc4fd74d
+  metadata.gz: 69d84c2a4a93bd07e8cc03bb17f85b74d5240fe452a221f51633879b49619c59
+  data.tar.gz: 0af70c6c8597a621929ba2c67479f1b4eee6c9cd6543f34d5e20bb6c8508a2b7
 SHA512:
-  metadata.gz: dc0aba1f4821abc37de307e0fc9a2d7b0323a0c3508efcf345c6617c5b0c61ec177f08c87d0fc96676750038e18e985f90ff202ee1bc0d3c1e25b0af6e905480
-  data.tar.gz: 52d7c1db05596ebae3eac257c6da53394c361c18e93ff1bc5964f304983c24ea33b58f4b7c6d60760ec4814bef052a7706a3ec0a1e022ddffba2eb313c6220e5
+  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|
@@ -12,20 +13,13 @@ module IsoDoc
               p.span class: "note_label" do |s|
                 name.children.each { |n| parse(n, s) }
               end
-              p << termnote_delim
+              p << " "
             end
             para_then_remainder(node.first_element_child, node, p, div)
           end
         end
       end
 
-      def admonition_name_parse(_node, div, name)
-        div.span class: "note_label" do |s|
-          name.children.each { |n| parse(n, s) }
-          s << " &#x2014; "
-        end
-      end
-
       def make_tr_attr(cell, row, totalrows, header, bordered)
         cell["border"] == "0" and bordered = false
         super
@@ -37,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
@@ -48,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
@@ -57,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
@@ -90,9 +84,10 @@ module IsoDoc
 
       def table_name(name, thead, cols)
         name or return
-        thead.children.first.previous =
-          full_row(cols, "<p class='TableTitle' style='text-align:center;'> " \
-                         "#{name.remove.children.to_xml}</p>")
+        thead.add_first_child full_row(
+          cols, "<p class='TableTitle' style='text-align:center;'> " \
+                         "#{name.remove.children.to_xml}</p>"
+        )
       end
 
       def table_note_cleanup(docxml)

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/html_convert.rb

@@ -35,12 +35,14 @@ module IsoDoc
         }
       end
 
+      # TODO to Presentation XML
       def make_table_footnote_target(out, fnid, fnref)
         attrs = { id: fnid, class: "TableFootnoteRef" }
         out.span do |s|
+         # TODO to Presentation XML
           s << @i18n.table_footnote
           out.span **attrs do |a|
-            a << "#{fnref})"
+            a << fnref
           end
           insert_tab(s, 1)
         end

data/lib/isodoc/jis/init.rb

@@ -10,9 +10,8 @@ module IsoDoc
       end
 
       def xref_init(lang, script, _klass, labels, options)
-        @xrefs = Xref.new(lang, script,
-                          HtmlConvert.new(language: lang, script: script),
-                          labels, options)
+        p = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, p, labels, options)
       end
 
       def i18n_init(lang, script, locale, i18nyaml = nil)
@@ -21,19 +20,21 @@ module IsoDoc
       end
 
       def bibrenderer(options = {})
-        ::Relaton::Render::Jis::General.new(options.merge(language: @lang,
-                                                          i18nhash: @i18n.get))
-      end
-
-      def omit_docid_prefix(prefix)
-        return true if prefix.nil? || prefix.empty?
-
-        super || %w(JIS).include?(prefix)
+        ::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