metanorma-iec 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08369dfaab9066548f5aad7c5011c358f56f6c1f1f704173de19afc0df4a6a51'
-  data.tar.gz: 8995d08b8a4a9c6569af60204a6964cc5e6ebcd0e57dfde55c26d2f030040661
+  metadata.gz: 1fbe3d530ca404960dbb29bf3e17cf9edd87f3aaf490c611237d0bdb24c0b9f4
+  data.tar.gz: 24d862f45615ae61c6763c8a3ed1a0ce7ef111daf7d7298182be2fd85d6689e7
 SHA512:
-  metadata.gz: 7038a4915d5f370122494500b39fefdb530310eb7c57a420f61eab9ae6c1bdd8ba5aa9a1ece06e4e4d63f41f76aefdf78943768c28061ea3db896e819180318d
-  data.tar.gz: e6906b0c4ee3debfd9ffa0fde700c4df213b7451c6ee3a60db8eb3a67b6da67656c9de1e43d5d3d8475dd0109753e714014962a1ec8063b5985cc2efe1ba213f
+  metadata.gz: 9caee1648d816b662e0a28802746b6a22c3d17d3ca1c6cb0ed5adc8b179b54f7d2a7172a64bc8a1658849b2f17080df009118d15be601d91f3bc23310933d3a1
+  data.tar.gz: c253b48e4750170511dfcfcc5496570fe6f85a4eb32372e1f95e161425b29ffb5ad21131ebb8083bae5188c6e0f0dfca9dfed79250b1d68278a3418b3a79f3a2

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
@@ -26,13 +34,6 @@ jobs:
         run: |
           sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake

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
@@ -26,18 +36,11 @@ jobs:
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake
       - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
         env:
           GH_USERNAME: ${{ secrets.PAT_USERNAME }}
           GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
@@ -46,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,15 +35,7 @@ jobs:
         run: |
           gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake

data/lib/asciidoctor/iec/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -82,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"/>
@@ -92,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
@@ -115,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"/>
@@ -130,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>
@@ -452,9 +478,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +500,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -611,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -737,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">
@@ -969,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">
@@ -989,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">
@@ -1028,12 +1115,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/lib/asciidoctor/iec/converter.rb

@@ -1,5 +1,6 @@
 require "asciidoctor"
 require "metanorma-iso"
+require_relative "./front.rb"
 
 module Asciidoctor
   module Iec
@@ -9,51 +10,9 @@ module Asciidoctor
 
       register_for "iec"
 
-      def metadata_author(node, xml)
-        publishers = node.attr("publisher") || "IEC"
-        publishers.split(/,[ ]?/).each do |p|
-          xml.contributor do |c|
-            c.role **{ type: "author" }
-            c.organization { |a| organization(a, p) }
-          end
-        end
-      end
-
-      def metadata_publisher(node, xml)
-        publishers = node.attr("publisher") || "IEC"
-        publishers.split(/,[ ]?/).each do |p|
-          xml.contributor do |c|
-            c.role **{ type: "publisher" }
-            c.organization { |a| organization(a, p) }
-          end
-        end
-      end
-
-      def metadata_copyright(node, xml)
-        publishers = node.attr("publisher") || "IEC"
-        publishers.split(/,[ ]?/).each do |p|
-          xml.copyright do |c|
-            c.from (node.attr("copyright-year") || Date.today.year)
-            c.owner do |owner|
-              owner.organization { |o| organization(o, p) }
-            end
-          end
-        end
-      end
-
-      def iso_id(node, xml)
-        return unless node.attr("docnumber")
-        part, subpart = node&.attr("partnumber")&.split(/-/)
-        dn = add_id_parts(node.attr("docnumber"), part, subpart)
-        dn = id_stage_prefix(dn, node)
-        dn = id_edition_suffix(dn, node)
-        xml.docidentifier dn, **attr_code(type: "iso")
-      end
-
-      def id_edition_suffix(dn, node)
-        ed = node.attr("edition") || 1
-        dn += " ED #{ed}"
-        dn
+      def init(node)
+        super
+        @is_iev = node.attr("docnumber") == "60050"
       end
 
       def boilerplate_file(x_orig)
@@ -79,91 +38,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "iec.rng"))
       end
 
-      STAGE_CODES = {
-        "PNW" => "1000",
-        "ANW" => "2000",
-        "CAN" => "2098",
-        "ACD" => "2099",
-        "CD" => "3020",
-        "BWG" => "3092",
-        "A2CD" => "3099",
-        "2CD" => "3520",
-        "3CD" => "3520",
-        "4CD" => "3520",
-        "5CD" => "3520",
-        "6CD" => "3520",
-        "7CD" => "3520",
-        "8CD" => "3520",
-        "9CD" => "3520",
-        "CDM" => "3591",
-        "A3CD" => "3592",
-        "A4CD" => "3592",
-        "A5CD" => "3592",
-        "A6CD" => "3592",
-        "A7CD" => "3592",
-        "A8CD" => "3592",
-        "A9CD" => "3592",
-        "ACDV" => "3599",
-        "CCDV" => "4020",
-        "CDVM" => "4091",
-        "NCDV" => "4092",
-        "NADIS" => "4093",
-        "ADIS" => "4099",
-        "ADTR" => "4099",
-        "ADTS" => "4099",
-        "RDISH" => "5000",
-        "RFDIS" => "5000",
-        "CDISH" => "5020",
-        "CDPAS" => "5020",
-        "CDTR" => "5020",
-        "CDTS" => "5020",
-        "CFDIS" => "5020",
-        "DTRM" => "5092",
-        "DTSM" => "5092",
-        "NDTR" => "5092",
-        "NDTS" => "5092",
-        "NFDIS" => "5092",
-        "APUB" => "5099",
-        "BPUB" => "6000",
-        "PPUB" => "6060",
-        "RR" => "9092",
-        "AMW" => "9220",
-        "WPUB" => "9599",
-        "DELPUB" => "9960",
-      }.freeze
-
-      DOC_STAGE = {
-        "00": "PWI",
-        "10": "NWIP",
-        "20": "WD",
-        "30": "CD",
-        "40": "CDV",
-        "50": "FDIS",
-      }.freeze
-
-      def get_stage(node)
-        stage = node.attr("status") || node.attr("docstage") || "60"
-        m = /([0-9])CD$/.match(stage) and
-          node.set_attr("iteration", m[1])
-        STAGE_CODES[stage] and stage = STAGE_CODES[stage][0..1]
-        stage
-      end
-
-      def get_substage(node)
-        st = node.attr("status") || node.attr("docstage")
-        stage = get_stage(node)
-        node.attr("docsubstage") || 
-          ( stage == "60" ? "60" : 
-           STAGE_CODES[st] ? STAGE_CODES[st][2..3] :
-           "00" )
-      end
-
-      def id_stage_abbr(stage, substage, node)
-        abbr = DOC_STAGE[stage.to_sym] || ""
-        abbr = node.attr("iteration") + abbr if node.attr("iteration")
-        abbr
-      end
-
       def load_yaml(lang, script)
         y = if @i18nyaml then YAML.load_file(@i18nyaml)
             elsif lang == "en"
@@ -187,6 +61,24 @@ module Asciidoctor
         node.nil? ? IsoDoc::Iec::WordConvert.new({}) :
           IsoDoc::Iec::WordConvert.new(doc_extract_attributes(node))
       end
+
+      def pdf_converter(node)
+        node.nil? ? IsoDoc::Iec::PdfConvert.new({}) :
+          IsoDoc::Iec::PdfConvert.new(doc_extract_attributes(node))
+      end
+        
+      def norm_ref_preface(f)
+        return super unless @is_iev
+        f.at("./title").next =
+          "<p>#{@norm_empty_pref}</p>"
+      end
+
+      def term_defs_boilerplate(div, source, term, preface, isodoc)
+        return super unless @is_iev
+      end
+
+      def sts_converter(node)
+      end
     end
   end
 end