metanorma-standoc 2.1.5 → 2.2.0

data/spec/metanorma/blocks_spec.rb

@@ -764,7 +764,7 @@ RSpec.describe Metanorma::Standoc do
       ====
     INPUT
     output = <<~OUTPUT
-                   #{BLANK_HDR}
+      #{BLANK_HDR}
             <sections>
                 <clause id='_' inline-header='false' obligation='normative'>
       <title>Clause</title>
@@ -940,6 +940,9 @@ RSpec.describe Metanorma::Standoc do
 
       .Final stages: All kernels are fully gelatinized
       image::spec/examples/rice_images/rice_image3_3.png[]
+
+      [%key]
+      A:: B
       ====
     INPUT
     output = <<~OUTPUT
@@ -956,7 +959,14 @@ RSpec.describe Metanorma::Standoc do
       <figure id="_">
         <name>Final stages: All kernels are fully gelatinized</name>
         <image src="spec/examples/rice_images/rice_image3_3.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-      </figure></figure>
+      </figure>
+      <dl id='_' key='true'>
+        <dt>A</dt>
+        <dd>
+          <p id='_'>B</p>
+        </dd>
+      </dl>
+      </figure>
       </sections>
       </standard-document>
     OUTPUT
@@ -1609,7 +1619,7 @@ RSpec.describe Metanorma::Standoc do
   it "processes recommendation" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [.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,tag=X,multilingual-rendering=common]
+      [.recommendation,identifier="/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,tag=X,multilingual-rendering=common]
       ====
       I recommend this
       ====
@@ -1618,7 +1628,7 @@ RSpec.describe Metanorma::Standoc do
       #{BLANK_HDR}
               <sections>
          <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
-         <label>/ogc/recommendation/wfs/2</label>
+         <identifier>/ogc/recommendation/wfs/2</identifier>
        <subject>user</subject>
        <subject>developer, implementer</subject>
        <inherit>/ss/584/2015/level/1</inherit>
@@ -1719,7 +1729,7 @@ RSpec.describe Metanorma::Standoc do
       . List
       =====
 
-      [requirement,type="general",label="/req/core/quantities-uom"]
+      [requirement,type="general",identifier="/req/core/quantities-uom"]
       ======
       ======
       ====
@@ -1744,7 +1754,7 @@ RSpec.describe Metanorma::Standoc do
         </description>
       </permission>
       <requirement id='_' type='general'>
-      <label>/req/core/quantities-uom</label>
+      <identifier>/req/core/quantities-uom</identifier>
       </requirement>
       </permission>
       </sections>
@@ -1760,7 +1770,7 @@ RSpec.describe Metanorma::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user",classification="control-class:Technical;priority:P0;family:System &amp; Communications Protection,System and Communications Protocols",obligation="permission,recommendation",filename="reqt1.rq"]
+      [.recommendation,identifier="/ogc/recommendation/wfs/2",subject="user",classification="control-class:Technical;priority:P0;family:System &amp; Communications Protection,System and Communications Protocols",obligation="permission,recommendation",filename="reqt1.rq"]
       ====
       I recommend _this_.
 
@@ -1819,7 +1829,7 @@ RSpec.describe Metanorma::Standoc do
     output = <<~"OUTPUT"
          #{BLANK_HDR}
                  <sections>
-                 <recommendation id="ABC"  obligation="permission,recommendation" filename="reqt1.rq"><label>/ogc/recommendation/wfs/2</label><subject>user</subject>
+                 <recommendation id="ABC"  obligation="permission,recommendation" filename="reqt1.rq"><identifier>/ogc/recommendation/wfs/2</identifier><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>

data/spec/metanorma/cleanup_blocks_spec.rb

@@ -803,7 +803,7 @@ RSpec.describe Metanorma::Standoc do
       [%metadata]
       model:: ogc
       type:: class
-      label:: http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules[*req/core*]
+      identifier:: 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
@@ -812,6 +812,7 @@ RSpec.describe Metanorma::Standoc do
       inherit:: http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used
       inherit:: <<ref2>>
       inherit:: <<ref3>>
+      target:: http://www.example.com
       classification:: priority:P0
       classification:: domain:Hydrology,Groundwater
       classification:: control-class:Technical
@@ -826,22 +827,14 @@ RSpec.describe Metanorma::Standoc do
         <clause id='_' inline-header='false' obligation='normative'>
           <title>Clause</title>
           <requirement id='_' subsequence='A' obligation='recommendation,requirement' model='ogc' type='class'>
-            <label>
-              <link target='http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules'>
-                <strong>req/core</strong>
-              </link>
-            </label>
+            <identifier>http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules</identifier>
             <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>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>http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used</inherit>
             <inherit>
               <xref target='ref2'/>
             </inherit>
@@ -849,21 +842,25 @@ RSpec.describe Metanorma::Standoc do
               <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>
+                 <tag>priority</tag>
+                 <value>P0</value>
+               </classification>
+               <classification>
+                 <tag>domain</tag>
+                 <value>Hydrology</value>
+               </classification>
+               <classification>
+                 <tag>domain</tag>
+                 <value>Groundwater</value>
+               </classification>
+               <classification>
+                 <tag>control-class</tag>
+                 <value>Technical</value>
+               </classification>
+               <classification>
+                 <tag>target</tag>
+                 <value><link target='http://www.example.com'/></value>
+               </classification>
             <description>
               <p id='_'>I recommend this</p>
             </description>

data/spec/metanorma/inline_spec.rb

@@ -59,6 +59,8 @@ RSpec.describe Metanorma::Standoc do
       [underline]#underline#
       [smallcap]#smallcap#
       [keyword]#keyword#
+      [css font-family:"Noto Sans JP"]#text#
+      [css font-family:'Noto Sans JP']#text#
     INPUT
     output = <<~OUTPUT
            #{BLANK_HDR}
@@ -80,6 +82,8 @@ RSpec.describe Metanorma::Standoc do
       <underline>underline</underline>
       <smallcap>smallcap</smallcap>
       <keyword>keyword</keyword>
+      <span style="font-family:&quot;Noto Sans JP&quot;">text</span>
+      <span style="font-family:'Noto Sans JP'">text</span>
       </sections>
       </standard-document>
     OUTPUT

data/spec/metanorma/macros_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe Metanorma::Standoc do
       autonumber:table[3]
       add:[a <<clause>>] del:[B]
       identifier:[a http://example.com]
+      s:category[text]
 
       [bibliography]
       == Bibliography
@@ -38,6 +39,7 @@ RSpec.describe Metanorma::Standoc do
                     </add>
                     <del>B</del>
                     <identifier>a http://example.com</identifier>
+                    <span class='category'>text</span>
         </foreword>
       </preface>
       <sections> </sections>