metanorma-iso 2.7.4 → 2.7.6

data/lib/metanorma/iso/isodoc.rng

@@ -156,44 +156,7 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <attribute name="target">
-          <data type="string">
-            <param name="pattern">\i\c*|\c+#\c+</param>
-          </data>
-        </attribute>
-        <optional>
-          <attribute name="to">
-            <data type="string">
-              <param name="pattern">\i\c*|\c+#\c+</param>
-            </data>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="type">
-            <ref name="ReferenceFormat"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="case">
-            <choice>
-              <value>capital</value>
-              <value>lowercase</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="droploc">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="style">
-            <ref name="XrefStyleType"/>
-          </attribute>
-        </optional>
+        <ref name="XrefAttributes"/>
         <ref name="XrefBody"/>
       </element>
     </define>
@@ -407,23 +370,7 @@
     </define>
     <define name="figure">
       <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="class"/>
-        </optional>
+        <ref name="FigureAttributes"/>
         <ref name="BlockAttributes"/>
         <optional>
           <ref name="tname"/>
@@ -2450,6 +2397,49 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefAttributes">
+    <attribute name="target">
+      <data type="string">
+        <param name="pattern">\i\c*|\c+#\c+</param>
+      </data>
+    </attribute>
+    <optional>
+      <attribute name="to">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="case">
+        <choice>
+          <value>capital</value>
+          <value>lowercase</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="droploc">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <ref name="XrefStyleType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label"/>
+    </optional>
+  </define>
   <define name="XrefBody">
     <zeroOrMore>
       <ref name="XrefTarget"/>
@@ -2528,6 +2518,28 @@
       <attribute name="columns"/>
     </optional>
   </define>
+  <define name="FigureAttributes">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <optional>
+      <attribute name="unnumbered">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/iso/validate.rb

@@ -125,13 +125,6 @@ module Metanorma
                    "#{@doctype} is not a recognised document type")
       end
 
-      def script_validate(xmldoc)
-        script = xmldoc&.at("//bibdata/script")&.text
-        %w(Cyrl Latn).include?(script) or
-          @log.add("Document Attributes", nil,
-                   "#{script} is not a recognised script")
-      end
-
       def iteration_validate(xmldoc)
         iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
         /^\d+/.match(iteration) or
@@ -141,7 +134,6 @@ module Metanorma
 
       def bibdata_validate(doc)
         doctype_validate(doc)
-        script_validate(doc)
         iteration_validate(doc)
       end
 

data/lib/metanorma/iso/validate_style.rb

@@ -6,10 +6,10 @@ module Metanorma
   module ISO
     class Converter < Standoc::Converter
       def extract_text(node)
-        return "" if node.nil?
-
+        node.nil? and return ""
         node1 = Nokogiri::XML.fragment(node.to_s)
-        node1.xpath("//link | //locality | //localityStack").each(&:remove)
+        node1.xpath(".//link | .//locality | .//localityStack | .//stem")
+          .each(&:remove)
         ret = ""
         node1.traverse { |x| ret += x.text if x.text? }
         HTMLEntities.new.decode(ret)
@@ -17,30 +17,26 @@ module Metanorma
 
       # ISO/IEC DIR 2, 12.2
       def foreword_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Foreword")
       end
 
       # ISO/IEC DIR 2, 14.2
       def scope_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Scope")
       end
 
       # ISO/IEC DIR 2, 13.2
       def introduction_style(node)
-        return if @novalid
-
+        @novalid and return
         r = requirement_check(extract_text(node))
         style_warning(node, "Introduction may contain requirement", r) if r
       end
 
       # ISO/IEC DIR 2, 16.5.6
       def definition_style(node)
-        return if @novalid
-
+        @novalid and return
         r = requirement_check(extract_text(node))
         style_warning(node, "Definition may contain requirement", r) if r
       end
@@ -48,24 +44,21 @@ module Metanorma
       # ISO/IEC DIR 2, 16.5.7
       # ISO/IEC DIR 2, 25.5
       def example_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Example")
         style(node, extract_text(node))
       end
 
       # ISO/IEC DIR 2, 24.5
       def note_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Note")
         style(node, extract_text(node))
       end
 
       # ISO/IEC DIR 2, 26.5
       def footnote_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Footnote")
         style(node, extract_text(node))
       end
@@ -91,7 +84,7 @@ module Metanorma
 
       def style(node, text)
         @novalid and return
-        style_number(node, text)
+        @novalid_number or style_number(node, text)
         style_percent(node, text)
         style_abbrev(node, text)
         style_units(node, text)
@@ -116,6 +109,8 @@ module Metanorma
       def style_ambig_words(node, text)
         r = ambig_words_check(text) and
           style_warning(node, "may contain ambiguous provision", r)
+        @lang == "en" and style_regex(/\b(?<num>billions?)\b/i,
+                                      "ambiguous number", node, text)
       end
 
       # ISO/IEC DIR 2, 9.1
@@ -124,11 +119,12 @@ module Metanorma
       def style_number(node, text)
         style_number_grouping(node, text)
         style_regex(/(?:^|\p{Zs})(?<num>[0-9]+\.[0-9]+)(?!\.[0-9])/i,
-                    "possible decimal point", node, text)
+                    "possible decimal point: mark up numbers with stem:[]", node, text)
         @lang == "en" and style_regex(/\b(?<num>billions?)\b/i,
                                       "ambiguous number", node, text)
         style_regex(/(?:^|\p{Zs})(?<num>-[0-9][0-9,.]*)/i,
                     "hyphen instead of minus sign U+2212", node, text)
+        @novalid_number = true
       end
 
       def style_number_grouping(node, text)
@@ -136,13 +132,13 @@ module Metanorma
           style_two_regex_not_prev(
             node, text, /^(?<num>-?[0-9]{4,}[,0-9]*)\Z/,
             %r{\b(ISO|IEC|IEEE|(in|January|February|March|April|May|June|August|September|October|November|December)\b)\Z},
-            "number not broken up in threes"
+            "number not broken up in threes: mark up numbers with stem:[]"
           )
         else
           style_two_regex_not_prev(
             node, text, /^(?<num>-?(?:[0-9]{5,}[,0-9]*|[03-9]\d\d\d|1[0-8]\d\d|2[1-9]\d\d|20[5-9]\d))\Z/,
             %r{\b(ISO|IEC|IEEE|\b)\Z},
-            "number not broken up in threes"
+            "number not broken up in threes: mark up numbers with stem:[]"
           )
         end
       end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.7.4".freeze
+    VERSION = "2.7.6".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -34,9 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "metanorma-standoc", "~> 2.8.4"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-cen"
-  spec.add_dependency "pubid-iec"
-  spec.add_dependency "pubid-iso"
+  spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -39,35 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: pubid-cen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pubid-iec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pubid-iso
+  name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -375,6 +347,7 @@ files:
 - lib/metanorma/iso/boilerplate-ru.adoc
 - lib/metanorma/iso/boilerplate.adoc
 - lib/metanorma/iso/cleanup.rb
+- lib/metanorma/iso/cleanup_biblio.rb
 - lib/metanorma/iso/converter.rb
 - lib/metanorma/iso/front.rb
 - lib/metanorma/iso/front_contributor.rb