metanorma-iso 3.0.4 → 3.0.5

data/lib/isodoc/iso/presentation_section.rb

@@ -51,7 +51,7 @@ module IsoDoc
       # Redo Amendment annex subclause titles as numbered
       def clause(docxml)
         super
-        docxml.xpath(ns("//annex//appendix")).each { |f| clause1(f) }
+        # docxml.xpath(ns("//annex//appendix")).each { |f| clause1(f) }
         amd?(docxml) or return
         @suppressheadingnumbers = @oldsuppressheadingnumbers
         docxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|

data/lib/isodoc/iso/presentation_terms.rb

@@ -12,8 +12,8 @@ module IsoDoc
         (docxml.xpath(ns("//concept")) - docxml.xpath(ns("//term//concept")))
           .each do |node|
           node.ancestors("definition, termsource, related").empty? and
-          concept_render(node, ital: "false", ref: "false",
-                               linkref: "true", linkmention: "false")
+            concept_render(node, ital: "false", ref: "false",
+                                 linkref: "true", linkmention: "false")
         end
       end
 
@@ -23,7 +23,7 @@ module IsoDoc
           (f.xpath(ns(".//concept")) - f.xpath(ns(".//term//concept")))
             .each do |c|
               c.ancestors("definition, termsource, related").empty? and
-              concept_term1(c, m)
+                concept_term1(c, m)
             end
         end
       end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -100,9 +100,14 @@ module IsoDoc
 
       def note1(elem)
         elem["type"] == "units" and return
+        elem["type"] == "requirement" and return requirement_note1(elem)
         super
       end
 
+      def requirement_note1(elem)
+        elem["unnumbered"] = "true"
+      end
+
       def formula_where(dlist)
         dlist.nil? and return
         dlist.xpath(ns("./dt")).size == 1 &&
@@ -157,7 +162,7 @@ module IsoDoc
 
       def twitter_cldr_localiser_symbols
         { group: " ", fraction_group: " ",
-          fraction_group_digits: 3 }
+          fraction_group_digits: 3, decimal: "," }
       end
 
       def implicit_reference(bib)

data/lib/isodoc/iso/word_dis_convert.rb

@@ -117,8 +117,7 @@ module IsoDoc
 
       def authority_cleanup(docxml)
         super
-        if @meta.get[:stage_int].to_s[0] == "9" ||
-            @meta.get[:stage_int].to_s[0] == "6"
+        if ["9", "6"].include?(@meta.get[:stage_int].to_s[0])
           copyright_prf(docxml)
         else
           copyright_dis(docxml)
@@ -142,6 +141,14 @@ module IsoDoc
         end
         docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each(&:remove)
       end
+
+      def list_title_parse(node, out)
+        name = node.at(ns("./fmt-name")) or return
+        klass = node["key"] == "true" ? "KeyTitle" : "ListTitle"
+        out.p class: klass do |p|
+          name.children&.each { |n| parse(n, p) }
+        end
+      end
     end
   end
 end

data/lib/isodoc/iso/xref.rb

@@ -235,7 +235,8 @@ module IsoDoc
       end
 
       def uncountable_note?(note)
-        @anchors[note["id"]] || blank?(note["id"]) || note["type"] == "units"
+        @anchors[note["id"]] || blank?(note["id"]) || note["type"] == "units" ||
+          note["type"] == "requirement"
       end
 
       def note_anchor_names1(notes, counter)

data/lib/isodoc/iso/xref_section.rb

@@ -7,19 +7,20 @@ module IsoDoc
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
-        #i = Counter.new(0, prefix: "0")
         i = clause_counter(0)
         clause.xpath(ns("./clause")).each do |c|
           section_names1(c, semx(clause, "0"), i.increment(c).print, 2)
         end
       end
 
-      def annex_names(clause, num)
+      # KILL
+      def annex_namesx(clause, num)
         appendix_names(clause, num)
         super
       end
 
-      def appendix_names(clause, _num)
+      # KILL
+      def appendix_namesx(clause, _num)
         i = clause_counter(0)
         clause.xpath(ns("./appendix")).each do |c|
           i.increment(c)
@@ -65,8 +66,8 @@ module IsoDoc
         @anchors[clause["id"]] = ret.merge(ret2)
       end
 
-      def appendix_names1(clause, parentnum, num, level, container)
-        #num = labelled_autonum(@labels["appendix"], num)
+      # KILL
+      def appendix_names1x(clause, parentnum, num, level, container)
         num = clause_number_semx(parentnum, clause, num)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    container: container }

data/lib/metanorma/iso/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.3 -->
+<!-- VERSION v2.0.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -1328,6 +1328,7 @@ numbers</a:documentation>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
+          <ref name="executivesummary"/>
         </choice>
       </oneOrMore>
     </element>
@@ -1351,6 +1352,11 @@ numbers</a:documentation>
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="executivesummary">
+    <element name="executivesummary">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="indexsect">
     <element name="indexsect">
       <ref name="Content-Section"/>
@@ -1576,6 +1582,15 @@ used in document amendments</a:documentation>
   <define name="annex">
     <element name="annex">
       <ref name="Annex-Section"/>
+      <zeroOrMore>
+        <ref name="annex-appendix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="annex-appendix">
+    <a:documentation>Appendix, distinct subclause type for annexes (annex to annex, rather than subclause to annex)</a:documentation>
+    <element name="appendix">
+      <ref name="Clause-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/metanorma/iso/isostandard.rng

@@ -162,9 +162,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="annex-appendix">
-    <element name="appendix">
-      <ref name="Clause-Section"/>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/iso/section.rb

@@ -4,7 +4,9 @@ require "uri" if /^2\./.match?(RUBY_VERSION)
 module Metanorma
   module Iso
     class Converter < Standoc::Converter
-      def clause_parse(attrs, xml, node)
+
+      # KILL
+      def clause_parsex(attrs, xml, node)
         node.option? "appendix" and return appendix_parse(attrs, xml, node)
         super
       end
@@ -14,7 +16,8 @@ module Metanorma
         clause_parse(attrs, xml, node)
       end
 
-      def appendix_parse(attrs, xml, node)
+      # KILL
+      def appendix_parsex(attrs, xml, node)
         attrs[:"inline-header"] = node.option? "inline-header"
         set_obligation(attrs, node)
         xml.appendix **attr_code(attrs) do |xml_section|
@@ -23,6 +26,10 @@ module Metanorma
         end
       end
 
+      def support_appendix?(_node)
+        true
+      end
+
       def patent_notice_parse(xml, node)
         # xml.patent_notice do |xml_section|
         #  xml_section << node.content

data/lib/metanorma/iso/validate.rb

@@ -14,16 +14,14 @@ module Metanorma
     class Converter < Standoc::Converter
       def isosubgroup_validate(root)
         root.xpath("//technical-committee/@type").each do |t|
-          unless %w{TC PC JTC JPC}.include? t.text
+          %w{TC PC JTC JPC}.include?(t.text) or
             @log.add("Document Attributes", nil,
                      "invalid technical committee type #{t}")
-          end
         end
         root.xpath("//subcommittee/@type").each do |t|
-          unless %w{SC JSC}.include? t.text
+          %w{SC JSC}.include?(t.text) or
             @log.add("Document Attributes", nil,
                      "invalid subcommittee type #{t}")
-          end
         end
       end
 

data/lib/metanorma/iso/validate_list.rb

@@ -61,7 +61,7 @@ module Metanorma
         when ":", "" then list_after_colon_punctuation(list, entries)
         when "." then entries.each { |li| list_full_sentence(li) }
         else style_warning(list, "All lists must be preceded by " \
-                                 "colon or full stop", prectext)
+                                 "colon or full stop", prectext, display: false)
         end
       end
 
@@ -81,7 +81,7 @@ module Metanorma
         text = elem.text.strip
         starts_lowercase?(text) or
           style_warning(elem, "List entry of broken up sentence must start " \
-                              "with lowercase letter", text)
+                              "with lowercase letter", text, display: false)
         list_semicolon_phrase_punct(elem, text, last)
       end
 
@@ -90,11 +90,12 @@ module Metanorma
         if last
           punct == "." or
             style_warning(elem, "Final list entry of broken up " \
-                                "sentence must end with full stop", text)
+                                "sentence must end with full stop", text,
+                          display: false)
         else
           punct == ";" or
             style_warning(elem, "List entry of broken up sentence must " \
-                                "end with semicolon", text)
+                                "end with semicolon", text, display: false)
         end
       end
 
@@ -103,11 +104,11 @@ module Metanorma
         text = elem.text.strip
         starts_uppercase?(text) or
           style_warning(elem, "List entry of separate sentences must start " \
-                              "with uppercase letter", text)
+                              "with uppercase letter", text, display: false)
         punct = text.strip.sub(/^.*?(\S)$/m, "\\1")
         punct == "." or
           style_warning(elem, "List entry of separate sentences must " \
-                              "end with full stop", text)
+                              "end with full stop", text, display: false)
       end
 
       # allow that all-caps word (acronym) is agnostic as to lowercase

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.0.4".freeze
+    VERSION = "3.0.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc