metanorma-ogc 2.0.8.1 → 2.1.2

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -2,6 +2,7 @@ require_relative "init"
 require_relative "reqt"
 require "isodoc"
 require "uuidtools"
+require_relative "../../relaton/render/general"
 
 module IsoDoc
   module Ogc
@@ -97,7 +98,7 @@ module IsoDoc
 
       def example1(elem)
         lbl = @xrefs.anchor(elem["id"], :label, false) or return
-        prefix_name(elem, " — ", l10n("#{@i18n.example} #{lbl}"),
+        prefix_name(elem, " — ", l10n("#{@i18n.example} #{lbl}"),
                     "name")
       end
 
@@ -169,15 +170,6 @@ module IsoDoc
         references(docxml)
       end
 
-      def references(docxml)
-        super
-        docxml.xpath(ns("//bibitem/date")).each do |d|
-          d.xpath(ns("./on | ./from | ./to")).each do |d1|
-            d1.children = d1.text.sub(/^(\d\d\d\d).*$/, "\\1")
-          end
-        end
-      end
-
       def bibdata(docxml)
         docxml.xpath(ns("//bibdata/contributor[@type = 'author']")).each do |a|
           a.at(ns("./description"))&.text == "contributor" and
@@ -230,6 +222,18 @@ module IsoDoc
           bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
       end
 
+      def bibrenderer
+        ::Relaton::Render::Ogc::General.new(language: @lang)
+      end
+
+      def bibrender(xml)
+        unless xml.at(ns("./formattedref"))
+          xml.children =
+            "#{bibrenderer.render(xml.to_xml)}"\
+            "#{xml.xpath(ns('./docidentifier | ./uri | ./note | ./status')).to_xml}"
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/ogc/word_convert.rb

@@ -102,7 +102,7 @@ module IsoDoc
           submitters docxml, div2
           preface docxml, div2
           acknowledgements docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
+          div2.p { |p| p << "&#xA0;" } # placeholder
         end
         section_break(body)
       end
@@ -159,14 +159,13 @@ module IsoDoc
         result = from_xhtml(word_cleanup(to_xhtml(result)))
           .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
         @wordstylesheet = wordstylesheet_update
-        Html2Doc.process(
-          result,
+        Html2Doc.new(
           filename: filename, imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
           header_file: header&.path, dir: dir,
           asciimathdelims: [@openmathdelim, @closemathdelim],
           liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" }
-        )
+        ).process(result)
         header&.unlink
         @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
       end

data/lib/isodoc/ogc/xref.rb

@@ -130,6 +130,7 @@ module IsoDoc
       end
 
       def initial_anchor_names(doc)
+        if @parse_settings.empty? || @parse_settings[:clauses]
         preface_anchor_names(doc)
         n = Counter.new
         n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
@@ -140,10 +141,13 @@ module IsoDoc
           n, 1
         )
         n = section_names(doc.at(ns("//sections/definitions")), n, 1)
-        middle_section_asset_names(doc)
         clause_names(doc, n)
+        end
+        if @parse_settings.empty?
+        middle_section_asset_names(doc)
         termnote_anchor_names(doc)
         termexample_anchor_names(doc)
+        end
       end
 
       def preface_anchor_names(doc)
@@ -217,7 +221,7 @@ module IsoDoc
         super
         return unless @klass.ogc_draft_ref?(ref)
 
-        @anchors[ref["id"]] = { xref: "#{@anchors[ref['id']][:xref]}  (draft)" }
+        @anchors[ref["id"]] = { xref: "#{@anchors[ref['id']][:xref]} (draft)" }
       end
     end
   end

data/lib/metanorma/ogc/biblio.rng

@@ -614,12 +614,12 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -851,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -957,36 +986,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">

data/lib/metanorma/ogc/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -245,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -287,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -323,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -851,6 +897,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1234,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1261,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.0.8.1".freeze
+    VERSION = "2.1.2".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -0,0 +1,10 @@
+template:
+  # skip standardidentifier, it is inserted in front of formattedref within metanorma
+  standard: "{% if creatornames %}{{ creatornames }} ({{role}}){%else%}{{ publisher_abbrev}}{%endif%} : {{standardidentifier|first}} {{draft}} , <em>{{ title }}</em>. {{ publisher }}{%if place%},{%endif%} {{ place }} ({{date}}). {{uri}}."
+  misc: standard
+  techreport: standard
+nametemplate:
+  one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} {{initials[0]}}{% endif %}"
+  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} {{initials[0]}}{% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1]}} {{ initials[1]}}{% endif %}"
+  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} {{initials[0]}} {% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1]}} {{ initials[1]}} {% endif %} , {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{surname[2]}} {{initials[2]}}{% endif %}"
+

data/lib/relaton/render/date.rb

@@ -0,0 +1,9 @@
+module Relaton
+  module Render
+    class Date
+      def render
+        @date&.sub(/-.*$/, "")
+      end
+    end
+  end
+end

data/lib/relaton/render/fields.rb

@@ -0,0 +1,23 @@
+require_relative "date"
+
+module Relaton
+  module Render
+    module Ogc
+      class Fields < ::Relaton::Render::Fields
+        def name_fields_format(hash)
+          super
+          hash[:publisher_abbrev] = hash[:publisher_abbrev_raw]&.join("/")
+        end
+
+        def draftformat(num, hash)
+          return nil unless hash[:publisher] == "Open Geospatial Consortium"
+          return nil unless num[:status]
+          return nil if %w(approved published deprecated retired)
+            .include?(num[:status])
+
+          "(Draft)"
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/general.rb

@@ -0,0 +1,25 @@
+require "relaton-render"
+require_relative "parse"
+require_relative "fields"
+
+module Relaton
+  module Render
+    module Ogc
+      class General < ::Relaton::Render::IsoDoc::General
+        def config_loc
+          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        end
+
+        def klass_initialize(_options)
+          @nametemplateklass = Relaton::Render::Template::Name
+          @seriestemplateklass = Relaton::Render::Template::Series
+          @extenttemplateklass = Relaton::Render::Template::Extent
+          @sizetemplateklass = Relaton::Render::Template::Size
+          @generaltemplateklass = Relaton::Render::Template::General
+          @fieldsklass = Relaton::Render::Ogc::Fields
+          @parseklass = Relaton::Render::Ogc::Parse
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/parse.rb

@@ -0,0 +1,11 @@
+module Relaton
+  module Render
+    module Ogc
+      class Parse < ::Relaton::Render::Parse
+        def creatornames_roles_allowed
+          %w(author performer adapter translator editor)
+        end
+      end
+    end
+  end
+end

data/metanorma-ogc.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.0.8.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +265,11 @@ files:
 - lib/metanorma/ogc/reqt.rng
 - lib/metanorma/ogc/validate.rb
 - lib/metanorma/ogc/version.rb
+- lib/relaton/render/config.yml
+- lib/relaton/render/date.rb
+- lib/relaton/render/fields.rb
+- lib/relaton/render/general.rb
+- lib/relaton/render/parse.rb
 - metanorma-ogc.gemspec
 homepage: https://github.com/metanorma/metanorma-ogc
 licenses:
@@ -285,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Metanorma for the Open Geospatial Consortium.