metanorma-mpfa 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb98fbac9c5a7d876d28998843e605d2a89c60028506ebea161b7d753b36df7
-  data.tar.gz: 26b7e35bfa14f05b62347a094f6098e3ecab134ae54c9a935cc3f22fcdec536a
+  metadata.gz: 418038d116be1278ad5197e740c8f14a3675ca1371b5b25c4e3254e460c89029
+  data.tar.gz: 98a1c3494bbad4aa223b7c317622a6f4f4d14b8226646d09cf99db0c101e9b26
 SHA512:
-  metadata.gz: ff249a97cd6c2998204cc99cc35a290292971c7b146c7d3e25bc090b6851cbe07e91b999f80e824a4c662225b85de2f5231fea36f23563670e35bcef0435716d
-  data.tar.gz: 8d9750fb688092b1934068e4afa8b73c584b904f57f5a9e6f0d3b95fe25d6d9a0177b590921d50c1bb5cfec76c8ed73bd0d6503139c396ce56c2053211d954e0
+  metadata.gz: dcaeba12b30cd6d84050c9143f4589b0e1ca6c0353de5248c9c26f8105a33c5ba63043b016aa5946b56e860bce6af9f56a39d70c0cf5ac9a13425759652cb9e9
+  data.tar.gz: 6b2a9b1b2e184bf524d7be19e44098517cd83872839e2222a49d0bbad8e1888e7b93ee246a8ae575e435a659a4966c6c04bc6623effd820e814c8bf999ad6842

data/lib/asciidoctor/mpfa/isodoc.rng

@@ -922,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1180,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/asciidoctor/mpfa/section.rb

@@ -58,7 +58,6 @@ module Asciidoctor
         attrs[:container] = true if node.role == "container"
         super
       end
-
     end
   end
 end

data/lib/isodoc/mpfa/base_convert.rb

@@ -1,51 +1,9 @@
 require "isodoc"
-require_relative "metadata"
-require_relative "xref"
 require  "fileutils"
 
 module IsoDoc
   module MPFA
     module BaseConvert
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{@xrefs.anchor(annex['id'], :label)} "
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
-      def i18n_init(lang, script)
-        super
-        y = if lang == "en"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            elsif lang == "zh" && script == "Hans"
-              YAML.load_file(File.join(File.dirname(__FILE__),
-                                       "i18n-zh-Hans.yaml"))
-            else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            end
-        @labels = @labels.merge(y)
-        @annex_lbl = y["annex"]
-        @clause_lbl = y["clause"]
-      end
-
-      def terms_defs_title(f)
-        return f&.at(ns("./title"))&.content
-      end
-
       TERM_CLAUSE = "//preface/terms | "\
         "//preface/clause[descendant::terms]".freeze
 
@@ -57,7 +15,7 @@ module IsoDoc
       def terms_defs(isoxml, out, num)
         f = isoxml.at(ns(self.class::TERM_CLAUSE)) or return num
         out.div **attr_code(id: f["id"]) do |div|
-          clause_name(nil, terms_defs_title(f), div, nil)
+          clause_name(nil, f&.at(ns("./title")), div, nil)
           f.elements.each do |e|
             parse(e, div) unless %w{title source}.include? e.name
           end
@@ -72,8 +30,7 @@ module IsoDoc
           if c.name == "terms" || c.at(ns(".//terms")) then terms_defs isoxml, out, 0
           else
             out.div **attr_code(id: c["id"]) do |s|
-              clause_name(@xrefs.anchor(c['id'], :label),
-                          c&.at(ns("./title"))&.content, s, nil)
+              clause_name(nil, c&.at(ns("./title")), s, nil)
               c.elements.reject { |c1| c1.name == "title" }.each do |c1|
                 parse(c1, s)
               end
@@ -91,6 +48,7 @@ module IsoDoc
       end
 
       def termdef_parse(node, out)
+        name = node&.at(ns("./name"))&.remove
         set_termdomain("")
         node.children.each { |n| parse(n, out) }
       end
@@ -98,8 +56,8 @@ module IsoDoc
       def clause(isoxml, out)
         isoxml.xpath(ns(middle_clause)).each do |c|
           out.div **attr_code(id: c["id"]) do |s|
-            clause_name(@xrefs.anchor(c['id'], :label),
-                        c&.at(ns("./title"))&.content, s, class: c["container"] ? "containerhdr" : nil )
+            clause_name(nil, c&.at(ns("./title")), s, 
+                        class: c["container"] ? "containerhdr" : nil )
             c.elements.reject { |c1| c1.name == "title" }.each do |c1|
               parse(c1, s)
             end
@@ -107,17 +65,11 @@ module IsoDoc
         end
       end
 
-      def clause_parse_title(node, div, c1, out)
-        if node["inline-header"] == "true"
-          inline_header_title(out, node, c1)
-        else
-          attrs = { class: node["container"] ? "containerhdr" : nil }
-          div.send "h#{@xrefs.anchor(node['id'], :level, :false) || '1'}", **attr_code(attrs) do |h|
-            lbl = @xrefs.anchor(node['id'], :label, false)
-            h << "#{lbl}. " if lbl && !@suppressheadingnumbers
-            c1&.children&.each { |c2| parse(c2, h) }
-          end
-        end
+      def clause_parse_title(node, div, c1, out, header_class = {})
+        attrs = {}
+        attrs = { class: "containerhdr" } if node["container"]
+        header_class = header_class.merge(attrs)
+        super
       end
 
       def ol_depth(node)

data/lib/isodoc/mpfa/html_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -57,6 +58,8 @@ module IsoDoc
           comments div3
         end
       end
+
+      include Init
     end
   end
 end

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

@@ -1,2 +1,7 @@
 clause: Paragraph
 annex: Appendix
+termsdef: Glossary
+termsdefsymbolsabbrev: Glossary
+termsdefsymbols: Glossary
+termsdefabbrev: Glossary
+

data/lib/isodoc/mpfa/i18n.rb

@@ -0,0 +1,16 @@
+module IsoDoc
+  module MPFA
+    class I18n < IsoDoc::I18n
+      def load_yaml1(lang, script)
+        y = if lang == "en"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            elsif lang == "zh" && script == "Hans"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+            else
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            end
+        super.merge(y)
+      end
+    end
+  end
+end

data/lib/isodoc/mpfa/init.rb

@@ -0,0 +1,28 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+require_relative "i18n"
+
+module IsoDoc
+  module MPFA
+    module Init
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, labels, options)
+      end
+
+      def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      end
+
+      def fileloc(loc)
+        File.join(File.dirname(__FILE__), loc)
+      end
+    end
+  end
+end
+

data/lib/isodoc/mpfa/presentation_xml_convert.rb

@@ -1,9 +1,18 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module MPFA
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def annex1(f)
+        lbl = @xrefs.anchor(f['id'], :label)
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(f, " ", lbl, "title")
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/mpfa/word_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -57,6 +58,8 @@ module IsoDoc
         end
         section_break(body)
       end
+
+      include Init
     end
   end
 end

data/lib/isodoc/mpfa/xref.rb

@@ -15,7 +15,7 @@ module IsoDoc
       end
 
       def annex_name_lbl(clause, num)
-        l10n("<b>#{@labels['annex']} #{num}</b>")
+        l10n("<strong>#{@labels['annex']} #{num}</strong>")
       end
 
       def clause_names(docxml, sect_num)

data/lib/metanorma/mpfa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module MPFA
-    VERSION = "0.4.3"
+    VERSION = "0.5.0"
   end
 end

data/metanorma-mpfd.gemspec

@@ -29,9 +29,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  #spec.add_dependency "nokogiri"
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "twitter_cldr"
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfa
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,8 @@ files:
 - lib/isodoc/mpfa/html_convert.rb
 - lib/isodoc/mpfa/i18n-en.yaml
 - lib/isodoc/mpfa/i18n-zh-Hans.yaml
+- lib/isodoc/mpfa/i18n.rb
+- lib/isodoc/mpfa/init.rb
 - lib/isodoc/mpfa/metadata.rb
 - lib/isodoc/mpfa/presentation_xml_convert.rb
 - lib/isodoc/mpfa/word_convert.rb