metanorma-iso 2.1.9 → 2.2.1

data/lib/isodoc/iso/xref.rb

@@ -1,3 +1,5 @@
+require_relative "xref_section"
+
 module IsoDoc
   module Iso
     class Counter < IsoDoc::XrefGen::Counter
@@ -17,21 +19,20 @@ module IsoDoc
 
       def initial_anchor_names_amd(doc)
         if @parse_settings.empty? || @parse_settings[:clauses]
-          doc.xpath(ns("//preface/*")).each do |c|
-            c.element? and preface_names(c)
+          ["//preface/*", "//sections/clause"].each do |xpath|
+            doc.xpath(ns(xpath)).each do |c|
+              c.element? and preface_names(c)
+            end
           end
-          doc.xpath(ns("//sections/clause")).each do |c|
-            c.element? and preface_names(c)
-          end
-        end
-        if @parse_settings.empty?
-          sequential_asset_names(doc.xpath(ns("//preface/*")))
-          middle_section_asset_names(doc)
-          termnote_anchor_names(doc)
-          termexample_anchor_names(doc)
         end
       end
 
+      def asset_anchor_names(doc)
+        super
+        @parse_settings.empty? or return
+        sequential_asset_names(doc.xpath(ns("//preface/*")))
+      end
+
       def initial_anchor_names1(doc)
         if @parse_settings.empty? || @parse_settings[:clauses]
           doc.xpath(ns("//preface/*")).each do |c|
@@ -47,81 +48,6 @@ module IsoDoc
             n = section_names(c, n, 1)
           end
         end
-        if @parse_settings.empty?
-          middle_section_asset_names(doc)
-          termnote_anchor_names(doc)
-          termexample_anchor_names(doc)
-        end
-      end
-
-      # we can reference 0-number clauses in introduction
-      def introduction_names(clause)
-        return if clause.nil?
-
-        clause.at(ns("./clause")) and
-          @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
-                                     xref: clause.at(ns("./title"))&.text }
-        i = Counter.new
-        clause.xpath(ns("./clause")).each do |c|
-          i.increment(c)
-          section_names1(c, "0.#{i.print}", 2)
-        end
-      end
-
-      def annex_names(clause, num)
-        appendix_names(clause, num)
-        super
-      end
-
-      def appendix_names(clause, _num)
-        i = Counter.new
-        clause.xpath(ns("./appendix")).each do |c|
-          i.increment(c)
-          @anchors[c["id"]] =
-            anchor_struct(i.print, nil, @labels["appendix"],
-                          "clause").merge(level: 2, subtype: "annex",
-                                          container: clause["id"])
-          j = Counter.new
-          c.xpath(ns("./clause | ./references")).each do |c1|
-            j.increment(c1)
-            lbl = "#{@labels['appendix']} #{i.print}.#{j.print}"
-            appendix_names1(c1, l10n(lbl), 3, clause["id"])
-          end
-        end
-      end
-
-      # subclauses are not prefixed with "Clause"
-      # retaining subtype for the semantics
-      def section_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, level: level, xref: num, subtype: "clause" }
-        i = Counter.new
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
-                        "./references"))
-          .each do |c|
-          i.increment(c)
-          section_names1(c, "#{num}.#{i.print}", level + 1)
-        end
-      end
-
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level,
-                                   subtype: "annex" }
-        i = Counter.new
-        clause.xpath(ns("./clause | ./references")).each do |c|
-          i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", level + 1)
-        end
-      end
-
-      def appendix_names1(clause, num, level, container)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level,
-                                   container: container }
-        i = Counter.new
-        clause.xpath(ns("./clause | ./references")).each do |c|
-          i.increment(c)
-          appendix_names1(c, "#{num}.#{i.print}", level + 1, container)
-        end
       end
 
       def hierarchical_formula_names(clause, num)
@@ -137,10 +63,10 @@ module IsoDoc
         end
       end
 
-      def figure_anchor(elem, sublabel, label)
+      def figure_anchor(elem, sublabel, label, klass)
         @anchors[elem["id"]] = anchor_struct(
           (sublabel ? "#{label} #{sublabel}" : label),
-          nil, @labels["figure"], "figure", elem["unnumbered"]
+          nil, @labels[klass] || klass.capitalize, klass, elem["unnumbered"]
         )
         sublabel && elem["unnumbered"] != "true" and
           @anchors[elem["id"]][:label] = sublabel
@@ -148,27 +74,49 @@ module IsoDoc
 
       def sequential_figure_names(clause)
         j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
+        clause.xpath(ns(FIGURE_NO_CLASS)).noblank
           .each_with_object(IsoDoc::XrefGen::Counter.new) do |t, c|
           j = subfigure_increment(j, c, t)
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          next if blank?(t["id"])
+          figure_anchor(t, sublabel, c.print, "figure")
+        end
+        sequential_figure_class_names(clause)
+      end
 
-          figure_anchor(t, sublabel, c.print)
+      def sequential_figure_class_names(clause)
+        c = {}
+        j = 0
+        clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
+          .each do |t|
+          c[t["class"]] ||= IsoDoc::XrefGen::Counter.new
+          j = subfigure_increment(j, c[t["class"]], t)
+          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
+          figure_anchor(t, sublabel, c.print, t["class"])
         end
       end
 
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
-          .each do |t|
+        clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
           label = "#{num}#{hiersep}#{c.print}"
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          next if blank?(t["id"])
+          figure_anchor(t, sublabel, label, "figure")
+        end
+        hierarchical_figure_class_names(clause, num)
+      end
 
-          figure_anchor(t, sublabel, label)
+      def hierarchical_figure_class_names(clause, num)
+        c = {}
+        j = 0
+        clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
+          .noblank.each do |t|
+          c[t["class"]] ||= IsoDoc::XrefGen::Counter.new
+          j = subfigure_increment(j, c[t["class"]], t)
+          label = "#{num}#{hiersep}#{c.print}"
+          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
+          figure_anchor(t, sublabel, label, t["class"])
         end
       end
 
@@ -185,10 +133,6 @@ module IsoDoc
         end
       end
 
-      def annex_name_lbl(clause, num)
-        super.sub(%r{<br/>(.*)$}, "<br/><span class='obligation'>\\1</span>")
-      end
-
       def list_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -

data/lib/isodoc/iso/xref_section.rb

@@ -0,0 +1,79 @@
+module IsoDoc
+  module Iso
+    class Xref < IsoDoc::Xref
+      # we can reference 0-number clauses in introduction
+      def introduction_names(clause)
+        return if clause.nil?
+
+        clause.at(ns("./clause")) and
+          @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
+                                     xref: clause.at(ns("./title"))&.text }
+        i = Counter.new
+        clause.xpath(ns("./clause")).each do |c|
+          i.increment(c)
+          section_names1(c, "0.#{i.print}", 2)
+        end
+      end
+
+      def annex_names(clause, num)
+        appendix_names(clause, num)
+        super
+      end
+
+      def appendix_names(clause, _num)
+        i = Counter.new
+        clause.xpath(ns("./appendix")).each do |c|
+          i.increment(c)
+          @anchors[c["id"]] =
+            anchor_struct(i.print, nil, @labels["appendix"],
+                          "clause").merge(level: 2, subtype: "annex",
+                                          container: clause["id"])
+          j = Counter.new
+          c.xpath(ns("./clause | ./references")).each do |c1|
+            j.increment(c1)
+            lbl = "#{@labels['appendix']} #{i.print}.#{j.print}"
+            appendix_names1(c1, l10n(lbl), 3, clause["id"])
+          end
+        end
+      end
+
+      # subclauses are not prefixed with "Clause"
+      # retaining subtype for the semantics
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref: num, subtype: "clause" }
+        i = Counter.new
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+                        "./references"))
+          .each do |c|
+          i.increment(c)
+          section_names1(c, "#{num}.#{i.print}", level + 1)
+        end
+      end
+
+      def annex_names1(clause, num, level)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level,
+                                   subtype: "annex" }
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          i.increment(c)
+          annex_names1(c, "#{num}.#{i.print}", level + 1)
+        end
+      end
+
+      def appendix_names1(clause, num, level, container)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level,
+                                   container: container }
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          i.increment(c)
+          appendix_names1(c, "#{num}.#{i.print}", level + 1, container)
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        super.sub(%r{<br/>(.*)$}, "<br/><span class='obligation'>\\1</span>")
+      end
+    end
+  end
+end

data/lib/metanorma/iso/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -650,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -741,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/iso/front_id.rb

@@ -215,11 +215,11 @@ pub =  (node.attr("publisher") || "ISO").split(/[;,]/)
 
       def id_stage_abbr1(stage, substage, node, bare)
         if bare
-          IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
+          IsoDoc::Iso::Metadata.new("en", "Latn", nil, @i18n)
             .status_abbrev(stage_abbr(stage, substage, doctype(node)),
                            substage, nil, nil, doctype(node))
         else
-          IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
+          IsoDoc::Iso::Metadata.new("en", "Latn", nil, @i18n)
             .status_abbrev(stage_abbr(stage, substage, doctype(node)),
                            substage, node.attr("iteration"),
                            node.attr("draft"), doctype(node))

data/lib/metanorma/iso/isodoc.rng

@@ -205,6 +205,15 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style">
+            <choice>
+              <value>basic</value>
+              <value>full</value>
+              <value>short</value>
+            </choice>
+          </attribute>
+        </optional>
         <ref name="XrefBody"/>
       </element>
     </define>

data/lib/metanorma/iso/isostandard.rng

@@ -508,6 +508,9 @@
   </define>
   <define name="stagename">
     <element name="stagename">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/iso/validate.rb

@@ -27,7 +27,7 @@ module Metanorma
         end
       end
 
-      # ISO/IEC DIR 2, 15.5.3
+      # ISO/IEC DIR 2, 15.5.3, 20.2
       # does not deal with preceding text marked up
       def see_xrefs_validate(root)
         root.xpath("//xref").each do |t|

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.9".freeze
+    VERSION = "2.2.1".freeze
   end
 end

data/lib/metanorma/iso.rb

@@ -2,6 +2,5 @@ require_relative "./iso/processor"
 
 module Metanorma
   module Iso
-
   end
 end

data/lib/metanorma/requirements/modspec.rb

@@ -3,16 +3,24 @@ 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 # &&
+          return lbl unless title &&
+            elem.ancestors("requirement, recommendation, permission").empty?
 
-          #  elem.ancestors("requirement, recommendation, permission").empty?
-
-          lbl += l10n(": ") if lbl
+          lbl += ": " if lbl
           lbl += title.children.to_xml
-          lbl
+          l10n(lbl)
         end
 
         # ISO labels modspec reqt as table, with reqt label as title
@@ -30,7 +38,8 @@ module Metanorma
         def requirement_component_parse(node, out)
           if node["exclude"] != "true" && node.name == "description"
             lbl = "statement"
-            lbl = "declaration" if recommend_class(node) == "recommendclass"
+            recommend_class(node.parent) == "recommendclass" and
+              lbl = "description"
             out << "<tr><td>#{@labels['modspec'][lbl]}</td>"\
                    "<td>#{node.children.to_xml}</td></tr>"
           else
@@ -38,11 +47,13 @@ module Metanorma
           end
         end
 
-        def requirement_table_cleanup(table)
+        def requirement_table_cleanup(node, table)
           return table unless table["type"] == "recommendclass"
 
+          label = if node["type"] == "conformanceclass" then "conformancetests"
+                  else "provisions" end
           ins = table.at(ns("./tbody/tr[td/table]")) or return table
-          ins.replace("<tr><td>#{@labels['modspec']['provisions']}</td>" +
+          ins.replace("<tr><td>#{@labels['modspec'][label]}</td>" +
                       "<td>#{nested_tables_names(table)}</td></tr>")
           table.xpath(ns("./tbody/tr[td/table]")).each(&:remove)
           table
@@ -54,6 +65,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("#{anchor[:xref_reqt2reqt]}: #{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>