metanorma-ogc 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9414ccffb628182f075ac6cb325a701e3e467ec9f63e39b6dc34ffcaf292267
-  data.tar.gz: 813fed6e91b026a7fd2086fd881df0c8ce71398e96eb25e86d8666d90f8bde60
+  metadata.gz: 294cc548cfcdb632298e8cc49a7fe9b83e1961016f6d65e0fca475ff061fcb1b
+  data.tar.gz: dd506401c8631fc0a703c928572c6e8959dd6ba8471667924a02f1f3996571e7
 SHA512:
-  metadata.gz: 92d1bc132ea6ba8fe709b3be9987032b5d07f49578ca0f47d18559f06376dd8d4f5473e10c64e25b9f888bdec005bfa165f6829bdde41260cc95392f566a4a68
-  data.tar.gz: 76b456a146b61ba58161226ca05ac9da0f2159ac9bfb2f97bef9012f709880b11a936fd10f07f0d50b8be48c476a8d23d23193de4cc4196f92669972cc9b1c39
+  metadata.gz: 608c44343f8690d6fba5be75d538f9fe4844cc441111de17e2674ecc8573095058ca8d471a2b9d77b17b5edd79294481f9c2e7b0d88ef845b0b50a79251c7730
+  data.tar.gz: c72fd20a20757bec35cd19f64561b01a87e9a28a30a157396f8768d671be2ac1dfd159054f5fbe78d58e04abe47910d432591c7d9e0af2a79aae7abb0a04d6d1

data/.github/workflows/macos.yml

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           sudo gem install bundler --force

data/.github/workflows/ubuntu.yml

@@ -31,7 +31,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           gem install bundler
@@ -39,15 +38,19 @@ jobs:
       - name: Run specs
         run: |
           bundle exec rake
-      - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
+      - name: Trigger repositories
+        if: matrix.ruby == '2.6'
         env:
-          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
-          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+          GH_USERNAME: metanorma-ci
+          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
         run: |
           curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
           [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          for repo in $DEPENDENT_REPOS
+          CLIENT_PAYLOAD=$(cat <<EOF
+          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
+          EOF
+          )
+          for repo in $REPOS
           do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
           done

data/.github/workflows/windows.yml

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         shell: pwsh
         run: |

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'isodoc/gem_tasks'
 
+IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/asciidoctor/ogc/boilerplate.xml

@@ -3,16 +3,16 @@
     <clause>
       <title>Copyright notice</title>
 
-      <p>Copyright
+      <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>
     </clause>
     <clause>
       <title>Note</title>
-      <p>Attention is drawn to the possibility that some of the elements of this document may be the subject of patent rights. The Open Geospatial Consortium shall not be held responsible for identifying any or all such patent rights.</p>
+      <p align="left">Attention is drawn to the possibility that some of the elements of this document may be the subject of patent rights. The Open Geospatial Consortium shall not be held responsible for identifying any or all such patent rights.</p>
 
-      <p>Recipients of this document are requested to submit, with their comments, notification of any relevant patent claims or other intellectual property rights of which they may be aware that might be infringed by any implementation of the standard set forth in this document, and to provide supporting documentation.</p>
+      <p align="left">Recipients of this document are requested to submit, with their comments, notification of any relevant patent claims or other intellectual property rights of which they may be aware that might be infringed by any implementation of the standard set forth in this document, and to provide supporting documentation.</p>
     </clause>
   </copyright-statement>
   <license-statement>

data/lib/asciidoctor/ogc/converter.rb

@@ -55,9 +55,12 @@ 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)
@@ -84,15 +87,16 @@ module Asciidoctor
       end
 
       def clause_parse(attrs, xml, node)
-        clausetype = node&.attr("heading")&.downcase || node.title.downcase
-        if clausetype == "submitters" then submitters_parse(attrs, xml, node)
-        else
-          super
+        case clausetype = node&.attr("heading")&.downcase || node.title.downcase
+        when "submitters" then return submitters_parse(attrs, xml, node)
+        when "conformance" then attrs = attrs.merge(type: "conformance")
         end
+        super
       end
 
       def submitters_parse(attrs, xml, node)
         xml.submitters **attr_code(attrs) do |xml_section|
+          xml_section.title @i18n.submitters
           xml_section << node.content
         end
       end

data/lib/asciidoctor/ogc/front.rb

@@ -12,8 +12,8 @@ module Asciidoctor
 
       def corporate_author(node, xml)
         return unless node.attr("submitting-organizations")
-        HTMLEntities.new.decode(node.attr("submitting-organizations")).
-          split(/;[ ]*/).each do |org|
+        csv_split(HTMLEntities.new.decode(node.attr("submitting-organizations")),
+                  ";")&.each do |org|
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization do |a|
@@ -63,13 +63,8 @@ module Asciidoctor
         end
       end
 
-      def metadata_publisher(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "publisher" }
-          c.organization do |a|
-            a.name Metanorma::Ogc::ORGANIZATION_NAME_SHORT
-          end
-        end
+      def default_publisher
+        "Open Geospatial Consortium"
       end
 
       def metadata_committee(node, xml)
@@ -123,16 +118,9 @@ module Asciidoctor
       end
 
       def metadata_copyright(node, xml)
-        from = node.attr("copyright-year") || node.attr("copyrightyear") ||
-          Date.today.year
-        xml.copyright do |c|
-          c.from from
-          c.owner do |owner|
-            owner.organization do |o|
-              o.name Metanorma::Ogc::ORGANIZATION_NAME_SHORT
-            end
-          end
-        end
+        node.attr("copyrightyear") and
+          node.set_attr("copyright-year", node.attr("copyrightyear"))
+        super
       end
 
       def metadata_date(node, xml)

data/lib/asciidoctor/ogc/isodoc.rng

@@ -922,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1180,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/asciidoctor/ogc/validate.rb

@@ -49,35 +49,25 @@ module Asciidoctor
         [
           {
             msg: "Prefatory material must be followed by (clause) Scope",
-            val: [{ tag: "clause", title: "Scope" }],
+            val: ["./self::clause[@type = 'scope']" ]
           },
           {
             msg: "Scope must be followed by Conformance",
-            val: [{ tag: "clause", title: "Conformance" }],
+            val: ["./self::clause[@type = 'conformance']" ]
           },
           {
             msg: "Normative References must be followed by "\
             "Terms and Definitions",
-            val: [
-              { tag: "terms", title: "Terms and definitions" },
-              { tag: "clause", title: "Terms and definitions" },
-              {
-                tag: "terms",
-                title: "Terms, definitions, symbols and abbreviated terms",
-              },
-              {
-                tag: "clause",
-                title: "Terms, definitions, symbols and abbreviated terms",
-              },
-            ],
+            val: ["./self::terms | .//terms"]
           },
       ].freeze
 
       def seqcheck(names, msg, accepted)
         n = names.shift
-        unless accepted.include? n
+        return [] if n.nil?
+        test = accepted.map { |a| n.at(a) }
+        if test.all? { |a| a.nil? }
           @log.add("Style", nil, msg)
-          names = []
         end
         names
       end
@@ -85,23 +75,21 @@ module Asciidoctor
       def sections_sequence_validate(root)
         return unless STANDARDTYPE.include?(
           root&.at("//bibdata/ext/doctype")&.text)
-        f = root.at("//sections").elements
-        names = f.map { |s| { tag: s.name, title: s&.at("./title")&.text } }
-        names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val]) || return
-        names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val]) || return
-        names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val]) || return
+        names = root.xpath("//sections/* | //bibliography/*")
+        names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val])
+        names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val])
+        names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val])
         n = names.shift
-        if !n.nil? && n[:tag] == "definitions"
+        if n&.at("./self::definitions")
           n = names.shift
         end
-        unless n
+        if n.nil? || n.name != "clause"
           @log.add("Style", nil, "Document must contain at least one clause")
           return
         end
         root.at("//references | //clause[descendant::references]"\
                 "[not(parent::clause)]") or
-        seqcheck([{tag: "clause"}],
-                 "Normative References are mandatory", [{tag: "references"}])
+        @log.add("Style", nil, "Normative References are mandatory")
       end
 
       def preface_sequence_validate(root)

data/lib/isodoc/ogc/base_convert.rb

@@ -1,5 +1,4 @@
 require "isodoc"
-require_relative "metadata"
 require_relative "reqt"
 require_relative "biblio"
 require_relative "sections"
@@ -8,18 +7,6 @@ require "fileutils"
 module IsoDoc
   module Ogc
     module BaseConvert
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
       def cleanup(docxml)
         requirement_table_cleanup(docxml)
         super
@@ -55,14 +42,6 @@ module IsoDoc
         docxml
       end
 
-      def load_yaml(lang, script)
-        y = if @i18nyaml then YAML.load_file(@i18nyaml)
-            else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            end
-        super.merge(y)
-      end
-
       def example_parse(node, out)
         name = node.at(ns("./name"))
         example_name_parse(node, out, name) #if name
@@ -73,17 +52,14 @@ module IsoDoc
       end
 
       def example_name_parse(node, div, name)
-        lbl = @xrefs.anchor(node['id'], :label, false)
         div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
-          lbl.nil? or p << l10n("#{@example_lbl} #{lbl}")
-          name and !lbl.nil? and p << "&nbsp;&mdash; "
           name&.children&.each { |n| parse(n, p) }
         end
       end
 
       def middle_clause
-        "//clause[parent::sections][not(xmlns:title = 'Scope' or "\
-        "xmlns:title = 'Conformance')][not(descendant::terms)]"
+        "//clause[parent::sections][not(@type = 'scope' or "\
+        "@type = 'conformance')][not(descendant::terms)]"
       end
 
       def middle(isoxml, out)

data/lib/isodoc/ogc/biblio.rb

@@ -60,13 +60,34 @@ module IsoDoc
         return [multiplenames_and(names), (abbrs.map { |x| x.text }).join("/")]
       end
 
+      def extract_author(b)
+        c = b.xpath(ns("./contributor[role/@type = 'author']"))
+        c = b.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
+        return nil if c.empty?
+        c.map do |c1|
+          c1&.at(ns("./organization/name"))&.text || extract_person_name(c1)
+        end.reject { |e| e.nil? || e.empty? }.join(", ")
+      end
+
+      def extract_person_name(b)
+        p = b.at(ns("./person/name")) or return
+        c = p.at(ns("./completename")) and return c.text
+        s = p&.at(ns("./surname"))&.text or return
+        i = p.xpath(ns("./initial")) and
+          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join("")
+        i.empty? and f = p.xpath(ns("./forename")) and
+          front = f.map { |e| e.text[0].upcase }.join("")
+        front ? "#{s} #{front}" : s
+      end
+
+
       def date_render(date)
         return nil if date.nil?
         on = date&.at(ns("./on"))&.text
         from = date&.at(ns("./from"))&.text
         to = date&.at(ns("./to"))&.text
-        return on if on
-        return "#{from}–#{to}" if from
+        return on if on && !on.empty?
+        return "#{from}–#{to}" if from && !from.empty?
         nil
       end
 
@@ -82,17 +103,24 @@ module IsoDoc
         b.at(ns("./place"))
       end
 
+      def extract_uri(b)
+        b.at(ns("./uri"))
+      end
+
       # {author}: {document identifier}, {title}. {publisher}, {city} ({year})
       def standard_citation(out, b)
         if ftitle = b.at(ns("./formattedref"))
           ftitle&.children&.each { |n| parse(n, out) }
         else
           pub, pub_abbrev = extract_publisher(b)
+          author = extract_author(b)
           c = extract_city(b)
           y = extract_year(b)
-          out << "#{pub_abbrev}: " if pub_abbrev
+          u = extract_uri(b)
+          out << "#{author || pub_abbrev}: " if author || pub_abbrev
           id = render_identifier(inline_bibitem_ref_code(b))
           out << id[1] if id[1]
+          out << " (Draft)" if ogc_draft_ref?(b)
           out << ", "
           out.i do |i|
             iso_title(b)&.children&.each { |n| parse(n, i) }
@@ -102,7 +130,8 @@ module IsoDoc
           out << ", " if pub && c
           c&.children&.each { |n| parse(n, out) }
           out << " " if (pub || c) && y
-          out << "(#{y})." if y
+          out << "(#{y}). " if y
+          u and out << "<a href='#{u.text}'>#{u.text}</a>"
         end
       end
 

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

@@ -0,0 +1,195 @@
+.coverpage-maturity, .coverpage-stage {
+  font-family: {{headerfont}};
+  font-weight: 400;
+  font-size: 1.3em;
+  margin: 0 0 2em 0;
+  text-transform: uppercase; }
+
+.icon-svg {
+  width: 100%;
+  color: #5ecf86; }
+
+.wrapper-top {
+  background: #00335b;
+  background: linear-gradient(130deg, #00335b 45%, #f1f8ff 100%);
+  color: #ffffff;
+  padding: 5em 0;
+  width: 100%; }
+
+.wrapper-top-bottom {
+  width: 0;
+  height: 0;
+  border-top: 100px solid #00335b;
+  border-right: 100px solid transparent;
+  position: absolute; }
+
+.coverpage-metadata {
+  margin-top: 35px;
+  padding-top: 15px;
+  margin-right: 25px;
+  border-top: solid 1px white; }
+
+.coverpage-metadata,
+.coverpage-alt-formats {
+  font-size: 12px;
+  font-family: {{headerfont}};
+  margin-left: 1em;
+  text-align: left; }
+  .coverpage-metadata span,
+  .coverpage-alt-formats span {
+    display: block;
+    text-align: left; }
+    .coverpage-metadata span a,
+    .coverpage-alt-formats span a {
+      color: white; }
+      .coverpage-metadata span a:hover,
+      .coverpage-alt-formats span a:hover {
+        text-decoration: underline;
+        background: none;
+        box-shadow: none !important;
+        font-weight: 400; }
+  .coverpage-metadata .value,
+  .coverpage-alt-formats .value {
+    font-size: 15px;
+    margin-bottom: 15px; }
+  .coverpage-metadata .label,
+  .coverpage-alt-formats .label {
+    font-size: 12px;
+    padding: 0; }
+
+.coverpage-alt-formats span {
+  display: inline;
+  text-align: left; }
+  .coverpage-alt-formats span a {
+    padding-right: 5px; }
+
+.coverpage-title {
+  padding-bottom: 0.5em;
+  font-family: {{headerfont}};
+  font-weight: 100;
+  padding-left: 1em;
+  padding-right: 1em; }
+  .coverpage-title span {
+    font-family: {{headerfont}};
+    font-size: 1.8em;
+    line-height: 1; }
+
+.docstage-box table {
+  width: auto; }
+
+.docstage-box th {
+  background-color: #93c0d6; }
+
+.docstage-box td {
+  vertical-align: top;
+  background-color: #daeef3;
+  padding: 0.5em;
+  border: 0; }
+
+.docstage-box th:first-child {
+  border-radius: 1em 0 0 0; }
+
+.docstage-box th:last-child {
+  border-radius: 0 1em 0 0; }
+
+.docstage-box tr:first-child {
+  border-radius: 0 0 0 1em; }
+
+.docstage-box tr:last-child {
+  border-radius: 0 1em 0 0; }
+
+.docstage-box tr:last-child > td:first-child {
+  border-radius: 0 0 0 1em; }
+
+.docstage-box tr:last-child > td:last-child {
+  border-radius: 0 0 1em 0; }
+
+.WordSection11 {
+  padding: 0 2em 0 3em; }
+
+.info-section {
+  padding: 0 2em 0 5em; }
+
+.prefatory-section {
+  padding: 0 3em 0 6em; }
+
+.zzSTDTitle1, .MsoCommentText {
+  display: none; }
+
+.coverpage {
+  text-align: center;
+  padding-left: 1.5em; }
+
+.coverpage-logo span, .coverpage-tc-name span {
+  font-family: {{bodyfont}};
+  text-transform: none;
+  font-weight: 300;
+  margin-left: 1em; }
+
+.coverpage-tc-name {
+  font-size: 1.2em;
+  line-height: 1.2em;
+  margin: 0.25em 0; }
+
+.copyright {
+  padding: 1em;
+  font-size: 0.9em;
+  text-align: left; }
+
+/* Document Identity */
+.coverpage-doc-identity {
+  font-size: 2em;
+  line-height: 2em; }
+
+.coverpage-title .title-second {
+  display: none; }
+
+.coverpage-stage-block {
+  font-family: {{headerfont}};
+  font-weight: 600;
+  font-size: 1.25em;
+  margin: 2em 0em 2em 0em;
+  text-transform: uppercase; }
+
+.authors {
+  margin-top: 2em; }
+  .authors span {
+    display: block;
+    line-height: 2; }
+  .authors span.roletag {
+    display: inline-block;
+    font-size: 12px;
+    color: #00335b;
+    background-color: white;
+    padding: 2px 5px;
+    margin-left: 7px;
+    border-radius: 5px; }
+
+/* Draft Warning */
+.coverpage-warning {
+  border: #f36f36 solid 2px;
+  color: #f36f36 !important;
+  margin: 1em 2em;
+  color: #2e81c2;
+  padding: 2em 1em 1em 1em;
+  border-radius: 25px; }
+  .coverpage-warning h1 {
+    font-family: {{headerfont}};
+    font-weight: 300;
+    text-transform: uppercase;
+    font-size: 1.2em; }
+
+@media print {
+  .document-info, .copyright {
+    page-break-before: always; }
+  .coverpage {
+    height: 23cm; }
+  .info-section {
+    display: none; }
+  .wrapper-top {
+    top: 0;
+    padding-top: 4cm;
+    padding-bottom: 4cm; }
+  .wrapper-top-bottom {
+    margin-top: -5px;
+    display: none; } }