metanorma-mpfa 0.4.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f5b3ae953cf84b4ba03366b96d6860178314c9b211c5abeffcafc0c9fb64045
-  data.tar.gz: 993f3b9dc13726cd5f5de441a7566227350a62982b5f0cca07b342398972c956
+  metadata.gz: ae4dfa96623980717b0d0aa5cab95bb85b8e2783cc3f2f7d150bfbd935fc9f34
+  data.tar.gz: 8821d201deb2309b37fa71a1dd11201fe40e4341302750209d22cd1972f6f081
 SHA512:
-  metadata.gz: e830fa528259968685e92f3995de5ef147f94db7a6fd2f5f12ea9bcd6b00bdf7efb5fe3c93781e75caf676db03cb3e02d1cb9485db58e9e838e64238f2fd693a
-  data.tar.gz: f89dd9ec2351bf1faf272c684294a3242beaa26c53a2e31da6e2583b8f554537c1215cacb9d35c76fa80c90f4be3a65d2cf4a2060f9d0bb941872ae7b8333d54
+  metadata.gz: 360c28eb4430f1decbf67e28afa792958ae2bb191757efc1e11259e64000e86d926c35c082313357c65d120e27d2ac3e1c2224b522b9275c5572310e3b39aec3
+  data.tar.gz: 2d6839910d73e8da3b1b7549cc4baffbddb347695acff7619f361f4c4660848bfa3389d4c23da945ac6567097130bcba959752db0b1570cdd0dfd867bbaa4148

data/lib/asciidoctor/mpfa/basicdoc.rng

@@ -158,7 +158,17 @@
         <data type="ID"/>
       </attribute>
       <oneOrMore>
-        <ref name="paragraph"/>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+        </choice>
       </oneOrMore>
     </element>
   </define>
@@ -402,6 +412,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -429,6 +449,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>

data/lib/asciidoctor/mpfa/converter.rb

@@ -19,24 +19,8 @@ module Asciidoctor
 
       register_for "mpfa"
 
-      def metadata_author(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "author" }
-          c.organization do |a|
-            a.name "Mandatory Provident Fund Schemes Authority"
-            a.abbreviation "MPFA"
-          end
-        end
-      end
-
-      def metadata_publisher(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "publisher" }
-          c.organization do |a|
-            a.name "Mandatory Provident Fund Schemes Authority"
-            a.abbreviation "MPFA"
-          end
-        end
+      def default_publisher
+        "Mandatory Provident Fund Schemes Authority"
       end
 
       def metadata_committee(node, xml)
@@ -58,19 +42,6 @@ module Asciidoctor
         xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
-      def metadata_copyright(node, xml)
-        from = node.attr("copyright-year") || Date.today.year
-        xml.copyright do |c|
-          c.from from
-          c.owner do |owner|
-            owner.organization do |o|
-              o.name "Mandatory Provident Fund Schemes Authority"
-              o.abbreviation "MPFA"
-            end
-          end
-        end
-      end
-
       def title_validate(root)
         nil
       end
@@ -85,6 +56,7 @@ module Asciidoctor
         presentation_xml_converter(node).convert(@filename + ".xml")
         html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
         doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
+        pdf_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
       end
 
       def validate(doc)
@@ -108,6 +80,10 @@ module Asciidoctor
       def doc_converter(node)
         IsoDoc::MPFA::WordConvert.new(doc_extract_attributes(node))
       end
+
+      def pdf_converter(node)
+        IsoDoc::MPFA::PdfConvert.new(doc_extract_attributes(node))
+      end
     end
   end
 end

data/lib/asciidoctor/mpfa/isodoc.rng

@@ -42,8 +42,11 @@
     </define>
     <define name="xref">
       <element name="xref">
+        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -578,6 +581,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +666,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +712,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -922,6 +947,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +989,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +1017,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1039,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,18 +1067,24 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1180,6 +1211,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1501,4 +1535,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/mpfa/section.rb

@@ -58,7 +58,6 @@ module Asciidoctor
         attrs[:container] = true if node.role == "container"
         super
       end
-
     end
   end
 end

data/lib/isodoc/mpfa/base_convert.rb

@@ -1,51 +1,9 @@
 require "isodoc"
-require_relative "metadata"
-require_relative "xref"
 require  "fileutils"
 
 module IsoDoc
   module MPFA
     module BaseConvert
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{@xrefs.anchor(annex['id'], :label)} "
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
-      def i18n_init(lang, script)
-        super
-        y = if lang == "en"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            elsif lang == "zh" && script == "Hans"
-              YAML.load_file(File.join(File.dirname(__FILE__),
-                                       "i18n-zh-Hans.yaml"))
-            else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            end
-        @labels = @labels.merge(y)
-        @annex_lbl = y["annex"]
-        @clause_lbl = y["clause"]
-      end
-
-      def terms_defs_title(f)
-        return f&.at(ns("./title"))&.content
-      end
-
       TERM_CLAUSE = "//preface/terms | "\
         "//preface/clause[descendant::terms]".freeze
 
@@ -57,7 +15,7 @@ module IsoDoc
       def terms_defs(isoxml, out, num)
         f = isoxml.at(ns(self.class::TERM_CLAUSE)) or return num
         out.div **attr_code(id: f["id"]) do |div|
-          clause_name(nil, terms_defs_title(f), div, nil)
+          clause_name(nil, f&.at(ns("./title")), div, nil)
           f.elements.each do |e|
             parse(e, div) unless %w{title source}.include? e.name
           end
@@ -70,10 +28,10 @@ module IsoDoc
       def preface(isoxml, out)
         isoxml.xpath(ns(self.class::FRONT_CLAUSE)).each do |c|
           if c.name == "terms" || c.at(ns(".//terms")) then terms_defs isoxml, out, 0
+          elsif !is_clause?(c.name) then parse(c, out)
           else
             out.div **attr_code(id: c["id"]) do |s|
-              clause_name(@xrefs.anchor(c['id'], :label),
-                          c&.at(ns("./title"))&.content, s, nil)
+              clause_name(nil, c&.at(ns("./title")), s, nil)
               c.elements.reject { |c1| c1.name == "title" }.each do |c1|
                 parse(c1, s)
               end
@@ -82,6 +40,10 @@ module IsoDoc
         end
       end
 
+      def middle_clause
+        "//clause[parent::sections][not(descendant::terms)]"
+      end
+
       def middle(isoxml, out)
         middle_title(out)
         middle_admonitions(isoxml, out)
@@ -91,6 +53,7 @@ module IsoDoc
       end
 
       def termdef_parse(node, out)
+        name = node&.at(ns("./name"))&.remove
         set_termdomain("")
         node.children.each { |n| parse(n, out) }
       end
@@ -98,8 +61,8 @@ module IsoDoc
       def clause(isoxml, out)
         isoxml.xpath(ns(middle_clause)).each do |c|
           out.div **attr_code(id: c["id"]) do |s|
-            clause_name(@xrefs.anchor(c['id'], :label),
-                        c&.at(ns("./title"))&.content, s, class: c["container"] ? "containerhdr" : nil )
+            clause_name(nil, c&.at(ns("./title")), s, 
+                        class: c["container"] ? "containerhdr" : nil )
             c.elements.reject { |c1| c1.name == "title" }.each do |c1|
               parse(c1, s)
             end
@@ -107,17 +70,11 @@ module IsoDoc
         end
       end
 
-      def clause_parse_title(node, div, c1, out)
-        if node["inline-header"] == "true"
-          inline_header_title(out, node, c1)
-        else
-          attrs = { class: node["container"] ? "containerhdr" : nil }
-          div.send "h#{@xrefs.anchor(node['id'], :level, :false) || '1'}", **attr_code(attrs) do |h|
-            lbl = @xrefs.anchor(node['id'], :label, false)
-            h << "#{lbl}. " if lbl && !@suppressheadingnumbers
-            c1&.children&.each { |c2| parse(c2, h) }
-          end
-        end
+      def clause_parse_title(node, div, c1, out, header_class = {})
+        attrs = {}
+        attrs = { class: "containerhdr" } if node["container"]
+        header_class = header_class.merge(attrs)
+        super
       end
 
       def ol_depth(node)