metanorma-standoc 1.8.2 → 1.8.7

data/lib/asciidoctor/standoc/validate.rb

@@ -35,10 +35,25 @@ module Asciidoctor
 
       def content_validate(doc)
         section_validate(doc)
+        norm_ref_validate(doc)
         repeat_id_validate(doc.root)
         iev_validate(doc.root)
       end
 
+      def norm_ref_validate(doc)
+        found = false
+        doc.xpath("//references[@normative = 'true']/bibitem").each do |b|
+          next unless docid = b.at("./docidentifier[@type = 'metanorma']")
+          next unless  /^\[\d+\]$/.match(docid.text)
+          @log.add("Bibliography", b, "Numeric reference in normative references")
+          found = true
+        end
+        if found
+          clean_exit
+          abort("Numeric reference in normative references")
+        end
+      end
+
       def repeat_id_validate1(ids, x)
         if ids[x["id"]]
           @log.add("Anchors", x, "Anchor #{x['id']} has already been used "\
@@ -89,7 +104,7 @@ module Asciidoctor
       def formattedstr_strip(doc)
         doc.xpath("//*[@format] | //stem | //bibdata//description | "\
                   "//formattedref | //bibdata//note | //bibdata/abstract | "\
-                  "//bibitem/abstract | //bibitem/note").each do |n|
+                  "//bibitem/abstract | //bibitem/note | //misc-container").each do |n|
           n.elements.each do |e|
             e.traverse do |e1|
               e1.element? and e1.each { |k, _v| e1.delete(k) }

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION= "1.8.2".freeze
+    VERSION= "1.8.7".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -31,25 +31,25 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isodoc", "~> 1.5.0"
   spec.add_dependency "iev", "~> 0.2.1"
   spec.add_dependency "metanorma-plugin-datastruct"
-  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.2.1"
+  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.3.0"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "relaton-cli", "~> 1.7.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
-  spec.add_dependency "metanorma-utils", "~> 1"
-  spec.add_dependency "mimemagic"
+  spec.add_dependency "metanorma-utils", "~> 1.0.2"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "latexmath"
+  spec.add_dependency "asciimath2unitsml", "~> 0.3.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", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 5.0.0"

data/spec/{asciidoctor-standoc → asciidoctor}/base_spec.rb

@@ -709,6 +709,7 @@ OUTPUT
       :header-font: Comic Sans
       :monospace-font: Andale Mono
       :htmlstylesheet: spec/assets/html.scss
+      :htmlstylesheet-override: spec/assets/html-override.css
       :htmlcoverpage: spec/assets/htmlcover.html
       :htmlintropage: spec/assets/htmlintro.html
       :scripts: spec/assets/scripts.html
@@ -727,6 +728,7 @@ OUTPUT
     expect(html).to match(%r[an empty html cover page])
     expect(html).to match(%r[an empty html intro page])
     expect(html).to match(%r[This is > a script])
+    expect(html).to match(%r[html-override])
   end
 
   it "uses specified fonts and assets in Word" do
@@ -741,6 +743,7 @@ OUTPUT
       :header-font: Comic Sans
       :monospace-font: Andale Mono
       :wordstylesheet: spec/assets/word.scss
+      :wordstylesheet-override: spec/assets/word-override.css
       :wordcoverpage: spec/assets/wordcover.html
       :wordintropage: spec/assets/wordintro.html
       :header: spec/assets/header.html
@@ -758,6 +761,7 @@ OUTPUT
     expect(html).to match(%r[h1[^{]+\{[^{]+font-family: Comic Sans;]m)
     expect(html).to match(%r[an empty word cover page])
     expect(html).to match(%r[an empty word intro page])
+    expect(html).to match(%r[word-override])
     expect(html).to include('\o "1-3"')
     expect(html).to include(%[Content-Location: file:///C:/Doc/test_files/header.html
 Content-Transfer-Encoding: base64

data/spec/{asciidoctor-standoc → asciidoctor}/cleanup_sections_spec.rb

@@ -560,15 +560,15 @@ INPUT
 </title>
              <p id='_'>There are no normative references in this document.</p>
            </references>
-           <references id='_' normative='false' obligation='informative'>
-             <title>Bibliography
+           <references id='_' normative='true' obligation='informative'>
+             <title>Normative References 2.
 <fn reference='1'>
   <p id='_'>A</p>
 </fn>
 </title>
            </references>
            <references id='_' normative='false' obligation='informative'>
-             <title>Bibliography.
+             <title>Bibliography
 <fn reference='1'>
   <p id='_'>A</p>
 </fn>
@@ -803,8 +803,8 @@ INPUT
               <title>Normative references</title>
               <p id='_'>There are no normative references in this document.</p>
             </references>
-            <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
+            <references id='_' normative='true' obligation='informative'>
+              <title>Normative References 2</title>
             </references>
             <references id='_' normative='false' obligation='informative'>
               <title>Bibliography</title>
@@ -1037,11 +1037,11 @@ INPUT
               <title>Références normatives</title>
               <p id='_'>Le présent document ne contient aucune référence normative.</p>
             </references>
-            <references id='_' normative='false' obligation='informative'>
-              <title>Bibliographie</title>
+            <references id='_' normative='true' obligation='informative'>
+              <title>Normative References 2</title>
             </references>
             <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
+              <title>Bibliographie</title>
             </references>
             <clause id='_' obligation='informative'>
               <title>Bibliography 2</title>
@@ -1268,11 +1268,11 @@ INPUT
               <title>规范性引用文件</title>
               <p id='_'>本文件并没有规范性引用文件。</p>
             </references>
-            <references id='_' normative='false' obligation='informative'>
-              <title>参考文献</title>
+            <references id='_' normative='true' obligation='informative'>
+              <title>Normative References 2</title>
             </references>
             <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
+              <title>参考文献</title>
             </references>
             <clause id='_' obligation='informative'>
               <title>Bibliography 2</title>
@@ -1499,11 +1499,11 @@ INPUT
               <title>Normaj citaĵoj</title>
               <p id='_'>There are no normative references in this document.</p>
             </references>
-            <references id='_' normative='false' obligation='informative'>
-              <title>Bibliografio</title>
+            <references id='_' normative='true' obligation='informative'>
+              <title>Normative References 2</title>
             </references>
             <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
+              <title>Bibliografio</title>
             </references>
             <clause id='_' obligation='informative'>
               <title>Bibliography 2</title>

data/spec/{asciidoctor-standoc → asciidoctor}/cleanup_spec.rb

@@ -3,6 +3,108 @@ require "relaton_iec"
 require "fileutils"
 
 RSpec.describe Asciidoctor::Standoc do
+ it "processes svgmap" do
+   FileUtils.cp "spec/fixtures/action_schemaexpg1.svg", "action_schemaexpg1.svg"
+   FileUtils.cp "spec/fixtures/action_schemaexpg1.svg", "action_schemaexpg2.svg"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+#{ASCIIDOC_BLANK_HDR}
+
+[svgmap%unnumbered,number=8,subsequence=A,keep-with-next=true,keep-lines-together=true]
+====
+* <<ref1,Computer>>; http://www.example.com
+====
+
+[[ref1]]
+.SVG title
+[.svgmap]
+====
+image::action_schemaexpg1.svg[]  
+
+* <<ref1,Computer>>; mn://action_schema
+* http://www.example.com[Phone]; http://www.example.com
+====
+ 
+[[ref2]]
+[svgmap%unnumbered,number=8,subsequence=A,keep-with-next=true,keep-lines-together=true]
+====
+[alt=Workmap]
+image::action_schemaexpg2.svg[]  
+
+* <<ref1,Computer>>; href1.htm
+* http://www.example.com[Phone]; mn://basic_attribute_schema
+* <<express:action_schema:action_schema.basic,Coffee>>; mn://support_resource_schema
+====
+INPUT
+       #{BLANK_HDR}
+       <sections>
+        <svgmap unnumbered='true' number='8' subsequence='A' keep-with-next='true' keep-lines-together='true'>
+             <target href='http://www.example.com'>
+               <xref target='ref1'>Computer</xref>
+             </target>
+           </svgmap>
+           <figure id='ref1'>
+           <name>SVG title</name>
+             <image src='action_schemaexpg1.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto'/>
+           </figure>
+           <svgmap>
+             <figure id='ref2' unnumbered='true' number='8' subsequence='A' keep-with-next='true' keep-lines-together='true'>
+               <image src='action_schemaexpg2.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto' alt='Workmap'/>
+             </figure>
+             <target href='mn://support_resource_schema'>
+               <eref bibitemid='express_action_schema' citeas=''>
+                 <localityStack>
+                   <locality type='anchor'>
+                     <referenceFrom>action_schema.basic</referenceFrom>
+                   </locality>
+                 </localityStack>
+                 Coffee
+               </eref>
+             </target>
+           </svgmap>
+</sections>
+<bibliography>
+  <references hidden='true' normative='false'>
+    <bibitem id='express_action_schema' type='internal'>
+      <docidentifier type='repository'>express/action_schema</docidentifier>
+    </bibitem>
+  </references>
+</bibliography>
+       </standard-document>
+OUTPUT
+expect(xmlpp(File.read("action_schemaexpg1.svg", encoding: "utf-8").sub(%r{<image .*</image>}m, ""))).to be_equivalent_to <<~OUTPUT
+<?xml version='1.0' encoding='UTF-8'?>
+       <!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+       <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
+         <style type='text/css'> .st0{fill:none;stroke:#000000;stroke-miterlimit:10;} </style>
+         <a xlink:href='#ref1'>
+           <rect x='123.28' y='273.93' class='st0' width='88.05' height='41.84'/>
+         </a>
+         <a xlink:href='mn://basic_attribute_schema'>
+           <rect x='324.69' y='450.52' class='st0' width='132.62' height='40.75'/>
+         </a>
+         <a xlink:href='mn://support_resource_schema'>
+           <rect x='324.69' y='528.36' class='st0' width='148.16' height='40.75'/>
+         </a>
+       </svg>
+OUTPUT
+expect(xmlpp(File.read("action_schemaexpg2.svg", encoding: "utf-8").sub(%r{<image .*</image>}m, ""))).to be_equivalent_to <<~OUTPUT
+<?xml version='1.0' encoding='UTF-8'?>
+       <!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+       <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
+         <style type='text/css'> .st0{fill:none;stroke:#000000;stroke-miterlimit:10;} </style>
+         <a xlink:href='mn://action_schema'>
+           <rect x='123.28' y='273.93' class='st0' width='88.05' height='41.84'/>
+         </a>
+         <a xlink:href='http://www.example.com'>
+           <rect x='324.69' y='450.52' class='st0' width='132.62' height='40.75'/>
+         </a>
+         <a xlink:href='mn://support_resource_schema'>
+           <rect x='324.69' y='528.36' class='st0' width='148.16' height='40.75'/>
+         </a>
+       </svg>
+OUTPUT
+ end
+
     it "processes markup in sourcecode" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -1249,7 +1351,7 @@ RSpec.describe Asciidoctor::Standoc do
           <abstract format="text/plain" language="en" script="Latn">This part of IEC 60050 gives the general mathematical terminology used in the fields of electricity, electronics and telecommunications, together with basic concepts in linear algebra. It maintains a clear distinction between mathematical concepts and physical concepts, even if some terms are used in both cases. Another part will deal with functions.&#13; 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>2007</from>
@@ -1662,7 +1764,7 @@ it "sorts symbols lists" do
   == Symbols and abbreviated terms
 
   α:: Definition 1
-  xa:: Definition 2
+  Xa:: Definition 2
   x_1_:: Definition 3
   x_m_:: Definition 4
   x:: Definition 5
@@ -1700,7 +1802,7 @@ it "sorts symbols lists" do
         <dd>
           <p id='_'>Definition 3</p>
         </dd>
-        <dt>xa</dt>
+        <dt>Xa</dt>
         <dd>
           <p id='_'>Definition 2</p>
         </dd>
@@ -2019,6 +2121,123 @@ expect(xmlpp(Asciidoctor.convert(input, backend: :standoc, header_footer: true))
 OUTPUT
 
 end
+
+it "converts UnitsML to MathML" do
+  expect(xmlpp(strip_guid(Asciidoctor.convert(<<~INPUT, backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+= Document title
+Author
+:stem:
+
+[stem]
+++++
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+  <mrow>
+  <mn>7</mn>
+  <mtext>unitsml(m*kg^-2)</mtext>
+  <mo>+</mo>
+  <mn>8</mn>
+  <mtext>unitsml(m*kg^-2)</mtext>
+  </mrow>
+</math>
+++++
+INPUT
+#{BLANK_HDR}
+<misc-container>
+           <UnitsML xmlns='https://schema.unitsml.org/unitsml/1.0'>
+             <UnitSet>
+               <Unit xml:id='U_m.kg-2' dimensionURL='#D_LM-2'>
+                 <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+                 <UnitName xml:lang='en'>m*kg^-2</UnitName>
+                 <UnitSymbol type='HTML'>
+                   m&#160;kg
+                   <sup>&#8722;2</sup>
+                 </UnitSymbol>
+                 <UnitSymbol type='MathML'>
+                   <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                     <mrow>
+                       <mi mathvariant='normal'>m</mi>
+                       <mo rspace='thickmathspace'>&#8290;</mo>
+                       <msup>
+                         <mrow>
+                           <mi mathvariant='normal'>kg</mi>
+                         </mrow>
+                         <mrow>
+                           <mo>&#8722;</mo>
+                           <mn>2</mn>
+                         </mrow>
+                       </msup>
+                     </mrow>
+                   </math>
+                 </UnitSymbol>
+                 <RootUnits>
+                   <EnumeratedRootUnit unit='meter'/>
+                   <EnumeratedRootUnit unit='gram' prefix='k' powerNumerator='-2'/>
+                 </RootUnits>
+               </Unit>
+             </UnitSet>
+             <DimensionSet>
+               <Dimension xml:id='D_LM-2'>
+                 <Length symbol='L' powerNumerator='1'/>
+                 <Mass symbol='M' powerNumerator='-2'/>
+               </Dimension>
+             </DimensionSet>
+             <PrefixSet>
+               <Prefix prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+                 <PrefixName xml:lang='en'>kilo</PrefixName>
+                 <PrefixSymbol type='ASCII'>k</PrefixSymbol>
+                 <PrefixSymbol type='unicode'>k</PrefixSymbol>
+                 <PrefixSymbol type='LaTeX'>k</PrefixSymbol>
+                 <PrefixSymbol type='HTML'>k</PrefixSymbol>
+               </Prefix>
+             </PrefixSet>
+           </UnitsML>
+         </misc-container>
+         <sections>
+           <formula id='_'>
+             <stem type='MathML'>
+               <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                 <mrow>
+                   <mn>7</mn>
+                   <mo rspace='thickmathspace'>&#8290;</mo>
+                   <mrow xref='U_m.kg-2'>
+                     <mi mathvariant='normal'>m</mi>
+                     <mo rspace='thickmathspace'>&#8290;</mo>
+                     <msup>
+                       <mrow>
+                         <mi mathvariant='normal'>kg</mi>
+                       </mrow>
+                       <mrow>
+                         <mo>&#8722;</mo>
+                         <mn>2</mn>
+                       </mrow>
+                     </msup>
+                   </mrow>
+                   <mo>+</mo>
+                   <mn>8</mn>
+                   <mo rspace='thickmathspace'>&#8290;</mo>
+                   <mrow xref='U_m.kg-2'>
+                     <mi mathvariant='normal'>m</mi>
+                     <mo rspace='thickmathspace'>&#8290;</mo>
+                     <msup>
+                       <mrow>
+                         <mi mathvariant='normal'>kg</mi>
+                       </mrow>
+                       <mrow>
+                         <mo>&#8722;</mo>
+                         <mn>2</mn>
+                       </mrow>
+                     </msup>
+                   </mrow>
+                 </mrow>
+               </math>
+             </stem>
+           </formula>
+         </sections>
+       </standard-document>
+OUTPUT
+
+end
+
 it "customises italicisation of MathML" do
 input = <<~INPUT
 = Document title
@@ -2251,23 +2470,37 @@ end
   it "process express_ref macro with no existing bibliography" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
+      [[B]]
+      [type="express-schema"]
       == Clause
 
+      [[B1]]
+      NOTE: X
+
       <<express-schema:A:A.B.C,C>>
       <<express-schema:A>>
+      <<express-schema:B>>
+      <<express-schema:B1>>
     INPUT
        #{BLANK_HDR}
        <sections>
-           <clause id='_' inline-header='false' obligation='normative'>
+       <clause id='B' type='express-schema' inline-header='false' obligation='normative'>
              <title>Clause</title>
+             <note id='B1'>
+               <p id='_'>X</p>
+             </note>
              <p id='_'>
-               <eref bibitemid='express-schema_A' citeas="">
-               <localityStack>
-                 <locality type='anchor'><referenceFrom>A.B.C</referenceFrom></locality>
-               </localityStack>
+               <eref bibitemid='express-schema_A' citeas=''>
+                 <localityStack>
+                   <locality type='anchor'>
+                     <referenceFrom>A.B.C</referenceFrom>
+                   </locality>
+                 </localityStack>
                  C
                </eref>
-               <eref bibitemid='express-schema_A' citeas=""/>
+               <eref bibitemid='express-schema_A' citeas=''/>
+               <xref target='B'/>
+               <xref target='B1'/>
              </p>
            </clause>
          </sections>
@@ -2404,6 +2637,4 @@ OUTPUT
     end.at_least :once
 end
 
-
-
 end