metanorma-gb 1.3.22 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7869dbde662c1dd411ca7fa2716aa6629127cbf69912e3fd0952b6d056ad8be7
-  data.tar.gz: ffb732575b3e11e7397a971ce75a09976527d90f8ee791857f3c0da1b5d8715d
+  metadata.gz: cee97909f541eb359323b825088997bfa0e320c8f857df31b681aad62df09381
+  data.tar.gz: b04990abaad05e36461b386a105e9957845d7c43df62e0facbf28bc7e759cecc
 SHA512:
-  metadata.gz: ae8c890aae4571242ebcff94a24e5365f77addcccd17788927eaced8fdd167b5d2d5d098d5b42ad1c0351f55d206e6f4e4969ff59a36b62b6cd7a546befafd7a
-  data.tar.gz: 47167eb6ee48de2dacbdeb3b3d5a3513450978f4a1ef5829084052f1eb5f0ae347c4a81f84a98127c595e13c73253177f22a7cee35f11f37066214e4775df738
+  metadata.gz: 4e5d3974a43321800525dd6280d9d970c821a4d6ef097658b13394086cccdb20193b07b3cfb32243d18139b32435ac0692dac22cd499ca40d5d3198452e4cbf3
+  data.tar.gz: fd97e5ce4f8f297ad337fc0cf160a721ee4dcf42192a949930ec825e6754f6bf00799d8055e3c8af30c224e0693f02abda8e1b45a697f73699b3dded7f852c8c

data/lib/asciidoctor/gb/isodoc.rng

@@ -129,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +306,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/asciidoctor/gb/section_input.rb

@@ -6,24 +6,6 @@ module Asciidoctor
     # A {Converter} implementation that generates GB output, and a document
     # schema encapsulation of the document for validation
     class Converter < ISO::Converter
-
-=begin
-      # subclause contains subclauses
-      def term_def_subclause_parse(attrs, xml, node)
-        return clause_parse(attrs, xml, node) if node.role == "nonterm"
-        sub = node.find_by(context: :section) {|s| s.level == node.level + 1 }
-        sub.empty? || (return term_def_parse(attrs, xml, node, false))
-        # TODO allow breakup of "symbols", "abbreviated terms"
-        (node.title.downcase == "symbols and abbreviated terms" ||
-        node.title == "符号、代号和缩略语") &&
-          (return symbols_parse(attrs, xml, node))
-        xml.term **attr_code(attrs) do |xml_section|
-          xml_section.preferred { |name| name << node.title }
-          xml_section << node.content
-        end
-      end
-=end
-
       def sectiontype_streamline(ret)
         case ret
         when "引言" then "introduction"
@@ -40,84 +22,10 @@ module Asciidoctor
       end
 
       def appendix_parse(attrs, xml, node)
+        # UNSAFE, there is no unset_option() in asciidoctor
+        node.remove_attr("appendix-option")
         clause_parse(attrs, xml, node)
       end
-
-=begin
-      # spec of permissible section sequence
-      SEQ = [
-        { msg: "Initial section must be (content) 前言",
-          val:  [{ tag: "foreword", title: "前言" }], },
-      { msg: "Prefatory material must be followed by (clause) 范围",
-        val:  [{ tag: "introduction", title: "引言" },
-               { tag: "clause", title: "范围" }], },
-      { msg: "Prefatory material must be followed by (clause) 范围",
-        val: [{ tag: "clause", title: "范围" }], },
-      { msg: "规范性引用文件 must be followed by "\
-        "术语和定义",
-        val: [
-          { tag: "terms", title: "术语和定义" },
-          { tag: "clause", title: "术语和定义" },
-          { tag: "clause",
-            title: "术语、定义、符号、代号和缩略语" },
-          { tag: "terms",
-            title: "术语、定义、符号、代号和缩略语" }
-        ] },
-      ]
-
-      SECTIONS_XPATH =
-        "//foreword | //introduction | //sections/terms | .//annex | "\
-        "//definitions | //sections/clause | //references[not(parent::clause)] | "\
-        "//clause[descendant::references][not(parent::clause)]".freeze
-
-      def sections_sequence_validate(root)
-        f = root.xpath(SECTIONS_XPATH)
-        names = f.map { |s| { tag: s.name, title: s&.at("./title")&.text } }
-        names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val]) || return
-        n = names[0]
-        names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val]) || return
-        if n == { tag: "introduction", title: "引言" }
-          names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val]) || return
-        end
-        names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val]) || return
-        n = names.shift
-        if n == { tag: "definitions", title: nil }
-          n = names.shift || return
-        end
-        unless n
-          warn "ISO style: Document must contain at least one clause"
-          return
-        end
-        n[:tag] == "clause" or
-          warn "ISO style: Document must contain clause after Terms and Definitions"
-        (n == { tag: "clause", title: "范围" }) &&
-          warn("ISO style: 范围 must occur before 术语和定义")
-        n = names.shift or return
-        while n[:tag] == "clause"
-          (n[:title] == "范围") &&
-            warn("ISO style: 范围 must occur before 术语和定义")
-          n = names.shift or return
-        end
-        unless n[:tag] == "annex" or n[:tag] == "references"
-          warn "ISO style: Only annexes and references can follow clauses"
-        end
-        while n[:tag] == "annex"
-          n = names.shift
-          if n.nil?
-            warn("ISO style: Document must include (references) "\
-                 "Normative References")
-            return
-          end
-        end
-        n == { tag: "references", title: "规范性引用文件" } or
-          warn "ISO style: Document must include (references) 规范性引用文件"
-        n = names.shift
-        n == { tag: "references", title: "参考文献" } or
-          warn "ISO style: Final section must be (references) 参考文献"
-        names.empty? or
-          warn "ISO style: There are sections after the final Bibliography"
-      end
-=end
     end
   end
 end

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.22"
+    VERSION = "1.3.23"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.23
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso