metanorma-ogc 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868dc6938ff146d001b5510963acea058cefe084d7a0b9d68e9d78916a6f122c
-  data.tar.gz: 4fce9933efebce96fb0b6c034c2297aeba957c1e7ad490f396f0f12dd04d415b
+  metadata.gz: a75c31de8888444e5fd9973771e9a9c24ac1541eae103f8a55f02605d4837f91
+  data.tar.gz: abf157ea956927268720b5582cfa0fb6d8986b45c1041bafc783dcf28d9c6b84
 SHA512:
-  metadata.gz: 3d15e4958895e014be50a293e945fc2abb0b21548803621663fde417235de6e4719c221689338e4e7de806dbfd7d94f5a08d32dc4dd8834343e8610638a297dc
-  data.tar.gz: 1f9566897b6ae34a99077f0ce09d5c8b36ab73ecb2e47ddb21aa3cdc75cd606e851243741641419f5ae9b3878798f45b59f20191ac015b0662750d33c8cc5b00
+  metadata.gz: 539fc9469c898441e23cf956da90c9f5c443ed6db504b3250e2ee9b5341addf00b2ba884aaacecd621852b4b66ddfd02598f4b7ce40f7111a85c77d0da054c9a
+  data.tar.gz: 3bb45e8622ff63c69fd3f1024b8d4c75411750bd7f25eac53d777c21caaea10852d9776861d6387dbe76442b093b503d503ff9c76e90c7c8d36cfb46a3425254

data/.github/workflows/macos.yml

@@ -26,13 +26,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

@@ -26,18 +26,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 +39,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

@@ -27,15 +27,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/ogc/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>
@@ -452,9 +458,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 +480,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"/>
@@ -737,6 +767,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -989,38 +1021,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 +1085,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/ogc/converter.rb

@@ -33,7 +33,8 @@ module Asciidoctor
           reference-model release-notes standard user-guide white-paper 
           test-suite}.include? d
           @warned_doctype or
-            @log.add("Document Attributes", nil, "'#{d}' is not a legal document type: reverting to 'standard'")
+            @log.add("Document Attributes", nil,
+                     "'#{d}' is not a legal document type: reverting to 'standard'")
           @warned_doctype = true
           d = "standard"
         end
@@ -60,7 +61,7 @@ module Asciidoctor
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
-          pdf_converter(node).convert filename unless node.attr("nodoc")
+          pdf_converter(node)&.convert filename unless node.attr("nodoc")
         end
         @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
@@ -129,6 +130,7 @@ module Asciidoctor
       end
 
       def pdf_converter(node)
+        return nil if node.attr("no-pdf")
         IsoDoc::Ogc::PdfConvert.new(html_extract_attributes(node))
       end
 

data/lib/asciidoctor/ogc/isodoc.rng

@@ -303,8 +303,23 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="TextElement" combine="choice">
+      <ref name="concept"/>
+    </define>
   </include>
   <!-- end overrides -->
+  <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"/>
@@ -911,7 +926,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 +937,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>

data/lib/asciidoctor/ogc/ogc.rng

@@ -75,10 +75,6 @@
         <value>profile</value>
         <value>profile-with-extension</value>
         <value>general</value>
-        <value>encoding</value>
-        <value>extension</value>
-        <value>profile</value>
-        <value>profile-with-extension</value>
       </choice>
     </element>
   </define>

data/lib/isodoc/ogc/html/html_ogc_titlepage.html

@@ -95,7 +95,8 @@
 
 <div class="docstage-box">
   <table>
-    <tr><th>Document type:</th><th>OGC {{doctype}}</th></tr>
+    <tr><td>Document number:</td><td>{{docnumber}}</td></tr>
+    <tr><td>Document type:</td><td>OGC {{doctype}}</td></tr>
     <tr><td align="right">Document subtype:</td><td align="right">{{docsubtype}}</td></tr>
     <tr><td align="right">Document stage:</td><td align="right">{{stage}}</td></tr>
     <tr><td align="right">Document language:</td><td align="right">{{doclanguage}}</td></tr>

data/lib/isodoc/ogc/html/scripts.html

@@ -1,24 +1,8 @@
   <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'main', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': true, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
+    $("#toc").on('click', 'li', function(e) {
+    $(this).parent().find('li.toc-active').removeClass('toc-active');
+    $(this).addClass('toc-active');
+});
   </script>
 
 <script>

data/lib/isodoc/ogc/html/word_ogc_titlepage.html

@@ -36,7 +36,7 @@ style='mso-no-proof:yes;font-size:10.0pt'>Editor: {{ editors | join: ", " }}</sp
 {% endif %}
 
 <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
-style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>OGC {{ doctitle }}</span>
+style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>{{ doctitle }}</span>
 </b></p>
 
 <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
@@ -55,6 +55,17 @@ page;mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'>
  <tr>
   <td valign=top align=left style='padding-top:7.1pt;padding-right:7.1pt;
   padding-bottom:7.1pt;padding-left:7.1pt'>
+  <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
+  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
+  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
+  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
+  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
+  lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
+  number:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>         </span><span
+  class=SpellE><span lang=EN-GB
+  style='font-size:10.0pt;font-weight:normal'>{{ docnumber }}</span><span lang=EN-GB style='font-size:10.0pt;
+  mso-color-alt:windowtext;font-weight:normal'><o:p></o:p></span></p>
+
   <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
   text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
   mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
@@ -66,7 +77,6 @@ page;mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'>
   style='font-size:10.0pt;font-weight:normal'>{{ doctype }}</span><span lang=EN-GB style='font-size:10.0pt;
   mso-color-alt:windowtext;font-weight:normal'><o:p></o:p></span></p>
   
-{% if docsubstatus %}  
   <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
   text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
   mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
@@ -74,7 +84,6 @@ page;mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'>
   mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
   lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
   subtype:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>    </span>{{ docsubstatus }}<o:p></o:p></span></p>
-{% endif %}
 
   <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
   text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
@@ -89,7 +98,7 @@ page;mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'>
   auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
   mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
   lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
-  language:&nbsp;<span style='mso-tab-count:1'>    </span>{{ language }}</span><span
+  language:&nbsp;<span style='mso-tab-count:1'>    </span>{{ doclanguage }}</span><span
   lang=EN-GB style='font-size:8.0pt;mso-bidi-font-size:10.0pt;mso-color-alt:
   windowtext'><o:p></o:p></span></p>
   </td>