metanorma-iho 0.5.8 → 0.6.2

data/lib/isodoc/iho/init.rb

@@ -16,7 +16,7 @@ module IsoDoc
 
       def i18n_init(lang, script, i18nyaml = nil)
         @i18n = I18n.new(
-          lang, script, i18nyaml ||
+          lang, script, i18nyaml: i18nyaml ||
           Metanorma::IHO.configuration.i18nyaml || @i18nyaml
         )
       end

data/lib/isodoc/iho/pdf_convert.rb

@@ -4,14 +4,14 @@ module IsoDoc
   module IHO
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
-    class PdfConvert <  IsoDoc::XslfoPdfConvert
+    class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
       end
 
       def pdf_stylesheet(docxml)
-        case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        case docxml&.at(ns("//bibdata/ext/doctype"))&.text
         when "standard" then "iho.standard.xsl"
         else
           "iho.specification.xsl"
@@ -20,4 +20,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/iho/presentation_xml_convert.rb

@@ -1,12 +1,16 @@
 require_relative "init"
 require "isodoc"
 require "metanorma-generic"
+require_relative "../../relaton/render/general"
 
 module IsoDoc
   module IHO
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      def bibrenderer
+        ::Relaton::Render::IHO::General.new(language: @lang)
+      end
+
       include Init
     end
   end
 end
-

data/lib/isodoc/iho/xref.rb

@@ -21,8 +21,9 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause", elem: lbl,
             xref: l10n("#{lbl} #{num}"), level: 1, value: num }
-        if a = single_annex_special_section(clause)
-          annex_names1(a, num.to_s, 1)
+        if @klass.single_term_clause?(clause)
+          annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
+                       num.to_s, 1)
         else
           i = Counter.new
           clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
@@ -36,17 +37,19 @@ module IsoDoc
 
       def back_anchor_names(docxml)
         super
-        i = Counter.new
-        docxml.xpath(ns("//annex[@obligation = 'informative']"))
-          .each do |c|
-          i.increment(c)
-          annex_names(c, i.print)
-        end
-        i = Counter.new("@", skip_i: true)
-        docxml.xpath(ns("//annex[not(@obligation = 'informative')]"))
-          .each do |c|
-          i.increment(c)
-          annex_names(c, i.print)
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          i = Counter.new
+          docxml.xpath(ns("//annex[@obligation = 'informative']"))
+            .each do |c|
+            i.increment(c)
+            annex_names(c, i.print)
+          end
+          i = Counter.new("@", skip_i: true)
+          docxml.xpath(ns("//annex[not(@obligation = 'informative')]"))
+            .each do |c|
+            i.increment(c)
+            annex_names(c, i.print)
+          end
         end
       end
 

data/lib/metanorma/iho/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/iho/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/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.5.8".freeze
+    VERSION = "0.6.2".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -0,0 +1,8 @@
+template:
+  # skip standardidentifier, it is inserted in front of formattedref within metanorma
+  standard: "{{ standardidentifier | first }} edition_{{ edition }} : {{ title }},  {{ creatornames }} ,_{{role}} ({{ uri }}) ." 
+  misc: 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 %} and {% 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 %} and {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{surname[2]}} {{initials[2]}}{% endif %}"

data/lib/relaton/render/fields.rb

@@ -0,0 +1,23 @@
+module Relaton
+  module Render
+    module IHO
+      class Fields < ::Relaton::Render::Fields
+        def edition_fields_format(hash)
+          super
+          hash[:publisher_raw]&.any? do |p|
+            ["IHO", "International Hydrographic Organization"]
+              .include?(p[:nonpersonal])
+          end or hash[:edition] = nil
+        end
+
+        def misc_fields_format(hash)
+          super
+          hash[:standardidentifier].map! do |x|
+            x.sub(/^IHO /, "")
+          end
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/general.rb

@@ -0,0 +1,25 @@
+require "relaton-render"
+require_relative "fields"
+require_relative "parse"
+
+module Relaton
+  module Render
+    module IHO
+      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::IHO::Fields
+          @parseklass = Relaton::Render::IHO::Parse
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/parse.rb

@@ -0,0 +1,31 @@
+module Relaton
+  module Render
+    module IHO
+      class Parse < ::Relaton::Render::Parse
+        def standardidentifier(doc)
+          out = doc.docidentifier.each_with_object([]) do |id, ret|
+            ret << id.id unless standardidentifier_exclude1.include? id.type
+          end
+          return out unless out.empty?
+
+          super
+        end
+
+        def standardidentifier_exclude1
+          %w(metanorma metanorma-ordinal DOI ISSN ISBN rfc-anchor)
+        end
+
+        def uri(doc)
+          uri = nil
+          %w(src).each do |t|
+            uri = doc.link.detect { |u| u.type == t } and break
+          end
+          uri ||= doc.link.first
+          return nil unless uri
+
+          uri.content.to_s
+        end
+      end
+    end
+  end
+end

data/metanorma-iho.gemspec

@@ -26,8 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-generic", "~> 2.0.0"
+  spec.add_dependency "metanorma-generic", "~> 2.1.1"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +225,10 @@ files:
 - lib/metanorma/iho/processor.rb
 - lib/metanorma/iho/reqt.rng
 - lib/metanorma/iho/version.rb
+- lib/relaton/render/config.yml
+- lib/relaton/render/fields.rb
+- lib/relaton/render/general.rb
+- lib/relaton/render/parse.rb
 - metanorma-iho.gemspec
 - metanorma.yml
 homepage: https://github.com/metanorma/metanorma-iho
@@ -260,7 +250,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-iho lets you write IHO in AsciiDoc.