metanorma-iso 2.3.0 → 2.3.2

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -62,7 +62,7 @@ module IsoDoc
       def example_span_label(_node, div, name)
         return if name.nil?
 
-        div.span **{ class: "example_label" } do |_p|
+        div.span class: "example_label" do |_p|
           name.children.each { |n| parse(n, div) }
         end
       end

data/lib/isodoc/iso/word_cleanup.rb

@@ -61,6 +61,10 @@ module IsoDoc
         end
       end
 
+      def sourcecode_style
+        "Code"
+      end
+
       STYLESMAP = {
         example: "Example",
         note: "Note",

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -35,10 +35,15 @@ module IsoDoc
         docxml.xpath("//p[not(@class)]").each { |p| p["class"] = "MsoBodyText" }
       end
 
+      def sourcecode_style
+        "Code"
+      end
+
       def dis_styles1(docxml)
         amd_style(docxml)
         code_style(docxml)
         figure_style(docxml)
+        formula_style(docxml)
         note_style(docxml)
         example_style(docxml)
         dis_style_interactions(docxml)
@@ -158,6 +163,14 @@ module IsoDoc
         end
       end
 
+      def formula_style(docxml)
+        docxml.xpath("//div[@class = 'Formula']").each do |f|
+          f.xpath(".//p[not(@class)]").each do |p|
+            p["class"] = "Formula"
+          end
+        end
+      end
+
       def code_style(doc)
         span_style((doc.xpath("//tt//b") - doc.xpath("//tt//i//b")),
                    "ISOCodebold")
@@ -206,7 +219,7 @@ module IsoDoc
           p["class"] = "zzCopyright"
           p["style"] = "text-indent:20.15pt;"
           p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
-                                             "style='text-indent:20.15pt;'>"))
+                                              "style='text-indent:20.15pt;'>"))
         end
         docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
           # p["class"] = "zzCopyright"

data/lib/isodoc/iso/word_dis_convert.rb

@@ -63,13 +63,7 @@ module IsoDoc
         TOC
       end
 
-      def render_identifier(ident)
-        ret = super
-        ret[:sdo] = std_docid_semantic(ret[:sdo])
-        ret
-      end
-
-      def make_tr_attr(cell, row, totalrows, header)
+      def make_tr_attr(cell, row, totalrows, header, bordered)
         super.merge(header: header)
       end
 

data/lib/isodoc/iso/xref.rb

@@ -188,6 +188,7 @@ module IsoDoc
         x = @anchors_previous[id][:xref_bare] || @anchors_previous[id][:xref]
         @anchors[id][:xref] = l10n("#{table_label}, #{x}")
         @anchors[id][:modspec] = @anchors_previous[id][:modspec]
+        @anchors[id][:subtype] = "modspec" # prevents citetbl style from beign applied
         true
       end
 

data/lib/isodoc/iso/xref_section.rb

@@ -3,10 +3,9 @@ module IsoDoc
     class Xref < IsoDoc::Xref
       # we can reference 0-number clauses in introduction
       def introduction_names(clause)
-        return if clause.nil?
-
+        clause.nil? and return
         clause.at(ns("./clause")) and
-          @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
+          @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
         i = Counter.new
         clause.xpath(ns("./clause")).each do |c|
@@ -43,7 +42,7 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: num, level: level, xref: num, subtype: "clause" }
         i = Counter.new
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | " \
                         "./references"))
           .each do |c|
           i.increment(c)

data/lib/metanorma/iso/isodoc.rng

@@ -571,6 +571,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1238,6 +1243,11 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="bold">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="ital">
           <data type="boolean"/>
@@ -2653,7 +2663,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
-      <value>modspec</value>
+      <text/>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.3.0".freeze
+    VERSION = "2.3.2".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -18,11 +18,12 @@ seriestemplate: "{% if series_formatted %}{{ series_formatted }}{%else%}{% if se
 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 }}." 
+  standard: "{% if home_standard %}<em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }}{% else %}<smallcap>{{ creatornames }}</smallcap>. <em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }} .  {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{labels['updated'] | capitalize }}_{{date_updated}}. {{status | capitalize}}. {{ authorizer }}. {{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>.{% endif %}" 
   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
+  techreport: 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

data/lib/relaton/render/general.rb

@@ -1,4 +1,5 @@
 require "relaton-render"
+require_relative "parse"
 
 module Relaton
   module Render
@@ -7,6 +8,11 @@ module Relaton
         def config_loc
           YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
         end
+
+        def klass_initialize(_options)
+          super
+          @parseklass = Relaton::Render::ISO::Parse
+        end
       end
     end
   end

data/lib/relaton/render/parse.rb

@@ -0,0 +1,20 @@
+module Relaton
+  module Render
+    module ISO
+      class Parse < ::Relaton::Render::Parse
+        def simple_or_host_xml2hash(doc, host)
+          ret = super
+          ret.merge(home_standard: home_standard(doc, ret[:publisher_raw]))
+        end
+
+        def home_standard(_doc, pubs)
+          pubs&.any? do |r|
+            ["International Organization for Standardization", "ISO",
+             "International Electrotechnical Commission", "IEC"]
+              .include?(r[:nonpersonal])
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -395,6 +395,7 @@ files:
 - lib/metanorma/requirements/requirements.rb
 - lib/relaton/render/config.yml
 - lib/relaton/render/general.rb
+- lib/relaton/render/parse.rb
 - metanorma-iso.gemspec
 homepage: https://github.com/metanorma/metanorma-iso
 licenses: