metanorma-mpfd 0.3.11 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3db8aa497e6fac24229ffb6b252499e7be2055d84b4df3cb3860497baa6fb6
-  data.tar.gz: a4fdc8195fdfa3d148515b274d4feca2a44c8d8d13900ae69d53c3fa96eecece
+  metadata.gz: bccaa9f5879bfab9212afa8d7dae9e3080abe74612afa7c8bf1a7e822301c3a8
+  data.tar.gz: 98adbc60f0095aa69d39c0bd34b63ffd250f6cd9a33a73e39e0947bcf8bcdadf
 SHA512:
-  metadata.gz: 16a1c149d4cacf47c2f7a01e8384a58b4f8ed2fe2301ffa2cdcc806c415ca61e5537983ca1bebb5796072d3e872bb9f459365e32b909b9dbfb263ef1bcbac349
-  data.tar.gz: ec5bc05411887ee6811268045e4971005c18a77f7ae0020a2a47ceca535ce2ae64c7b64fa9db5aa401abdd7e3fa4e715cf03449378c6494faaaaca1cc6fb9329
+  metadata.gz: 2dca1ca21055f6493b73b49c0722356c05666201e2886751b31f9e9d2be526f1e67dcf8900a73b30b089be3d1e75f22c0b07d857fa6f1fec4dd86d69ba8cb7f1
+  data.tar.gz: ae1b5dd0cd743a614d6159d041e78f86c4ccbe0c8e05cc78827c6cf2b3e7f2241c8031cef7772d4f3a76cb8a31e60300de66ed24a9dfae289711b2d6c8bfeae1

data/lib/asciidoctor/mpfd/converter.rb

@@ -15,7 +15,7 @@ module Asciidoctor
     #
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "mpfd-standard".freeze
-      XML_NAMESPACE = "https://www.metanorma.com/ns/mpfd".freeze
+      XML_NAMESPACE = "https://www.metanorma.org/ns/mpfd".freeze
 
       register_for "mpfd"
 

data/lib/asciidoctor/mpfd/mpfd.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.com/ns/mpfd" xmlns="http://relaxng.org/ns/structure/1.0">
+<grammar ns="https://www.metanorma.org/ns/mpfd" xmlns="http://relaxng.org/ns/structure/1.0">
   <!--
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different

data/lib/asciidoctor/mpfd/section.rb

@@ -31,34 +31,6 @@ module Asciidoctor
         end
       end
 
-      def section(node)
-        a = section_attributes(node)
-        noko do |xml|
-          case sectiontype(node)
-          when "introduction" then introduction_parse(a, xml, node)
-          when "terms and definitions"
-            @term_def = true
-            term_def_parse(a, xml, node, true)
-            @term_def = false
-          when "symbols and abbreviated terms"
-            symbols_parse(a, xml, node)
-          when "bibliography" then bibliography_parse(a, xml, node)
-          else
-            if @term_def then term_def_subclause_parse(a, xml, node)
-            elsif @biblio then bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography"
-              bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "abstract"
-              abstract_parse(a, xml, node)
-            elsif node.attr("style") == "appendix" && node.level == 1
-              annex_parse(a, xml, node)
-            else
-              clause_parse(a, xml, node)
-            end
-          end
-        end.join("\n")
-      end
-
       def term_def_title(_toplevel, node)
         return node.title
       end
@@ -70,21 +42,21 @@ module Asciidoctor
         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
+        move_clauses_into_preface(x, preface)
+        acknowledgements = x.at("//acknowledgements")
+        preface.add_child acknowledgements.remove if acknowledgements
       end
 
       def make_preface(x, s)
-        if x.at("//foreword | //introduction | //terms | //abstract | //clause[@preface]")
+        if x.at("//foreword | //introduction | //terms | //acknowledgements |"\
+            "//abstract[not(ancestor::bibitem)] | //clause[@preface]")
           preface = s.add_previous_sibling("<preface/>").first
           move_sections_into_preface(x, preface)
+          make_abstract(x, s)
         end
       end
 
       def clause_parse(attrs, xml, node)
-        attrs[:preface] = true if node.attr("style") == "preface"
         attrs[:guidance] = true if node.role == "guidance"
         attrs[:container] = true if node.role == "container"
         super

data/lib/isodoc/mpfd/base_convert.rb

@@ -5,14 +5,6 @@ require  "fileutils"
 module IsoDoc
   module Mpfd
     module BaseConvert
-      #def convert1(docxml, filename, dir)
-      #  FileUtils.cp html_doc_path("logo.jpg"), File.join(@localdir, "logo.jpg")
-      #  FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), File.join(@localdir, "mpfa-logo-no-text@4x.png")
-      #  @files_to_delete << File.join(@localdir, "logo.jpg")
-      #  @files_to_delete << File.join(@localdir, "mpfa-logo-no-text@4x.png")
-      #  super
-      #end
-
       def metadata_init(lang, script, labels)
         @meta = Metadata.new(lang, script, labels)
       end
@@ -54,7 +46,7 @@ module IsoDoc
 
       SECTIONS_XPATH = 
         "//foreword | //introduction | //preface/terms | //preface/clause | //annex | "\
-        "//sections/clause | //bibliography/references | "\
+        "//sections/clause | //bibliography/references | //acknowledgements | "\
         "//bibliography/clause".freeze
 
       def terms_defs(isoxml, out, num)

data/lib/isodoc/mpfd/metadata.rb

@@ -39,7 +39,7 @@ module IsoDoc
         set(:doctype, t)
       end
 
-      def status_abbr(status)
+      def stage_abbr(status)
         case status
         when "working-draft" then "wd"
         when "committee-draft" then "cd"

data/lib/metanorma/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Mpfd
-    VERSION = "0.3.11"
+    VERSION = "0.3.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfd
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities