metanorma-csa 1.5.1 → 1.6.2

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

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

data/lib/isodoc/csa/html_convert.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base_convert'
+require_relative 'init'
 require 'isodoc'
 
 module IsoDoc
@@ -52,6 +53,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

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

@@ -0,0 +1,2 @@
+annex: Appendix
+

data/lib/isodoc/csa/i18n.rb

@@ -0,0 +1,10 @@
+module IsoDoc
+  module Csa
+    class I18n < IsoDoc::I18n
+      def load_yaml1(lang, script)
+        y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+        super.merge(y)
+      end
+    end
+  end
+end

data/lib/isodoc/csa/init.rb

@@ -0,0 +1,24 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+require_relative "i18n"
+
+module IsoDoc
+  module Csa
+    module Init
+      def metadata_init(lang, script, i18n)
+        @meta = Metadata.new(lang, script, i18n)
+      end
+
+      def xref_init(lang, script, klass, i18n, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, i18n, options)
+      end
+
+       def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      end
+    end
+  end
+end
+

data/lib/isodoc/csa/presentation_xml_convert.rb

@@ -1,9 +1,18 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module Csa
     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, "<br/>", lbl, "title")
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/csa/word_convert.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base_convert'
+require_relative 'init'
 require 'isodoc'
 
 module IsoDoc
@@ -35,6 +36,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/csa/xref.rb

@@ -0,0 +1,6 @@
+module IsoDoc
+  module Csa
+    class Xref < IsoDoc::Xref
+    end
+  end
+end

data/lib/metanorma/csa/version.rb

@@ -2,6 +2,6 @@
 
 module Metanorma
   module Csa
-    VERSION = '1.5.1'
+    VERSION = '1.6.2'
   end
 end

data/metanorma-csa.gemspec

@@ -36,10 +36,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
 
-  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_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-csa
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.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
@@ -100,28 +100,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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,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
@@ -286,6 +300,7 @@ files:
 - lib/isodoc/csa/base_convert.rb
 - lib/isodoc/csa/csa.standard.xsl
 - lib/isodoc/csa/html/csa-logo-white.png
+- lib/isodoc/csa/html/csa.css
 - lib/isodoc/csa/html/csa.png
 - lib/isodoc/csa/html/csa.scss
 - lib/isodoc/csa/html/dots-w@2x.png
@@ -293,16 +308,22 @@ files:
 - lib/isodoc/csa/html/header.html
 - lib/isodoc/csa/html/html_csa_intro.html
 - lib/isodoc/csa/html/html_csa_titlepage.html
+- lib/isodoc/csa/html/htmlstyle.css
 - lib/isodoc/csa/html/htmlstyle.scss
 - lib/isodoc/csa/html/scripts.html
 - lib/isodoc/csa/html/word_csa_intro.html
 - lib/isodoc/csa/html/word_csa_titlepage.html
+- lib/isodoc/csa/html/wordstyle.css
 - lib/isodoc/csa/html/wordstyle.scss
 - lib/isodoc/csa/html_convert.rb
+- lib/isodoc/csa/i18n-en.yaml
+- lib/isodoc/csa/i18n.rb
+- lib/isodoc/csa/init.rb
 - lib/isodoc/csa/metadata.rb
 - lib/isodoc/csa/pdf_convert.rb
 - lib/isodoc/csa/presentation_xml_convert.rb
 - lib/isodoc/csa/word_convert.rb
+- lib/isodoc/csa/xref.rb
 - lib/metanorma-csa.rb
 - lib/metanorma/csa.rb
 - lib/metanorma/csa/processor.rb