metanorma-nist 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdfccf7f80188c5fdb7b176e3f2e1ec2533218d878ffc2e8798a4ad3b9cd70f7
-  data.tar.gz: d98180fcdd728e854e47df4f8ca07503c77de570ac3c7f41ab21c6ae0b516e87
+  metadata.gz: '05109623d4ab89934b15717692765c6c29015007695efad9ea8258b81d1e956c'
+  data.tar.gz: f848bb3f40e50382a2bfeca5f2bd89a78d06d7808bbb3aa4e01d3ce88a8cb87e
 SHA512:
-  metadata.gz: 25231b4da1777b011ef5ac9eb9aa2c9691227882ca37fa59cc034a4bbf5a22b077bb59b512e1673488d7a497b36c304d508e8e65b45fd0deb5b3aa069304a9bc
-  data.tar.gz: ba4697d24bb857a5468dd1dc02e4b0bf83cb8ea296c6fc08b205c855d8b9b4dd000a08bcba3f7871ce06ab5919dfeb758148f862464fbbc78ed6124b6d26aa7b
+  metadata.gz: 5b3e0c43ab7a515b8dcba5a6c988254d361934a87091dca35a9134b3d51833c463126695bc2ebee8a3c1430b309210fd08adc8efec6e1ddce727dd2a9c96ad28
+  data.tar.gz: edc0d9b4b5aa9b8fe2c98a7369cfec29a44a93a3b4808dfb95b8eb618aa6ff7ada7e0110190bb84cf35355fbcb4497c84827ddbd0eb540aeba2a3389525fd20d

data/lib/asciidoctor/nist/converter.rb

@@ -97,21 +97,12 @@ module Asciidoctor
         super
       end
 
-      def document(node)
-        init(node)
-        ret1 = makexml(node)
-        ret = ret1.to_xml(indent: 2)
-        unless node.attr("nodoc") || !node.attr("docfile")
-          filename = node.attr("docfile").gsub(/\.adoc/, ".xml").
-            gsub(%r{^.*/}, "")
-          File.open(filename, "w:UTF-8") { |f| f.write(ret) }
-          html_converter(node).convert filename unless node.attr("nodoc")
-          word_converter(node).convert filename unless node.attr("nodoc")
-          pdf_converter(node)&.convert filename unless node.attr("nodoc")
-        end
-        @log.write(@localdir + @filename + ".err") unless @novalid
-        @files_to_delete.each { |f| FileUtils.rm f }
-        ret
+      def outputs(node, ret)
+        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
+          presentation_xml_converter(node).convert(@filename + ".xml")
+          html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
+          doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
+          pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
       end
 
       def clause_parse(attrs, xml, node)
@@ -170,8 +161,8 @@ module Asciidoctor
         xml.annex **attr_code(attrs1) do |xml_section|
           xml_section.title { |t| t << "Bibliography" }
           @biblio = true
-          xml.references **attr_code(attrs) do |xml_section|
-            xml_section << node.content
+          xml.references **attr_code(attrs.merge(normative: true)) do |r|
+            r << node.content
           end
         end
         @biblio = false
@@ -203,11 +194,15 @@ module Asciidoctor
         super
       end
 
+      def presentation_xml_converter(node)
+        IsoDoc::NIST::PresentationXMLConvert.new(html_extract_attributes(node))
+      end
+
       def html_converter(node)
         IsoDoc::NIST::HtmlConvert.new(html_extract_attributes(node))
       end
 
-      def word_converter(node)
+      def doc_converter(node)
         IsoDoc::NIST::WordConvert.new(doc_extract_attributes(node))
       end
 

data/lib/isodoc/nist/base_convert.rb

@@ -1,6 +1,6 @@
 require "isodoc"
 require_relative "metadata"
-require_relative "xrefs"
+require_relative "xref"
 require_relative "refs"
 require_relative "section"
 require "fileutils"
@@ -8,6 +8,14 @@ require "fileutils"
 module IsoDoc
   module NIST
     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 keywords(_docxml, out)
         kw = @meta.get[:keywords]
         kw.empty? and return
@@ -126,8 +134,9 @@ module IsoDoc
         end
       end
 
-      MIDDLE_CLAUSE = "//clause[parent::sections] | "\
-        "//terms[parent::sections]".freeze
+      def middle_clause
+        "//clause[parent::sections] | //terms[parent::sections]"
+      end
 
       def middle(isoxml, out)
         middle_admonitions(isoxml, out)
@@ -219,6 +228,19 @@ module IsoDoc
           out << " &mdash; "
         node.at(ns("./p")).children.each { |n| parse(n, out) }
       end
+
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{@xrefs.anchor(annex['id'], :label)} &mdash; "
+          t.b do |b|
+            if @bibliographycount == 1 && annex.at(ns("./references"))
+              b << "References"
+            else
+              name&.children&.each { |c2| parse(c2, b) }
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/isodoc/nist/html_convert.rb

@@ -37,10 +37,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
       def googlefonts
         <<~HEAD.freeze
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,600i" rel="stylesheet">

data/lib/isodoc/nist/pdf_convert.rb

@@ -7,26 +7,15 @@ module IsoDoc
   module NIST
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
+    class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
       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)
-        @series =  docxml&.at(ns("//bibdata/series/abbreviation"))&.text
-        /\.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, @series == "NIST CSWP" ?
-                    "nist.cswp.xsl" : "nist.sp.xsl"))
+      def pdf_stylesheet(docxml)
+        series =  docxml&.at(ns("//bibdata/series/abbreviation"))&.text
+        series == "NIST CSWP" ?  "nist.cswp.xsl" : "nist.sp.xsl"
       end
     end
   end

data/lib/isodoc/nist/presentation_xml_convert.rb

@@ -0,0 +1,10 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module NIST
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    end
+  end
+end
+

data/lib/isodoc/nist/refs.rb

@@ -62,7 +62,7 @@ module IsoDoc
         title = node&.at(ns("./title"))&.text || ""
         out.div do |div|
           unless suppress_biblio_title(node)
-            anchor(node['id'], :label, false) and
+            @xrefs.anchor(node['id'], :label, false) and
               clause_parse_title(node, div, node.at(ns("./title")), out) or
               div.h2 title, **{ class: "Section3" }
           end

data/lib/isodoc/nist/section.rb

@@ -25,7 +25,7 @@ module IsoDoc
       def preface1(c, title, patent, out)
         out.div **attr_code(id: c["id"]) do |s|
           page_break(s) if patent
-          clause_name(anchor(c['id'], :label), title, s,
+          clause_name(@xrefs.anchor(c['id'], :label), title, s,
                       class: (c.name == "executivesummary") ? "NormalTitle" :
                       "IntroTitle")
           c.elements.reject { |c1| c1.name == "title" }.each do |c1|

data/lib/isodoc/nist/word_convert.rb

@@ -49,10 +49,6 @@ module IsoDoc
           olstyle: "l2" }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|

data/lib/isodoc/nist/{xrefs.rb → xref.rb}

@@ -4,7 +4,7 @@ require "fileutils"
 
 module IsoDoc
   module NIST
-    module BaseConvert
+    class Xref < IsoDoc::Xref
       SECTIONS_XPATH =
         "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
         "//sections/clause | //bibliography/references | //acknowledgements | "\
@@ -50,7 +50,7 @@ module IsoDoc
       end
 
       def annex_name_lbl(clause, num)
-        l10n("<b>#{@annex_lbl} #{num}</b>")
+        l10n("<b>#{@labels['annex']} #{num}</b>")
       end
 
       def annex_name(annex, name, div)

data/lib/metanorma-nist.rb

@@ -3,7 +3,9 @@ require_relative "asciidoctor/nist/converter"
 require_relative "isodoc/nist/html_convert"
 require_relative "isodoc/nist/pdf_convert"
 require_relative "isodoc/nist/word_convert"
+require_relative "isodoc/nist/presentation_xml_convert"
 require_relative "isodoc/nist/render"
+require_relative "isodoc/nist/xref"
 require_relative "metanorma/nist/version"
 
 if defined? Metanorma

data/lib/metanorma/nist/processor.rb

@@ -33,14 +33,16 @@ module Metanorma
         Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
-      def output(isodoc_node, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::NIST::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::NIST::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::NIST::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::NIST::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::NIST::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::NIST::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::NIST::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.0.10"
+    VERSION = "1.1.0"
   end
 end

data/metanorma-nist.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "tzinfo-data" # we need this for windows only
 
   spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.0.0"
+  spec.add_dependency "isodoc", "~> 1.1.0"
   #spec.add_dependency "relaton-nist", "~> 0.3.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -100,14 +100,14 @@ 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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +298,7 @@ files:
 - lib/isodoc/nist/nist.cswp.xsl
 - lib/isodoc/nist/nist.sp.xsl
 - lib/isodoc/nist/pdf_convert.rb
+- lib/isodoc/nist/presentation_xml_convert.rb
 - lib/isodoc/nist/refs.rb
 - lib/isodoc/nist/render.rb
 - lib/isodoc/nist/render_contributors.rb
@@ -305,7 +306,7 @@ files:
 - lib/isodoc/nist/section.rb
 - lib/isodoc/nist/word_convert.rb
 - lib/isodoc/nist/word_convert_toc.rb
-- lib/isodoc/nist/xrefs.rb
+- lib/isodoc/nist/xref.rb
 - lib/metanorma-nist.rb
 - lib/metanorma/nist.rb
 - lib/metanorma/nist/processor.rb
@@ -315,7 +316,7 @@ homepage: https://github.com/metanorma/metanorma-nist
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -330,9 +331,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 NIST gem.
 test_files: []