metanorma-iso 1.3.27 → 1.4.0

data/lib/isodoc/iso/pdf_convert.rb

@@ -20,19 +20,6 @@ module IsoDoc
           "iso.international-standard.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/iso/presentation_xml_convert.rb

@@ -0,0 +1,13 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module Iso
+
+    # A {Converter} implementation that generates HTML output, and a document
+    # schema encapsulation of the document for validation
+    #
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    end
+  end
+end

data/lib/isodoc/iso/sections.rb

@@ -30,9 +30,9 @@ module IsoDoc
       end
 
       def annex(isoxml, out)
-        @amd and @suppressheadingnumbers = @oldsuppressheadingnumbers
+        amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
         super
-        @amd and @suppressheadingnumbers = true
+        amd(isoxml) and @suppressheadingnumbers = true
       end
 
       def introduction(isoxml, out)

data/lib/isodoc/iso/sts_convert.rb

@@ -10,18 +10,20 @@ module IsoDoc
     class StsConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
+        @format = :sts
+        @suffix = "sts.xml"
       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|
+      def convert(input_filename, file = nil, debug = false, output_filename = nil)
+        file = File.read(input_filename, encoding: "utf-8") if file.nil?
+        docxml, filename, dir = convert_init(file, input_filename, debug)
+        /\.xml$/.match(input_filename) or
+          input_filename = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
           f.write file
           f.path
         end
         FileUtils.rm_rf dir
-        Mn2sts.convert(filename, outname_html + ".sts.xml")
+        Mn2sts.convert(input_filename, output_filename || "#{filename}.#{@suffix}")
       end
     end
   end

data/lib/isodoc/iso/xref.rb

@@ -1,8 +1,8 @@
 module IsoDoc
   module Iso
-    module BaseConvert
-      def anchor_names(docxml)
-        if @amd
+    class Xref < IsoDoc::Xref
+      def parse(docxml)
+        if @klass.amd(docxml)
           back_anchor_names(docxml)
           note_anchor_names(docxml.xpath(ns("//annex//table | //annex//figure")))
           note_anchor_names(docxml.xpath(ns("//annex")))
@@ -33,7 +33,7 @@ module IsoDoc
 
       def appendix_names(clause, num)
         clause.xpath(ns("./appendix")).each_with_index do |c, i|
-          @anchors[c["id"]] = anchor_struct(i + 1, nil, @appendix_lbl, "clause")
+          @anchors[c["id"]] = anchor_struct(i + 1, nil, @labels["appendix"], "clause")
           @anchors[c["id"]][:level] = 2
           @anchors[c["id"]][:container] = clause["id"]
         end
@@ -58,12 +58,12 @@ module IsoDoc
       end
 
       def hierarchical_formula_names(clause, num)
-        c = IsoDoc::Function::XrefGen::Counter.new
+        c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           @anchors[t["id"]] =
             anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", t,
-                          t["inequality"] ? @inequality_lbl : @formula_lbl,
+                          t["inequality"] ? @labels["inequality"] : @labels["formula"],
                           "formula", t["unnumbered"])
         end
       end
@@ -71,13 +71,13 @@ module IsoDoc
       def figure_anchor(t, sublabel, label)
         @anchors[t["id"]] = anchor_struct(
           (sublabel ? "#{label} #{sublabel}" : label),
-          nil, @figure_lbl, "figure", t["unnumbered"])
+          nil, @labels["figure"], "figure", t["unnumbered"])
         sublabel && t["unnumbered"] != "true" and
           @anchors[t["id"]][:label] = sublabel
       end
 
       def sequential_figure_names(clause)
-        c = IsoDoc::Function::XrefGen::Counter.new
+        c = IsoDoc::XrefGen::Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
           each do |t|
@@ -89,7 +89,7 @@ module IsoDoc
       end
 
       def hierarchical_figure_names(clause, num)
-        c = IsoDoc::Function::XrefGen::Counter.new
+        c = IsoDoc::XrefGen::Counter.new
         j = 0
         clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
           each do |t|
@@ -100,6 +100,12 @@ module IsoDoc
           figure_anchor(t, sublabel, label)
         end
       end
+
+      def reference_names(ref)
+        super
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].
+                                sub(/ \(All Parts\)/i, "") }
+      end
     end
   end
 end

data/lib/metanorma-iso.rb

@@ -5,6 +5,7 @@ require_relative "isodoc/iso/html_convert"
 require_relative "isodoc/iso/word_convert"
 require_relative "isodoc/iso/pdf_convert"
 require_relative "isodoc/iso/sts_convert"
+require_relative "isodoc/iso/presentation_xml_convert"
 require "asciidoctor/extensions"
 
 if defined? Metanorma

data/lib/metanorma/iso/processor.rb

@@ -37,18 +37,25 @@ module Metanorma
         Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
-      def output(isodoc_node, outname, format, options={})
+      def use_presentation_xml(ext)
+        return true if ext == :html_alt
+        super
+      end
+
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::Iso::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iso::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :html_alt
-          IsoDoc::Iso::HtmlConvert.new(options.merge(alt: true)).convert(outname, isodoc_node)
+          IsoDoc::Iso::HtmlConvert.new(options.merge(alt: true)).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Iso::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iso::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::Iso::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iso::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :sts
-          IsoDoc::Iso::StsConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iso::StsConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::Iso::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.27".freeze
+    VERSION = "1.4.0".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.0.0"
+  spec.add_dependency "isodoc", "~> 1.1.0"
   spec.add_dependency "metanorma-standoc", "~> 1.4.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -547,7 +547,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
        #{BLANK_HDR}
        <sections><formula id="_">
-          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mtext>or</mtext><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
+          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mi>or</mi><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
        <dl id="_">
          <dt>a</dt>
          <dd>

data/spec/asciidoctor-iso/table_spec.rb

@@ -150,7 +150,7 @@ RSpec.describe Asciidoctor::ISO do
            <tr>
              <th rowspan="2" align="left">Defect</th>
              <th colspan="4" align="center">Maximum permissible mass fraction of defects in husked rice<br/>
-       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mi>max</mi></msub></math></stem></th>
+       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mo>max</mo></msub></math></stem></th>
            </tr>
          <tr>
              <th align="left">in husked rice</th>

data/spec/metanorma/processor_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Metanorma::Iso::Processor do
 
   it "registers output formats against metanorma" do
     expect(processor.output_formats.sort.to_s).to be_equivalent_to <<~"OUTPUT"
-    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:pdf, "pdf"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
+    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
     OUTPUT
   end
 
@@ -35,7 +35,7 @@ RSpec.describe Metanorma::Iso::Processor do
 
   it "generates HTML from IsoDoc XML" do
     FileUtils.rm_f "test.xml"
-    processor.output(<<~"INPUT", "test.html", :html)
+    processor.output(<<~"INPUT", "test.xml", "test.html", :html)
                <iso-standard xmlns="http://riboseinc.com/isoxml">
        <sections>
        <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.3.27
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 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: ruby-jing
@@ -30,14 +30,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: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +308,7 @@ files:
 - lib/isodoc/iso/iso.international-standard.xsl
 - lib/isodoc/iso/metadata.rb
 - lib/isodoc/iso/pdf_convert.rb
+- lib/isodoc/iso/presentation_xml_convert.rb
 - lib/isodoc/iso/sections.rb
 - lib/isodoc/iso/sts_convert.rb
 - lib/isodoc/iso/word_convert.rb
@@ -375,7 +376,7 @@ homepage: https://github.com/metanorma/metanorma-iso
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -390,9 +391,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-iso lets you write ISO standards in AsciiDoc.
 test_files: []