metanorma-iso 2.0.7 → 2.1.0

data/lib/metanorma/iso/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -851,6 +888,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1225,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1252,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.0.7".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/lib/metanorma-iso.rb

@@ -7,6 +7,7 @@ require_relative "isodoc/iso/pdf_convert"
 require_relative "isodoc/iso/sts_convert"
 require_relative "isodoc/iso/isosts_convert"
 require_relative "isodoc/iso/presentation_xml_convert"
+require_relative "html2doc/lists"
 require "asciidoctor/extensions"
 
 if defined? Metanorma

data/lib/relaton/render/config.yml

@@ -0,0 +1,4 @@
+template:
+  # skip standardidentifier, it is inserted in front of formattedref within metanorma
+  standard: "<em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }}." 
+  website: "{{ creatornames }} ({{ role }}) . <em><span_class='stddocTitle'>{{ title }}</span></em> [website]. {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{ place }}: {{ publisher }}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ standardidentifier | first }}. {{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]. "

data/lib/relaton/render/general.rb

@@ -0,0 +1,13 @@
+require "relaton-render"
+
+module Relaton
+  module Render
+    module Iso
+      class General < ::Relaton::Render::IsoDoc::General
+        def config_loc
+          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        end
+      end
+    end
+  end
+end

data/metanorma-iso.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"

data/spec/isodoc/amd_spec.rb

@@ -128,7 +128,7 @@ RSpec.describe IsoDoc do
           <annex id="annex1" displayorder="5">
             <title>
               <strong>Annex A</strong>
-              <br/>(informative)</title>
+              <br/><span class="obligation">(informative)</span></title>
             <clause id="annex1a" inline-header="true">
               <title>A.1</title>
               <note id="AN">
@@ -252,21 +252,21 @@ RSpec.describe IsoDoc do
               <title>Foreword</title>
               <p id='A'>
                 This is a preamble 
-                <xref target='C'>0.1</xref>
-                <xref target='C1'>0.2</xref>
-                <xref target='D'>Scope</xref>
+                <xref target='C'><span class='citesec'>0.1</span></xref>
+                <xref target='C1'><span class='citesec'>0.2</span></xref>
+                <xref target='D'><span class='citesec'>Scope</span></xref>
                 <xref target='H'>[H]</xref>
                 <xref target='I'>[I]</xref>
                 <xref target='J'>[J]</xref>
                 <xref target='K'>[K]</xref>
                 <xref target='L'>[L]</xref>
-                <xref target='M'>Clause 4</xref>
-                <xref target='N'>Introduction</xref>
-                <xref target='O'>Clause 4.2</xref>
-                <xref target='P'>Annex A</xref>
-                <xref target='Q'>A.1</xref>
-                <xref target='Q1'>A.1.1</xref>
-                <xref target='Q2'>Annex A, Appendix 1</xref>
+                <xref target='M'><span class='citesec'>Clause 4</span></xref>
+                <xref target='N'><span class='citesec'>Introduction</span></xref>
+                <xref target='O'><span class='citesec'>Clause 4.2</span></xref>
+                <xref target='P'><span class='citeapp'>Annex A</span></xref>
+                <xref target='Q'><span class='citeapp'>A.1</span></xref>
+                <xref target='Q1'><span class='citeapp'>A.1.1</span></xref>
+                <xref target='Q2'><span class='citeapp'>Annex A, Appendix 1</span></xref>
                 <xref target='R'>[R]</xref>
               </p>
             </foreword>
@@ -297,7 +297,7 @@ RSpec.describe IsoDoc do
             <title>
               <strong>Annex A</strong>
               <br/>
-              (normative)
+              <span class="obligation">(normative)</span>
               <br/>
               <br/>
               <strong>Annex</strong>
@@ -503,7 +503,7 @@ RSpec.describe IsoDoc do
           </clause>
         </sections>
         <annex id="P" inline-header="false" obligation="normative" displayorder="10">
-          <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+          <title><strong>Annex A</strong><br/><span class="obligation">(normative)</span><br/><br/><strong>Annex</strong></title>
           <clause id="Q" inline-header="false" obligation="normative">
             <title depth="2">A.1<tab/>Annex A.1</title>
             <clause id="Q1" inline-header="false" obligation="normative">
@@ -511,7 +511,8 @@ RSpec.describe IsoDoc do
             </clause>
           </clause>
         </annex>
-        <annex id="P1" inline-header="false" obligation="normative" displayorder="11"><title><strong>Annex B</strong><br/>(normative)</title></annex>
+        <annex id="P1" inline-header="false" obligation="normative" displayorder="11">
+        <title><strong>Annex B</strong><br/><span class="obligation">(normative)</span></title></annex>
         <bibliography>
           <references id="R" normative="true" obligation="informative" displayorder="7">
             <title depth="1">Normative References</title>