metanorma-iso 2.4.0 → 2.4.2

data/lib/isodoc/iso/metadata.rb

@@ -84,15 +84,15 @@ module IsoDoc
         p = titlenums[:part]
         titlenums[:part] && titlenums[:subpart] and
           p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
-        "#{PART_LABEL[lang.to_sym]} #{p}"
+        "#{self.class::PART_LABEL[lang.to_sym]} #{p}"
       end
 
       def amd_prefix(titlenums, lang)
-        "#{AMD_LABEL[lang.to_sym]} #{titlenums[:amd]}"
+        "#{self.class::AMD_LABEL[lang.to_sym]} #{titlenums[:amd]}"
       end
 
       def corr_prefix(titlenums, lang)
-        "#{CORR_LABEL[lang.to_sym]} #{titlenums[:corr]}"
+        "#{self.class::CORR_LABEL[lang.to_sym]} #{titlenums[:corr]}"
       end
 
       def compose_title(tparts, tnums, lang)

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -23,6 +23,7 @@ module IsoDoc
         sourcecode docxml
         formula docxml
         admonition docxml
+        source docxml
         ol docxml
         permission docxml
         requirement docxml

data/lib/isodoc/iso/word_cleanup.rb

@@ -86,7 +86,7 @@ module IsoDoc
       }.freeze
 
       def new_styles(docxml)
-        STYLESMAP.each do |k, v|
+        self.class::STYLESMAP.each do |k, v|
           docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
         end
         docxml.xpath("//div[@class = 'Section3']//p[@class = 'Tabletitle']")

data/lib/isodoc/iso/word_convert.rb

@@ -231,14 +231,19 @@ module IsoDoc
         out.div align: "center", class: "table_container" do |div|
           div.table **table_attrs(node) do |t|
             table_parse_core(node, t)
-            (dl = node.at(ns("./dl"))) && parse(dl, div)
-            node.xpath(ns("./note[not(@type = 'units')]"))
-              .each { |n| parse(n, div) }
+            table_parse_tail(node, t)
           end
         end
         @in_table = false
       end
 
+      def table_parse_tail(node, out)
+        (dl = node.at(ns("./dl"))) && parse(dl, out)
+        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./note[not(@type = 'units')]"))
+          .each { |n| parse(n, out) }
+      end
+
       include BaseConvert
       include Init
     end

data/lib/metanorma/iso/isodoc.rng

@@ -382,6 +382,9 @@
         <optional>
           <ref name="dl"/>
         </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
       </element>
     </define>
     <define name="figure">
@@ -404,9 +407,6 @@
           <attribute name="class"/>
         </optional>
         <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -431,6 +431,20 @@
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
+        <optional>
+          <ref name="source"/>
+        </optional>
+      </element>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <ref name="origin"/>
+        <optional>
+          <ref name="modification"/>
+        </optional>
       </element>
     </define>
     <define name="sourcecode">
@@ -2099,10 +2113,7 @@
   <define name="termsource">
     <element name="termsource">
       <attribute name="status">
-        <choice>
-          <value>identical</value>
-          <value>modified</value>
-        </choice>
+        <ref name="SourceStatusType"/>
       </attribute>
       <attribute name="type">
         <choice>
@@ -2116,6 +2127,17 @@
       </optional>
     </element>
   </define>
+  <define name="SourceStatusType">
+    <choice>
+      <value>identical</value>
+      <value>modified</value>
+      <value>restyled</value>
+      <value>context-added</value>
+      <value>generalisation</value>
+      <value>specialisation</value>
+      <value>unspecified</value>
+    </choice>
+  </define>
   <define name="origin">
     <element name="origin">
       <choice>

data/lib/metanorma/iso/validate.rb

@@ -106,10 +106,11 @@ module Metanorma
         xmldoc.xpath("//term").each do |t|
           para = t.at("./definition/verbal-definition") || return
           term = t.at("./preferred//name").text
-          termdef_warn(para.text, /\A(the|a)\b/i, t, term,
-                       "term definition starts with article")
-          termdef_warn(para.text, /\.\Z/i, t, term,
-                       "term definition ends with period")
+          @lang == "en" and termdef_warn(para.text, /\A(the|a)\b/i, t, term,
+                                         "term definition starts with article")
+          %(Cyrl Latn).include?(@script) and
+            termdef_warn(para.text, /\.\Z/i, t, term,
+                         "term definition ends with period")
         end
       end
 

data/lib/metanorma/iso/validate_list.rb

@@ -56,7 +56,8 @@ module Metanorma
       def list_punctuation1(list, prectext)
         prectext ||= ""
         entries = list.xpath(".//li")
-        case prectext.strip.chars.last
+        %w(Cyrl Latn Grek).include?(@script) or return
+        case prectext.strip[-1]
         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 "\
@@ -98,6 +99,7 @@ module Metanorma
       end
 
       def list_full_sentence(elem)
+        %w(Cyrl Latn Grek).include?(@script) or return
         text = elem.text.strip
         starts_uppercase?(text) or
           style_warning(elem, "List entry of separate sentences must start "\

data/lib/metanorma/iso/validate_requirements.rb

@@ -99,6 +99,7 @@ module Metanorma
       end
 
       def style_no_guidance(node, text, docpart)
+        @lang == "en" or return
         r = requirement_check(text)
         style_warning(node, "#{docpart} may contain requirement", r) if r
         r = permission_check(text)

data/lib/metanorma/iso/validate_section.rb

@@ -32,9 +32,9 @@ module Metanorma
           @log.add("Style", f, "normative references contains subclauses")
       end
 
-      ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated "\
+      ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated " \
                             "Terms section in the standard".freeze
-      NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can "\
+      NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can " \
                                "only contain a definition list".freeze
 
       def symbols_validate(root)
@@ -46,7 +46,7 @@ module Metanorma
           @log.add("Style", f.first, NON_DL_SYMBOLS_WARNING)
         @vocab and f.each do |f1|
           f1.at("./ancestor::annex") or
-            @log.add("Style", f1, "In vocabulary documents, Symbols and "\
+            @log.add("Style", f1, "In vocabulary documents, Symbols and " \
                                   "Abbreviated Terms are only permitted in annexes")
         end
       end
@@ -80,15 +80,15 @@ module Metanorma
           val: ["./self::introduction", "./self::clause[@type = 'scope']"] },
         { msg: "Prefatory material must be followed by (clause) Scope",
           val: ["./self::clause[@type = 'scope']"] },
-        { msg: "Normative References must be followed by "\
+        { msg: "Normative References must be followed by " \
                "Terms and Definitions",
           val: ["./self::terms | .//terms"] },
       ].freeze
 
       SECTIONS_XPATH =
-        "//foreword | //introduction | //sections/terms | .//annex | "\
-        "//sections/definitions | //sections/clause | "\
-        "//references[not(parent::clause)] | "\
+        "//foreword | //introduction | //sections/terms | .//annex | " \
+        "//sections/definitions | //sections/clause | " \
+        "//references[not(parent::clause)] | " \
         "//clause[descendant::references][not(parent::clause)]".freeze
 
       def sections_sequence_validate(root)
@@ -119,7 +119,7 @@ module Metanorma
           @log.add("Style", elem, "Document must contain at least one clause")
         end
         elem&.at("./self::clause") ||
-          @log.add("Style", elem, "Document must contain clause after "\
+          @log.add("Style", elem, "Document must contain clause after " \
                                   "Terms and Definitions")
         elem&.at("./self::clause[@type = 'scope']") &&
           @log.add("Style", elem,
@@ -151,12 +151,12 @@ module Metanorma
         while elem&.name == "annex"
           elem = names.shift
           if elem.nil?
-            @log.add("Style", nil, "Document must include (references) "\
+            @log.add("Style", nil, "Document must include (references) " \
                                    "Normative References")
           end
         end
         elem&.at("./self::references[@normative = 'true']") ||
-          @log.add("Style", nil, "Document must include (references) "\
+          @log.add("Style", nil, "Document must include (references) " \
                                  "Normative References")
         elem = names&.shift
         elem&.at("./self::references[@normative = 'false']") ||
@@ -227,13 +227,13 @@ module Metanorma
         if terms.size == 1
           ((t = terms.first.at("./title")) && (t&.text == @i18n.termsdef)) or
             @log.add("Style", terms.first,
-                     "Single terms clause in vocabulary document "\
+                     "Single terms clause in vocabulary document " \
                      "should have normal Terms and definitions heading")
         elsif terms.size > 1
           terms.each do |x|
             ((t = x.at("./title")) && /^#{@i18n.termsrelated}/.match?(t&.text)) or
               @log.add("Style", x,
-                       "Multiple terms clauses in vocabulary document "\
+                       "Multiple terms clauses in vocabulary document " \
                        "should have 'Terms related to' heading")
           end
         end

data/lib/metanorma/iso/validate_style.rb

@@ -110,8 +110,8 @@ module Metanorma
         )
         style_regex(/\b(?<num>[0-9]+\.[0-9]+)/i,
                     "possible decimal point", node, text)
-        style_regex(/\b(?<num>billions?)\b/i,
-                    "ambiguous number", node, text)
+        @lang == "en" and style_regex(/\b(?<num>billions?)\b/i,
+                                      "ambiguous number", node, text)
         style_regex(/(^|\s)(?<num>-[0-9][0-9,.]*)/i,
                     "hyphen instead of minus sign U+2212", node, text)
       end
@@ -135,8 +135,8 @@ module Metanorma
       end
 
       # leaving out as problematic: N J K C S T H h d B o E
-      SI_UNIT = "(m|cm|mm|km|μm|nm|g|kg|mgmol|cd|rad|sr|Hz|Hz|MHz|Pa|hPa|kJ|"\
-                "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|"\
+      SI_UNIT = "(m|cm|mm|km|μm|nm|g|kg|mgmol|cd|rad|sr|Hz|Hz|MHz|Pa|hPa|kJ|" \
+                "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|" \
                 "bit|kB|MB|Hart|nat|Sh|var)".freeze
 
       # ISO/IEC DIR 2, 9.3
@@ -165,8 +165,8 @@ module Metanorma
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-and
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-andor
       def style_punct(node, text)
-        style_regex(/\b(?<num>and\/?or)\b/i,
-                    "Use 'either x or y, or both'", node, text)
+        @lang == "en" and style_regex(/\b(?<num>and\/?or)\b/i,
+                                      "Use 'either x or y, or both'", node, text)
         style_regex(/\s(?<num>&)\s/i,
                     "Avoid ampersand in ordinary text'", node, text)
       end
@@ -180,8 +180,8 @@ module Metanorma
       end
 
       ASSETS_TO_STYLE =
-        "//termsource | //formula | //termnote | "\
-        "//p[not(ancestor::boilerplate)] | //li[not(p)] | //dt | "\
+        "//termsource | //formula | //termnote | " \
+        "//p[not(ancestor::boilerplate)] | //li[not(p)] | //dt | " \
         "//dd[not(p)] | //td[not(p)] | //th[not(p)]".freeze
 
       def asset_style(root)

data/lib/metanorma/iso/validate_title.rb

@@ -42,8 +42,8 @@ module Metanorma
       def title_subpart_validate(root)
         docid = root.at("//bibdata/docidentifier[@type = 'ISO']")
         subpart = /-\d+-\d+/.match docid
-        iec = root.at("//bibdata/contributor[role/@type = 'publisher']/"\
-                      "organization[abbreviation = 'IEC' or "\
+        iec = root.at("//bibdata/contributor[role/@type = 'publisher']/" \
+                      "organization[abbreviation = 'IEC' or " \
                       "name = 'International Electrotechnical Commission']")
         subpart && !iec and
           @log.add("Style", docid, "Subpart defined on non-IEC document!")
@@ -51,6 +51,7 @@ module Metanorma
 
       # ISO/IEC DIR 2, 11.5.2
       def title_names_type_validate(root)
+        @lang == "en" or return
         doctypes = /International\sStandard | Technical\sSpecification |
         Publicly\sAvailable\sSpecification | Technical\sReport | Guide /xi
         title_main_en = title_lang_part(root, "main", "en")
@@ -93,8 +94,8 @@ module Metanorma
 
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-full
       def title_no_full_stop_validate(root)
-        root.xpath("//preface//title | //sections//title | //annex//title | "\
-                   "//references/title | //preface//name | //sections//name | "\
+        root.xpath("//preface//title | //sections//title | //annex//title | " \
+                   "//references/title | //preface//name | //sections//name | " \
                    "//annex//name").each do |t|
           style_regex(/\A(?<num>.+\.\Z)/i,
                       "No full stop at end of title or caption",

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.4.0".freeze
+    VERSION = "2.4.2".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-iso", "~> 0.4.0"
+  spec.add_dependency "pubid-iso", "~> 0.5.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -340,6 +340,7 @@ files:
 - lib/isodoc/iso/html_convert.rb
 - lib/isodoc/iso/i18n-en.yaml
 - lib/isodoc/iso/i18n-fr.yaml
+- lib/isodoc/iso/i18n-ja.yaml
 - lib/isodoc/iso/i18n-ru.yaml
 - lib/isodoc/iso/i18n-zh-Hans.yaml
 - lib/isodoc/iso/i18n.rb