metanorma-mpfd 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1655ee3b5580cfc2abaabbc4653444e5f11f7e08c050dee4d099465f5a0615b0
-  data.tar.gz: a20e4a6d2a715611fd7263cf469b60e17ac31d76a846ff97233f71a136ac2a62
+  metadata.gz: bfd947976cf7723097bbc39190d29aba93c2877d4092851c492b1dd7b7121bc8
+  data.tar.gz: 101bc888077da408a72f130bef43747b30ee193426900be832e1e7fae25b9784
 SHA512:
-  metadata.gz: 47869341de5531fc40f67568f85695360c9644985f3e8f873ab660438863ed98936191422b4246f27ede73e74ceaa67a9fa34667b8a7344acddb0210db755948
-  data.tar.gz: 01f46db89bc5118bc94bd91f7a260590a74bb0aa965cdac468d690b1ae5a41c90674c9f4de05a3089febf31236e4b5d65e2dd35b42494edcdfc08b01219449ef
+  metadata.gz: b06e333a82690dd83ebfd954208028ee99342385eea6e32a631119681e9ec19a781c7ba4918d1ab63df22a5e6dcad8493891324ca0ab878a7593935c0fb95c0f
+  data.tar.gz: 12820e5a38ee13e815549cf27c2dfddabb5ef5428d73d5fbc88a830bca1ddc3b3087ea97ac6e503f0055489fe09bfc44f65a0ff57d4f3c9e977cb03aad79d08b

data/lib/asciidoctor/mpfd/biblio.rng

@@ -661,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -1021,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">

data/lib/asciidoctor/mpfd/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -902,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">

data/lib/isodoc/mpfd/base_convert.rb

@@ -90,6 +90,7 @@ module IsoDoc
 
       def middle(isoxml, out)
         middle_title(out)
+        middle_admonitions(isoxml, out)
         clause isoxml, out
         annex isoxml, out
         bibliography isoxml, out
@@ -163,13 +164,13 @@ module IsoDoc
         @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
                                    xref: "#{@annex_lbl} #{num}", level: 1 }
         if a = single_annex_special_section(clause)
-        annex_names1(a, "#{num}", 1)
+          annex_names1(a, "#{num}", 1)
         else
-        i = 0
-        clause.xpath(ns("./clause | ./references")).each do |c|
-          container_names(c, 0)
-          i = annex_naming(c, num, 1, i)
-        end
+          i = 0
+          clause.xpath(ns("./clause | ./references")).each do |c|
+            container_names(c, 0)
+            i = annex_naming(c, num, 1, i)
+          end
         end
         hierarchical_asset_names(clause, num)
       end

data/lib/metanorma/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Mpfd
-    VERSION = "0.3.20"
+    VERSION = "0.3.21"
   end
 end

data/metanorma-mpfd.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   #spec.add_dependency "nokogiri"
-  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
   spec.add_dependency "isodoc", "~> 1.0.0"
   spec.add_dependency "twitter_cldr"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfd
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement