metanorma-ogc 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cee080dfddf34ac247b0913a4bdfa0a1a399c45cdb13821a3e0135ca20967c8
-  data.tar.gz: 9ba37a51168b6a5445f04da1f189ff3a560240fcadae5c688ed59baa291adbfb
+  metadata.gz: 4584b19640ae392d32331f799e97e13e6716ac96fe509b7ccf1c0c533778982d
+  data.tar.gz: 7db35d1b9b76cbc831f30acd5abf1b0a474819625898c2089fbb1e8083401872
 SHA512:
-  metadata.gz: 1f03966af60358ff2e2d4c20f64e508f1605ab6995f75c923bae735a151ede61b55cc1a1a5c80cb9f07c9ff6fe67cbe88c566f824360724221ccb40e47271097
-  data.tar.gz: 3a71ba1576a89618248131d4266d09c7e86db3946e69f1ad260f9e3b3c5091f9505fda2a5a5e3cd5eeb3943c2ac717516ebd08d68dfead2571fe65a49d8115fc
+  metadata.gz: 0131aa4d4e433d368d47f431b5d6c45cf798a1340b3eb2083ceb1b5a51739570225832d9303f11b134a4fe721f6bdf3332b9d92b45cc2f50430c8d610a2348a9
+  data.tar.gz: bc237907bc224453c0d6dee4ce0beaa28e3611dec7bde17eeedd43279f179489558b43cd5f35091b2e84d9353f559239ae1ef130b2e86ca726530e2e2eeb20fc

data/lib/asciidoctor/ogc/converter.rb

@@ -44,6 +44,7 @@ module Asciidoctor
         case ret
         when "preface" then "foreword"
         when "foreword" then "donotrecognise-foreword"
+        when "introduction" then "donotrecognise-foreword"
         else
           super
         end

data/lib/asciidoctor/ogc/front.rb

@@ -4,12 +4,7 @@ require "fileutils"
 
 module Asciidoctor
   module Ogc
-
-    # A {Converter} implementation that generates RSD output, and a document
-    # schema encapsulation of the document for validation
-    #
     class Converter < Standoc::Converter
-
       def metadata_author(node, xml)
         corporate_author(node, xml)
         personal_author(node, xml)
@@ -17,7 +12,8 @@ module Asciidoctor
 
       def corporate_author(node, xml)
         return unless node.attr("submitting-organizations")
-        node.attr("submitting-organizations").split(/;[ ]*/).each do |org|
+        HTMLEntities.new.decode(node.attr("submitting-organizations")).
+          split(/;[ ]*/).each do |org|
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization do |a|
@@ -91,9 +87,18 @@ module Asciidoctor
         end
       end
 
+      def externalid(node)
+        return node.attr("external-id") if node.attr("external-id")
+        d = doctype(node)
+        a = node.attr("abbrev")
+        return unless d and a
+        url = "http://www.opengis.net/doc/#{IsoDoc::Ogc::DOCTYPE_ABBR[d]}/#{a}"
+        v = node.attr("edition") and url += "/#{v}"
+        url
+      end
+
       def metadata_id(node, xml)
-        node.attr("external-id") and
-          xml.docidentifier node.attr("external-id"), **{ type: "ogc-external" }
+        e = externalid(node) and xml.docidentifier e, **{ type: "ogc-external" }
         node.attr("referenceurlid") and
           xml.docidentifier externalurl(node), **{ type: "ogc-external" }
         docnumber = node.attr("docnumber") || node.attr("docreference")
@@ -168,6 +173,13 @@ module Asciidoctor
         s and xml.docsubtype s
       end
 
+      def title(node, xml)
+        super
+        at = { format: "text/plain", type: "abbrev" }
+        a = node.attr("abbrev") and
+          xml.title a, **attr_code(at)
+      end
+
       def metadata_ext(node, xml)
         metadata_doctype(node, xml)
         metadata_subdoctype(node, xml)

data/lib/asciidoctor/ogc/validate.rb

@@ -12,6 +12,7 @@ module Asciidoctor
 
       def bibdata_validate(doc)
         stage_validate(doc)
+        version_validate(doc)
       end
 
       def stage_validate(xmldoc)
@@ -21,6 +22,16 @@ module Asciidoctor
         warn "Document Attributes: #{stage} is not a recognised status"
       end
 
+      def version_validate(xmldoc)
+        version = xmldoc&.at("//bibdata/edition")&.text
+        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+        if %w(engineering-report discussion-paper).include? doctype
+          warn "Version not permitted for #{doctype}" unless version.nil?
+        else
+          warn "Version required for #{doctype}" if version.nil?
+        end
+      end
+
       def section_validate(doc)
         preface_sequence_validate(doc.root)
         sections_sequence_validate(doc.root)

data/lib/isodoc/ogc/base_convert.rb

@@ -128,12 +128,13 @@ module IsoDoc
       def preface_names_numbered(clause)
         return if clause.nil?
         @prefacenum += 1
+        pref = RomanNumerals.to_roman(@prefacenum).downcase
         @anchors[clause["id"]] =
-          { label: RomanNumerals.to_roman(@prefacenum).downcase,
+          { label: pref,
             level: 1, xref: preface_clause_name(clause), type: "clause" }
         clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
                         "./references")).each_with_index do |c, i|
-          section_names1(c, "#{@prefacenum}.#{i + 1}", 2)
+          section_names1(c, "#{pref}.#{i + 1}", 2)
         end
       end
 

data/lib/isodoc/ogc/html/header.html

@@ -66,15 +66,15 @@ normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuatio
 <div style='mso-element:header' id=eh1>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>CS&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}</span></p>
 
 </div>
 
 <div style='mso-element:header' id=h1>
 
 <p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
-Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All rights reserved</span><span lang=EN-GB
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>
+Open Geospatial Consortium&nbsp;{{ docnumber }}</span><span lang=EN-GB
 style='font-weight:normal'><o:p></o:p></span></p>
 
 </div>
@@ -92,28 +92,28 @@ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!-
 style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
+style='mso-tab-count:1'>                                                                                                                                                                           </span>© Open Geospatial Consortium&nbsp;{{ docyear }} – All rights reserved<o:p></o:p></span></p>
 
 </div>
 
 <div style='mso-element:header' id=eh2>
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}</span></p>
 </div>
 
 <div style='mso-element:header' id=eh2l>
 <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2>
 <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2l>
 <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2>
@@ -127,7 +127,8 @@ style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
 style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span 
-style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
+style='mso-tab-count:1'>                                                                                                                                                                           </span>© Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
 </div>
 
 <div style='mso-element:footer' id=ef2l>
@@ -141,7 +142,8 @@ style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
 style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span 
-style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
+style='mso-tab-count:1'>                                                                                                                                                                           </span>© Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
 </div>
 
 <div style='mso-element:footer' id=f2>
@@ -184,7 +186,8 @@ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!-
 style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
+style='mso-tab-count:1'>                                                                                                                                                                           </span>© Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
 </div>
 
 <div style='mso-element:footer' id=ef3l>
@@ -199,7 +202,8 @@ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!-
 style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
+style='mso-tab-count:1'>                                                                                                                                                                           </span>© Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
 </div>
 
 <div style='mso-element:footer' id=f3>

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

@@ -105,10 +105,11 @@
 <div class="info-section">
 <div class="copyright">
   <div id="boilerplate-copyright-destination"/>
-
+{% if doctype == "Standard" or doctype == "Community Standard" %}
 <div class="contact-info">
   <div id="boilerplate-contact-destination"/>
 </div>
+{% endif %}
 </div>
 
 <div class="rule"></div>

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

@@ -258,16 +258,9 @@ span.keyword {
 /* Tables */
 
 table {
-  @include table($border: none !important);
-
-  color: #010d16;
+  @include table($border: 1px solid black);
 
-  tr:nth-child(even) {
-    background: #f1f8ff
-  }
-  tr:nth-child(odd) {
-    background: #cfe6fd
-  }
+  /*color: #010d16;*/
 
   thead tr th {
     background-color: #5d99d6;
@@ -355,7 +348,11 @@ p.Biblio, p.NormRef {
 
 /* Blocks */
 
-.Sourcecode {
+.SourceTitle {
+  @include blockTitle();
+}
+
+pre {
   @include sourceBlock(#f7f7f7);
 
   font-family: $monospacefont;
@@ -388,7 +385,7 @@ p.Biblio, p.NormRef {
   }
 }
 
-.figure, .Sourcecode, .pseudocode {
+.figure, pre, .pseudocode {
   background-color: #e1eef1;
   color: #424242;
   font-size: 0.8em;
@@ -419,7 +416,7 @@ p.Biblio, p.NormRef {
     margin-left:-1.5em;
   }
 
-  .Sourcecode, .pseudocode {
+  pre, .pseudocode {
     background: none;
   }
 }

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

@@ -131,7 +131,7 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	margin-right:0cm;
 	margin-bottom:12.0pt;
 	margin-left:0cm;
-	text-align:justify;
+	text-align:left;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
@@ -199,7 +199,7 @@ p.Definition, li.Definition, div.Definition
 	margin-right:0cm;
 	margin-bottom:12.0pt;
 	margin-left:0cm;
-	text-align:justify;
+	text-align:left;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
@@ -216,7 +216,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
 	margin-right:0cm;
 	margin-bottom:15.5pt;
 	margin-left:0cm;
-	text-align:justify;
+	text-align:left;
 	line-height:15.5pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
@@ -241,7 +241,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
 	margin-right:0cm;
 	margin-bottom:15.5pt;
 	margin-left:0cm;
-	text-align:justify;
+	text-align:left;
 	line-height:15.5pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
@@ -409,7 +409,7 @@ p.zzCopyright, li.zzCopyright
 	margin-right:14.2pt;
 	margin-bottom:12.0pt;
 	margin-left:14.2pt;
-	text-align:justify;
+	text-align:left;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt 25.7pt 481.15pt;
@@ -492,7 +492,7 @@ p.Quote, li.Quote, div.Quote
 	margin-right:36.0pt;
 	margin-bottom:0cm;
 	margin-left:36.0pt;
-	text-align:justify;
+	text-align:left;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;

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

@@ -30,8 +30,10 @@ style='mso-no-proof:yes;font-size:10.0pt'>Version: {{ edition }}</span></span></
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
 style='mso-no-proof:yes;font-size:10.0pt'>Category: {{ doctype }}</span></span></p>
 
+{% if editors %}
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
 style='mso-no-proof:yes;font-size:10.0pt'>Editor: {{ editors | join: ", " }}</span></span></p>
+{% 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>

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

@@ -630,7 +630,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	margin-right:0cm;
 	margin-bottom:12.0pt;
 	margin-left:0cm;
-	text-align:justify;
+	text-align:left;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
@@ -649,7 +649,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	margin-right:0cm;
 	margin-bottom:6.0pt;
 	margin-left:0cm;
-	text-align:justify;
+	text-align:left;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	font-size:10.5pt;

data/lib/isodoc/ogc/word_convert.rb

@@ -145,6 +145,7 @@ module IsoDoc
         word_recommend_cleanup(docxml)
         super
         word_license_cleanup(docxml)
+        word_term_cleanup(docxml)
         docxml
       end
 
@@ -154,6 +155,12 @@ module IsoDoc
         end
       end
 
+      def word_term_cleanup(docxml)
+        docxml.xpath("//p[@class = 'TermNum']//p[@class = 'Terms']").each do |p|
+          p.replace(p.children)
+        end
+      end
+
       def word_recommend_cleanup(docxml)
         docxml.xpath("//table[@class = 'recommendtest']/thead/tr").each do |tr|
           style_update(tr, "background:#C9C9C9;")

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities