metanorma-mpfa 0.4.1 → 0.5.2

data/lib/isodoc/mpfa/html/wordstyle.scss

@@ -1154,4 +1154,3 @@ ol
 ul
 	{margin-bottom:0cm;
 	margin-left:18pt;}
-

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
@@ -49,6 +50,7 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2
+          #preface_block docxml, div2
           abstract docxml, div2
           foreword docxml, div2
           introduction docxml, div2
@@ -57,6 +59,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.1"
+    VERSION = "0.5.2"
   end
 end

data/metanorma-mpfd.gemspec

@@ -29,12 +29,12 @@ 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"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfa
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-27 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
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -232,19 +246,24 @@ files:
 - lib/isodoc/mpfa/html/header.html
 - lib/isodoc/mpfa/html/html_rsd_intro.html
 - lib/isodoc/mpfa/html/html_rsd_titlepage.html
+- lib/isodoc/mpfa/html/htmlstyle.css
 - lib/isodoc/mpfa/html/htmlstyle.scss
 - lib/isodoc/mpfa/html/logo.jpg
 - lib/isodoc/mpfa/html/logo.svg
 - lib/isodoc/mpfa/html/mpfa-logo-no-text@4x.png
 - lib/isodoc/mpfa/html/mpfa-logo@4x.png
+- lib/isodoc/mpfa/html/rsd.css
 - lib/isodoc/mpfa/html/rsd.scss
 - lib/isodoc/mpfa/html/scripts.html
 - lib/isodoc/mpfa/html/word_rsd_intro.html
 - lib/isodoc/mpfa/html/word_rsd_titlepage.html
+- lib/isodoc/mpfa/html/wordstyle.css
 - lib/isodoc/mpfa/html/wordstyle.scss
 - 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