metanorma-cc 1.4.1 → 1.5.2

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

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

data/lib/isodoc/cc/html_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -45,6 +46,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

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

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

data/lib/isodoc/cc/i18n.rb

@@ -0,0 +1,10 @@
+module IsoDoc
+  module CC
+    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/cc/init.rb

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

data/lib/isodoc/cc/metadata.rb

@@ -6,7 +6,6 @@ module IsoDoc
     # A {Converter} implementation that generates CC output, and a document
     # schema encapsulation of the document for validation
     class Metadata < IsoDoc::Metadata
-
       def initialize(lang, script, labels)
         super
         set(:tc, "XXXX")

data/lib/isodoc/cc/presentation_xml_convert.rb

@@ -1,9 +1,18 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module CC
     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/cc/word_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -32,6 +33,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/cc/xref.rb

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

data/lib/metanorma/cc/processor.rb

@@ -38,7 +38,7 @@ module Metanorma
           IsoDoc::CC::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
           IsoDoc::CC::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
-        when :pdf
+        when :presentation
           IsoDoc::CC::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "1.4.1"
+    VERSION = "1.5.2"
   end
 end

data/metanorma-cc.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  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-cc
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.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: metanorma-standoc
@@ -16,28 +16,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
@@ -52,6 +52,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
@@ -205,23 +219,31 @@ files:
 - lib/asciidoctor/cc/validate_section.rb
 - lib/isodoc/cc/base_convert.rb
 - lib/isodoc/cc/csd.standard.xsl
+- lib/isodoc/cc/html/_coverpage.css
 - lib/isodoc/cc/html/_coverpage.scss
+- lib/isodoc/cc/html/cc.css
 - lib/isodoc/cc/html/cc.scss
 - lib/isodoc/cc/html/dots-w@2x.png
 - lib/isodoc/cc/html/dots@2x.png
 - lib/isodoc/cc/html/header.html
 - lib/isodoc/cc/html/html_cc_intro.html
 - lib/isodoc/cc/html/html_cc_titlepage.html
+- lib/isodoc/cc/html/htmlstyle.css
 - lib/isodoc/cc/html/htmlstyle.scss
 - lib/isodoc/cc/html/scripts.html
 - lib/isodoc/cc/html/word_cc_intro.html
 - lib/isodoc/cc/html/word_cc_titlepage.html
+- lib/isodoc/cc/html/wordstyle.css
 - lib/isodoc/cc/html/wordstyle.scss
 - lib/isodoc/cc/html_convert.rb
+- lib/isodoc/cc/i18n-en.yaml
+- lib/isodoc/cc/i18n.rb
+- lib/isodoc/cc/init.rb
 - lib/isodoc/cc/metadata.rb
 - lib/isodoc/cc/pdf_convert.rb
 - lib/isodoc/cc/presentation_xml_convert.rb
 - lib/isodoc/cc/word_convert.rb
+- lib/isodoc/cc/xref.rb
 - lib/metanorma-cc.rb
 - lib/metanorma/cc.rb
 - lib/metanorma/cc/processor.rb