metanorma-ogc 1.2.11 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e15d1d5244c56742241206793480e35f4147e85f20718fe003da6b8609138b9e
-  data.tar.gz: 71fc5a1f0e1583e1b4de15b23626bdadbe6acc6e533824c33cf15b9f4dbf0578
+  metadata.gz: 816ca1ce2154ba61cd550a0b550929268b5afffc1e0169bad4e068826213f1b2
+  data.tar.gz: 67d972963e5c5e9e5451ed5de9f16f5bc7ee25954c4db4e5c9773d090dad9b72
 SHA512:
-  metadata.gz: c217d011a9b1177160d097c7e706d074ad6313daec50e36de1ff7d45c93d50d3b7a88ac0823cf2434ce5ca83f9532988ddd47e04497cfac144db541ff7c364cb
-  data.tar.gz: c963da6c2086b761979d59bcb38b157f34ea0ad6ea5f3739f6b240c95945f49424d5c4bf5a9dfaa7ceb9f030a854ae96b8d0933ebbd6e4629d2ccd97e60917df
+  metadata.gz: 5e1cbd0845909917b8b160abba46bec7ea9b86bc1b32277df618a97034824fd59e4122e1e95734c8b416307ddc148e328897ba0ff803ed259fe0ac0930347f81
+  data.tar.gz: 867108d5fb51c724b538929614bcbce7ef9f10416a9c97a70273a995d6e046b8fd3f2f9dbeaecea273699bf402ac68ca0427ec07d4ee0993e96208551a50f9f6

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/.rubocop.yml

@@ -4,7 +4,3 @@
 
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
-AllCops:
-  TargetRubyVersion: 2.3
-Rails:
-  Enabled: true

data/lib/asciidoctor/ogc/basicdoc.rng

@@ -729,9 +729,11 @@
   </define>
   <define name="index">
     <element name="index">
-      <attribute name="to">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="to">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <element name="primary">
         <oneOrMore>
           <ref name="PureTextElement"/>

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"/>
@@ -789,6 +789,9 @@
       <attribute name="width"/>
     </element>
   </define>
+  <define name="BibItemType" combine="choice">
+    <value>internal</value>
+  </define>
   <define name="TextElement" combine="choice">
     <ref name="concept"/>
   </define>
@@ -809,6 +812,8 @@
       <ref name="requirement"/>
       <ref name="recommendation"/>
       <ref name="permission"/>
+      <ref name="imagemap"/>
+      <ref name="svgmap"/>
     </choice>
   </define>
   <define name="bibliography">
@@ -914,6 +919,9 @@
         </choice>
       </attribute>
       <ref name="bibdata"/>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -924,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>
@@ -952,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>
@@ -1632,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;
+}

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

@@ -848,3 +848,6 @@ div.warning p {
   mso-border-alt: solid windowtext .5pt;
   padding: 0cm;
   mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt; }
+
+span.hi {
+  background-color: yellow; }

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

@@ -806,3 +806,6 @@ div.warning p {
   margin-bottom:6.0pt;border:none;mso-border-alt:solid windowtext .5pt;
 padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 }
+span.hi {
+  background-color: yellow;
+}

data/lib/isodoc/ogc/html_convert.rb

@@ -18,8 +18,8 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
+          bodyfont: '"Overpass",sans-serif',
+          headerfont: '"Overpass",sans-serif',
           monospacefont: '"Space Mono",monospace',
           normalfontsize: "16px",
           monospacefontsize: "0.8em",