metanorma-iso 2.0.6.1 → 2.0.8.1

data/lib/isodoc/iso/metadata.rb

@@ -56,14 +56,14 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ISO']"))
-        set(:docnumber, dn&.text)
-        tcdn = isoxml.xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']"))
-        set(:tc_docnumber, tcdn.map(&:text))
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-with-lang']"))
-        set(:docnumber_lang, dn&.text)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-reference']"))
-        set(:docnumber_reference, dn&.text)
+        set(:tc_docnumber, isoxml
+          .xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']")).map(&:text))
+        { docnumber: "ISO", docnumber_lang: "iso-with-lang",
+          docnumber_reference: "iso-reference",
+          docnumber_undated: "iso-undated" }.each do |k, v|
+          set(k,
+              isoxml&.at(ns("//bibdata/docidentifier[@type = '#{v}']"))&.text)
+        end
       end
 
       # we don't leave this to i18n.rb, because we have both English and
@@ -91,55 +91,63 @@ module IsoDoc
         end
       end
 
-      def part_title(part, partnum, subpartnum, lang)
+      def part_title(part, titlenums, lang)
         return "" unless part
 
         suffix = @c.encode(part.text, :hexadecimal)
-        partnum = "#{partnum}–#{subpartnum}" if partnum && subpartnum
-        suffix = "#{part_label(lang)} #{partnum}: " + suffix if partnum
+        p = titlenums[:part]
+        titlenums[:part] && titlenums[:subpart] and
+          p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
+        titlenums[:part] and
+          suffix = "#{part_label(lang)} #{p}: " + suffix
         suffix
       end
 
-      def part_prefix(partnum, subpartnum, lang)
-        partnum = "#{partnum}–#{subpartnum}" if partnum && subpartnum
-        "#{part_label(lang)} #{partnum}"
+      def part_prefix(titlenums, lang)
+        p = titlenums[:part]
+        titlenums[:part] && titlenums[:subpart] and
+          p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
+        "#{part_label(lang)} #{p}"
       end
 
-      def amd_prefix(num, lang)
-        "#{amd_label(lang)} #{num}"
+      def amd_prefix(titlenums, lang)
+        "#{amd_label(lang)} #{titlenums[:amd]}"
       end
 
-      def corr_prefix(num, lang)
-        "#{corr_label(lang)} #{num}"
+      def corr_prefix(titlenums, lang)
+        "#{corr_label(lang)} #{titlenums[:corr]}"
       end
 
-      def compose_title(main, intro, part, partnum, subpartnum, lang)
-        main = main.nil? ? "" : @c.encode(main.text, :hexadecimal)
-        intro &&
-          main = "#{@c.encode(intro.text, :hexadecimal)} — #{main}"
-        if part
-          suffix = part_title(part, partnum, subpartnum, lang)
+      def compose_title(tparts, tnums, lang)
+        main = ""
+        tparts[:main].nil? or
+          main = @c.encode(tparts[:main].text, :hexadecimal)
+        tparts[:intro] &&
+          main = "#{@c.encode(tparts[:intro].text,
+                              :hexadecimal)} — #{main}"
+        if tparts[:part]
+          suffix = part_title(tparts[:part], tnums, lang)
           main = "#{main} — #{suffix}"
         end
         main
       end
 
       def title_nums(isoxml)
-        [isoxml.at(ns("//bibdata//project-number/@part")),
-         isoxml.at(ns("//bibdata//project-number/@subpart")),
-         isoxml.at(ns("//bibdata//project-number/@amendment")),
-         isoxml.at(ns("//bibdata//project-number/@corrigendum"))]
+        { part: isoxml.at(ns("//bibdata//project-number/@part")),
+          subpart: isoxml.at(ns("//bibdata//project-number/@subpart")),
+          amd: isoxml.at(ns("//bibdata//project-number/@amendment")),
+          corr: isoxml.at(ns("//bibdata//project-number/@corrigendum")) }
       end
 
       def title_parts(isoxml, lang)
-        [isoxml.at(ns("//bibdata//title[@type='title-intro' and "\
-                      "@language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-main' and "\
-                      "@language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-part' and "\
-                      "@language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-amd' and "\
-                      "@language='#{lang}']"))]
+        { intro: isoxml.at(ns("//bibdata//title[@type='title-intro' and "\
+                              "@language='#{lang}']")),
+          main: isoxml.at(ns("//bibdata//title[@type='title-main' and "\
+                             "@language='#{lang}']")),
+          part: isoxml.at(ns("//bibdata//title[@type='title-part' and "\
+                             "@language='#{lang}']")),
+          amd: isoxml.at(ns("//bibdata//title[@type='title-amd' and "\
+                            "@language='#{lang}']")) }
       end
 
       def title(isoxml, _out)
@@ -148,43 +156,46 @@ module IsoDoc
                when "ru" then "ru"
                else "en"
                end
-        intro, main, part, amd = title_parts(isoxml, lang)
-        partnumber, subpartnumber, amdnumber, corrnumber = title_nums(isoxml)
+        # intro, main, part, amd = title_parts(isoxml, lang)
+        tp = title_parts(isoxml, lang)
+        tn = title_nums(isoxml)
 
-        set(:doctitlemain, @c.encode(main ? main.text : "", :hexadecimal))
-        main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
+        set(:doctitlemain,
+            @c.encode(tp[:main] ? tp[:main].text : "", :hexadecimal))
+        main = compose_title(tp, tn, lang)
         set(:doctitle, main)
-        if intro
+        if tp[:intro]
           set(:doctitleintro,
-              @c.encode(intro ? intro.text : "", :hexadecimal))
+              @c.encode(tp[:intro] ? tp[:intro].text : "", :hexadecimal))
         end
-        set(:doctitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
-        set(:doctitlepart, @c.encode(part.text, :hexadecimal)) if part
-        set(:doctitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
-        set(:doctitleamd, @c.encode(amd.text, :hexadecimal)) if amd
-        set(:doctitlecorrlabel, corr_prefix(corrnumber, lang)) if corrnumber
+        set(:doctitlepartlabel, part_prefix(tn, lang))
+        set(:doctitlepart, @c.encode(tp[:part].text, :hexadecimal)) if tp[:part]
+        set(:doctitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
+        set(:doctitleamd, @c.encode(tp[:amd].text, :hexadecimal)) if tp[:amd]
+        set(:doctitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 
       def subtitle(isoxml, _out)
-        lang = case @lang
-               when "fr", "ru" then "en"
-               else "fr"
-               end
-        intro, main, part, amd = title_parts(isoxml, lang)
-        partnumber, subpartnumber, amdnumber, corrnumber = title_nums(isoxml)
+        lang = @lang == "en" ? "fr" : "en"
+        tp = title_parts(isoxml, lang)
+        tn = title_nums(isoxml)
 
-        set(:docsubtitlemain, @c.encode(main ? main.text : "", :hexadecimal))
-        main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
+        set(:docsubtitlemain,
+            @c.encode(tp[:main] ? tp[:main].text : "", :hexadecimal))
+        main = compose_title(tp, tn, lang)
         set(:docsubtitle, main)
-        if intro
+        if tp[:intro]
           set(:docsubtitleintro,
-              @c.encode(intro ? intro.text : "", :hexadecimal))
+              @c.encode(tp[:intro] ? tp[:intro].text : "", :hexadecimal))
+        end
+        set(:docsubtitlepartlabel, part_prefix(tn, lang))
+        if tp[:part]
+          set(:docsubtitlepart,
+              @c.encode(tp[:part].text, :hexadecimal))
         end
-        set(:docsubtitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
-        set(:docsubtitlepart, @c.encode(part.text, :hexadecimal)) if part
-        set(:docsubtitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
-        set(:docsubtitleamd, @c.encode(amd.text, :hexadecimal)) if amd
-        set(:docsubtitlecorrlabel, corr_prefix(corrnumber, lang)) if corrnumber
+        set(:docsubtitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
+        set(:docsubtitleamd, @c.encode(tp[:amd].text, :hexadecimal)) if tp[:amd]
+        set(:docsubtitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 
       def author(xml, _out)
@@ -238,8 +249,8 @@ module IsoDoc
         ics = []
         isoxml.xpath(ns("//bibdata/ext/ics/code")).each { |i| ics << i.text }
         set(:ics, ics.empty? ? nil : ics.join(", "))
-        a = isoxml.at(ns("//bibdata/ext/horizontal")) and set(:horizontal,
-                                                              a.text)
+        a = isoxml.at(ns("//bibdata/ext/horizontal")) and
+          set(:horizontal, a.text)
       end
     end
   end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -27,8 +27,6 @@ module IsoDoc
       end
 
       def figure1(node)
-        return if labelled_ancestor(node) && node.ancestors("figure").empty?
-
         lbl = @xrefs.anchor(node["id"], :label, false) or return
         figname = node.parent.name == "figure" ? "" : "#{@i18n.figure} "
         connective = node.parent.name == "figure" ? "  " : " — "

data/lib/isodoc/iso/sts_convert.rb

@@ -10,14 +10,19 @@ module IsoDoc
         @suffix = "sts.xml"
       end
 
-      def convert(in_fname, file = nil, debug = false, out_fname = nil)
-        file = File.read(in_fname, encoding: "utf-8") if file.nil?
-        _docxml, filename, dir = convert_init(file, in_fname, debug)
+      def inputfile(in_fname, filename)
         /\.xml$/.match?(in_fname) or
           in_fname = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
             f.write file
             f.path
           end
+        in_fname
+      end
+
+      def convert(in_fname, file = nil, debug = false, out_fname = nil)
+        file = File.read(in_fname, encoding: "utf-8") if file.nil?
+        _docxml, filename, dir = convert_init(file, in_fname, debug)
+        in_fname = inputfile(in_fname, filename)
         FileUtils.rm_rf dir
         MnConvert.convert(in_fname,
                           { input_format: MnConvert::InputFormat::MN,

data/lib/isodoc/iso/word_cleanup.rb

@@ -65,7 +65,7 @@ module IsoDoc
         insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
         auth = docxml&.at("//div[@class = 'boilerplate-license']")&.remove
         auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
-        auth and insert.children = auth
+        auth and insert and insert.children = auth
         insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
         auth = docxml&.at("//div[@class = 'boilerplate-copyright']")&.remove
         auth&.xpath(".//p[not(@class)]")&.each do |p|
@@ -80,7 +80,7 @@ module IsoDoc
         auth&.xpath(".//p[@id = 'boilerplate-place']")&.each do |p|
           p["class"] = "zzCopyright1"
         end
-        auth and insert.children = auth
+        auth and insert and insert.children = auth
       end
 
       def word_cleanup(docxml)

data/lib/isodoc/iso/word_convert.rb

@@ -45,6 +45,18 @@ module IsoDoc
           olstyle: "l2" }
       end
 
+      def convert1(docxml, filename, dir)
+        @dis = /^[45].$/.match?(docxml&.at(ns("//bibdata/status/stage"))&.text)
+        if @dis
+          @wordstylesheet_name = html_doc_path("wordstyle-dis.scss")
+          @standardstylesheet_name = html_doc_path("isodoc-dis.scss")
+          @wordcoverpage = html_doc_path("word_iso_titlepage-dis.html")
+          @wordintropage = html_doc_path("word_iso_intro-dis.html")
+          @header = html_doc_path("header-dis.html")
+        end
+        super
+      end
+
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|

data/lib/isodoc/iso/xref.rb

@@ -113,7 +113,7 @@ module IsoDoc
       def hierarchical_formula_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|
-          next if t["id"].nil? || t["id"].empty?
+          next if blank?(t["id"])
 
           @anchors[t["id"]] = anchor_struct(
             "#{num}#{hiersep}#{c.increment(t).print}", t,
@@ -133,13 +133,12 @@ module IsoDoc
       end
 
       def sequential_figure_names(clause)
-        c = IsoDoc::XrefGen::Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
-          .each do |t|
+          .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 t["id"].nil? || t["id"].empty?
+          next if blank?(t["id"])
 
           figure_anchor(t, sublabel, c.print)
         end
@@ -153,7 +152,7 @@ module IsoDoc
           j = subfigure_increment(j, c, t)
           label = "#{num}#{hiersep}#{c.print}"
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          next if t["id"].nil? || t["id"].empty?
+          next if blank?(t["id"])
 
           figure_anchor(t, sublabel, label)
         end

data/lib/metanorma/iso/biblio.rng

@@ -527,7 +527,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/lib/metanorma/iso/cleanup.rb

@@ -51,10 +51,10 @@ module Metanorma
         id.content = id_prefix(prefix, id)
         id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
           id.content = id_prefix(prefix, id)
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-with-lang']") and
-          id.content = id_prefix(prefix, id)
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-reference']") and
-          id.content = id_prefix(prefix, id)
+        %w(iso-with-lang iso-reference iso-undated).each do |t|
+          id = xmldoc.at("//bibdata/docidentifier[@type = '#{t}']") and
+            id.content = id_prefix(prefix, id)
+        end
       end
 
       def format_ref(ref, type)
@@ -140,7 +140,7 @@ module Metanorma
         xmldoc.xpath("//bibitem/note[@type = 'Unpublished-Status']").each do |n|
           e = xmldoc.at("//eref[@bibitemid = '#{n.parent['id']}']") or next
           fn = n.children.to_xml
-          n&.elements&.first&.name == "p" or fn = "<p>#{fn}</p>"
+          n.elements&.first&.name == "p" or fn = "<p>#{fn}</p>"
           e.next = "<fn>#{fn}</fn>"
         end
       end

data/lib/metanorma/iso/front_id.rb

@@ -73,13 +73,19 @@ module Metanorma
         (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
           return
 
-        dn = iso_id1(node)
-        dn1 = id_stage_prefix(dn, node, false)
-        dn2 = id_stage_prefix(dn, node, true)
-        xml.docidentifier dn1, **attr_code(type: "ISO")
-        xml.docidentifier(id_langsuffix(dn1, node),
+        dn = id_stage_prefix(iso_id1(node), node)
+        dns = [id_year(dn, node, mode: :default),
+               id_year(dn, node, mode: :force),
+               id_year(dn, node, mode: :strip)]
+        iso_id_out(node, xml, dns)
+      end
+
+      def iso_id_out(node, xml, dns)
+        xml.docidentifier dns[0], **attr_code(type: "ISO")
+        xml.docidentifier dns[2], **attr_code(type: "iso-undated")
+        xml.docidentifier(id_langsuffix(dns[0], node),
                           **attr_code(type: "iso-with-lang"))
-        xml.docidentifier(id_langsuffix(dn2, node),
+        xml.docidentifier(id_langsuffix(dns[1], node),
                           **attr_code(type: "iso-reference"))
       end
 
@@ -160,14 +166,14 @@ module Metanorma
       def cover_stage_abbr(node)
         stage = get_stage(node)
         abbr = id_stage_abbr(get_stage(node), get_substage(node), node, true)
-        typeabbr = get_typeabbr(node, true)
+        typeabbr = get_typeabbr(node, amd: true)
         if stage.to_i > 50 || (stage.to_i == 60 && get_substage(node).to_i < 60)
           typeabbr = ""
         end
         "#{abbr}#{typeabbr}".strip
       end
 
-      def id_stage_prefix(docnum, node, force_year)
+      def id_stage_prefix(docnum, node)
         stage = get_stage(node)
         typeabbr = get_typeabbr(node)
         if stage && (stage.to_i < 60)
@@ -175,11 +181,22 @@ module Metanorma
         elsif typeabbr == "DIR " then docnum = "#{typeabbr}#{docnum}"
         elsif typeabbr && !@amd then docnum = "/#{typeabbr}#{docnum}"
         end
-        (force_year || !(stage && (stage.to_i < 60))) and
-          docnum = id_add_year(docnum, node)
         docnum
       end
 
+      def id_year(docnum, node, mode: :default)
+        case mode
+        when :strip then docnum.sub(/:(19|20)\d\d(?!\d)/, "")
+        when :force then id_add_year(docnum, node)
+        else
+          stage = get_stage(node)
+          if stage && (stage.to_i < 60)
+            docnum
+          else id_add_year(docnum, node)
+          end
+        end
+      end
+
       def unpub_stage_prefix(docnum, stage, typeabbr, node)
         abbr = id_stage_abbr(stage, get_substage(node), node)
         %w(40 50).include?(stage) && i = node.attr("iteration") and
@@ -213,7 +230,7 @@ module Metanorma
         ret
       end
 
-      def get_typeabbr(node, amd = false)
+      def get_typeabbr(node, amd: false)
         case doctype(node)
         when "directive" then "DIR "
         when "technical-report" then "TR "

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.0.6.1".freeze
+    VERSION = "2.0.8.1".freeze
   end
 end