metanorma-jis 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0390d5e28376c6e536985c4f658e4e939eb12931602991a787b01fe832c6f8f
-  data.tar.gz: 599457fe99595bec1161f38217eca0ef96eab8ba1a401a4b6e6ba3ddda01f5db
+  metadata.gz: 2ee0f607f2c8574957f29235f1275f1429da187b745f4ddb33b2ddb56df963df
+  data.tar.gz: 2c701b9b9a847ab56e541bfa89071811524ac8aa8b91e23af6aa52d5221e4988
 SHA512:
-  metadata.gz: d24345a27eb6dde003eadf90254a267c86ca19bfbd16a9e94093e7389a5ffc843bc05db82389480a01d387456f7e23247efb34fc0c46a2f3095ff7bef1d289ce
-  data.tar.gz: bccf625290d0f44d49d024fe409b1d4e1c01849bef810ecbdd5571f3f6753691d5dc6b877327c781e6f10e9516f07c1f1739bca8eb2b658d264594524dad4a9e
+  metadata.gz: 7f6f2229ed80159a55fac331a60a9562dcd5dc35d64f74f668d65fe4e357717fe19be77d8e206f8c54a5bd4a846dbfb498c48deec06cc8efc2a5aa81855a706d
+  data.tar.gz: 8910abb49ac749e5452324f238b3841213f3f1895faf0301e34e274916f5d483a26a8a5250227f087d346c26465646217816603e765d84d61e46399196345ec6

data/lib/isodoc/jis/base_convert.rb

@@ -12,20 +12,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
@@ -90,9 +83,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/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/i18n-ja.yaml

@@ -14,6 +14,7 @@ chairperson: 委員会長
 membership_table: 構成表
 full_name: 氏名
 affiliation: 所属
+toc_page: 頁
 doctype_dict:
   international-standard: 日本産業規格
   japanese-industrial-standard: 日本産業規格

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)
@@ -25,12 +24,6 @@ module IsoDoc
                                                           i18nhash: @i18n.get))
       end
 
-      def omit_docid_prefix(prefix)
-        return true if prefix.nil? || prefix.empty?
-
-        super || %w(JIS).include?(prefix)
-      end
-
       def std_docid_semantic(text)
         text
       end