metanorma-itu 2.2.1 → 2.2.3

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -123,8 +123,8 @@ module IsoDoc
         f = renderings[xml["id"]][:formattedref]
         f &&= "<formattedref>#{f}</formattedref>"
         # retain date in order to generate reference tag
-        xml.children =
-          "#{f}#{xml.xpath(ns('./docidentifier | ./uri | ./note | ./date')).to_xml}"
+        keep = "./docidentifier | ./uri | ./note | ./date | ./biblio-tag"
+        xml.children = "#{f}#{xml.xpath(ns(keep)).to_xml}"
       end
 
       def twitter_cldr_localiser_symbols
@@ -179,6 +179,22 @@ module IsoDoc
         super
       end
 
+      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn)
+        ret = (idents[:metanorma] || idents[:sdo] || idents[:ordinal]).to_s
+        !idents[:metanorma] && idents[:sdo] and ret = "[#{ret}]"
+        ret += datefn
+        ret.empty? and return ret
+        ret.gsub(/-/, "&#x2011;").gsub(/ /, "&#xa0;")
+      end
+
+      def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn)
+        ret = (idents[:metanorma] || idents[:sdo] || idents[:ordinal]).to_s
+        !idents[:metanorma] && idents[:sdo] and ret = "[#{ret}]"
+        ret += datefn
+        ret.empty? and return ret
+        ret.gsub(/-/, "&#x2011;").gsub(/ /, "&#xa0;")
+      end
+
       include Init
     end
   end

data/lib/isodoc/itu/ref.rb

@@ -7,24 +7,14 @@ module IsoDoc
     module BaseConvert
       def nonstd_bibitem(list, bibitem, _ordinal, biblio)
         list.tr **attr_code(iso_bibitem_entry_attrs(bibitem, biblio)) do |ref|
-          id = render_identifier(bibitem_ref_code(bibitem))
           ref.td **{ style: "vertical-align:top" } do |td|
-            td << pick_ident(id)
-              &.gsub(/-/, "&#x2011;")&.gsub(/ /, "&#xa0;")
-            date_note_process(bibitem, td)
+            tag = bibitem.at(ns("./biblio-tag"))
+            tag&.children&.each { |n| parse(n, td) }
           end
           ref.td { |td| reference_format(bibitem, td) }
         end
       end
 
-      def pick_ident(id)
-        return id[:metanorma] if id[:metanorma]
-        return "[#{id[:sdo]}]" if id[:sdo]
-        return id[:ordinal] if id[:ordinal]
-
-        ""
-      end
-
       def std_bibitem_entry(list, bibitem, ordinal, biblio)
         nonstd_bibitem(list, bibitem, ordinal, biblio)
       end

data/lib/isodoc/itu/word_convert.rb

@@ -101,7 +101,7 @@ module IsoDoc
           olstyle: "l2" }
       end
 
-      def make_tr_attr(tcell, row, totalrows, header)
+      def make_tr_attr(tcell, row, totalrows, header, bordered)
         super.merge(valign: "top")
       end
 

data/lib/metanorma/itu/isodoc.rng

@@ -1238,6 +1238,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 +2658,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
-      <value>modspec</value>
+      <text/>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.2.1".freeze
+    VERSION = "2.2.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 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: htmlentities