metanorma-iso 2.0.2 → 2.0.5

data/lib/isodoc/iso/metadata.rb

@@ -72,12 +72,14 @@ module IsoDoc
         case lang
         when "en" then "Part"
         when "fr" then "Partie"
+        when "ru" then "Часть"
         end
       end
 
       def amd_label(lang)
         case lang
         when "en", "fr" then "AMENDMENT"
+        when "ru" then "ПОПРАВКА"
         end
       end
 
@@ -85,6 +87,7 @@ module IsoDoc
         case lang
         when "en" then "TECHNICAL CORRIGENDUM"
         when "fr" then "RECTIFICATIF TECHNIQUE"
+        when "ru" then "ТЕХНИЧЕСКОЕ ИСПРАВЛЕНИЕ"
         end
       end
 
@@ -140,7 +143,11 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        lang = @lang == "fr" ? "fr" : "en"
+        lang = case @lang
+               when "fr" then "fr"
+               when "ru" then "ru"
+               else "en"
+               end
         intro, main, part, amd = title_parts(isoxml, lang)
         partnumber, subpartnumber, amdnumber, corrnumber = title_nums(isoxml)
 
@@ -159,7 +166,10 @@ module IsoDoc
       end
 
       def subtitle(isoxml, _out)
-        lang = @lang == "fr" ? "en" : "fr"
+        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)
 

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -47,37 +47,74 @@ module IsoDoc
 
       def eref_delim(delim, type)
         if delim == ";" then ";"
-        else type == "list" ? "" : delim
+        else type == "list" ? " " : delim
         end
       end
 
-      def eref_localities1_zh(target, type, from, upto, node, delim)
-        subsection = from&.text&.match(/\./)
-        ret = eref_delim(delim, type)
-        ret += " 第#{from.text}" if from
-        ret += "–#{upto.text}" if upto
-        loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize)
-        ret += " #{loc}" unless (subsection && type == "clause") ||
-          type == "list" || target.match(/^IEV$|^IEC 60050-/) ||
-          node["droploc"] == "true"
+      def can_conflate_eref_rendering?(refs)
+        super or return false
+
+        first = subclause?(nil, refs.first.at(ns("./locality/@type"))&.text,
+                           refs.first.at(ns("./locality/referenceFrom"))&.text)
+        refs.all? do |r|
+          subclause?(nil, r.at(ns("./locality/@type"))&.text,
+                     r.at(ns("./locality/referenceFrom"))&.text) == first
+        end
+      end
+
+      def locality_delimiter(loc)
+        loc&.next_element&.attribute("type")&.text == "list" and return " "
+        super
+      end
+
+      def eref_localities_conflated(refs, target, node)
+        droploc = node["droploc"]
+        node["droploc"] = true
+        ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
+                                                            node))
+        node["droploc"] = droploc
+        eref_localities1(target,
+                         prefix_clause(target, refs.first.at(ns("./locality"))),
+                         l10n(ret[1..-1].join), nil, node, @lang)
+      end
+
+      def prefix_clause(target, loc)
+        loc["type"] == "clause" or return loc["type"]
+
+        if subclause?(target, loc["type"], loc&.at(ns("./referenceFrom"))&.text)
+          ""
+        else
+          "clause"
+        end
+      end
+
+      def subclause?(target, type, from)
+        (from&.match?(/\./) && type == "clause") ||
+          type == "list" || target&.match(/^IEV$|^IEC 60050-/)
+      end
+
+      def eref_localities1_zh(target, type, from, upto, node)
+        ret = " 第#{from}" if from
+        ret += "–#{upto}" if upto
+        if node["droploc"] != "true" && !subclause?(target, type, from)
+          ret += eref_locality_populate(type, node)
+        end
         ret += ")" if type == "list"
         ret
       end
 
-      def eref_localities1(target, type, from, upto, delim, node, lang = "en")
-        return "" if type == "anchor"
+      def eref_localities1(target, type, from, upto, node, lang = "en")
+        return nil if type == "anchor"
 
-        subsection = from&.text&.match(/\./)
         type = type.downcase
         lang == "zh" and
-          return l10n(eref_localities1_zh(target, type, from, upto, node,
-                                          delim))
-        ret = eref_delim(delim, type)
-        ret += eref_locality_populate(type, node) unless (subsection &&
-          type == "clause") || type == "list" ||
-          target.match(/^IEV$|^IEC 60050-/)
-        ret += " #{from.text}" if from
-        ret += "–#{upto.text}" if upto
+          return l10n(eref_localities1_zh(target, type, from, upto, node))
+        ret = if node["droploc"] != "true" && !subclause?(target, type, from)
+                eref_locality_populate(type, node)
+              else ""
+              end
+        ret += " #{from}" if from
+        ret += "–#{upto}" if upto
         ret += ")" if type == "list"
         l10n(ret)
       end

data/lib/metanorma/iso/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/metanorma/iso/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/iso/boilerplate-fr.xml

@@ -2,7 +2,7 @@
   <copyright-statement>
     <clause>
       <title>DOCUMENT PROTÉGÉ PAR COPYRIGHT</title>
-    <p id="boilerplate-year">&copy; {{ agency }} {{ docyear }}</p>
+    <p id="boilerplate-year">&#xa9; {{ agency }} {{ docyear }}</p>
 
   <p id="boilerplate-message">
 Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne
@@ -16,8 +16,8 @@ l’adresse ci-après ou au comité membre de l’ISO dans le pays du demandeur.
     ISO copyright office<br/>
     Ch. de Blandonnet 8 &#x2022; CP 401<br/>
     CH-1214 Vernier, Geneva, Switzerland<br/>
-    Tel.&nbsp;&nbsp;+ 41 22 749 01 11<br/>
-    Fax&nbsp;&nbsp;+ 41 22 749 09 47<br/>
+    Tel.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Fax&#xa0;&#xa0;+ 41 22 749 09 47<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>

data/lib/metanorma/iso/boilerplate-ru.xml

@@ -0,0 +1,39 @@
+<boilerplate>
+  <copyright-statement>
+    <clause>
+      <title>ДОКУМЕНТ, ОХРАНЯЕМЫЙ АВТОРСКИМ ПРАВОМ</title>
+    <p id="boilerplate-year">
+    &#xa9; {{ agency }} {{ docyear }}
+  </p>
+
+  <p id="boilerplate-message">
+    Все права защищены. Если иначе не определено, никакая часть этой публикации не может быть воспроизведена или использована иначе в любой форме или каким-либо образом, электронным или механическим, включая фотокопирование, или публикацию в Интернете или интранете, без предварительного письменного разрешения. Разрешение может быть запрошено ISO по адресу, указанному ниже, или у органа — члена ISO страны запрашивающего.
+  </p>
+
+  <p id="boilerplate-address" align="left">
+    Бюро ISO по охране авторских прав<br/>
+    Ch. de Blandonnet 8 &#x2022; CP 401<br/>
+    CH-1214 Vernier, Geneva, Switzerland<br/>
+    Tel.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Fax&#xa0;&#xa0;+ 41 22 749 09 47<br/>
+    Электронная почта: copyright@iso.org<br/>
+    Сайт: www.iso.org
+  </p>
+    <p id="boilerplate-place">
+    Издано в Швейцарии
+  </p>
+</clause>
+  </copyright-statement>
+
+  {% if unpublished %}
+  <license-statement>
+    <clause>
+<title>Предупреждение для WD и CD</title>
+
+<p>Этот документ не является международным стандартом ISO. Распространяется для ознакомления и комментариев. Оно может быть изменено без предварительного уведомления и не может упоминаться как международный стандарт.</p>
+
+<p>Получателям этого проекта предлагается представить вместе со своими комментариями уведомление о любых соответствующих патентных правах, о которых им известно, и предоставить подтверждающую документацию.</p>
+</clause>
+  </license-statement>
+{% endif %}
+</boilerplate>

data/lib/metanorma/iso/boilerplate.xml

@@ -3,7 +3,7 @@
     <clause>
       <title>COPYRIGHT PROTECTED DOCUMENT</title>
     <p id="boilerplate-year">
-    &copy; {{ agency }} {{ docyear }}
+    &#xa9; {{ agency }} {{ docyear }}
   </p>
 
   <p id="boilerplate-message">
@@ -19,8 +19,8 @@ at the address below or ISO's member body in the country of the requester.
     ISO copyright office<br/>
     Ch. de Blandonnet 8 &#x2022; CP 401<br/>
     CH-1214 Vernier, Geneva, Switzerland<br/>
-    Tel.&nbsp;&nbsp;+ 41 22 749 01 11<br/>
-    Fax&nbsp;&nbsp;+ 41 22 749 09 47<br/>
+    Tel.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Fax&#xa0;&#xa0;+ 41 22 749 09 47<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>

data/lib/metanorma/iso/cleanup.rb

@@ -37,13 +37,11 @@ module Metanorma
       end
 
       def get_id_prefix(xmldoc)
-        prefix = []
         xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
-                     "/organization").each do |x|
+                     "/organization").each_with_object([]) do |x, prefix|
           x1 = x.at("abbreviation")&.text || x.at("name")&.text
           (x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
         end
-        prefix
       end
 
       # ISO as a prefix goes first
@@ -125,7 +123,11 @@ module Metanorma
       end
 
       def boilerplate_file(_xmldoc)
-        file = @lang == "fr" ? "boilerplate-fr.xml" : "boilerplate.xml"
+        file = case @lang
+               when "fr" then "boilerplate-fr.xml"
+               when "ru" then "boilerplate-ru.xml"
+               else "boilerplate.xml"
+               end
         File.join(@libdir, file)
       end
 
@@ -136,8 +138,7 @@ module Metanorma
 
       def unpub_footnotes(xmldoc)
         xmldoc.xpath("//bibitem/note[@type = 'Unpublished-Status']").each do |n|
-          id = n.parent["id"]
-          e = xmldoc.at("//eref[@bibitemid = '#{id}']") or next
+          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>"
           e.next = "<fn>#{fn}</fn>"
@@ -147,21 +148,46 @@ module Metanorma
       def bibitem_cleanup(xmldoc)
         super
         unpublished_note(xmldoc)
+        withdrawn_note(xmldoc)
       end
 
       def unpublished_note(xmldoc)
-        xmldoc.xpath("//bibitem[not(note[@type = 'Unpublished-Status'])]")
-          .each do |b|
+        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]"\
+                     "[not(note[@type = 'Unpublished-Status'])]").each do |b|
           next if pub_class(b) > 2
           next unless (s = b.at("./status/stage")) && (s.text.to_i < 60)
 
           id = b.at("docidentifier").text
-          b.at("./language | ./script | ./abstract | ./status")
-            .previous = %(<note type="Unpublished-Status">
-                          <p>#{@i18n.under_preparation.sub(/%/, id)}</p></note>)
+          insert_unpub_note(b, @i18n.under_preparation.sub(/%/, id))
         end
       end
 
+      def withdrawn_note(xmldoc)
+        xmldoc.xpath("//bibitem[not(note[@type = 'Unpublished-Status'])]")
+          .each do |b|
+            next if pub_class(b) > 2
+            next unless (s = b.at("./status/stage")) && (s.text.to_i >= 90)
+
+            if id = replacement_standard(b)
+              insert_unpub_note(b, @i18n.cancelled_and_replaced.sub(/%/, id))
+            else
+              insert_unpub_note(b, @i18n.withdrawn)
+            end
+          end
+      end
+
+      def replacement_standard(biblio)
+        r = biblio.at("./relation[@type = 'updates']/bibitem") or return nil
+        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | "\
+                  "./docidentifier | ./formattedref") or return nil
+        id.text
+      end
+
+      def insert_unpub_note(biblio, msg)
+        biblio.at("./language | ./script | ./abstract | ./status")
+          .previous = %(<note type="Unpublished-Status"><p>#{msg}</p></note>)
+      end
+
       def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
         once = true
         super
@@ -171,6 +197,11 @@ module Metanorma
         @vocab and src.empty? and return
         super
       end
+
+      def section_names_terms_cleanup(xml)
+        @vocab and return
+        super
+      end
     end
   end
 end

data/lib/metanorma/iso/front.rb

@@ -135,7 +135,7 @@ module Metanorma
       end
 
       def title(node, xml)
-        ["en", "fr"].each do |lang|
+        %w(en ru fr).each do |lang|
           at = { language: lang, format: "text/plain" }
           title_full(node, xml, lang, at)
           title_intro(node, xml, lang, at)

data/lib/metanorma/iso/front_id.rb

@@ -106,6 +106,7 @@ module Metanorma
         suffix = case lang
                  when "en" then "(E)"
                  when "fr" then "(F)"
+                 when "ru" then "(R)"
                  else
                    "(X)"
                  end

data/lib/metanorma/iso/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/iso/processor.rb

@@ -45,19 +45,26 @@ module Metanorma
       def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::Iso::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iso::HtmlConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :html_alt
-          IsoDoc::Iso::HtmlConvert.new(options.merge(alt: true)).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iso::HtmlConvert.new(options.merge(alt: true))
+            .convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Iso::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iso::WordConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::Iso::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iso::PdfConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :sts
-          IsoDoc::Iso::StsConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iso::StsConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :isosts
-          IsoDoc::Iso::IsoStsConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iso::IsoStsConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :presentation
-          IsoDoc::Iso::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iso::PresentationXMLConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/iso/validate.rb

@@ -4,6 +4,7 @@ require_relative "./validate_requirements"
 require_relative "./validate_section"
 require_relative "./validate_title"
 require_relative "./validate_image"
+require_relative "./validate_list"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -35,7 +36,7 @@ module Metanorma
             /\b(see| refer to)\s*\Z/mi.match(preceding)
 
           (target = root.at("//*[@id = '#{t['target']}']")) || next
-          if target&.at("./ancestor-or-self::*[@obligation = 'normative']")
+          if target.at("./ancestor-or-self::*[@obligation = 'normative']")
             @log.add("Style", t,
                      "'see #{t['target']}' is pointing to a normative section")
           end
@@ -75,6 +76,30 @@ module Metanorma
         regex.match(text) && @log.add("Style", elem, "#{term}: #{msg}")
       end
 
+      # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-r-ref_clause3
+      def term_xrefs_validate(xmldoc)
+        termids = xmldoc
+          .xpath("//sections/terms | //sections/clause[.//terms] | "\
+                 "//annex[.//terms]").each_with_object({}) do |t, m|
+          t.xpath(".//*/@id").each { |a| m[a.text] = true }
+          t.name == "terms" and m[t["id"]] = true
+        end
+        xmldoc.xpath(".//xref").each do |x|
+          term_xrefs_validate1(x, termids)
+        end
+      end
+
+      def term_xrefs_validate1(xref, termids)
+        (termids[xref["target"]] && !termids[xref.parent["id"]]) and
+          @log.add("Style", xref,
+                   "only terms clauses can cross-reference terms clause "\
+                   "(#{xref['target']})")
+        (!termids[xref["target"]] && termids[xref.parent["id"]]) and
+          @log.add("Style", xref,
+                   "non-terms clauses cannot cross-reference terms clause "\
+                   "(#{xref['target']})")
+      end
+
       # ISO/IEC DIR 2, 16.5.6
       def termdef_style(xmldoc)
         xmldoc.xpath("//term").each do |t|
@@ -98,7 +123,7 @@ module Metanorma
 
       def script_validate(xmldoc)
         script = xmldoc&.at("//bibdata/script")&.text
-        script == "Latn" or
+        %w(Cyrl Latn).include?(script) or
           @log.add("Document Attributes", nil,
                    "#{script} is not a recognised script")
       end
@@ -139,11 +164,14 @@ module Metanorma
         onlychild_clause_validate(doc.root)
         termdef_style(doc.root)
         see_xrefs_validate(doc.root)
+        term_xrefs_validate(doc.root)
         see_erefs_validate(doc.root)
         locality_erefs_validate(doc.root)
         bibdata_validate(doc.root)
         bibitem_validate(doc.root)
         figure_validate(doc.root)
+        listcount_validate(doc)
+        list_punctuation(doc)
       end
 
       def bibitem_validate(xmldoc)

data/lib/metanorma/iso/validate_image.rb

@@ -78,9 +78,9 @@ module Metanorma
         xmldoc.xpath("//image").each do |i|
           next if i["src"].start_with?("data:")
 
-          if /^ISO_\d+_/.match?(File.basename(i["src"]))
-          elsif /^(SL)?#{prefix}fig/.match?(File.basename(i["src"]))
-            image_name_validate1(i, prefix)
+          case File.basename(i["src"])
+          when /^ISO_\d+_/
+          when /^(SL)?#{prefix}fig/ then image_name_validate1(i, prefix)
           else
             @log.add("Style", i,
                      "image name #{i['src']} does not match DRG requirements: expect #{prefix}fig")