metanorma-iho 0.0.3 → 0.1.0

data/lib/isodoc/iho/pdf_convert.rb

@@ -18,19 +18,6 @@ module IsoDoc
           "iho.specification.xsl"
         end
       end
-
-      def convert(filename, file = nil, debug = false)
-        file = File.read(filename, encoding: "utf-8") if file.nil?
-        docxml, outname_html, dir = convert_init(file, filename, debug)
-        /\.xml$/.match(filename) or
-          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
-          f.write file
-          f.path
-        end
-        FileUtils.rm_rf dir
-        ::Metanorma::Output::XslfoPdf.new.convert(
-          filename, outname_html + ".pdf", File.join(@libdir, pdf_stylesheet(docxml)))
-      end
     end
   end
 end

data/lib/isodoc/iho/presentation_xml_convert.rb

@@ -0,0 +1,11 @@
+require_relative "base_convert"
+require "isodoc"
+require "metanorma-generic"
+
+module IsoDoc
+  module IHO
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+    end
+  end
+end
+

data/lib/isodoc/iho/xref.rb

@@ -0,0 +1,64 @@
+require "isodoc/generic/xref"
+
+module IsoDoc
+  module IHO
+    class Xref < IsoDoc::Generic::Xref
+      def annex_name_lbl(clause, num)
+        lbl = clause["obligation"] == "informative" ?
+          @labels["appendix"] : @labels["annex"]
+        l10n("<b>#{lbl} #{num}</b>")
+      end
+
+      def annex_names(clause, num)
+        appendix_names(clause, num)
+        lbl = clause["obligation"] == "informative" ?
+          @labels["appendix"] : @labels["annex"]
+        @anchors[clause["id"]] =
+          { label: annex_name_lbl(clause, num), type: "clause",
+            xref: "#{lbl} #{num}", level: 1 }
+        if a = single_annex_special_section(clause)
+          annex_names1(a, "#{num}", 1)
+        else
+          clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
+            each_with_index do |c, i|
+            annex_names1(c, "#{num}.#{i + 1}", 2)
+          end
+        end
+        hierarchical_asset_names(clause, num)
+      end
+
+      def back_anchor_names(docxml)
+        super
+        docxml.xpath(ns("//annex[@obligation = 'informative']")).
+          each_with_index do |c, i|
+          annex_names(c, i + 1)
+        end
+        docxml.xpath(ns("//annex[not(@obligation = 'informative')]")).
+          each_with_index do |c, i|
+          annex_names(c, (65 + i + (i > 7 ? 1 : 0)).chr.to_s)
+        end
+      end
+
+      def annex_names1(clause, num, level)
+        lbl = clause.at("./ancestor::xmlns:annex/@obligation").
+          text == "informative" ?  @labels["appendix"] : @labels["annex"]
+        @anchors[clause["id"]] =
+          { label: num, xref: "#{lbl} #{num}",
+            level: level, type: "clause" }
+        clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
+          each_with_index do |c, i|
+          annex_names1(c, "#{num}.#{i + 1}", level + 1)
+        end
+      end
+
+      def appendix_names(clause, num)
+        clause.xpath(ns("./appendix")).each_with_index do |c, i|
+          @anchors[c["id"]] =
+            anchor_struct(i + 1, nil, @labels["appendix"], "clause")
+          @anchors[c["id"]][:level] = 2
+          @anchors[c["id"]][:container] = clause["id"]
+        end
+      end
+    end
+  end
+end

data/lib/metanorma-iho.rb

@@ -4,6 +4,7 @@ require_relative "isodoc/iho/base_convert"
 require_relative "isodoc/iho/html_convert"
 require_relative "isodoc/iho/word_convert"
 require_relative "isodoc/iho/pdf_convert"
+require_relative "isodoc/iho/presentation_xml_convert"
 require_relative "metanorma/iho/version"
 
 if defined? Metanorma

data/lib/metanorma/iho/processor.rb

@@ -27,14 +27,16 @@ module Metanorma
         "Metanorma::IHO #{Metanorma::IHO::VERSION}"
       end
 
-      def output(isodoc_node, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::IHO::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::IHO::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::IHO::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::IHO::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::IHO::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::IHO::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::IHO::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/metanorma-iho.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.0.0"
-  spec.add_dependency 'metanorma-generic', '~> 1.4.0'
+  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency 'metanorma-generic', '~> 1.5.0'
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +241,9 @@ files:
 - lib/isodoc/iho/iho.standard.xsl
 - lib/isodoc/iho/metadata.rb
 - lib/isodoc/iho/pdf_convert.rb
+- lib/isodoc/iho/presentation_xml_convert.rb
 - lib/isodoc/iho/word_convert.rb
+- lib/isodoc/iho/xref.rb
 - lib/metanorma-iho.rb
 - lib/metanorma/iho.rb
 - lib/metanorma/iho/processor.rb
@@ -252,7 +254,7 @@ homepage: https://github.com/metanorma/metanorma-iho
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -267,9 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: metanorma-iho lets you write IHO in AsciiDoc.
 test_files: []