metanorma-mpfd 0.1.0 → 0.1.1

data/lib/asciidoctor/mpfd/isostandard.rng

@@ -84,6 +84,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>
@@ -163,6 +166,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>

data/lib/asciidoctor/mpfd/mpfd.rng

@@ -16,6 +16,9 @@
     </define>
     <define name="docidentifier">
       <element name="docidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <text/>
       </element>
     </define>
@@ -29,30 +32,38 @@
         <attribute name="id">
           <data type="ID"/>
         </attribute>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
         <choice>
+          <ref name="image"/>
+          <ref name="pre"/>
           <oneOrMore>
-            <ref name="figure"/>
+            <ref name="subfigure"/>
           </oneOrMore>
-          <group>
-            <choice>
-              <zeroOrMore>
-                <ref name="TextElement"/>
-              </zeroOrMore>
-              <ref name="pre"/>
-            </choice>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-            <optional>
-              <ref name="dl"/>
-            </optional>
-          </group>
+        </choice>
+        <zeroOrMore>
+          <ref name="fn"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="dl"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="subfigure">
+      <element name="figure">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <choice>
+          <ref name="image"/>
+          <ref name="pre"/>
         </choice>
       </element>
     </define>
@@ -96,7 +107,6 @@
       <choice>
         <value>policy-and-procedures</value>
         <value>best-practices</value>
-        <value>circular</value>
         <value>supporting-document</value>
         <value>report</value>
         <value>legal</value>
@@ -107,7 +117,9 @@
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <ref name="committee"/>
+        <oneOrMore>
+          <ref name="committee"/>
+        </oneOrMore>
       </element>
     </define>
     <define name="BibData">
@@ -128,6 +140,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>

data/lib/asciidoctor/mpfd/section.rb

@@ -17,8 +17,7 @@ module Asciidoctor
         x.xpath("//*[@inline-header]").each do |h|
           h.delete("inline-header")
         end
-        x.xpath("//[@guidance]").each do |h|
-          require "byebug"; byebug
+        x.xpath("//*[@guidance]").each do |h|
           c = h.previous_element || next
           c.add_child h.remove
         end
@@ -28,11 +27,7 @@ module Asciidoctor
         a = { id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node) }
         noko do |xml|
           case sectiontype(node)
-          when "introduction" then
-            if node.level == 1 then introduction_parse(a, xml, node)
-            else
-              clause_parse(a, xml, node)
-            end
+          when "introduction" then introduction_parse(a, xml, node)
           when "terms and definitions",
             "terms, definitions, symbols and abbreviated terms",
             "terms, definitions, symbols and abbreviations",
@@ -54,8 +49,6 @@ module Asciidoctor
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "appendix" && node.level == 1
               annex_parse(a, xml, node)
-            elsif node.option? "appendix"
-              appendix_parse(a, xml, node)
             else
               clause_parse(a, xml, node)
             end
@@ -67,22 +60,26 @@ module Asciidoctor
         return node.title
       end
 
-      def make_preface(x, s)
-        if x.at("//foreword | //introduction | //terms")
-          preface = s.add_previous_sibling("<preface/>").first
-          foreword = x.at("//foreword")
-          preface.add_child foreword.remove if foreword
-          introduction = x.at("//introduction")
-          preface.add_child introduction.remove if introduction
-          terms = x.at("//terms")
-          preface.add_child terms.remove if terms
-        end
+      def move_sections_into_preface(x, preface)
+        foreword = x.at("//foreword")
+        preface.add_child foreword.remove if foreword
+        introduction = x.at("//introduction")
+        preface.add_child introduction.remove if introduction
+        terms = x.at("//sections/clause[descendant::terms]") || x.at("//terms")
+        preface.add_child terms.remove if terms
         x.xpath("//clause[@preface]").each do |c|
           c.delete("preface")
           preface.add_child c.remove
         end
       end
 
+      def make_preface(x, s)
+        if x.at("//foreword | //introduction | //terms | //clause[@preface]")
+          preface = s.add_previous_sibling("<preface/>").first
+          move_sections_into_preface(x, preface)
+        end
+      end
+
       def clause_parse(attrs, xml, node)
         attrs[:preface] = true if node.attr("style") == "preface"
         attrs[:guidance] = true if node.role == "guidance"

data/lib/isodoc/mpfd/html/htmlstyle.scss

@@ -527,7 +527,7 @@ ul  li {
 }
 
 ul li:before {
-  content: "—";
+  content: "\2014";
   display: inline-block; width: 1em;
   margin-left: -1.2em;
 }

data/lib/isodoc/mpfd/html/word_rsd_titlepage.html

@@ -1,6 +1,6 @@
 {% if docnumber %}
 <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
-normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }}:{{ docyear }} {{ draftinfo }}</span></b><b
+normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }} {{ draftinfo }}</span></b><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
 {% endif %}
 

data/lib/isodoc/mpfd/html_convert.rb

@@ -84,14 +84,6 @@ module IsoDoc
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end
 
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
       def error_parse(node, out)
         # catch elements not defined in ISO
         case node.name
@@ -108,11 +100,6 @@ module IsoDoc
         File.join(File.dirname(__FILE__), loc)
       end
 
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
-
       def i18n_init(lang, script)
         super
         y = if lang == "en"
@@ -121,10 +108,10 @@ module IsoDoc
               YAML.load_file(File.join(File.dirname(__FILE__),
                                        "i18n-zh-Hans.yaml"))
             else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
             end
-        @annex_lbl = "Appendix"
         @labels = @labels.merge(y)
+        @annex_lbl = y["annex"]
         @clause_lbl = y["clause"]
       end
 
@@ -135,6 +122,11 @@ module IsoDoc
       TERM_CLAUSE = "//preface/terms | "\
         "//preface/clause[descendant::terms]".freeze
 
+      SECTIONS_XPATH = 
+         "//foreword | //introduction | //preface/terms | //preface/clause | //annex | "\
+      "//sections/clause | //bibliography/references | "\
+      "//bibliography/clause".freeze
+
       def terms_defs(isoxml, out, num)
         f = isoxml.at(ns(TERM_CLAUSE)) or return num
         out.div **attr_code(id: f["id"]) do |div|
@@ -150,7 +142,7 @@ module IsoDoc
 
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
-          if c.name == "terms" then  terms_defs isoxml, out, 0
+          if c.name == "terms" || c.at(ns(".//terms")) then terms_defs isoxml, out, 0
           else
             out.div **attr_code(id: c["id"]) do |s|
               clause_name(get_anchors[c['id']][:label],
@@ -199,14 +191,6 @@ module IsoDoc
         l10n("<b>#{@annex_lbl} #{num}</b>")
       end
 
-      def xclause_names(docxml, _sect_num)
-        q = "//clause[parent::sections]"
-        @topnum = nil
-        docxml.xpath(ns(q)).each do |c|
-          section_names(c, @topnum, 1)
-        end
-      end
-
       def clause_names(docxml, sect_num)
         q = "//clause[parent::sections]"
         @topnum = nil
@@ -231,9 +215,7 @@ module IsoDoc
       def sect_names(clause, num, i, lvl, prev_lvl)
         return i if clause.nil?
         curr = i
-        if clause["container"]
-          retlvl = lvl+1
-        else  
+        if !clause["container"]
           retlvl = lvl
           i+=1
           curr = i
@@ -258,7 +240,7 @@ module IsoDoc
       def annex_naming(c, num, lvl, i)
         if c["guidance"] then annex_names1(c, "#{num}E", lvl + 1)
         else
-          i+= 1
+          i+= 1 unless c["container"]
           annex_names1(c, "#{num}.#{i}", lvl + 1)
         end
         i
@@ -269,14 +251,15 @@ module IsoDoc
                                    xref: "#{@annex_lbl} #{num}", level: 1 }
         i = 0
         clause.xpath(ns("./clause")).each do |c|
+          container_names(c, 0)
           i = annex_naming(c, num, 1, i)
         end
         hierarchical_asset_names(clause, num)
       end
 
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
-                                   level: level }
+        clause["container"] or @anchors[clause["id"]] = 
+          { label: num, xref: "#{@annex_lbl} #{num}", level: level }
         i = 0
         clause.xpath(ns("./clause")).each do |c|
           i = annex_naming(c, num, level, i)

data/lib/isodoc/mpfd/i18n-en.yaml

@@ -1 +1,2 @@
 clause: Paragraph
+annex: Appendix

data/lib/isodoc/mpfd/i18n-zh-Hans.yaml

@@ -0,0 +1,2 @@
+clause: 段
+annex: 附录

data/lib/isodoc/mpfd/metadata.rb

@@ -27,14 +27,7 @@ module IsoDoc
 
       def docid(isoxml, _out)
         docnumber = isoxml.at(ns("//bibdata/docidentifier"))
-        docstatus = isoxml.at(ns("//bibdata/status"))
-        dn = docnumber&.text
-        if docstatus
-          set(:status, status_print(docstatus.text))
-          abbr = status_abbr(docstatus.text)
-          dn = "#{dn}(#{abbr})" unless abbr.empty?
-        end
-        set(:docnumber, dn)
+        set(:docnumber, docnumber&.text)
       end
 
       def doctype(isoxml, _out)
@@ -45,10 +38,6 @@ module IsoDoc
         set(:doctype, t)
       end
 
-      def status_print(status)
-        status.split(/-/).map{ |w| w.capitalize }.join(" ")
-      end
-
       def status_abbr(status)
         case status
         when "working-draft" then "wd"
@@ -61,10 +50,8 @@ module IsoDoc
 
       def version(isoxml, _out)
         super
-
         revdate = get[:revdate]
         set(:revdate_monthyear, monthyr(revdate))
-
         edition = isoxml.at(ns("//version/edition"))
         if edition
           set(
@@ -74,12 +61,6 @@ module IsoDoc
               split(/(\W)/).map(&:capitalize).join
           )
         end
-
-        puts "get get[:docstage] #{get[:docstage]}"
-        puts get[:docstage]
-        if get[:docstage] == "95" and get[:docsubstage] == "99"
-          set(:draftinfo, "(Repealed)")
-        end
       end
 
       def monthyr(isodate)
@@ -89,11 +70,6 @@ module IsoDoc
         # invalid dates get thrown
         isodate
       end
-
-      def security(isoxml, _out)
-        security = isoxml.at(ns("//bibdata/security")) || return
-        set(:security, security.text)
-      end
     end
   end
 end

data/lib/isodoc/mpfd/pdf_convert.rb

@@ -82,14 +82,6 @@ module IsoDoc
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end
 
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
       def error_parse(node, out)
         # catch elements not defined in ISO
         case node.name
@@ -106,11 +98,6 @@ module IsoDoc
         File.join(File.dirname(__FILE__), loc)
       end
 
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
-
       def i18n_init(lang, script)
         super
         y = if lang == "en"
@@ -119,10 +106,10 @@ module IsoDoc
               YAML.load_file(File.join(File.dirname(__FILE__),
                                        "i18n-zh-Hans.yaml"))
             else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
             end
-        @annex_lbl = "Appendix"
         @labels = @labels.merge(y)
+        @annex_lbl = y["annex"]
         @clause_lbl = y["clause"]
       end
 
@@ -133,6 +120,10 @@ module IsoDoc
       TERM_CLAUSE = "//preface/terms | "\
         "//preface/clause[descendant::terms]".freeze
 
+      SECTIONS_XPATH =
+         "//foreword | //introduction | //preface/terms | //preface/clause | //annex | "\
+      "//sections/clause | //bibliography/references | "\
+      "//bibliography/clause".freeze
 
       def terms_defs(isoxml, out, num)
         f = isoxml.at(ns(TERM_CLAUSE)) or return num
@@ -150,7 +141,7 @@ module IsoDoc
 
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
-          if c.name == "terms" then  terms_defs isoxml, out, 0
+          if c.name == "terms" || c.at(ns(".//terms")) then  terms_defs isoxml, out, 0
           else
             out.div **attr_code(id: c["id"]) do |s|
               clause_name(get_anchors[c['id']][:label],
@@ -227,9 +218,7 @@ module IsoDoc
       def sect_names(clause, num, i, lvl, prev_lvl)
         return i if clause.nil?
         curr = i
-        if clause["container"]
-          retlvl = lvl+1
-        else
+        if !clause["container"]
           retlvl = lvl
           i+=1
           curr = i
@@ -254,7 +243,7 @@ module IsoDoc
       def annex_naming(c, num, lvl, i)
         if c["guidance"] then annex_names1(c, "#{num}E", lvl + 1)
         else
-          i+= 1
+          i+= 1 unless c["container"]
           annex_names1(c, "#{num}.#{i}", lvl + 1)
         end
         i
@@ -265,14 +254,15 @@ module IsoDoc
                                    xref: "#{@annex_lbl} #{num}", level: 1 }
         i = 0
         clause.xpath(ns("./clause")).each do |c|
+          container_names(c, 0)
           i = annex_naming(c, num, 1, i)
         end
         hierarchical_asset_names(clause, num)
       end
 
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
-                                   level: level }
+        clause["container"] or @anchors[clause["id"]] = 
+          { label: num, xref: "#{@annex_lbl} #{num}", level: level }
         i = 0
         clause.xpath(ns("./clause")).each do |c|
           i = annex_naming(c, num, level, i)

data/lib/isodoc/mpfd/word_convert.rb

@@ -7,10 +7,6 @@ module IsoDoc
     # A {Converter} implementation that generates Word output, and a document
     # schema encapsulation of the document for validation
     class WordConvert < IsoDoc::WordConvert
-      def rsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
@@ -57,49 +53,6 @@ module IsoDoc
         end
       end
 
-      def make_body2(body, docxml)
-        body.div **{ class: "WordSection2" } do |div2|
-          info docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
-        end
-        #body.br **{ clear: "all", style: "page-break-before:auto;mso-break-type:section-break;" }
-        section_break(body)
-      end
-
-      def title(isoxml, _out)
-        main = isoxml&.at(ns("//title[@language='en']"))&.text
-        set_metadata(:doctitle, main)
-      end
-
-      def generate_header(filename, dir)
-        return unless @header
-        template = Liquid::Template.parse(File.read(@header, encoding: "UTF-8"))
-        meta = @meta.get
-        meta[:filename] = filename
-        params = meta.map { |k, v| [k.to_s, v] }.to_h
-        File.open("header.html", "w") { |f| f.write(template.render(params)) }
-        @files_to_delete << "header.html"
-        "header.html"
-      end
-
-      def header_strip(h)
-        h = h.to_s.gsub(%r{<br/>}, " ").sub(/<\/?h[12][^>]*>/, "")
-        h1 = to_xhtml_fragment(h.dup)
-        h1.traverse do |x|
-          x.replace(" ") if x.name == "span" &&
-            /mso-tab-count/.match(x["style"])
-          x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
-          x.remove if x.name == "a" && x["epub:type"] == "footnote"
-          x.replace(x.children) if x.name == "a"
-        end
-        from_xhtml(h1)
-      end
-
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
-
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "
@@ -113,19 +66,6 @@ module IsoDoc
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end
 
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
-
       def error_parse(node, out)
         # catch elements not defined in ISO
         case node.name
@@ -150,9 +90,10 @@ module IsoDoc
               YAML.load_file(File.join(File.dirname(__FILE__),
                                        "i18n-zh-Hans.yaml"))
             else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+              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
 
@@ -163,6 +104,10 @@ module IsoDoc
       TERM_CLAUSE = "//preface/terms | "\
         "//preface/clause[descendant::terms]".freeze
 
+      SECTIONS_XPATH =
+         "//foreword | //introduction | //preface/terms | //preface/clause | //annex | "\
+      "//sections/clause | //bibliography/references | "\
+      "//bibliography/clause".freeze
 
       def terms_defs(isoxml, out, num)
         f = isoxml.at(ns(TERM_CLAUSE)) or return num
@@ -176,22 +121,6 @@ module IsoDoc
       end
 
       FRONT_CLAUSE = "//*[parent::preface]".freeze
-      #FRONT_CLAUSE = "//clause[parent::preface] | //terms[parent::preface]".freeze
-
-      def preface(isoxml, out)
-        isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
-          if c.name == "terms" then  terms_defs isoxml, out, 0
-          else
-            out.div **attr_code(id: c["id"]) do |s|
-              clause_name(get_anchors[c['id']][:label],
-                          c&.at(ns("./title"))&.content, s, nil)
-              c.elements.reject { |c1| c1.name == "title" }.each do |c1|
-                parse(c1, s)
-              end
-            end
-          end
-        end
-      end
 
       def initial_anchor_names(d)
         d.xpath(ns(FRONT_CLAUSE)).each do |c|
@@ -204,14 +133,6 @@ module IsoDoc
         termexample_anchor_names(d)
       end
 
-
-      def middle(isoxml, out)
-        middle_title(out)
-        clause isoxml, out
-        annex isoxml, out
-        bibliography isoxml, out
-      end
-
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2
@@ -223,7 +144,6 @@ module IsoDoc
         section_break(body)
       end
 
-
       def middle(isoxml, out)
         middle_title(out)
         clause isoxml, out
@@ -264,9 +184,7 @@ module IsoDoc
       def sect_names(clause, num, i, lvl, prev_lvl)
         return i if clause.nil?
         curr = i
-        if clause["container"]
-          retlvl = lvl+1
-        else
+        if !clause["container"]
           retlvl = lvl
           i+=1
           curr = i
@@ -291,7 +209,7 @@ module IsoDoc
       def annex_naming(c, num, lvl, i)
         if c["guidance"] then annex_names1(c, "#{num}E", lvl + 1)
         else
-          i+= 1
+          i+= 1 unless c["container"]
           annex_names1(c, "#{num}.#{i}", lvl + 1)
         end
         i
@@ -302,14 +220,15 @@ module IsoDoc
                                    xref: "#{@annex_lbl} #{num}", level: 1 }
         i = 0
         clause.xpath(ns("./clause")).each do |c|
+          container_names(c, 0)
           i = annex_naming(c, num, 1, i)
         end
         hierarchical_asset_names(clause, num)
       end
 
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
-                                   level: level }
+        clause["container"] or @anchors[clause["id"]] = 
+          { label: num, xref: "#{@annex_lbl} #{num}", level: level }
         i = 0
         clause.xpath(ns("./clause")).each do |c|
           i = annex_naming(c, num, level, i)

data/lib/metanorma/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Mpfd
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end