metanorma-ogc 1.2.12 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e95cb5e967227b7768df33d08b3e2e3b70bfcbd7030ba0f5aefa091315bd8aec
-  data.tar.gz: 45585c842aae29e420d1f077bc9a3d8a37712a94bb0b2bc14de8e37c2878c48e
+  metadata.gz: d9b2a4f6759733416b83c67147a76fb26454cdb88b2db0878276307bfc47814e
+  data.tar.gz: c4eee012c45e1ab5bda542e1a53ea39acbc75889f2b9a2535a7338cbc4740197
 SHA512:
-  metadata.gz: b095cea06604606bf565a4ee2699ac4c84553b7be09a90cf9bf5e4a9a4ad65566e3e425161063d3282a2a802e411487df3167352089506b3412e99b5f4017c43
-  data.tar.gz: 9320167efb0439ae364797ff99495502f4bd5e287e977701bc4c7b673bfb3328fe73ed45a7cdefc91cc5e3320a6505af6d7c94ff6382050b536de8a5619a6457
+  metadata.gz: 8edb09f7b9250c90d53cfb5e046819d0f4b8bd25314f8b91f31f6b2d4e065e39ed867f9f68449f2561fcd17f53e4f64944b4e5123c8418e877e766917cda29af
+  data.tar.gz: 49477bcbb1cba63879167fb1228fc30994b9cc60ea82fc52289073c63d2c67c56cb42dadce15588d728a2603b119d1b8bb193994f282316d61c1efa20728ad51

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main  ]
+    branches: [ master, main ]
     tags: [ v* ]
   pull_request:
 
@@ -16,50 +16,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'ubuntu-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'windows-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'macos-latest'
             experimental: true
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - if: matrix.os == 'macos-latest'
-        run: brew install autoconf automake libtool
-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
-
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger tests passed event
-        uses: Sibz/github-status-action@v1
-        with:
-          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          context: 'tests-passed-successfully'
-          description: 'Tests passed successfully'
-          state: 'success'
-          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/.gitignore

@@ -1 +1,3 @@
 .DS_Store
+
+.rubocop-https--*

data/.rubocop.yml

@@ -1,10 +1,14 @@
 # This project follows the Ribose OSS style guide.
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
-
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+
 AllCops:
-  TargetRubyVersion: 2.3
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.4
 Rails:
   Enabled: true

data/lib/asciidoctor/ogc/biblio.rng

@@ -124,7 +124,7 @@
           <value>application/tei+xml</value>
           <value>text/x-asciidoc</value>
           <value>text/markdown</value>
-          <value>application/x-isodoc+xml</value>
+          <value>application/x-metanorma+xml</value>
           <text/>
         </choice>
       </attribute>
@@ -452,6 +452,7 @@
       <attribute name="type">
         <choice>
           <value>isni</value>
+          <value>orcid</value>
           <value>uri</value>
         </choice>
       </attribute>
@@ -461,10 +462,7 @@
   <define name="org-identifier">
     <element name="identifier">
       <attribute name="type">
-        <choice>
-          <value>orcid</value>
-          <value>uri</value>
-        </choice>
+        <data type="string" datatypeLibrary=""/>
       </attribute>
       <text/>
     </element>
@@ -1106,7 +1104,7 @@
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>
-      <value>cited</value>
+      <value>cites</value>
       <value>isCitedIn</value>
     </choice>
   </define>

data/lib/asciidoctor/ogc/boilerplate.xml

@@ -6,7 +6,7 @@
       <p align="center">Copyright
         © {{ docyear }} Open Geospatial Consortium<br/>
         To obtain additional rights of use, visit 
-        <link target="http://www.opengeospatial.org/legal/">http://www.opengeospatial.org/legal/</link></p>
+        <link target="http://www.ogc.org/legal/">http://www.ogc.org/legal/</link></p>
     </clause>
     <clause>
       <title>Note</title>

data/lib/asciidoctor/ogc/converter.rb

@@ -55,18 +55,14 @@ module Asciidoctor
       def outputs(node, ret)
         File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml", 
-                                     nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", 
-                                    nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", 
-                                     nil, false, "#{@filename}.pdf")
+        html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
+        doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
+        pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
       end
 
       def validate(doc)
         content_validate(doc)
-        schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), "ogc.rng"))
+        schema_validate(formattedstr_strip(doc.dup), File.join(File.dirname(__FILE__), "ogc.rng"))
       end
 
       def sections_cleanup(x)
@@ -87,19 +83,19 @@ module Asciidoctor
       end
 
       def insert_security(x, s)
-        preface = s.at("//preface") ||
-          s.add_previous_sibling("<preface/>").first
+        doctype = s&.at("//bibdata/ext/doctype")&.text
+        description = %w(standard community-standard).include?(doctype) ? "standard" : "document"
+        preface = s.at("//preface") || s.add_previous_sibling("<preface/>").first
         s = x&.at("//clause[@type = 'security']")&.remove ||
           "<clause type='security' #{add_id}>"\
           "<title>Security Considerations</title>"\
-          "<p>#{@i18n.security_empty}</p></clause>"
+          "<p>#{@i18n.security_empty.sub(/%/, description)}</p></clause>"
         preface.add_child s
       end
 
       def insert_submitters(x, s)
         if x.at("//submitters")
-          preface = s.at("//preface") || 
-            s.add_previous_sibling("<preface/>").first
+          preface = s.at("//preface") || s.add_previous_sibling("<preface/>").first
           submitters = x.at("//submitters").remove
           preface.add_child submitters.remove
         end
@@ -132,8 +128,11 @@ module Asciidoctor
       def bibdata_cleanup(xmldoc)
         super
         a = xmldoc.at("//bibdata/status/stage")
-        a.text == "published" and
-          a.children = "approved"
+        a.text == "published" and a.children = "approved"
+      end
+
+      def highlight_parse(text, xml)
+        xml.hi { |s| s << text }
       end
 
       def presentation_xml_converter(node)

data/lib/asciidoctor/ogc/isodoc.rng

@@ -102,7 +102,7 @@
           </attribute>
         </optional>
         <oneOrMore>
-          <ref name="li"/>
+          <ref name="ul_li"/>
         </oneOrMore>
         <zeroOrMore>
           <ref name="note"/>
@@ -812,6 +812,8 @@
       <ref name="requirement"/>
       <ref name="recommendation"/>
       <ref name="permission"/>
+      <ref name="imagemap"/>
+      <ref name="svgmap"/>
     </choice>
   </define>
   <define name="bibliography">
@@ -917,6 +919,9 @@
         </choice>
       </attribute>
       <ref name="bibdata"/>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -927,11 +932,21 @@
       <zeroOrMore>
         <ref name="annex"/>
       </zeroOrMore>
+      <optional>
+        <ref name="bibliography"/>
+      </optional>
       <zeroOrMore>
-        <ref name="references"/>
+        <ref name="indexsect"/>
       </zeroOrMore>
     </element>
   </define>
+  <define name="misccontainer">
+    <element name="misc-container">
+      <oneOrMore>
+        <ref name="AnyElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>
@@ -955,6 +970,11 @@
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="indexsect">
+    <element name="indexsect">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="boilerplate">
     <element name="boilerplate">
       <optional>
@@ -1635,4 +1655,87 @@
       <text/>
     </element>
   </define>
+  <define name="imagemap">
+    <element name="imagemap">
+      <ref name="figure"/>
+      <zeroOrMore>
+        <element name="area">
+          <attribute name="type">
+            <choice>
+              <value>rect</value>
+              <value>circle</value>
+              <value>ellipse</value>
+              <value>poly</value>
+            </choice>
+          </attribute>
+          <choice>
+            <ref name="xref"/>
+            <ref name="hyperlink"/>
+            <ref name="eref"/>
+          </choice>
+          <oneOrMore>
+            <element name="coords">
+              <attribute name="x">
+                <data type="float"/>
+              </attribute>
+              <attribute name="y">
+                <data type="float"/>
+              </attribute>
+            </element>
+          </oneOrMore>
+          <optional>
+            <element name="radius">
+              <attribute name="x">
+                <data type="float"/>
+              </attribute>
+              <optional>
+                <attribute name="y">
+                  <data type="float"/>
+                </attribute>
+              </optional>
+            </element>
+          </optional>
+        </element>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="svgmap">
+    <element name="svgmap">
+      <ref name="figure"/>
+      <zeroOrMore>
+        <element name="target">
+          <attribute name="href">
+            <data type="anyURI"/>
+          </attribute>
+          <choice>
+            <ref name="xref"/>
+            <ref name="hyperlink"/>
+            <ref name="eref"/>
+          </choice>
+        </element>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="ul_li">
+    <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="uncheckedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="checkedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="BasicBlock"/>
+      </oneOrMore>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/ogc/ogc.rng

@@ -63,6 +63,22 @@
       </element>
     </define>
   </include>
+  <define name="TextElement" combine="choice">
+    <ref name="hi"/>
+  </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="hi"/>
+  </define>
+  <define name="hi">
+    <element name="hi">
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="docsubtype">
     <element name="docsubtype">
       <choice>
@@ -115,6 +131,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -126,6 +145,9 @@
         <ref name="annex"/>
       </zeroOrMore>
       <ref name="bibliography"/>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
     </element>
   </define>
 </grammar>

data/lib/isodoc/ogc/base_convert.rb

@@ -6,6 +6,20 @@ require "fileutils"
 module IsoDoc
   module Ogc
     module BaseConvert
+      def error_parse(node, out)
+        case node.name
+        when "hi" then hi_parse(node, out)
+        else
+          super
+        end
+      end
+
+      def hi_parse(node, out)
+        out.span **{class: "hi"} do |e|
+          node.children.each { |n| parse(n, e) }
+        end
+      end
+
       def cleanup(docxml)
         super
         term_cleanup(docxml)
@@ -37,7 +51,7 @@ module IsoDoc
 
       def middle_clause(_docxml)
         "//clause[parent::sections][not(@type = 'scope' or "\
-        "@type = 'conformance')][not(descendant::terms)]"
+          "@type = 'conformance')][not(descendant::terms)]"
       end
 
       def is_clause?(name)

data/lib/isodoc/ogc/html/htmlstyle.css

@@ -1092,3 +1092,6 @@ a.footnote-number {
 
 .footnote {
   font-size: {{footnotefontsize}}; }
+
+span.hi {
+  background-color: yellow; }

data/lib/isodoc/ogc/html/htmlstyle.scss

@@ -597,3 +597,7 @@ a.footnote-number {
 .footnote {
   font-size: $footnotefontsize;
 }
+
+span.hi {
+  background-color: yellow;
+}