metanorma-iso 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee39375384be0c9f62cc38c73fa594f7801ecd2f8b29e1f59899a72fe5675a6f
-  data.tar.gz: 9387fa058b07994b39c75b6f278a2827a883f1734e6e56553fc464a66cebc362
+  metadata.gz: 8e375fde6639d425ae85af705bd4bcb587c6960baf0eec6469912d0d3a4a22de
+  data.tar.gz: 22bf0e8a7c33f81cf826755922c5c7280a70f31223fdb4fdbdbf6487987a862b
 SHA512:
-  metadata.gz: fa215941951f4f41451ea5e59917eab3244c8474b60ba2e075cf04e1a3d3bb2c0a64d2165868aadaf7f754fde1d7944ce9a6b7c492e8de1be0bc69f3c21c0db3
-  data.tar.gz: b5730599e19b0e297836a2d248e6ec94cd937f6138b6db2ef91f2b63c88253f35dbee859c4650f273740bf40f93c1030a97ca931cd5535786eb4d72e56158608
+  metadata.gz: 4c483551a44da35ef87cd32632d0f502996c42ed717fee27e4c48d8b33d5d99ef613035796f0c80fd7c57663c2550ceded93741f3ce88b3dab2dc3abe1f487b4
+  data.tar.gz: ab3019273d47c9a2717af58fe15d7176beb61ab097fdbac5c1ce7de07e2f635f5d425563a3fc423a34c5cf2f71a3b2c5a9259db1aa794b92d681995d4f33ebc2

data/.travis.yml

@@ -1,15 +1,17 @@
-dist: trusty
-sudo: false
 language: ruby
+cache: bundler
+os:
+- linux
+- osx
 rvm:
-  - 2.5
-  - 2.4
-  - 2.3
-  - ruby-head
+- 2.5
+- 2.4
+- 2.3
+- ruby-head
 before_install:
-  - gem install bundler -v 2.0.1
-  - travis_retry sudo apt-get update
-  - sudo bash -c "curl -L https://raw.githubusercontent.com/metanorma/plantuml-install/master/ubuntu.sh | bash"
+- gem install bundler -v 2.0.1
+- bundle update
+- curl -L https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/travis-plantuml-install.sh | bash
 matrix:
   allow_failures:
     - rvm: ruby-head

data/appveyor.yml

@@ -1,10 +1,14 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 version: '{build}'
 
+cache:
+  - vendor/bundle
+
 environment:
   matrix:
     - RUBY_VERSION: 25
     - RUBY_VERSION: 24
-    - RUBY_VERSION: 23
     - RUBY_VERSION: _trunk
 
 matrix:
@@ -17,6 +21,8 @@ install:
 
 build_script:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - set GIT_TERMINAL_PROMPT=0
+  - bundle config --local path vendor/bundle
   - bundle update
   - bundle install
 
@@ -27,4 +33,3 @@ before_test:
 
 test_script:
   - bundle exec rake
-

data/lib/asciidoctor/iso/biblio.rng

@@ -35,7 +35,28 @@
   </define>
   <define name="status">
     <element name="status">
-      <ref name="LocalizedString"/>
+      <ref name="stage"/>
+      <optional>
+        <ref name="substage"/>
+      </optional>
+      <optional>
+        <ref name="iteration"/>
+      </optional>
+    </element>
+  </define>
+  <define name="stage">
+    <element name="stage">
+      <text/>
+    </element>
+  </define>
+  <define name="substage">
+    <element name="substage">
+      <text/>
+    </element>
+  </define>
+  <define name="iteration">
+    <element name="iteration">
+      <text/>
     </element>
   </define>
   <define name="language">
@@ -523,9 +544,9 @@
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
-    <optional>
+    <zeroOrMore>
       <ref name="abstract"/>
-    </optional>
+    </zeroOrMore>
     <optional>
       <ref name="status"/>
     </optional>
@@ -636,22 +657,27 @@
       <ref name="ISO8601Date"/>
     </optional>
   </define>
+  <define name="BibliographicDateType">
+    <choice>
+      <value>published</value>
+      <value>accessed</value>
+      <value>created</value>
+      <value>implemented</value>
+      <value>obsoleted</value>
+      <value>confirmed</value>
+      <value>updated</value>
+      <value>issued</value>
+      <value>transmitted</value>
+      <value>copied</value>
+      <value>unchanged</value>
+      <value>circulated</value>
+    </choice>
+  </define>
   <define name="bdate">
     <element name="date">
       <attribute name="type">
         <choice>
-          <value>published</value>
-          <value>accessed</value>
-          <value>created</value>
-          <value>implemented</value>
-          <value>obsoleted</value>
-          <value>confirmed</value>
-          <value>updated</value>
-          <value>issued</value>
-          <value>transmitted</value>
-          <value>copied</value>
-          <value>unchanged</value>
-          <value>circulated</value>
+          <ref name="BibliographicDateType"/>
           <text/>
         </choice>
       </attribute>
@@ -805,6 +831,9 @@
   </define>
   <define name="biblionote">
     <element name="note">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <ref name="FormattedString"/>
     </element>
   </define>

data/lib/asciidoctor/iso/cleanup.rb

@@ -54,8 +54,7 @@ module Asciidoctor
         prefix = get_id_prefix(xmldoc)
         id = xmldoc.at("//bibdata/docidentifier[@type = 'iso']") or return
         id.content = id_prefix(prefix, id)
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-structured']/"\
-                       "project-number") or return
+        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") or return
         id.content = id_prefix(prefix, id)
       end
     end

data/lib/asciidoctor/iso/front.rb

@@ -23,7 +23,17 @@ module Asciidoctor
         dn = add_id_parts(node.attr("docnumber"), part, subpart)
         dn = id_stage_prefix(dn, node)
         xml.docidentifier dn, **attr_code(type: "iso")
-        xml.docidentifier **attr_code(type: "iso-structured") do |i|
+      end
+
+      def metadata_ext(node, xml)
+        super
+        structured_id(node, xml)
+      end
+
+      def structured_id(node, xml)
+        return unless node.attr("docnumber")
+        part, subpart = node&.attr("partnumber")&.split(/-/)
+        xml.structuredidentifier do |i|
           i.project_number node.attr("docnumber"),
             **attr_code(part: part, subpart: subpart)
         end
@@ -36,9 +46,11 @@ module Asciidoctor
       end
 
       def id_stage_prefix(dn, node)
-        if node.attr("docstage") && node.attr("docstage").to_i < 60
+        stage = get_stage(node)
+        substage = get_substage(node)
+        if stage && (stage.to_i < 60 || stage.to_i == 60 && substage.to_i < 60)
           abbr = IsoDoc::Iso::Metadata.new("en", "Latn", {}).
-            stage_abbrev(node.attr("docstage"), node.attr("iteration"), 
+            stage_abbrev(stage, substage, node.attr("iteration"), 
                          node.attr("draft"))
           dn = "/#{abbr} #{dn}" # prefixes added in cleanup
         else
@@ -93,10 +105,19 @@ module Asciidoctor
         end
       end
 
+      def get_stage(node)
+        stage = node.attr("status") || node.attr("docstage") || "60"
+      end
+
+      def get_substage(node)
+        stage = get_stage(node)
+        node.attr("docsubstage") || ( stage == "60" ? "60" : "00" )
+      end
+
       def metadata_status(node, xml)
         xml.status do |s|
-          s.stage (node.attr("docstage") || "60")
-          s.substage (node.attr("docsubstage") || "60")
+          s.stage get_stage(node)
+          s.substage get_substage(node)
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end
       end
@@ -112,32 +133,42 @@ module Asciidoctor
 
       def title_intro(node, t, lang, at)
         return unless node.attr("title-intro-#{lang}")
-        t.title_intro(**attr_code(at)) do |t1|
+        t.title(**attr_code(at.merge(type: "title-intro"))) do |t1|
           t1 << asciidoc_sub(node.attr("title-intro-#{lang}"))
         end
       end
 
       def title_main(node, t, lang, at)
-        t.title_main **attr_code(at) do |t1|
+        t.title **attr_code(at.merge(type: "title-main")) do |t1|
           t1 << asciidoc_sub(node.attr("title-main-#{lang}"))
         end
       end
 
       def title_part(node, t, lang, at)
         return unless node.attr("title-part-#{lang}")
-        t.title_part(**attr_code(at)) do |t1|
+        t.title(**attr_code(at.merge(type: "title-part"))) do |t1|
           t1 << asciidoc_sub(node.attr("title-part-#{lang}"))
         end
       end
 
+      def title_full(node, t, lang, at)
+        title = node.attr("title-main-#{lang}")
+        intro = node.attr("title-intro-#{lang}")
+        part = node.attr("title-part-#{lang}")
+        title = "#{intro} -- #{title}" if intro
+        title = "#{title} -- #{part}" if part
+        t.title **attr_code(at.merge(type: "main")) do |t1|
+          t1 << asciidoc_sub(title)
+        end
+      end
+
       def title(node, xml)
         ["en", "fr"].each do |lang|
-          xml.title do |t|
-            at = { language: lang, format: "text/plain" }
-            title_intro(node, t, lang, at)
-            title_main(node, t, lang, at)
-            title_part(node, t, lang, at)
-          end
+          at = { language: lang, format: "text/plain" }
+          title_full(node, xml, lang, at)
+          title_intro(node, xml, lang, at)
+          title_main(node, xml, lang, at)
+          title_part(node, xml, lang, at)
         end
       end
     end

data/lib/asciidoctor/iso/isodoc.rng

@@ -19,27 +19,16 @@
 -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
-  <include href="biblio.rng">
-    <define name="status">
-      <element name="status">
-        <choice>
-          <value>proposal</value>
-          <value>working_draft</value>
-          <value>committee_draft</value>
-          <value>draft_standard</value>
-          <value>final_draft</value>
-          <value>published</value>
-          <value>withdrawn</value>
-        </choice>
-      </element>
-    </define>
-  </include>
+  <include href="biblio.rng"/>
   <start>
     <ref name="standard-document"/>
   </start>
   <define name="standard-document">
     <element name="standard-document">
       <ref name="bibdata"/>
+      <optional>
+        <ref name="boilerplate"/>
+      </optional>
       <optional>
         <ref name="preface"/>
       </optional>
@@ -64,6 +53,42 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="boilerplate">
+    <element name="boilerplate">
+      <optional>
+        <ref name="copyright-statement"/>
+      </optional>
+      <optional>
+        <ref name="license-statement"/>
+      </optional>
+      <optional>
+        <ref name="legal-statement"/>
+      </optional>
+      <optional>
+        <ref name="feedback-statement"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright-statement">
+    <element name="copyright-statement">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="license-statement">
+    <element name="license-statement">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="legal-statement">
+    <element name="legal-statement">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="feedback-statement">
+    <element name="feedback-statement">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="sections">
     <element name="sections">
       <oneOrMore>
@@ -446,6 +471,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -494,6 +524,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -533,6 +568,14 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>
@@ -647,6 +690,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -690,6 +738,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <ref name="source"/>
       </optional>
@@ -735,6 +788,20 @@
       <ref name="bookmark"/>
     </choice>
   </define>
+  <define name="PureTextElement">
+    <choice>
+      <text/>
+      <ref name="em"/>
+      <ref name="strong"/>
+      <ref name="sub"/>
+      <ref name="sup"/>
+      <ref name="tt"/>
+      <ref name="keyword"/>
+      <ref name="strike"/>
+      <ref name="smallcap"/>
+      <ref name="br"/>
+    </choice>
+  </define>
   <define name="source">
     <element name="source">
       <ref name="TypedUri"/>
@@ -742,42 +809,58 @@
   </define>
   <define name="em">
     <element name="em">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="strong">
     <element name="strong">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="tt">
     <element name="tt">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="keyword">
     <element name="keyword">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sub">
     <element name="sub">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sup">
     <element name="sup">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="strike">
     <element name="strike">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="smallcap">
     <element name="smallcap">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="br">
@@ -838,6 +921,9 @@
       <attribute name="type">
         <ref name="ReferenceFormat"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1019,57 +1105,28 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibData">
-    <optional>
-      <attribute name="type">
-        <ref name="BibItemType"/>
-      </attribute>
-    </optional>
-    <oneOrMore>
-      <ref name="btitle"/>
-    </oneOrMore>
-    <optional>
-      <ref name="formattedref"/>
-    </optional>
-    <zeroOrMore>
-      <ref name="bsource"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="docidentifier"/>
-    </zeroOrMore>
-    <optional>
-      <ref name="docnumber"/>
-    </optional>
-    <zeroOrMore>
-      <ref name="bdate"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="contributor"/>
-    </zeroOrMore>
-    <optional>
-      <ref name="edition"/>
-    </optional>
-    <optional>
-      <ref name="version"/>
-    </optional>
-    <zeroOrMore>
-      <ref name="biblionote"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="language"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="script"/>
-    </zeroOrMore>
+  <define name="ext">
+    <element name="ext">
+      <ref name="BibDataExtensionType"/>
+    </element>
+  </define>
+  <define name="BibDataExtensionType">
     <optional>
-      <ref name="abstract"/>
+      <ref name="doctype"/>
     </optional>
+  </define>
+  <define name="doctype">
+    <element name="doctype">
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="DocumentType">
+    <value>document</value>
+  </define>
+  <define name="BibData">
+    <ref name="BibliographicItem"/>
     <optional>
-      <ref name="status"/>
+      <ref name="ext"/>
     </optional>
-    <ref name="copyright"/>
-    <zeroOrMore>
-      <ref name="docrelation"/>
-    </zeroOrMore>
   </define>
 </grammar>