metanorma-iso 1.3.26 → 1.4.3.pre.alpha

data/lib/isodoc/iso/metadata.rb

@@ -53,7 +53,7 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso']"))
+        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ISO']"))
         set(:docnumber, dn&.text)
         tcdn = isoxml.xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']"))
         set(:tc_docnumber, tcdn.map { |n| n.text })

data/lib/isodoc/iso/pdf_convert.rb

@@ -15,24 +15,11 @@ module IsoDoc
 
       def pdf_stylesheet(docxml)
         case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
-        when "amendment", "technical-corrigendum" then "itu.recommendation-annex.xsl"
+        when "amendment", "technical-corrigendum" then "iso.amendment.xsl"
         else
           "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

@@ -0,0 +1,111 @@
+module IsoDoc
+  module Iso
+    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")))
+          example_anchor_names(docxml.xpath(ns("//annex")))
+          list_anchor_names(docxml.xpath(ns("//annex")))
+        else
+          super
+        end
+      end
+
+      def initial_anchor_names(d)
+        super
+        introduction_names(d.at(ns("//introduction")))
+      end
+
+      # we can reference 0-number clauses in introduction
+      def introduction_names(clause)
+        return if clause.nil?
+        clause.xpath(ns("./clause")).each_with_index do |c, i|
+          section_names1(c, "0.#{i + 1}", 2)
+        end
+      end
+
+      def annex_names(clause, num)
+        appendix_names(clause, num)
+        super
+      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
+
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref: num }
+        # subclauses are not prefixed with "Clause"
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+                        "./references")).
+                       each_with_index do |c, i|
+          section_names1(c, "#{num}.#{i + 1}", level + 1)
+        end
+      end
+
+      def annex_names1(clause, num, level)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level }
+        clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
+          annex_names1(c, "#{num}.#{i + 1}", level + 1)
+        end
+      end
+
+      def hierarchical_formula_names(clause, num)
+        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"] ? @labels["inequality"] : @labels["formula"],
+                          "formula", t["unnumbered"])
+        end
+      end
+
+      def figure_anchor(t, sublabel, label)
+        @anchors[t["id"]] = anchor_struct(
+          (sublabel ? "#{label} #{sublabel}" : label),
+          nil, @labels["figure"], "figure", t["unnumbered"])
+        sublabel && t["unnumbered"] != "true" and
+          @anchors[t["id"]][:label] = sublabel
+      end
+
+      def sequential_figure_names(clause)
+        c = IsoDoc::XrefGen::Counter.new
+        j = 0
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
+          each do |t|
+          j = subfigure_increment(j, c, t)
+          sublabel = j.zero? ? nil : "#{(j+96).chr})"
+          next if t["id"].nil? || t["id"].empty?
+          figure_anchor(t, sublabel, c.print)
+        end
+      end
+
+      def hierarchical_figure_names(clause, num)
+        c = IsoDoc::XrefGen::Counter.new
+        j = 0
+        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
+          each do |t|
+          j = subfigure_increment(j, c, t)
+          label = "#{num}#{hiersep}#{c.print}"
+          sublabel = j.zero? ? nil : "#{(j+96).chr})"
+          next if t["id"].nil? || t["id"].empty?
+          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

@@ -33,22 +33,25 @@ module Metanorma
         "Metanorma::ISO #{Metanorma::ISO::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
+      def use_presentation_xml(ext)
+        return true if ext == :html_alt
+        super
       end
 
-      def output(isodoc_node, outname, format, options={})
+      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.26".freeze
+    VERSION = "1.4.3-alpha".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,17 +30,18 @@ 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.3.pre.alpha3"
   spec.add_dependency "metanorma-standoc", "~> 1.4.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "mn2sts", "~> 1.2.0"
 
   spec.add_development_dependency "byebug"
+  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"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake" #, "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"

data/spec/asciidoctor-iso/amd_spec.rb

@@ -241,7 +241,7 @@ OUTPUT
   d’échantillon et recommandations relatives aux conditions d’entreposage et
   de transport
 </title>
-    <docidentifier type='iso'>ISO 17301-1:2016/PreNP Amd 1</docidentifier>
+    <docidentifier type='ISO'>ISO 17301-1:2016/PreNP Amd 1</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2016/PreNP Amd 1(E)</docidentifier>
     <docidentifier type='iso-reference'>ISO 17301-1:2016/PreNP Amd 1:2017(E)</docidentifier>
     <docnumber>17301</docnumber>
@@ -332,7 +332,7 @@ Author
 INPUT
  <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
    <bibdata type='standard'>
-     <docidentifier type='iso'>ISO 17301-1:2030/CD Amd 1</docidentifier>
+     <docidentifier type='ISO'>ISO 17301-1:2030/CD Amd 1</docidentifier>
      <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
      <docidentifier type='iso-reference'>ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
      <docnumber>17301</docnumber>
@@ -400,7 +400,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
          <bibdata type='standard'>
-           <docidentifier type='iso'>ISO 17301-1:2030/DAmd 1</docidentifier>
+           <docidentifier type='ISO'>ISO 17301-1:2030/DAmd 1</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/DAmd 1(E)</docidentifier>
            <docidentifier type='iso-reference'>ISO 17301-1:2030/DAmd 1(E)</docidentifier>
            <docnumber>17301</docnumber>
@@ -467,7 +467,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
          <bibdata type='standard'>
-           <docidentifier type='iso'>ISO 17301-1:2030/Amd 1</docidentifier>
+           <docidentifier type='ISO'>ISO 17301-1:2030/Amd 1</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Amd 1(E)</docidentifier>
            <docidentifier type='iso-reference'>ISO 17301-1:2030/Amd 1(E)</docidentifier>
            <docnumber>17301</docnumber>
@@ -535,7 +535,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
   <bibdata type='standard'>
-    <docidentifier type='iso'>ISO 17301-1:2030/CD Cor.3</docidentifier>
+    <docidentifier type='ISO'>ISO 17301-1:2030/CD Cor.3</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
     <docidentifier type='iso-reference'>ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
     <docnumber>17301</docnumber>
@@ -603,7 +603,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
   <bibdata type='standard'>
-    <docidentifier type='iso'>ISO 17301-1:2030/FDCor.3</docidentifier>
+    <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
     <docidentifier type='iso-reference'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
     <docnumber>17301</docnumber>
@@ -670,7 +670,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
          <bibdata type='standard'>
-           <docidentifier type='iso'>ISO 17301-1:2030/Cor.3</docidentifier>
+           <docidentifier type='ISO'>ISO 17301-1:2030/Cor.3</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Cor.3(E)</docidentifier>
            <docidentifier type='iso-reference'>ISO 17301-1:2030/Cor.3(E)</docidentifier>
            <docnumber>17301</docnumber>

data/spec/asciidoctor-iso/base_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe Asciidoctor::ISO do
    <title language="fr" format="text/plain" type="title-intro">Introduction Française</title>
    <title language="fr" format="text/plain" type="title-main">Titre Principal</title>
    <title language="fr" format="text/plain" type="title-part">Part du Titre</title>
-         <docidentifier type="iso">ISO/PreWD3 1000-1</docidentifier>
+         <docidentifier type="ISO">ISO/PreWD3 1000-1</docidentifier>
          <docidentifier type='iso-with-lang'>ISO/PreWD3 1000-1(E)</docidentifier>
          <docidentifier type='iso-reference'>ISO/PreWD3 1000-1:2000(E)</docidentifier>
         <docnumber>1000</docnumber>
@@ -192,7 +192,7 @@ RSpec.describe Asciidoctor::ISO do
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="https://www.metanorma.org/ns/iso">
        <bibdata type="standard">
-         <docidentifier type="iso">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
+         <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
          <docidentifier type='iso-with-lang'>ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
          <docidentifier type='iso-reference'>ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
@@ -304,7 +304,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
     <iso-standard xmlns="https://www.metanorma.org/ns/iso">
 <bibdata type="standard">
-  <docidentifier type="iso">ISO/DTS 1000.2</docidentifier>
+  <docidentifier type="ISO">ISO/DTS 1000.2</docidentifier>
   <docidentifier type='iso-with-lang'>ISO/DTS 1000.2(F)</docidentifier>
   <docidentifier type='iso-reference'>ISO/DTS 1000.2(F)</docidentifier>
   <docnumber>1000</docnumber>
@@ -370,7 +370,7 @@ OUTPUT
     INPUT
 <iso-standard xmlns="https://www.metanorma.org/ns/iso">
 <bibdata type="standard">
-  <docidentifier type="iso">ISO 1000</docidentifier>
+  <docidentifier type="ISO">ISO 1000</docidentifier>
   <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
   <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
   <docnumber>1000</docnumber>
@@ -436,7 +436,7 @@ OUTPUT
     INPUT
 <iso-standard xmlns="https://www.metanorma.org/ns/iso">
 <bibdata type="standard">
-  <docidentifier type="iso">ISO 1000</docidentifier>
+  <docidentifier type="ISO">ISO 1000</docidentifier>
   <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
   <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
   <docnumber>1000</docnumber>

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>
@@ -654,7 +654,7 @@ RSpec.describe Asciidoctor::ISO do
              <abbreviation>ISO</abbreviation>
            </organization>
          </contributor>
-         <note format="text/plain">ISO DATE: The standard is in press</note>
+         <note format="text/plain" type="ISO DATE">The standard is in press</note>
        </bibitem>
       </references>
       </bibliography>

data/spec/asciidoctor-iso/macros_spec.rb

@@ -234,11 +234,16 @@ RSpec.describe Asciidoctor::ISO do
 
           == Terms and Definitions
 
-          === name
+          === name identity
+
+          [[name-check]]
+          === name check
 
           paragraph
 
-          term:[name] is a term
+          term:[name check] is a term
+
+          term:[name identity] is a term
 
           Moreover, term:[missing] is a term
         XML
@@ -268,14 +273,23 @@ RSpec.describe Asciidoctor::ISO do
                     </p>
                   </li>
                 </ul>
-                <term id='term-name'>
-                  <preferred>name</preferred>
+                <term id='term-name-identity'>
+  <preferred>name identity</preferred>
+</term>
+                <term id='name-check'>
+                  <preferred>name check</preferred>
                   <definition>
                     <p id='_'>paragraph</p>
                     <p id='_'>
-                      <em>name</em> 
+                      <em>name check</em> 
+                       (
+                      <xref target='name-check'/>
+                      ) is a term
+                      </p>
+                      <p id='_'>
+                      <em>name identity</em>
                        (
-                      <xref target='term-name'/>
+                      <xref target='term-name-identity'/>
                       ) is a term
                       </p>
                       <p id="_">Moreover, (<strong>term “missing” not resolved</strong>) is a term

data/spec/asciidoctor-iso/refs_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Asciidoctor::ISO do
              <abbreviation>ISO</abbreviation>
            </organization>
          </contributor>
-         <note format="text/plain">ISO DATE: The standard is in press</note>
+         <note format="text/plain" type="ISO DATE">The standard is in press</note>
        </bibitem>
        </references>
        </bibliography>