metanorma-gb 1.3.21 → 1.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9572e4b6c6d084df727b40bfc2827cdba1e9238f2905213753166091ce6d7fb6
-  data.tar.gz: 0cc451ec6098c3fcaeb4d7f246cec4b623f2a2ce7a2ae9b9600f453163814767
+  metadata.gz: c5ab15c22cf0e24f6123d08214e17d272620bde6ec0075d242401c6cfa66b114
+  data.tar.gz: ac1ad202131c7f4a060ba2e5e564fd49079bf8d106e4a553adf382b6059b3668
 SHA512:
-  metadata.gz: f62662c60f2f0bea290ae7bcc81cb17af9e7738f31305a90cdc9ce7259e8f2d6a31fb2596cc7e735e21cf62d3c20f240fced43f552ec04a8b359ae778b742e80
-  data.tar.gz: 15727819f77f7d1b9456377f5c6aa22b4fbe4e900a9fd6de656dcd0015ea0125ecad379f3079adeefa3092d0d93fbe9c5ed6b3ab5113a0f089403f04aa678f84
+  metadata.gz: a6a151c0c4295e76c15b6d91f41afb3aab397cd864bd7d2ff53352c6e13b9a8e2ca1eaf965ddd7dee4d381581148c2e490b4788fcd562bd25f886e7103356a02
+  data.tar.gz: 06c2cc4e0c48481b05520836ad03da70a026a72f04620683bf8a5badad808050cfcd8961832dd9ea6c9de53edb769296ae7d8eee316282ff33c57cf305e07fd8

data/.github/workflows/macos.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/ubuntu.yml
+      - .github/workflows/windows.yml
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby

data/.github/workflows/ubuntu.yml

@@ -5,16 +5,26 @@ name: ubuntu
 on:
   push:
     branches: [ master ]
+    tags:
+      - '*'
   pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/windows.yml
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby
@@ -39,5 +49,5 @@ jobs:
           [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
           for repo in $DEPENDENT_REPOS
           do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
           done

data/.github/workflows/windows.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/ubuntu.yml
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby
@@ -27,7 +35,6 @@ jobs:
         run: |
           gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/lib/asciidoctor/gb/biblio.rng

@@ -88,7 +88,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString">
+  <define name="LocalizedString1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -98,6 +98,16 @@
     </optional>
     <text/>
   </define>
+  <define name="LocalizedString">
+    <choice>
+      <ref name="LocalizedString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedString1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <!--
     Unlike UML, change type to format: type is overloaded
     Would be need if plain were default value and could omit the attribute
@@ -121,7 +131,7 @@
     </optional>
     <ref name="LocalizedStringOrXsAny"/>
   </define>
-  <define name="LocalizedStringOrXsAny">
+  <define name="LocalizedStringOrXsAny1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -136,6 +146,16 @@
       </choice>
     </oneOrMore>
   </define>
+  <define name="LocalizedStringOrXsAny">
+    <choice>
+      <ref name="LocalizedStringOrXsAny1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedStringOrXsAny1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <define name="contributor">
     <element name="contributor">
       <zeroOrMore>
@@ -641,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -767,6 +787,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -999,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">
@@ -1019,38 +1051,63 @@
   </define>
   <define name="DocRelationType">
     <choice>
-      <value>obsoletes</value>
-      <value>obsoletedBy</value>
-      <value>supersedes</value>
-      <value>supersededBy</value>
-      <value>updates</value>
-      <value>updatedBy</value>
-      <value>complements</value>
-      <value>derivedFrom</value>
-      <value>translatedFrom</value>
-      <value>hasTranslation</value>
-      <value>adoptedFrom</value>
-      <value>equivalent</value>
-      <value>identical</value>
-      <value>nonequivalent</value>
-      <value>includedIn</value>
       <value>includes</value>
-      <value>instance</value>
-      <value>instanceOf</value>
-      <value>partOf</value>
+      <value>includedIn</value>
       <value>hasPart</value>
-      <value>hasDraft</value>
-      <value>draftOf</value>
+      <value>partOf</value>
       <value>merges</value>
+      <value>mergedInto</value>
       <value>splits</value>
-      <value>amends</value>
-      <value>amendedBy</value>
-      <value>corrects</value>
-      <value>correctedBy</value>
-      <value>revises</value>
-      <value>revisedBy</value>
+      <value>splitInto</value>
+      <value>instance</value>
+      <value>hasInstance</value>
+      <value>exemplarOf</value>
+      <value>hasExemplar</value>
+      <value>manifestationOf</value>
+      <value>hasManifestation</value>
+      <value>reproductionOf</value>
+      <value>hasReproduction</value>
+      <value>reprintOf</value>
+      <value>hasReprint</value>
+      <value>expressionOf</value>
+      <value>hasExpression</value>
+      <value>translatedFrom</value>
+      <value>hasTranslation</value>
+      <value>arrangementOf</value>
+      <value>hasArrangement</value>
+      <value>abridgementOf</value>
+      <value>hasAbridgement</value>
+      <value>annotationOf</value>
+      <value>hasAnnotation</value>
+      <value>draftOf</value>
+      <value>hasDraft</value>
+      <value>editionOf</value>
+      <value>hasEdition</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>derivedFrom</value>
+      <value>derives</value>
       <value>describes</value>
       <value>describedBy</value>
+      <value>catalogues</value>
+      <value>cataloguedBy</value>
+      <value>hasSuccessor</value>
+      <value>successorOf</value>
+      <value>adaptedFrom</value>
+      <value>hasAdaptation</value>
+      <value>adoptedFrom</value>
+      <value>adoptedAs</value>
+      <value>reviewOf</value>
+      <value>hasReview</value>
+      <value>commentaryOf</value>
+      <value>hasCommentary</value>
+      <value>related</value>
+      <value>complements</value>
+      <value>complementOf</value>
+      <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>cited</value>
+      <value>isCitedIn</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/gb/converter.rb

@@ -3,6 +3,7 @@ require "asciidoctor/iso/converter"
 require "metanorma/gb/version"
 require "isodoc/gb/gbconvert"
 require "isodoc/gb/gbwordconvert"
+require "isodoc/gb/pdf_convert"
 require "gb_agencies"
 require_relative "./section_input.rb"
 require_relative "./front.rb"
@@ -58,6 +59,11 @@ module Asciidoctor
           IsoDoc::Gb::WordConvert.new(doc_extract_attributes(node))
       end
 
+      def pdf_converter(node)
+        node.nil? ? IsoDoc::Gb::PdfConvert.new({}) :
+          IsoDoc::Gb::PdfConvert.new(doc_extract_attributes(node))
+      end
+
       def document(node)
         init(node)
         ret = makexml(node).to_xml(indent: 2)
@@ -68,6 +74,7 @@ module Asciidoctor
           FileUtils.mv "#{filename}.html", "#{filename}_compliant.html"
           html_converter(node).convert(filename + ".xml")
           doc_converter(node).convert(filename + ".xml")
+          pdf_converter(node).convert(filename + ".xml")
         end
         @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }

data/lib/asciidoctor/gb/front.rb

@@ -1,24 +1,8 @@
+require_relative "front_id"
+
 module Asciidoctor
   module Gb
     class Converter < ISO::Converter
-      STAGE_ABBRS_CN = {
-        "00": "新工作项目建议",
-        "10": "新工作项目",
-        "20": "标准草案工作组讨论稿",
-        "30": "标准草案征求意见稿",
-        "40": "标准草案送审稿",
-        "50": "标准草案报批稿",
-        "60": "国家标准",
-        "90": "(Review)",
-        "95": "(Withdrawal)",
-      }.freeze
-
-      def stage_name(stage, substage)
-        return "Proof" if stage == "60" && substage == "00"
-        @language == "en" ?
-          STAGE_NAMES[stage.to_sym] : STAGE_ABBRS_CN[stage.to_sym]
-      end
-
       def doctype(node)
         type = node.attr("mandate") || "mandatory"
         type = "standard" if type == "mandatory"
@@ -192,40 +176,6 @@ module Asciidoctor
         metadata_contributor1(node, xml, "issuer", "issuer")
       end
 
-      def iso_id(node, xml)
-        return unless node.attr("docnumber")
-        part = node.attr("partnumber")
-        dn = add_id_parts(node.attr("docnumber"), part, nil)
-        dn = id_stage_prefix(dn, node)
-        xml.docidentifier dn, **attr_code(type: "gb")
-      end
-
-      def structured_id(node, xml)
-        part = node.attr("partnumber")
-        xml.structuredidentifier do |i|
-          i.project_number node.attr("docnumber"),
-            **attr_code(part: part)
-        end
-      end
-
-      def add_id_parts(dn, part, subpart)
-        dn += ".#{part}" if part
-        dn += ".#{subpart}" if subpart
-        dn
-      end
-
-      def id_stage_prefix(dn, node)
-        if node.attr("docstage") && node.attr("docstage").to_i < 60
-          abbr = IsoDoc::Gb::Metadata.new("en", "Latn", {}).
-            status_abbrev(node.attr("docstage"), node.attr("iteration"),
-                          node.attr("draft"))
-          dn = "/#{abbr} #{dn}" # prefixes added in cleanup
-        else
-          dn += "-#{node.attr("copyright-year")}" if node.attr("copyright-year")
-        end
-        dn
-      end
-
       def metadata_language(node, xml)
         xml.language (node.attr("language") || "zh")
       end

data/lib/asciidoctor/gb/front_id.rb

@@ -0,0 +1,57 @@
+module Asciidoctor
+  module Gb
+    class Converter < ISO::Converter
+            STAGE_ABBRS_CN = {
+        "00": "新工作项目建议",
+        "10": "新工作项目",
+        "20": "标准草案工作组讨论稿",
+        "30": "标准草案征求意见稿",
+        "40": "标准草案送审稿",
+        "50": "标准草案报批稿",
+        "60": "国家标准",
+        "90": "(Review)",
+        "95": "(Withdrawal)",
+      }.freeze
+
+      def stage_name(stage, substage)
+        return "Proof" if stage == "60" && substage == "00"
+        @language == "en" ?
+          STAGE_NAMES[stage.to_sym] : STAGE_ABBRS_CN[stage.to_sym]
+      end
+
+      def iso_id(node, xml)
+        return unless node.attr("docnumber")
+        part = node.attr("partnumber")
+        dn = add_id_parts(node.attr("docnumber"), part, nil)
+        dn = id_stage_prefix(dn, node)
+        xml.docidentifier dn, **attr_code(type: "gb")
+      end
+
+      def structured_id(node, xml)
+        part = node.attr("partnumber")
+        xml.structuredidentifier do |i|
+          i.project_number node.attr("docnumber"),
+            **attr_code(part: part)
+        end
+      end
+
+      def add_id_parts(dn, part, subpart)
+        dn += ".#{part}" if part
+        dn += ".#{subpart}" if subpart
+        dn
+      end
+
+      def id_stage_prefix(dn, node)
+        if node.attr("docstage") && node.attr("docstage").to_i < 60
+          abbr = IsoDoc::Gb::Metadata.new("en", "Latn", {}).
+            status_abbrev(node.attr("docstage"), nil, node.attr("iteration"),
+                          node.attr("draft"), node.attr("doctype"))
+          dn = "/#{abbr} #{dn}" # prefixes added in cleanup
+        else
+          dn += "-#{node.attr("copyright-year")}" if node.attr("copyright-year")
+        end
+        dn
+      end
+    end
+  end
+end

data/lib/asciidoctor/gb/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -129,6 +137,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -305,6 +316,21 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -884,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">
@@ -911,7 +945,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -919,6 +956,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>