metanorma-jis 0.6.6 → 1.0.0

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -47,13 +47,17 @@ module IsoDoc
         node.children.to_xml.gsub(%r{</?p( [^>]*)?>}, "")
       end
 
+      def contains_para?(text)
+        /\([^()]+\)|（[^（）].+）/.match?(text)
+      end
+
       def source1_label(elem, sources, ancestor)
         elem.children = if ancestor == :table
-                          l10n("#{@i18n.source}: #{sources}")
-                        elsif /\(.+\)/.match?(sources)
-                          l10n("[#{@i18n.source}: #{sources}]")
+                          l10n("#{@i18n.source}: #{esc sources}")
+                        elsif contains_para?(sources)
+                          l10n("[#{@i18n.source}: #{esc sources}]")
                         else
-                          l10n("(#{@i18n.source}: #{sources})")
+                          l10n("(#{@i18n.source}: #{esc sources})")
                         end
       end
 
@@ -87,7 +91,7 @@ module IsoDoc
 
       def convert1(xml, filename, dir)
         j = xml.at(ns("//metanorma-extension/presentation-metadata/" \
-                     "autonumbering-style"))&.text
+                      "autonumbering-style"))&.text
         j ||= "arabic"
         @autonumbering_style = j.to_sym
         @xrefs.autonumbering_style = j.to_sym
@@ -150,14 +154,10 @@ module IsoDoc
       end
 
       # if termsource xref has no SDO identifier, cite instead by full reference
-      def citeas(xmldoc)
+      def anchor_linkend(node, linkend)
+        node.name == "fmt-origin" && fmt_origin_cite_full?(node) and
+          node["style"] ||= "short"
         super
-        xmldoc.xpath(ns("//fmt-origin")).each do |e|
-          fmt_origin_cite_full?(e) or next
-          bibitem = @bibitem_lookup[e["bibitemid"]]
-          cit = bibitem.at(ns("./formattedref")) or next
-          e["citeas"] = citeas_cleanup(to_xml(cit.children).strip)
-        end
       end
 
       def fmt_origin_cite_full?(elem)
@@ -177,8 +177,59 @@ module IsoDoc
         @lang == "ja" ? "、" : "; "
       end
 
+      def termsource_mod_text_delim(_elem)
+        @lang == "ja" ? "，" : ", "
+      end
+
+      def termsource_modification(elem)
+        elem.xpath(".//text()[normalize-space() = '']").each(&:remove)
+        origin = elem.at(ns("./origin"))
+        mod = elem.at(ns("./modification"))
+        s = termsource_status(elem["status"])
+        mod && elem["status"] == "modified" and s = @i18n.modified_detail
+        s and origin.next = l10n(", #{s}", @lang, @script,
+                                 { prev: origin.text })
+        mod or return
+        termsource_add_modification_text(mod)
+      end
+
+      def termsource_label(elem, sources)
+        if contains_para?(sources)
+          elem.replace(l10n("[#{@i18n.source}: #{esc sources}]"))
+        else
+          elem.replace(l10n("(#{@i18n.source}: #{esc sources})"))
+        end
+      end
+
       def bracketed_refs_processing(docxml); end
 
+      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, bib)
+        delim = bib.at(ns("./language"))&.text == "ja" ? "&#x3000;" : "<esc>,</esc> "
+        ret = (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
+        ret = esc(ret)
+        (idents[:ordinal] || idents[:metanorma]) && idents[:sdo] and
+          ret += "#{delim}<strong>#{esc idents[:sdo]}</strong>"
+        !idents[:ordinal] && !idents[:metanorma] && idents[:sdo] and
+          ret = "<strong>#{ret}</ret>"
+        ret += datefn
+        ret.empty? and return ret
+        idents[:sdo] and ret += delim
+        ret.sub(delim, "").strip.empty? and return ""
+        ret
+      end
+
+      def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, bib)
+        delim = bib.at(ns("./language"))&.text == "ja" ? "&#x3000;" : "<esc>,</esc> "
+        ret = esc(ids[:ordinal]) || esc(ids[:metanorma]) || "[#{esc ordinal.to_s}]"
+        if ids[:sdo] && !ids[:sdo].empty?
+          ret = prefix_bracketed_ref(ret)
+          ret += "#{esc ids[:sdo]}#{datefn}#{delim}"
+        else
+          ret = prefix_bracketed_ref("#{ret}#{datefn}")
+        end
+        ret
+      end
+
       include Init
     end
   end

data/lib/isodoc/jis/xref.rb

@@ -69,8 +69,9 @@ module IsoDoc
         ) 
         if elem["unnumbered"] != "true"
           x = semx(elem, sublabel)
+          p = elem.at("./ancestor::xmlns:figure")
           @anchors[elem["id"]][:label] = x
-          @anchors[elem["id"]][:xref] = @anchors[elem.parent["id"]][:xref] + 
+          @anchors[elem["id"]][:xref] = @anchors[p["id"]][:xref] + 
             subfigure_separator(markup: true) + x + delim_wrap(subfigure_delim)
         end
       end 
@@ -171,12 +172,23 @@ module IsoDoc
           label = counter.increment(entry).listlabel(entry.parent, depth)
           s = semx(entry, label)
           base = @c.decode(opts[:prev_label].gsub(%r{<[^>]+>}, "")).split(/\)\s*/) # List a) 1.1.1
-          label = "#{base[-1].sub(/^の/,'')}#{clausesep}#{label}"
+          label = "#{base[-1].sub(/^の/,'')}<esc>#{clausesep}</esc>#{label}"
           [label, opts[:prev_label] + delim_wrap(clausesep) + s]
         else
           super
         end
       end
+
+      def hierarchical_figure_names(clause, num)
+        #require "debug"; binding.b
+        super
+      end
+
+      def localise_anchors(type = nil)
+        #require "debug"; binding.b
+        super
+      end
+
     end
   end
 end

data/lib/metanorma/jis/biblio.rng

@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibItemType" combine="choice">
+  <define name="BibItemType">
     <a:documentation>Type of bibliographic item.
 The value list complies with the types provided in ISO 690:2021.
 NOTE: These values represent a strict superset to BibTeX

data/lib/metanorma/jis/cleanup.rb

@@ -8,7 +8,6 @@ module Metanorma
           pref = if ref_empty?(ref) then @i18n.norm_empty_pref
                  else @i18n.get[ref_dated(ref)]
                  end
-          #ref.at("./title").next = "<p>#{pref}</p>"
           ref.at("./title").next = boilerplate_snippet_convert(pref, isodoc)
         end
       end

data/lib/metanorma/jis/converter.rb

@@ -91,3 +91,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "log"

data/lib/metanorma/jis/isodoc.rng

@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video"/>
         <ref name="audio"/>
-        <ref name="pre"/>
+        <ref name="pre">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
+          <ref name="paragraph-with-footnote">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure"/>
+          <ref name="figure">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image-no-id"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image-no-id">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video-no-id"/>
         <ref name="audio-no-id"/>
-        <ref name="pre-no-id"/>
+        <ref name="pre-no-id">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote-no-id"/>
+          <ref name="paragraph-with-footnote-no-id">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure-no-id"/>
+          <ref name="figure-no-id">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table-no-id">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
+      <ref name="LocalizedStringAttributes">
+        <a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
+      </ref>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>

data/lib/metanorma/jis/log.rb

@@ -0,0 +1,20 @@
+module Metanorma
+  module Jis
+    class Converter
+      JIS_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "JIS_1": { category: "Document Attributes",
+                   error: "%s is not a recognised document type",
+                   severity: 2 },
+        "JIS_2": { category: "Document Attributes",
+                   error: "%s is not a recognised script",
+                   severity: 2 },
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(JIS_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/jis/validate.rb

@@ -4,15 +4,13 @@ module Metanorma
       def doctype_validate(_xmldoc)
         %w(japanese-industrial-standard technical-report
            technical-specification amendment).include? @doctype or
-          @log.add("Document Attributes", nil,
-                   "#{@doctype} is not a recognised document type")
+          @log.add("JIS_1", nil, params: [@doctype])
       end
 
       def script_validate(xmldoc)
         script = xmldoc&.at("//bibdata/script")&.text
         %w(Jpan Latn).include?(script) or
-          @log.add("Document Attributes", nil,
-                   "#{script} is not a recognised script")
+          @log.add("JIS_2", nil, params: [script])
       end
 
       def schema_file

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.6.6".freeze
+    VERSION = "1.0.0".freeze
   end
 end
 

data/lib/relaton/render-jis/config.yml

@@ -16,28 +16,75 @@ nametemplate:
 # 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: "{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %} ({{series_run}}) {{ labels['volume'] }}_{{series_num}} {{ labels['part'] }}_{{series_partnumber}}"
+
+citetemplate:
+  author_date: "{{ author }} {{ date}}"
+  author_date_br: "{{ author }} ({{ date}})"
+  author: "{{ author }}"
+  date: "{{ date }}"
+  reference_tag: "{{ biblio_tag }}"
+  title: "{{labels['punct']['open-title']}}|{{ title }}|{{labels['punct']['close-title']}}"
+  title_reference_tag: "{{labels['punct']['open-title']}}|{{ title }}|{{labels['punct']['close-title']}} {{ biblio_tag }}"
+  short:
+    standard: "{% if home_standard %}<span_class='stddocTitle'>{{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}}</span> ,_{{ extent }}{% else %}{{ creatornames }}$$$ <span_class='stddocTitle'>{{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}}</span> ,_{{ extent }} $$$  {{ version }}$$$ {{labels['updated'] | capitalize }}_{{date_updated}}$$$ {{status | capitalize}}$$$ {{ authorizer }}$$${% endif %}"
+    website: "{{ creatornames }} ({{ role }}) $$$ <span_class='stddocTitle'>{{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}}</span> [{{ labels['website'] }}]$$$ {{ version }}$$$ {{place}}: {{ publisher }}$$$ {{date}}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}$$$ $$$_{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>"
+    book: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ edition | capitalize_first }}$$$ ({{ series }})$$$ {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}"
+    booklet: book
+    manual: book
+    techreport: book
+    proceedings: book
+    inbook: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-secondarytitle']}}{{ title }}{{labels['punct']['close-secondary-title']}} $$$ {{labels['punct']['open-title']}}{{host_title}}{{labels['punct']['close-title']}} ({{host_role}} {{ host_creatornames}})$$$ {{ edition | capitalize_first }}$$$ ({{ series }})$$$ {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}"
+    inproceedings: inbook
+    incollection: inbook
+    journal: "{{labels['punct']['open-title']}}{{ title}}{{labels['punct']['close-title']}} $$$ {{ edition | capitalize_first }}$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}"
+    article: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-secondary-title']}}{{ title }}{{labels['punct']['close-secondary-title']}}$$$ {{labels['punct']['open-title']}}{{ series }}{{labels['punct']['close-title']}} $$$ {{date}}, {{ extent }}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}"
+    software: "{{ creatornames }} ({{ role}}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ version }}$$$ {{medium | capitalize}}$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}"
+    electronic resource:  software
+    dataset: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ version }}$$$ {{medium | capitalize }}$$$ {{ labels['in'] | capitalize }}:_{{series}}$$$ {{date}}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}$$$ {{ authoritative_identifier | join '$$$' }}$$$ {{ other_identifier | join '$$$' }}$$$  {{ size }}$$$ {{ extent}}$$$ [{{ labels['viewed'] }}:_{{date_accessed}}]"
+    webresource: website
+    unpublished: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ medium | capitalize }}$$$ {{ date }}$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}"
+    presentation: unpublished
+    thesis: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ medium | capitalize }}$$$ {{place}}: {{ publisher }}$$$ {{ date }}"
+    misc:  "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ 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
+
 template:
   # skip standardidentifier, it is inserted in front of formattedref within metanorma
-  standard: "{% if home_standard %}<span_class='stddocTitle'>{{ title }}</span> ,_{{ extent }}{% else %}{{ creatornames }}. <span_class='stddocTitle'>{{ title }}</span> ,_{{ extent }} .  {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{labels['updated'] | capitalize }}_{{date_updated}}. {{status | capitalize}}. {{ authorizer }}. {{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>.{% endif %}"
-  website: "{{ creatornames }} ({{ role }}) . <span_class='stddocTitle'>{{ title }}</span> [{{ labels['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: "{{ creatornames }} ({{role}}) . {{ title }} . {{ 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}}]."
+  standard: "{% if home_standard %}<span_class='stddocTitle'>{{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}}</span> ,_{{ extent }}{% else %}{{ creatornames }}$$$ <span_class='stddocTitle'>{{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}}</span> ,_{{ extent }} $$$  {{ version }}$$$ {{labels['updated'] | capitalize }}_{{date_updated}}$$$ {{status | capitalize}}$$$ {{ authorizer }}$$$ {{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>{% endif %}"
+  website: "{{ creatornames }} ({{ role }}) $$$ <span_class='stddocTitle'>{{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}}</span> [{{ labels['website'] }}]$$$ {{ version }}$$$ {{place}}: {{ publisher }}$$$ {{date}}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}$$$ $$$_{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>$$$ [{{ labels['viewed'] }}:_{{date_accessed}}]"
+  book: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ 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
   techreport: book
   proceedings: book
-  inbook: "{{ creatornames }} ({{role}}) . {{ title }} . {{host_title}} ({{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}}]."
+  inbook: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-secondary-title']}}{{ title }}{{labels['punct']['close-secondary-title']}} $$$ {{host_title}} ({{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: "{{ title}} . {{ 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: "{{ creatornames }} ({{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: "{{ creatornames }} ({{ role}}) . {{ title }} . {{ 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}}]. "
+  journal: "{{labels['punct']['open-title']}}{{ title}}{{labels['punct']['close-title']}} $$$ {{ 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: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-secondary-title']}}{{ title }}{{labels['punct']['close-secondary-title']}}$$$ {{labels['punct']['open-title']}}{{ series }}{{labels['punct']['close-title']}} $$$ {{date}}, {{ extent }}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}$$$ $$$_{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}$$$ [{{ labels['viewed'] }}:_{{date_accessed}}]"
+  software: "{{ creatornames }} ({{ role}}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ version }}$$$ {{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: "{{ creatornames }} ({{ role }}) . {{ title }} . {{ 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}}]. "
+  dataset: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ version }}$$$ {{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: "{{ creatornames }} ({{ role }}) . {{ title }} . {{ medium | capitalize }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  unpublished: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ medium | capitalize }}$$$ {{ date }}$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}$$$ $$$_{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>$$$ [{{ labels['viewed'] }}:_{{date_accessed}}]"
   presentation: unpublished
-  thesis: "{{ creatornames }} ({{ role }}) . {{ title }} . {{ medium | capitalize }}. {{place}}: {{ publisher }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]."
-  misc:  "{{ creatornames }} ({{ role }}) . {{ title }} . {{ date }}."
+  thesis: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ medium | capitalize }}$$$ {{place}}: {{ publisher }}$$$ {{ date }}$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}$$$ $$$_{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>$$$ [{{ labels['viewed'] }}:_{{date_accessed}}]"
+  misc:  "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ date }}"
   # following are # unsupported types:
   map: misc
   audiovisual: misc

data/lib/relaton/render-jis/fields.rb

@@ -0,0 +1,19 @@
+require "metanorma-iso"
+
+module Relaton
+  module Render
+    module Jis
+      class Fields < ::Relaton::Render::Fields
+        def edition_fields_format(hash)
+          super
+          hash[:version] = versionformat(hash[:edition_raw], hash)
+        end
+
+        def versionformat(edn, context)
+          edn && !edn.empty? or return
+          @r.i18n.select(context).populate("version_cardinal", { "var1" => edn })
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render-jis/general.rb

@@ -2,6 +2,7 @@ require "relaton-render"
 require "metanorma-iso"
 require "isodoc"
 require_relative "parse"
+require_relative "fields"
 
 module Relaton
   module Render
@@ -14,13 +15,7 @@ module Relaton
         def klass_initialize(_options)
           super
           @parseklass = Relaton::Render::Jis::Parse
-        end
-
-        def render1(doc)
-          r = doc.relation.select { |x| x.type == "hasRepresentation" }
-            .map { |x| @i18n.also_pub_as + render_single_bibitem(x.bibitem) }
-          out = [render_single_bibitem(doc)] + r
-          @i18n.l10n(out.join(". ").gsub(/[.。]\. /, ". ").sub(/[.。]\s*$/, ""))
+          @fieldsklass = Relaton::Render::Jis::Fields
         end
 
         def render_all(bib, type: "author-date")

data/metanorma-jis.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "japanese_calendar", "~> 0"
-  spec.add_dependency "metanorma-iso", "~> 3.1.0"
+  spec.add_dependency "metanorma-iso", "~> 3.2.0"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"
@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "iev", "~> 0.3.0"
+  spec.add_development_dependency "openssl"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"
@@ -47,5 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "canon"
+  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -238,16 +252,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 description: |
   metanorma-jis lets you write JIS standards in AsciiDoc syntax.
 
@@ -311,12 +325,14 @@ files:
 - lib/metanorma/jis/isodoc.rng
 - lib/metanorma/jis/isostandard.rng
 - lib/metanorma/jis/jis.rng
+- lib/metanorma/jis/log.rb
 - lib/metanorma/jis/processor.rb
 - lib/metanorma/jis/relaton-jis.rng
 - lib/metanorma/jis/reqt.rng
 - lib/metanorma/jis/validate.rb
 - lib/metanorma/jis/version.rb
 - lib/relaton/render-jis/config.yml
+- lib/relaton/render-jis/fields.rb
 - lib/relaton/render-jis/general.rb
 - lib/relaton/render-jis/parse.rb
 - metanorma-jis.gemspec