metanorma-standoc 1.11.0.1 → 1.11.4

data/lib/isodoc/html/htmlstyle.css

@@ -76,6 +76,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -87,6 +93,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -467,32 +476,32 @@ p.document-stage {
 /*
     3.1 Titles
 */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
   color: #C70039;
   font-weight: 300;
   margin-top: 1.6em;
   margin-bottom: 0.3em; }
 
-h1 {
+h1, .h1 {
   font-size: 1.6em;
   text-transform: uppercase;
   margin-top: 2em; }
 
-h1#content {
+h1#content, #content.h1 {
   margin-top: 2em; }
 
-h2 {
+h2, .h2 {
   margin-top: 1.3em;
   font-size: 1.3em;
   font-weight: 400; }
 
-h3 {
+h3, .h3 {
   margin-top: 1.1em;
   font-size: 1.1em;
   font-weight: 100; }
 
-.TermNum, .Terms, .AltTerms {
+.TermNum {
   color: #C70039;
   font-weight: 100; }
 
@@ -791,7 +800,7 @@ p {
   margin-top: 1em;
   margin-bottom: 1em; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 /*
@@ -942,7 +951,7 @@ To top button
 @media print {
   .document-info, nav, .copyright {
     page-break-before: always; }
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; }
   .note, .figure, pre, .pseudocode, table {
@@ -965,12 +974,12 @@ To top button
   h1.content {
     margin-top: 2em;
     line-height: 2.5em; }
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5; }
-  h2 {
+  h2, .h2 {
     font-size: 1.2em; }
-  h3 {
+  h3, .h3 {
     font-size: 1em; }
   .Note {
     background-color: #fff495;

data/lib/isodoc/html/htmlstyle.scss

@@ -155,7 +155,7 @@ p.document-stage {
     3.1 Titles
 */
 
-  h1,h2,h3,h4,h5,h6 {
+  h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6 {
     font-family: $headerfont;
     color: #C70039;
     font-weight: 300;
@@ -163,29 +163,29 @@ p.document-stage {
     margin-bottom: 0.3em;
   }
 
-  h1 {
+  h1,.h1 {
     font-size: 1.6em;
     text-transform: uppercase;
     margin-top: 2em;
   }
 
-  h1#content {
+  h1#content,.h1#content {
       margin-top: 2em;
   }
 
-  h2 {
+  h2,.h2 {
     margin-top: 1.3em;
     font-size: 1.3em;
     font-weight: 400;
   }
 
-  h3 {
+  h3,.h3 {
     margin-top: 1.1em;
     font-size: 1.1em;
     font-weight: 100;
   }
 
-  .TermNum, .Terms, .AltTerms {
+  .TermNum {
     color: #C70039;
     font-weight: 100;
   }
@@ -471,7 +471,7 @@ p {
   margin-bottom: 1em;
 }
 
-h2 p {
+h2 p, .h2 p {
   display: inline;
 }
 
@@ -643,7 +643,7 @@ To top button
       page-break-before: always;
   }
 
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
@@ -685,16 +685,16 @@ To top button
     line-height: 2.5em;
   }
 
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5;
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.11.0.1".freeze
+    VERSION = "1.11.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
-  spec.add_dependency "iev", "~> 0.2.1"
+  spec.add_dependency "iev", "~> 0.3.0"
   spec.add_dependency "isodoc", "~> 1.8.0"
   spec.add_dependency "metanorma-plugin-datastruct"
   spec.add_dependency "metanorma-plugin-lutaml"
@@ -37,12 +37,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "latexmath"
   spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "metanorma-utils", "~> 1.2.0"
+  spec.add_dependency "metanorma-utils", "~> 1.2.8"
   spec.add_dependency "relaton-cli", "~> 1.9.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
 
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

data/spec/asciidoctor/base_spec.rb

@@ -849,6 +849,47 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes document relations by description" do
+    mock_relaton_relation_descriptions
+    input = <<~INPUT
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :normatively-cited-in: ABC
+
+    INPUT
+    output = <<~OUTPUT
+      <standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
+      <bibdata type='standard'>
+        <title language='en' format='text/plain'>Document title</title>
+        <language>en</language>
+        <script>Latn</script>
+        <status>
+          <stage>published</stage>
+        </status>
+        <copyright>
+          <from>2021</from>
+        </copyright>
+        <relation type='isCitedIn'>
+          <description>normatively cited in</description>
+          <bibitem>
+            <title>--</title>
+            <docidentifier>ABC</docidentifier>
+          </bibitem>
+        </relation>
+        <ext>
+          <doctype>article</doctype>
+        </ext>
+      </bibdata>
+      <sections> </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(Asciidoctor.convert(input, *OPTIONS)))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "reads scripts into blank HTML document" do
     FileUtils.rm_f "test.html"
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
@@ -986,4 +1027,11 @@ QU1FOiB0ZXN0Cgo=
         "International Standards Organization",
       )
   end
+
+  def mock_relaton_relation_descriptions
+    allow_any_instance_of(::Asciidoctor::Standoc::Front)
+      .to receive(:relaton_relation_descriptions).and_return(
+        "normatively-cited-in" => "isCitedIn",
+      )
+  end
 end

data/spec/asciidoctor/blocks_spec.rb

@@ -355,7 +355,7 @@ RSpec.describe Asciidoctor::Standoc do
              <term id='term-term1'>
                <preferred><expression><name>Term1</name></expression></preferred>
                <definition>
-                 <verbaldefinition>
+                 <verbal-definition>
                  <p id='_'>first definition</p>
                  <termsource status='identical' type="authoritative">
                    <origin bibitemid='ISO2191' type='inline' citeas=''>
@@ -366,10 +366,10 @@ RSpec.describe Asciidoctor::Standoc do
                      </localityStack>
                    </origin>
                  </termsource>
-                 </verbaldefinition>
+                 </verbal-definition>
                </definition>
                <definition>
-               <verbaldefinition>
+               <verbal-definition>
                  <p id='_'>second definition</p>
                  <termsource status='identical' type="authoritative">
                    <origin bibitemid='ISO2191' type='inline' citeas=''>
@@ -380,7 +380,7 @@ RSpec.describe Asciidoctor::Standoc do
                      </localityStack>
                    </origin>
                  </termsource>
-                 </verbaldefinition>
+                 </verbal-definition>
                </definition>
                <termnote id='_'>
                  <p id='_'>This is a note</p>
@@ -514,6 +514,59 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes nested terms" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Terms and Definitions
+
+      [.term]
+      === Term1
+
+      definition
+
+      NOTE: Note 1
+
+      ==== Term11
+      definition2
+
+      NOTE: Note 2
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+                <sections>
+           <clause id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <terms id='_' obligation='normative'>
+               <title>Term1</title>
+               <p id='_'>definition</p>
+               <note id='_'>
+                 <p id='_'>Note 1</p>
+               </note>
+               <term id='term-term11'>
+                 <preferred>
+                   <expression>
+                     <name>Term11</name>
+                   </expression>
+                 </preferred>
+                 <definition>
+                   <verbal-definition>
+                     <p id='_'>definition2</p>
+                   </verbal-definition>
+                 </definition>
+                 <termnote id='_'>
+                   <p id='_'>Note 2</p>
+                 </termnote>
+               </term>
+             </terms>
+           </clause>
+         </sections>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes notes" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -1201,7 +1254,7 @@ RSpec.describe Asciidoctor::Standoc do
              the following terms and definitions apply.</p>
                <term id="term-term1">
                <preferred><expression><name>Term1</name></expression></preferred>
-               <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+               <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
                <termsource status="identical" type="authoritative">
                <origin bibitemid="ISO2191" type="inline" citeas="">
                <localityStack>
@@ -1220,9 +1273,9 @@ RSpec.describe Asciidoctor::Standoc do
              <term id='term-term2'>
         <preferred><expression><name>Term2</name></expression></preferred>
         <definition>
-        <verbaldefinition>
+        <verbal-definition>
           <p id='_'>Definition</p>
-          </verbaldefinition>
+          </verbal-definition>
         </definition>
         <termsource status='identical' type="authoritative">
           <origin citeas=''>
@@ -1276,7 +1329,7 @@ RSpec.describe Asciidoctor::Standoc do
              the following terms and definitions apply.</p>
                <term id="term-term1">
                <preferred><expression><name>Term1</name></expression></preferred>
-               <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+               <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
                <termsource status="modified" type="authoritative">
                <origin bibitemid="ISO2191" type="inline" citeas="">
                <localityStack>
@@ -1290,9 +1343,9 @@ RSpec.describe Asciidoctor::Standoc do
              </term>
              <term id='term-term2'>
         <preferred><expression><name>Term2</name></expression></preferred>
-        <definition><verbaldefinition>
+        <definition><verbal-definition>
           <p id='_'>Definition</p>
-        </verbaldefinition></definition>
+        </verbal-definition></definition>
         <termsource status='modified' type="authoritative">
           <origin citeas=''>
             <termref base='IEV' target='xyz'/>
@@ -1342,7 +1395,7 @@ RSpec.describe Asciidoctor::Standoc do
             <name>Term1</name>
           </expression>
         </preferred>
-        <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+        <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
         <termsource status='generalisation' type='authoritative'>
           <origin bibitemid='ISO2191' type='inline' citeas=''>
             <localityStack>
@@ -1362,9 +1415,9 @@ RSpec.describe Asciidoctor::Standoc do
             <name>Term2</name>
           </expression>
         </preferred>
-        <definition><verbaldefinition>
+        <definition><verbal-definition>
           <p id='_'>Definition</p>
-        </verbaldefinition></definition>
+        </verbal-definition></definition>
         <termsource status='modified' type='lineage'>
           <origin citeas=''>
             <termref base='IEV' target='xyz'/>
@@ -1391,7 +1444,7 @@ OUTPUT
       ====
     INPUT
     output = <<~"OUTPUT"
-                  #{BLANK_HDR}
+     #{BLANK_HDR}
              <sections>
         <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
         <label>/ogc/recommendation/wfs/2</label>
@@ -1399,7 +1452,8 @@ OUTPUT
       <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>
+        <description><p id="_">I recommend this</p>
+      </description>
       </recommendation>
              </sections>
              </standard-document>
@@ -1417,6 +1471,9 @@ OUTPUT
       .Title
       ====
       I recommend this
+
+      . http://www.example.com[]
+      . <<ABC>>
       ====
     INPUT
     output = <<~OUTPUT
@@ -1425,7 +1482,20 @@ OUTPUT
         <requirement id="ABC" subsequence="A" number="3" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
               <title>Title</title>
         <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
-        <description><p id="_">I recommend this</p></description>
+        <description><p id="_">I recommend this</p>
+                       <ol id='_' type='arabic'>
+                 <li>
+                   <p id='_'>
+                     <link target='http://www.example.com'/>
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     <xref target='ABC'/>
+                   </p>
+                 </li>
+               </ol>
+      </description>
       </requirement>
              </sections>
              </standard-document>
@@ -1473,6 +1543,9 @@ OUTPUT
       [.permission]
       =====
       I also permit this
+
+      . List
+      . List
       =====
 
       [requirement,type="general",label="/req/core/quantities-uom"]
@@ -1488,7 +1561,16 @@ OUTPUT
         <p id="_">Example 2</p>
       </example></description>
       <permission id="_">
-        <description><p id="_">I also permit this</p></description>
+        <description><p id="_">I also permit this</p>
+                  <ol id='_' type='arabic'>
+            <li>
+              <p id='_'>List</p>
+            </li>
+            <li>
+              <p id='_'>List</p>
+            </li>
+          </ol>
+        </description>
       </permission>
       <requirement id='_' type='general'>
       <label>/req/core/quantities-uom</label>

data/spec/asciidoctor/cleanup_blocks_spec.rb

@@ -1015,4 +1015,28 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "updates anchor reference along with anchor to match content" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [[samplecode]]
+      .Sample Code
+      ====
+
+      [source,ruby]
+      --
+      puts "Hello, world."
+      %w{a b c}.each do |x| <1>
+        puts x
+      end
+      --
+      <1> This is an annotation
+      ====
+    INPUT
+    output = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS))
+    callout_id = output.at("//xmlns:callout/@target").text
+    annotation_id = output.at("//xmlns:annotation/@id").text
+    expect(callout_id).to eq(annotation_id)
+  end
 end

data/spec/asciidoctor/cleanup_sections_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Asciidoctor::Standoc do
       </ul>
              <term id="term-time">
              <preferred><expression><name>Time</name></expression></preferred>
-               <definition><verbaldefinition><p id="_">This paragraph is extraneous</p></verbaldefinition></definition>
+               <definition><verbal-definition><p id="_">This paragraph is extraneous</p></verbal-definition></definition>
              </term></terms>
              </sections>
              </standard-document>

data/spec/asciidoctor/cleanup_spec.rb

@@ -426,7 +426,7 @@ RSpec.describe Asciidoctor::Standoc do
         <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
         <term id="term-term1">
         <preferred><expression><name>Term1</name></expression></preferred>
-        <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+        <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
         <termsource status="identical" type="authoritative">
         <origin bibitemid="ISO2191" type="inline" citeas="">
         <localityStack>
@@ -545,7 +545,7 @@ RSpec.describe Asciidoctor::Standoc do
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          <term id="term-automation1">
           <preferred><expression><name>Automation1</name></expression></preferred>
-          <definition><verbaldefinition><p id='_'>Definition 1</p></verbaldefinition></definition>
+          <definition><verbal-definition><p id='_'>Definition 1</p></verbal-definition></definition>
           <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-103" type="inline" citeas="IEC 60050-103:2009">
           <localityStack>
@@ -556,7 +556,7 @@ RSpec.describe Asciidoctor::Standoc do
         </term>
         <term id="term-automation2">
           <preferred><expression><name>Automation2</name></expression></preferred>
-          <definition><verbaldefinition><p id='_'>Definition 2</p></verbaldefinition></definition>
+          <definition><verbal-definition><p id='_'>Definition 2</p></verbal-definition></definition>
           <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-102" type="inline" citeas="IEC 60050-102:2007">
           <localityStack>
@@ -567,7 +567,7 @@ RSpec.describe Asciidoctor::Standoc do
         </term>
         <term id="term-automation3">
           <preferred><expression><name>Automation3</name></expression></preferred>
-          <definition><verbaldefinition><p id='_'>Definition 3</p></verbaldefinition></definition>
+          <definition><verbal-definition><p id='_'>Definition 3</p></verbal-definition></definition>
           <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-103" type="inline" citeas="IEC 60050-103:2009">
           <localityStack>
@@ -579,7 +579,7 @@ RSpec.describe Asciidoctor::Standoc do
           <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
           <bibitem type="standard" id="IEC60050-102">
-          <fetched>#{Date.today}</fetched>
+          <fetched/>
           <title type="title-main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV)</title>
           <title type="title-part" format="text/plain" language="en" script="Latn">Part 102: Mathematics — General concepts and linear algebra</title>
           <title type='main' format='text/plain' language='en' script='Latn'>International Electrotechnical Vocabulary (IEV) — Part 102: Mathematics — General concepts and linear algebra</title>
@@ -618,7 +618,7 @@ RSpec.describe Asciidoctor::Standoc do
           </copyright>
           <place>Geneva</place>
         </bibitem><bibitem type="standard" id="IEC60050-103">
-          <fetched>#{Date.today}</fetched>
+          <fetched/>
           <title type="title-main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV)</title>
           <title type="title-part" format="text/plain" language="en" script="Latn">Part 103: Mathematics — Functions</title>
           <title type="main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV) — Part 103: Mathematics — Functions</title>