metanorma-standoc 1.10.3 → 1.10.5

data/lib/isodoc/pdf_convert.rb

@@ -0,0 +1,20 @@
+require "isodoc"
+
+module IsoDoc
+  module Standoc
+
+    # A {Converter} implementation that generates HTML output, and a document
+    # schema encapsulation of the document for validation
+    #
+    class PdfConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
+      def pdf_stylesheet(docxml)
+          "base.standard.xsl"
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/processor.rb

@@ -13,6 +13,7 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
+          pdf: "pdf",
         )
       end
 
@@ -29,12 +30,15 @@ module Metanorma
         when :html
           options = options
             .merge(htmlstylesheet: html_path("htmlstyle.scss"),
-                  htmlcoverpage: html_path("html_titlepage.html"))
+                   htmlcoverpage: html_path("html_titlepage.html"))
           IsoDoc::HtmlConvert.new(options)
             .convert(inname, isodoc_node, nil, outname)
         when :doc
           IsoDoc::WordConvert.new(options)
             .convert(inname, isodoc_node, nil, outname)
+        when :pdf
+          IsoDoc::Standoc::PdfConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :presentation
           IsoDoc::PresentationXMLConvert.new(options)
             .convert(inname, isodoc_node, nil, outname)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.10.3".freeze
+    VERSION = "1.10.5".freeze
   end
 end

data/lib/metanorma-standoc.rb

@@ -1,4 +1,5 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
+require_relative "isodoc/pdf_convert"
 require_relative "asciidoctor/standoc/converter"
 require_relative "metanorma/standoc/version"
 require "asciidoctor/extensions"

data/metanorma-standoc.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "latexmath"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-utils", "~> 1.2.0"
-  spec.add_dependency "relaton-cli", "~> 1.8.0"
+  spec.add_dependency "relaton-cli", "~> 1.9.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
 

data/spec/asciidoctor/base_spec.rb

@@ -35,6 +35,7 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(Asciidoctor.convert(input, *OPTIONS)))
       .to be_equivalent_to xmlpp(output)
     expect(File.exist?("test.doc")).to be true
+    expect(File.exist?("test.pdf")).to be true
     expect(File.exist?("htmlstyle.css")).to be false
   end
 
@@ -45,6 +46,7 @@ RSpec.describe Asciidoctor::Standoc do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-pdf:
       :language: ar
     INPUT
     output = <<~OUTPUT
@@ -887,6 +889,7 @@ RSpec.describe Asciidoctor::Standoc do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-pdf:
       :scripts: spec/assets/scripts.html
     INPUT
     html = File.read("test.html", encoding: "utf-8")
@@ -899,6 +902,7 @@ RSpec.describe Asciidoctor::Standoc do
       = Document title
       Author
       :docfile: test.adoc
+      :no-pdf:
       :novalid:
       :script: Hans
       :body-font: Zapf Chancery
@@ -934,6 +938,7 @@ RSpec.describe Asciidoctor::Standoc do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-pdf:
       :script: Hans
       :body-font: Zapf Chancery
       :header-font: Comic Sans
@@ -974,6 +979,7 @@ QU1FOiB0ZXN0Cgo=
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
+      :no-pdf:
       :docfile: test.adoc
       :doctype: standard
       :encoding: utf-8

data/spec/asciidoctor/blocks_spec.rb

@@ -264,6 +264,8 @@ RSpec.describe Asciidoctor::Standoc do
       </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes review blocks if document is in draft mode" do
@@ -1173,7 +1175,7 @@ RSpec.describe Asciidoctor::Standoc do
   it "processes recommendation" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user",inherit="/ss/584/2015/level/1; /ss/584/2015/level/2",options="unnumbered",type=verification,model=ogc]
+      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user;developer, implementer",inherit="/ss/584/2015/level/1; /ss/584/2015/level/2",options="unnumbered",type=verification,model=ogc]
       ====
       I recommend this
       ====
@@ -1184,6 +1186,7 @@ RSpec.describe Asciidoctor::Standoc do
         <recommendation id="_" unnumbered="true" type="verification" model="ogc">
         <label>/ogc/recommendation/wfs/2</label>
       <subject>user</subject>
+      <subject>developer, implementer</subject>
       <inherit>/ss/584/2015/level/1</inherit>
       <inherit>/ss/584/2015/level/2</inherit>
         <description><p id="_">I recommend this</p></description>
@@ -1330,31 +1333,48 @@ RSpec.describe Asciidoctor::Standoc do
       success-response()
       ----
       --
+
+      [.component]
+      --
+      Hello
+      --
+
+      [.component,class=condition]
+      --
+      If this be thus
+      --
       ====
     INPUT
     output = <<~"OUTPUT"
-                  #{BLANK_HDR}
-             <sections>
-             <recommendation id="ABC"  obligation="permission,recommendation" filename="reqt1.rq"><label>/ogc/recommendation/wfs/2</label><subject>user</subject>
-      <classification><tag>control-class</tag><value>Technical</value></classification><classification><tag>priority</tag><value>P0</value></classification><classification><tag>family</tag><value>System &amp; Communications Protection</value></classification><classification><tag>family</tag><value>System and Communications Protocols</value></classification>
-              <description><p id="_">I recommend <em>this</em>.</p>
-             </description><specification exclude="false" type="tabular" keep-with-next="true" keep-lines-together="true"><p id="_">This is the object of the recommendation:</p><table id="_">  <tbody>    <tr>      <td valign="top" align="left">Object</td>      <td valign="top" align="left">Value</td>    </tr>    <tr>      <td valign="top" align="left">Mission</td>      <td valign="top" align="left">Accomplished</td>    </tr>  </tbody></table></specification><description>
-             <p id="_">As for the measurement targets,</p>
-             </description><measurement-target exclude="false"><p id="_">The measurement target shall be measured as:</p><formula id="_">  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfrac>
-             <mrow>
-        <mi>r</mi>
-      </mrow>
-      <mrow>
-        <mn>1</mn>
-      </mrow>
-      </mfrac><mo>=</mo><mn>0</mn></math></stem></formula></measurement-target>
-             <verification exclude="false"><p id="_">The following code will be run for verification:</p><sourcecode  lang="CoreRoot" id="_">CoreRoot(success): HttpResponse
-      if (success)
-        recommendation(label: success-response)
-      end</sourcecode></verification>
-             <import exclude="true">  <sourcecode  lang="CoreRoot" id="_">success-response()</sourcecode></import></recommendation>
-             </sections>
-             </standard-document>
+         #{BLANK_HDR}
+                 <sections>
+                 <recommendation id="ABC"  obligation="permission,recommendation" filename="reqt1.rq"><label>/ogc/recommendation/wfs/2</label><subject>user</subject>
+          <classification><tag>control-class</tag><value>Technical</value></classification><classification><tag>priority</tag><value>P0</value></classification><classification><tag>family</tag><value>System &amp; Communications Protection</value></classification><classification><tag>family</tag><value>System and Communications Protocols</value></classification>
+                  <description><p id="_">I recommend <em>this</em>.</p>
+                 </description><specification exclude="false" type="tabular" keep-with-next="true" keep-lines-together="true"><p id="_">This is the object of the recommendation:</p><table id="_">  <tbody>    <tr>      <td valign="top" align="left">Object</td>      <td valign="top" align="left">Value</td>    </tr>    <tr>      <td valign="top" align="left">Mission</td>      <td valign="top" align="left">Accomplished</td>    </tr>  </tbody></table></specification><description>
+                 <p id="_">As for the measurement targets,</p>
+                 </description><measurement-target exclude="false"><p id="_">The measurement target shall be measured as:</p><formula id="_">  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfrac>
+                 <mrow>
+            <mi>r</mi>
+          </mrow>
+          <mrow>
+            <mn>1</mn>
+          </mrow>
+          </mfrac><mo>=</mo><mn>0</mn></math></stem></formula></measurement-target>
+                 <verification exclude="false"><p id="_">The following code will be run for verification:</p><sourcecode  lang="CoreRoot" id="_">CoreRoot(success): HttpResponse
+          if (success)
+            recommendation(label: success-response)
+          end</sourcecode></verification>
+                 <import exclude="true">  <sourcecode  lang="CoreRoot" id="_">success-response()</sourcecode></import>
+                 <component exclude='false' class='component'>
+        <p id='_'>Hello</p>
+      </component>
+      <component exclude='false' class='condition'>
+        <p id='_'>If this be thus</p>
+      </component>
+          </recommendation>
+                 </sections>
+                 </standard-document>
     OUTPUT
 
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))

data/spec/asciidoctor/cleanup_sections_spec.rb

@@ -1357,7 +1357,7 @@ RSpec.describe Asciidoctor::Standoc do
 
   it "processes section names, internationalisation file" do
     input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR.sub(/:nodoc:/, ':i18nyaml: spec/assets/i18n.yaml')}
+      #{ASCIIDOC_BLANK_HDR.sub(/:nodoc:/, ":no-pdf:\n:i18nyaml: spec/assets/i18n.yaml")}
       .Foreword
 
       Text
@@ -1588,4 +1588,70 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "adds variant titles" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      == Clause
+      Text
+
+      === Subclause
+
+      [.variant-title,type=toc]
+      Clause _A_ stem:[x]
+
+      [.variant-title,type=sub]
+      "A" 'B'
+
+      Text
+
+      [appendix]
+      == Clause
+
+      [.variant-title,type=toc]
+      Clause _A_ stem:[x]
+
+      Text
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+         <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <p id='_'>Text</p>
+             <clause id='_' inline-header='false' obligation='normative'>
+               <title>Subclause</title>
+               <variant-title variant_title='true' type='sub'>&#8220;A&#8221; &#8216;B&#8217;</variant-title>
+               <variant-title variant_title='true' type='toc'>
+                 Clause
+                 <em>A</em>
+                 <stem type='MathML'>
+                   <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                     <mi>x</mi>
+                   </math>
+                 </stem>
+               </variant-title>
+               <p id='_'>Text</p>
+             </clause>
+           </clause>
+         </sections>
+         <annex id='_' inline-header='false' obligation='normative'>
+           <title>Clause</title>
+           <variant-title variant_title='true' type='toc'>
+             Clause
+             <em>A</em>
+             <stem type='MathML'>
+               <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                 <mi>x</mi>
+               </math>
+             </stem>
+           </variant-title>
+           <p id='_'>Text</p>
+         </annex>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/asciidoctor/cleanup_spec.rb

@@ -323,28 +323,44 @@ RSpec.describe Asciidoctor::Standoc do
       "((ppt))",
 
       "((ppm))", "((ppt))"
+
+      "((ppm))" 
+
+      ....
+      ((ppm))",
+      ....
     INPUT
     output = <<~OUTPUT
-      #{BLANK_HDR}
-             <sections>
-                        <p id='_'>
-           &#8220;ppt&#8221;,
-           <index>
-             <primary>ppt</primary>
-           </index>
-         </p>
-         <p id='_'>
-           &#8220;ppm&#8221;,
-           <index>
-             <primary>ppm</primary>
-           </index>
-            &#8220;ppt&#8221;
-           <index>
-             <primary>ppt</primary>
-           </index>
-         </p>
-      </sections>
-      </standard-document>
+            #{BLANK_HDR}
+                   <sections>
+                              <p id='_'>
+                 &#8220;ppt&#8221;,
+                 <index>
+                   <primary>ppt</primary>
+                 </index>
+               </p>
+               <p id='_'>
+                 &#8220;ppm&#8221;,
+                 <index>
+                   <primary>ppm</primary>
+                 </index>
+                  &#8220;ppt&#8221;
+                 <index>
+                   <primary>ppt</primary>
+                 </index>
+               </p>
+               <p id='_'>
+        &#8220;ppm
+        <index>
+          <primary>ppm</primary>
+        </index>
+        &#8220;&#160;
+      </p>
+      <figure id='_'>
+        <pre id='_'>((ppm))",</pre>
+      </figure>
+            </sections>
+            </standard-document>
     OUTPUT
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
@@ -1523,7 +1539,7 @@ RSpec.describe Asciidoctor::Standoc do
           <abstract format="text/plain" language="en" script="Latn">IEC 60050-103:2009 gives the terminology relative to functions of one or more variables. Together with IEC 60050-102, it covers the mathematical terminology used in the fields of electricity, electronics and telecommunications. It maintains a clear distinction between mathematical concepts and physical concepts, even if some terms are used in both cases. Mathematical symbols are generally in accordance with IEC 60027-1 and ISO 80000-2. This standard cancels and replaces Sections 101-13, 101-14 and 101-15 of International Standard IEC 60050-101:1998. It has the status of a horizontal standard in accordance with IEC Guide 108.</abstract>
           <status>
             <stage>60</stage>
-            <substage>60</substage>
+            <substage>00</substage>
           </status>
           <copyright>
             <from>2009</from>
@@ -1663,6 +1679,33 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "cleans up nested mathvariant instances" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      
+      stem:[sf "unitsml(cd)"]
+    INPUT
+    output = <<~OUTPUT
+             <sections>
+         <p id='_'>
+           <stem type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mstyle mathvariant='sans-serif'>
+                 <mrow xref='U_NISTu7'>
+                   <mi mathvariant='sans-serif'>cd</mi>
+                 </mrow>
+               </mstyle>
+             </math>
+           </stem>
+         </p>
+       </sections>
+    OUTPUT
+    expect(xmlpp(strip_guid(Nokogiri::XML(
+      Asciidoctor.convert(input, *OPTIONS),
+    ).at("//xmlns:sections").to_xml)))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "removes nested bibitem IDs" do
     input = <<~INPUT
       #{BLANK_HDR}
@@ -2084,6 +2127,90 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "moves metadata deflist to correct location" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      == Clause
+
+      [.requirement,subsequence="A",inherit="/ss/584/2015/level/1 &amp; /ss/584/2015/level/2"]
+      ====
+      [%metadata]
+      model:: ogc
+      type:: class
+      label:: http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules[*req/core*]
+      subject:: Encoding of logical models
+      inherit:: urn:iso:dis:iso:19156:clause:7.2.2
+      inherit:: urn:iso:dis:iso:19156:clause:8
+      inherit:: http://www.opengis.net/doc/IS/GML/3.2/clause/2.4
+      inherit:: O&M Abstract model, OGC 10-004r3, clause D.3.4
+      inherit:: http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used
+      inherit:: <<ref2>>
+      inherit:: <<ref3>>
+      classification:: priority:P0
+      classification:: domain:Hydrology,Groundwater
+      classification:: control-class:Technical
+      obligation:: recommendation,requirement
+
+      I recommend this
+      ====
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+            <sections>
+        <clause id='_' inline-header='false' obligation='normative'>
+          <title>Clause</title>
+          <requirement id='_' subsequence='A'>
+            <label>
+              <link target='http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules'>
+                <strong>req/core</strong>
+              </link>
+            </label>
+            <subject>Encoding of logical models</subject>
+            <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
+            <inherit>urn:iso:dis:iso:19156:clause:7.2.2</inherit>
+            <inherit>urn:iso:dis:iso:19156:clause:8</inherit>
+            <inherit>
+              <link target='http://www.opengis.net/doc/IS/GML/3.2/clause/2.4'/>
+            </inherit>
+            <inherit>O&amp;M Abstract model, OGC 10-004r3, clause D.3.4</inherit>
+            <inherit>
+              <link target='http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used'/>
+            </inherit>
+            <inherit>
+              <xref target='ref2'/>
+            </inherit>
+            <inherit>
+              <xref target='ref3'/>
+            </inherit>
+            <classification>
+              <tag>control-class</tag>
+              <value>Technical</value>
+            </classification>
+            <classification>
+              <tag>domain</tag>
+              <value>Groundwater</value>
+            </classification>
+            <classification>
+              <tag>domain</tag>
+              <value>Hydrology</value>
+            </classification>
+            <classification>
+              <tag>priority</tag>
+              <value>P0</value>
+            </classification>
+            <description>
+              <p id='_'>I recommend this</p>
+            </description>
+          </requirement>
+        </clause>
+      </sections>
+            </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "moves inherit macros to correct location" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}