metanorma-iso 2.1.9 → 2.2.0

data/lib/metanorma/requirements/modspec.rb

@@ -3,12 +3,20 @@ module Metanorma
     class Modspec
       # Don't want to inherit from Metanorma::Requirements::Modspec
       class Iso < ::Metanorma::Requirements::Modspec
+        def recommendation_label_xref(elem, label, xrefs, _type)
+          id = @reqtlabels[label]
+          number = xrefs.anchor(id, :xref_reqt2reqt, false)
+          number.nil? and return type
+          elem.ancestors("requirement, recommendation, permission").empty? and
+            return number
+          "<xref target='#{id}'>#{number}</xref>"
+        end
+
         def recommendation_label(elem, type, xrefs)
           lbl = super
           title = elem.at(ns("./title"))
-          return lbl unless title # &&
-
-          #  elem.ancestors("requirement, recommendation, permission").empty?
+          return lbl unless title &&
+            elem.ancestors("requirement, recommendation, permission").empty?
 
           lbl += l10n(": ") if lbl
           lbl += title.children.to_xml
@@ -30,7 +38,7 @@ module Metanorma
         def requirement_component_parse(node, out)
           if node["exclude"] != "true" && node.name == "description"
             lbl = "statement"
-            lbl = "declaration" if recommend_class(node) == "recommendclass"
+            lbl = "description" if recommend_class(node.parent) == "recommendclass"
             out << "<tr><td>#{@labels['modspec'][lbl]}</td>"\
                    "<td>#{node.children.to_xml}</td></tr>"
           else
@@ -54,6 +62,61 @@ module Metanorma
               m << t.at(ns("./name")).children.to_xml
             end.join("<br/>")
         end
+
+        def postprocess_anchor_struct(block, anchor)
+          super
+          anchor[:xref_reqt2reqt] = anchor[:xref_bare]
+          if l = block.at(ns("./title"))
+            anchor[:xref_reqt2reqt] +=
+              l10n(": ") + l.children.to_xml.strip
+          end
+          anchor
+        end
+
+        def reqt_ids(docxml)
+          docxml.xpath(ns("//requirement | //recommendation | //permission"))
+            .each_with_object({}) do |r, m|
+              id = r.at(ns("./identifier")) or next
+              m[id.text] =
+                { id: r["id"],
+                  lbl: @xrefs.anchor(r["id"], :xref_reqt2reqt, false) }
+            end
+        end
+
+        def reqt_links_test(docxml)
+          docxml.xpath(ns("//requirement | //recommendation | //permission"))
+            .each_with_object({}) do |r, m|
+              next unless %w(conformanceclass
+                             verification).include?(r["type"])
+
+              subj = r.at(ns("./classification[tag = 'target']/value"))
+              id = r.at(ns("./identifier")) or next
+              lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref_reqt2reqt,
+                                  false)
+              next unless subj
+
+              m[subj.text] = { lbl: lbl, id: r["id"] }
+            end
+        end
+
+        def reqt_links_class(docxml)
+          docxml.xpath(ns("//requirement | //recommendation | //permission"))
+            .each_with_object({}) do |r, m|
+              next unless %w(class
+                             conformanceclass).include?(r["type"])
+
+              id = r.at(ns("./identifier")) or next
+              r.xpath(ns("./requirement | ./recommendation | ./permission"))
+                .each do |r1|
+                id1 = r1.at(ns("./identifier")) or next
+                lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id],
+                                    :xref_reqt2reqt, false)
+                next unless lbl
+
+                m[id1.text] = { lbl: lbl, id: r["id"] }
+              end
+            end
+        end
       end
     end
   end

data/lib/metanorma-iso.rb

@@ -10,6 +10,7 @@ require_relative "isodoc/iso/isosts_convert"
 require_relative "isodoc/iso/presentation_xml_convert"
 require_relative "html2doc/lists"
 require "asciidoctor/extensions"
+require "metanorma"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/iso"

data/lib/relaton/render/config.yml

@@ -1,4 +1,56 @@
+extenttemplate:
+  book: "{{ volume }} {{ page }}"
+  booklet: book
+  proceedings: book
+  journal: book
+  standard: book
+  techreport: book
+  inbook: "{{ volume }} {{ page }}"
+  misc: "{{ volume }} {{issue}} {{ page }}, {{ duration }}"
+nametemplate:
+  one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0]}} {{initials[0] | join: ''}}.{% endif %}"
+  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0]}} {{initials[0] | join: ''}}.{% endif %} , & {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1]}} {{initials[1] | join: ''}}.{% endif %}"
+  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0]}} {{initials[0] | join: ''}}.{% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1]}} {{initials[1] | join: ''}}. {% endif %} , & {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{surname[2]}} {{initials[2] | join: ''}}.{% endif %}"
+# disabled the following: they should be provided in inheriting calls
+# etal: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %} <em>et al.</em>"
+# etal_count: 5
+seriestemplate: "{% if series_formatted %}{{ series_formatted }}{%else%}{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %} ({{series_run}}) {{series_num}}|({{series_partnumber}}){%endif%}"
+journaltemplate: "<em>{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %}</em> ({{series_run}}) {{ labels['volume'] }}_{{series_num}} {{ labels['part'] }}_{{series_partnumber}}"
 template:
   # skip standardidentifier, it is inserted in front of formattedref within metanorma
   standard: "<em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }}." 
-  website: "{{ creatornames }} ({{ role }}) . <em><span_class='stddocTitle'>{{ title }}</span></em> [website]. {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{ place }}: {{ publisher }}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ standardidentifier | first }}. {{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+  website: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em><span_class='stddocTitle'>{{ title }}</span></em> [website]. {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{place}}: {{ publisher }}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+  book: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . <em>{{ title }}</em> . {{ edition | capitalize_first }}. ({{ series }}). {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  booklet: book
+  manual: book
+  proceedings: book
+  inbook: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . {{ title }} . <em>{{host_title}}</em> ({{host_role}} {{ host_creatornames}}). {{ edition | capitalize_first }}. ({{ series }}). {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  inproceedings: inbook
+  incollection: inbook
+  journal: "<em>{{ title}}</em> . {{ edition | capitalize_first }}. {{place}}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  article: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . {{ title }}. {{ series }} . {{date}}, {{ extent }}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  software: "<smallcap>{{ creatornames }}</smallcap> ({{ role}}) . <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize}}. {{place}}: {{publisher}}. {{date}}. {{size}}. {{extent}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+  electronic resource:  software
+  dataset: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize }}. {{ labels['in'] | capitalize }}:_{{series}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join '. ' }}. {{ other_identifier | join '. ' }}.  ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ size }}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+  webresource: website
+  unpublished: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ medium | capitalize }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  presentation: unpublished
+  thesis: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ medium | capitalize }}. {{place}}: {{ publisher }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  misc:  "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ date }}."
+  # following are # unsupported types:
+  map: misc
+  audiovisual: misc
+  film: misc
+  video: misc
+  broadcast: misc
+  graphic_work: misc
+  music: misc
+  performance: misc
+  patent: misc
+  archival: misc
+  social_media: misc
+  alert: misc
+  message: misc
+  conversation: misc
+  internal: misc
+

data/metanorma-iso.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid-iso"
   spec.add_dependency "ruby-jing"

data/spec/isodoc/i18n_spec.rb

@@ -1332,7 +1332,7 @@ RSpec.describe IsoDoc do
           <clause id="D" obligation="normative" type="scope" displayorder='3'>
             <title depth="1">1<tab/>Scope</title>
             <p id="E">
-              <eref bibitemid="ISO712" type="inline"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality>ISO 712, <span class='citetbl'>第1–1表</span></eref>
+              <eref bibitemid="ISO712" type="inline"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality>ISO 712， <span class='citetbl'>第1–1表</span></eref>
             </p>
           </clause>
           <clause id="H" obligation="normative" displayorder='5'>
@@ -1423,7 +1423,7 @@ RSpec.describe IsoDoc do
              <div id='D'>
                <h1>1　Scope</h1>
                <p id='E'>
-                 <a href='#ISO712'>ISO 712, 第1–1表</a>
+                 <a href='#ISO712'>ISO 712， 第1–1表</a>
                </p>
              </div>
              <div>

data/spec/isodoc/ref_spec.rb

@@ -209,12 +209,12 @@ RSpec.describe IsoDoc do
           <references id="_bibliography" normative="false" obligation="informative" displayorder="3">
             <title depth="1">Bibliography</title>
             <bibitem id="ISBN" type="book">
-              <formattedref><em>Chemicals for analytical laboratory use</em>. n.p.: n.d. ISBN.</formattedref>
+              <formattedref><em>Chemicals for analytical laboratory use</em>. n.p.: n.d. </formattedref>
               <docidentifier type="metanorma-ordinal">[1]</docidentifier>
               <docidentifier type="ISBN">ISBN</docidentifier>
             </bibitem>
             <bibitem id="ISSN" type="journal">
-              <formattedref><em>Instruments for analytical laboratory use</em>. n.d. ISSN.</formattedref>
+              <formattedref><em>Instruments for analytical laboratory use</em>. n.d.</formattedref>
               <docidentifier type="metanorma-ordinal">[2]</docidentifier>
               <docidentifier type="ISSN">ISSN</docidentifier>
             </bibitem>
@@ -326,12 +326,12 @@ RSpec.describe IsoDoc do
                <p id='ISBN' class='Biblio'>
                  [1]  
                  <i>Chemicals for analytical laboratory use</i>
-                 . n.p.: n.d. ISBN.
+                 . n.p.: n.d. 
                </p>
                <p id='ISSN' class='Biblio'>
                  [2]  
                  <i>Instruments for analytical laboratory use</i>
-                 . n.d. ISSN.
+                 . n.d. 
                </p>
                <div class='Note'>
                  <p>