metanorma-iso 2.5.0 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b68e0ac152a02770b1ca677908a34d243a66ba8da955a98aac66391a6e1a73ae
-  data.tar.gz: 4122f534ef647b210a829dc1645240b79bc240a0059dec141ca3eec0f1c64efc
+  metadata.gz: 66e717f4c41d2cda0aa92bc42985e6f12d420e9bcdb2b0410fe085bca689a549
+  data.tar.gz: 33d5e0b9f67c9c76afcbd0feff13a81e21919c3cb48dc56524bfa34203725ae1
 SHA512:
-  metadata.gz: bb2d619b3e439f33ac96fd63691a288730daed7aa3ed8d478898caca5f755d3aea436469499afd81aa318519be87f5f12e5d8b632d17f40cff1b67e2c20851ad
-  data.tar.gz: 2e37056accf0f22aa7a13702ff79c928c359c0188126a10e165e8c448a9a7f110acf743b29fed45b5b972c54d77f7a8a7610a6da889f8ef9ca43d3b77bbfa501
+  metadata.gz: a5249f0f6147e52c1ef81b7c32a3a431a74478a7727e8bde1842e411f20d1e56311fb41755828f93dc626e94ea14b5d661a5e4fbd6a17c41619131fe1a4d60eb
+  data.tar.gz: a97203b198a7e9baa2e28f5597f53c9cd60ab79cc0de989f5e3dcc7671d5199e9047abdf0eb0b02401d05d48317dbae45781475642275b4c15fa8a6aaf0f446d

data/lib/isodoc/iso/base_convert.rb

@@ -6,7 +6,7 @@ module IsoDoc
   module Iso
     module BaseConvert
       def convert1(docxml, filename, dir)
-        if amd(docxml)
+        if amd?(docxml)
           @oldsuppressheadingnumbers = @suppressheadingnumbers
           @suppressheadingnumbers = true
         end

data/lib/isodoc/iso/init.rb

@@ -20,9 +20,8 @@ module IsoDoc
                                        i18nyaml: i18nyaml || @i18nyaml)
       end
 
-      def amd(docxml)
-        doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
-        %w(amendment technical-corrigendum).include? doctype
+      def amd?(docxml)
+        %w(amendment technical-corrigendum).include? @doctype
       end
 
       def clausedelim
@@ -44,16 +43,15 @@ module IsoDoc
       end
 
       def std_docid_semantic1(id)
-        ids = id.split(/ /)
-        %w(ISO IEC ITU IETF NIST OGC IEEE BIPM BSI IANA UN W3C IEV)
-          .include?(ids[0].sub(/\/.*$/, "")) or
-          return id
+        ids = id.split(/(\p{Zs})/)
+        agency?(ids[0].sub(/\/.*$/, "")) or return id
         ids.map! do |i|
           if %w(GUIDE TR TS DIR).include?(i)
             "<span class='stddocNumber'>#{i}</span>"
+          elsif /\p{Zs}/.match?(i) then i
           else std_docid_semantic_full(i)
           end
-        end.join(" ")
+        end.join
       end
 
       def std_docid_semantic_full(ident)

data/lib/isodoc/iso/iso.amendment.xsl

@@ -2674,11 +2674,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -5352,21 +5367,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -8588,8 +8603,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -8622,7 +8641,7 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:if test="@width != '' and @width != 'auto'">
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
 											<xsl:value-of select="@width"/>
 										</xsl:attribute>

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -2674,11 +2674,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -5352,21 +5367,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -8588,8 +8603,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -8622,7 +8641,7 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:if test="@width != '' and @width != 'auto'">
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
 											<xsl:value-of select="@width"/>
 										</xsl:attribute>

data/lib/isodoc/iso/pdf_convert.rb

@@ -14,7 +14,7 @@ module IsoDoc
       end
 
       def pdf_stylesheet(docxml)
-        case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        case @doctype
         when "amendment", "technical-corrigendum" then "iso.amendment.xsl"
         else
           "iso.international-standard.xsl"

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -11,7 +11,7 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def convert1(docxml, filename, dir)
         @iso_class = instance_of?(IsoDoc::Iso::PresentationXMLConvert)
-        if amd(docxml)
+        if amd?(docxml)
           @oldsuppressheadingnumbers = @suppressheadingnumbers
           @suppressheadingnumbers = true
         end
@@ -38,12 +38,12 @@ module IsoDoc
       end
 
       def annex(isoxml)
-        amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
+        amd?(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
         super
         isoxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|
           clause1(f)
         end
-        amd(isoxml) and @suppressheadingnumbers = true
+        amd?(isoxml) and @suppressheadingnumbers = true
       end
 
       def figure1(node)
@@ -87,23 +87,25 @@ module IsoDoc
         end
       end
 
-      # we're assuming terms and clauses in the right place for display,
-      # to cope with multiple terms sections
-      def display_order(docxml)
-        i = 0
-        i = display_order_xpath(docxml, "//preface/*", i)
-        i = display_order_at(docxml, "//clause[@type = 'scope']", i)
-        i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        i = display_order_xpath(docxml,
-                                "//sections/clause[not(@type = 'scope')][not(.//references)] | " \
-                                "//sections/terms | //sections/definitions", i)
-        i = display_order_xpath(docxml, "//annex", i)
-        i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
-        display_order_xpath(docxml, "//indexsect", i)
-      end
-
       def admonition1(elem)
         super
+        admonition_inline_name(elem)
+        admonition_outside_clauses(elem)
+      end
+
+      def admonition_outside_clauses(elem)
+        elem.parent.name == "sections" or return
+        wrap_in_bold(elem)
+      end
+
+      def wrap_in_bold(cell)
+        cell.text? && cell.text.strip.empty? and return
+        cell.text? and cell.swap("<strong>#{cell.to_xml}</strong>")
+        %w(strong fn).include?(cell.name) and return
+        cell.children.each { |p| wrap_in_bold(p) }
+      end
+
+      def admonition_inline_name(elem)
         n = elem.at(ns("./name")) or return
         if (p = n.next_element) && p&.name == "p"
           p.children.first.previous = admonition_name(to_xml(n.remove.children))
@@ -156,8 +158,7 @@ module IsoDoc
       end
 
       def toc_title(docxml)
-        doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
-        %w(amendment technical-corrigendum).include?(doctype) and return
+        %w(amendment technical-corrigendum).include?(@doctype) and return
         super
       end
 
@@ -194,6 +195,12 @@ module IsoDoc
         ret
       end
 
+      def move_norm_ref_to_sections(docxml)
+        if amd?(docxml)
+        else super
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/sections.rb

@@ -2,10 +2,10 @@ module IsoDoc
   module Iso
     module BaseConvert
       def annex(node, out)
-        amd(node.document) and
+        amd?(node.document) and
           @suppressheadingnumbers = @oldsuppressheadingnumbers
         super
-        amd(node.document) and @suppressheadingnumbers = true
+        amd?(node.document) and @suppressheadingnumbers = true
       end
 
       def foreword(clause, out)

data/lib/isodoc/iso/word_convert.rb

@@ -185,8 +185,7 @@ module IsoDoc
       end
 
       def figure_name_parse(node, div, name)
-        return if name.nil?
-
+        name.nil? and return
         div.p **figure_name_attrs(node) do |p|
           name.children.each { |n| parse(n, p) }
         end
@@ -205,8 +204,7 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        return if name.nil?
-
+        name.nil? and return
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
         div.h1 class: "Annex" do |t|
           annex_name1(name, t)

data/lib/isodoc/iso/word_dis_convert.rb

@@ -103,15 +103,18 @@ module IsoDoc
       end
 
       def span_parse(node, out)
+        st = node["style"]
         case node["class"]
         when "nonboldtitle"
-          out.span(style: "font-weight:normal") do |s|
+          out.span **attr_code(style: "#{st};font-weight:normal") do |s|
             node.children.each { |n| parse(n, s) }
           end
         when "boldtitle"
-          node.children.each { |n| parse(n, out) }
+          out.span **attr_code(style: st) do |s|
+            node.children.each { |n| parse(n, s) }
+          end
         else
-          out.span class: node["class"] do |x|
+          out.span **attr_code(class: node["class"], style: st) do |x|
             node.children.each { |n| parse(n, x) }
           end
         end

data/lib/isodoc/iso/xref.rb

@@ -8,22 +8,33 @@ module IsoDoc
     class Xref < IsoDoc::Xref
       attr_accessor :anchors_previous, :anchors
 
-      def initial_anchor_names(doc)
-        if @klass.amd(doc) then initial_anchor_names_amd(doc)
-        else initial_anchor_names1(doc)
+      def clause_order_main(docxml)
+        if @klass.amd?(docxml)
+          [{ path: "//sections/clause", multi: true }]
+        else
+          [{ path: "//clause[@type = 'scope']" },
+           { path: @klass.norm_ref_xpath },
+           { path:
+             "#{@klass.middle_clause(docxml)} | //sections/terms | " \
+             "//sections/clause[descendant::terms or descendant::definitions] " \
+             "| //sections/definitions", multi: true }]
         end
-        if @parse_settings.empty? || @parse_settings[:clauses]
-          introduction_names(doc.at(ns("//introduction")))
+      end
+
+      def clause_order_back(docxml)
+        if @klass.amd?(docxml)
+          [{ path: @klass.norm_ref_xpath },
+           { path: @klass.bibliography_xpath },
+           { path: "//indexsect", multi: true },
+           { path: "//colophon/*", multi: true }]
+        else super
         end
       end
 
-      def initial_anchor_names_amd(doc)
+      def initial_anchor_names(doc)
+        super
         if @parse_settings.empty? || @parse_settings[:clauses]
-          ["//preface/*", "//sections/clause"].each do |xpath|
-            doc.xpath(ns(xpath)).each do |c|
-              c.element? and preface_names(c)
-            end
-          end
+          introduction_names(doc.at(ns("//introduction")))
         end
       end
 
@@ -33,23 +44,6 @@ module IsoDoc
         sequential_asset_names(doc.xpath(ns("//preface/*")))
       end
 
-      def initial_anchor_names1(doc)
-        if @parse_settings.empty? || @parse_settings[:clauses]
-          doc.xpath(ns("//preface/*")).each do |c|
-            c.element? and preface_names(c)
-          end
-          # potentially overridden in middle_section_asset_names()
-          sequential_asset_names(doc.xpath(ns("//preface/*")))
-          n = Counter.new
-          n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
-          n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-          doc.xpath(ns("//sections/clause[not(@type = 'scope')][not(.//references)] | " \
-                       "//sections/terms | //sections/definitions")).each do |c|
-            n = section_names(c, n, 1)
-          end
-        end
-      end
-
       def hierarchical_formula_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|
@@ -131,13 +125,6 @@ module IsoDoc
           .sub(/ \(All Parts\)/i, "") }
       end
 
-      def back_anchor_names(docxml)
-        super
-        if @parse_settings.empty? || @parse_settings[:clauses]
-          docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
-        end
-      end
-
       def list_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -

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

@@ -1,5 +1,5 @@
 == copyright-statement
-=== {% if stage_int >= 40 %}DOCUMENT PROTÉGÉ PAR COPYRIGHT{%else%}{blank}
+=== {% if stage_int >= 40 %}DOCUMENT PROTÉGÉ PAR COPYRIGHT{%else%}{blank}{%endif%}
 
 [[boilerplate-year]]
 © span:std_publisher:[{{ agency }}] span:std_docNumber[{{ docyear }}]

data/lib/metanorma/iso/cleanup.rb

@@ -110,10 +110,10 @@ module Metanorma
         xml.xpath("//*[@inline-header]").each { |h| h.delete("inline-header") }
       end
 
-      def boilerplate_file(xmldoc)
+      def boilerplate_file(_xmldoc)
         file = case @lang
-               when "fr" then "boilerplate-fr.xml"
-               when "ru" then "boilerplate-ru.xml"
+               when "fr" then "boilerplate-fr.adoc"
+               when "ru" then "boilerplate-ru.adoc"
                else "boilerplate.adoc"
                end
         File.join(@libdir, file)
@@ -142,11 +142,10 @@ module Metanorma
       def unpublished_note(xmldoc)
         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)
-
+          pub_class(b) > 2 and next
+          ((s = b.at("./status/stage")) && (s.text.to_i < 60)) or next
           id = b.at("docidentifier").text
-          insert_unpub_note(b, @i18n.under_preparation.sub(/%/, id))
+          insert_unpub_note(b, @i18n.under_preparation.sub("%", id))
         end
       end
 
@@ -155,7 +154,7 @@ module Metanorma
           .each do |b|
             withdrawn_ref?(b) or next
             if id = replacement_standard(b)
-              insert_unpub_note(b, @i18n.cancelled_and_replaced.sub(/%/, id))
+              insert_unpub_note(b, @i18n.cancelled_and_replaced.sub("%", id))
             else insert_unpub_note(b, @i18n.withdrawn)
             end
           end
@@ -227,7 +226,7 @@ module Metanorma
         xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/" \
                      "organization").each_with_object([]) do |p, m|
           x = p.at("./abbreviation") || p.at("./name") or next
-          m << x.text
+          m << x.children.to_xml
         end
       end
 
@@ -237,8 +236,7 @@ module Metanorma
       def editorial_group_types(xmldoc)
         %w(technical-committee subcommittee workgroup).each do |v|
           xmldoc.xpath("//bibdata//#{v} | //bibdata//approval-#{v}").each do |g|
-            next if g["type"]
-
+            g["type"] and next
             g["type"] = DEFAULT_EDGROUP_TYPE[v.to_sym]
           end
         end

data/lib/metanorma/iso/front.rb

@@ -5,6 +5,7 @@ require "json"
 require "pathname"
 require "open-uri"
 require_relative "front_id"
+require_relative "front_contributor"
 
 module Metanorma
   module ISO
@@ -17,13 +18,16 @@ module Metanorma
           xml.updates_document_type a
       end
 
+      STAGE_ERROR = [Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
+                     Pubid::Core::Errors::TypeStageParseError,
+                     Pubid::Core::Errors::StageInvalidError].freeze
+
       def metadata_stage(node, xml)
         id = iso_id_default(iso_id_params(node))
         id.stage and
           xml.stagename metadata_stagename(id)&.strip,
                         **attr_code(abbreviation: id.typed_stage_abbrev&.strip)
-      rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
-             Pubid::Core::Errors::TypeStageParseError
+      rescue *STAGE_ERROR
       end
 
       def metadata_stagename(id)
@@ -44,53 +48,6 @@ module Metanorma
         a = node.attr("horizontal") and xml.horizontal a
       end
 
-      def org_abbrev
-        { "International Organization for Standardization" => "ISO",
-          "International Electrotechnical Commission" => "IEC" }
-      end
-
-      def metadata_author(node, xml)
-        publishers = node.attr("publisher") || "ISO"
-        csv_split(publishers).each do |p|
-          xml.contributor do |c|
-            c.role type: "author"
-            c.organization do |a|
-              organization(a, p, false, node, !node.attr("publisher"))
-            end
-          end
-        end
-      end
-
-      def metadata_publisher(node, xml)
-        publishers = node.attr("publisher") || "ISO"
-        csv_split(publishers).each do |p|
-          xml.contributor do |c|
-            c.role type: "publisher"
-            c.organization do |a|
-              organization(a, p, true, node, !node.attr("publisher"))
-            end
-          end
-        end
-      end
-
-      def metadata_copyright(node, xml)
-        publishers = node.attr("copyright-holder") || node.attr("publisher") ||
-          "ISO"
-        csv_split(publishers).each do |p|
-          xml.copyright do |c|
-            c.from (node.attr("copyright-year") || Date.today.year)
-            c.owner do |owner|
-              owner.organization do |o|
-                organization(
-                  o, p, true, node,
-                  !(node.attr("copyright-holder") || node.attr("publisher"))
-                )
-              end
-            end
-          end
-        end
-      end
-
       def metadata_status(node, xml)
         stage = get_stage(node)
         substage = get_substage(node)
@@ -100,8 +57,7 @@ module Metanorma
           s.substage substage
           i = node.attr("iteration") and s.iteration i
         end
-      rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
-             Pubid::Core::Errors::TypeStageParseError
+      rescue *STAGE_ERROR
         report_illegal_stage(stage, substage)
       end
 
@@ -111,46 +67,6 @@ module Metanorma
         warn err
       end
 
-      def metadata_committee(node, xml)
-        metadata_editorial_committee(node, xml)
-        metadata_approval_committee(node, xml)
-      end
-
-      def metadata_editorial_committee(node, xml)
-        xml.editorialgroup do |a|
-          %w(technical-committee subcommittee workgroup).each do |v|
-            node.attr("#{v}-number") and committee_component(v, node, a)
-          end
-          node.attr("secretariat") and a.secretariat(node.attr("secretariat"))
-        end
-      end
-
-      def metadata_approval_committee(node, xml)
-        types = metadata_approval_committee_types(node)
-        xml.approvalgroup do |a|
-          metadata_approval_agency(a, node.attr("approval-agency")
-            &.split(%r{[/,;]}))
-          types.each do |v|
-            node.attr("#{v}-number") and committee_component(v, node, a)
-          end
-        end
-      end
-
-      def metadata_approval_committee_types(node)
-        types = %w(technical-committee subcommittee workgroup)
-        node.attr("approval-technical-committee-number") and
-          types = %w(approval-technical-committee approval-subcommittee
-                     approval-workgroup)
-        types
-      end
-
-      def metadata_approval_agency(xml, list)
-        list = ["ISO"] if list.nil? || list.empty?
-        list.each do |v|
-          xml.agency v
-        end
-      end
-
       def title_intro(node, xml, lang, at)
         return unless node.attr("title-intro-#{lang}")
 

data/lib/metanorma/iso/front_contributor.rb

@@ -0,0 +1,144 @@
+module Metanorma
+  module ISO
+    class Converter < Standoc::Converter
+      def home_agency
+        "ISO"
+      end
+
+      def org_abbrev
+        { "International Organization for Standardization" => "ISO",
+          "International Electrotechnical Commission" => "IEC" }
+      end
+
+      def metadata_author(node, xml)
+        publishers = node.attr("publisher") || home_agency
+        metadata_contrib_sdo(node, xml, publishers,
+                             { role: "author",
+                               default_org: !node.attr("publisher") })
+        committee_contributors(node, xml, false, home_agency)
+      end
+
+      def metadata_contrib_sdo(node, xml, publishers, opt)
+        publishers.nil? and return
+        csv_split(publishers).each do |p|
+          xml.contributor do |c|
+            c.role type: opt[:role] do |r|
+              opt[:desc] and r << opt[:desc]
+            end
+            c.organization do |a|
+              (opt[:committee] and
+                contrib_committee_build(a, opt[:agency],
+                                        { name: p, id: opt[:ident] })) or
+                organization(a, p, opt[:role] == "publisher", node,
+                             opt[:default_org])
+            end
+          end
+        end
+      end
+
+      def committee_contributors(node, xml, approval, agency)
+        types = metadata_approval_committee_types(approval ? node : nil)
+        types.each do |v|
+          n = node.attr("#{v}-number") or next
+          t = committee_abbrev(node.attr("#{v}-type"), n, v)
+          metadata_contrib_sdo(
+            node, xml, node.attr(v),
+            { role: approval ? "authorizer" : "author", ident: t,
+              default_org: false, committee: true, agency: agency,
+              desc: v.sub(/^approval-/, "").gsub("-", " ").capitalize }
+          )
+        end
+        approval and
+          metadata_contrib_sdo(node, xml, agency,
+                               { role: "authorizer", default_org: false,
+                                 desc: "Agency", committee: false })
+      end
+
+      def contrib_committee_build(xml, agency, committee)
+        n = org_abbrev.invert[agency] and agency = n
+        xml.name agency
+        xml.subdivision committee[:name]
+        committee[:abbr] and xml.abbreviation committee[:abbr]
+        committee[:id] and xml.identifier committee[:id]
+      end
+
+      COMMITTEE_ABBREVS =
+        { "technical-committee" => "TC", "subcommittee" => "SC",
+          "workgroup" => "WG" }.freeze
+
+      def committee_abbrev(type, number, level)
+        type ||= COMMITTEE_ABBREVS[level.sub(/^approval-/, "")]
+        type == "Other" and type = ""
+        "#{type} #{number}".strip
+      end
+
+      def metadata_publisher(node, xml)
+        publishers = node.attr("publisher") || home_agency
+        metadata_contrib_sdo(node, xml, publishers,
+                             { role: "publisher",
+                               default_org: !node.attr("publisher") })
+        # approvals
+        committee_contributors(node, xml, true,
+                               node.attr("approval-agency") || home_agency)
+      end
+
+      def metadata_copyright(node, xml)
+        publishers = node.attr("copyright-holder") || node.attr("publisher") ||
+          home_agency
+        csv_split(publishers).each do |p|
+          xml.copyright do |c|
+            c.from (node.attr("copyright-year") || Date.today.year)
+            c.owner do |owner|
+              owner.organization do |o|
+                organization(
+                  o, p, true, node,
+                  !(node.attr("copyright-holder") || node.attr("publisher"))
+                )
+              end
+            end
+          end
+        end
+      end
+
+      def metadata_committee(node, xml)
+        metadata_editorial_committee(node, xml)
+        metadata_approval_committee(node, xml)
+      end
+
+      def metadata_editorial_committee(node, xml)
+        xml.editorialgroup do |a|
+          %w(technical-committee subcommittee workgroup).each do |v|
+            node.attr("#{v}-number") and committee_component(v, node, a)
+          end
+          node.attr("secretariat") and a.secretariat(node.attr("secretariat"))
+        end
+      end
+
+      def metadata_approval_committee(node, xml)
+        types = metadata_approval_committee_types(node)
+        xml.approvalgroup do |a|
+          metadata_approval_agency(a, node.attr("approval-agency")
+            &.split(%r{[/,;]}))
+          types.each do |v|
+            node.attr("#{v}-number") and committee_component(v, node, a)
+          end
+        end
+      end
+
+      def metadata_approval_committee_types(node)
+        types = %w(technical-committee subcommittee workgroup)
+        !node.nil? && node.attr("approval-technical-committee-number") and
+          types = %w(approval-technical-committee approval-subcommittee
+                     approval-workgroup)
+        types
+      end
+
+      def metadata_approval_agency(xml, list)
+        list = [home_agency] if list.nil? || list.empty?
+        list.each do |v|
+          xml.agency v
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/iso/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.3 -->
+<!-- VERSION v1.2.4 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -2068,6 +2068,9 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <choice>
         <ref name="verbaldefinition"/>
         <ref name="nonverbalrep"/>

data/lib/metanorma/iso/validate.rb

@@ -1,10 +1,10 @@
 require "metanorma-standoc"
-require_relative "./validate_style"
-require_relative "./validate_requirements"
-require_relative "./validate_section"
-require_relative "./validate_title"
-require_relative "./validate_image"
-require_relative "./validate_list"
+require_relative "validate_style"
+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"
@@ -34,7 +34,7 @@ module Metanorma
         root.xpath("//xref").each do |t|
           preceding = t.at("./preceding-sibling::text()[last()]")
           next unless !preceding.nil? &&
-            /\b(see| refer to)\s*\Z/mi.match(preceding)
+            /\b(see| refer to)\p{Zs}*\Z/mi.match(preceding)
 
           (target = root.at("//*[@id = '#{t['target']}']")) || next
           target.at("./ancestor-or-self::*[@obligation = 'normative']") &&
@@ -49,7 +49,7 @@ module Metanorma
         @lang == "en" or return
         root.xpath("//eref").each do |t|
           prec = t.at("./preceding-sibling::text()[last()]")
-          next unless !prec.nil? && /\b(see|refer to)\s*\Z/mi.match(prec)
+          next unless !prec.nil? && /\b(see|refer to)\p{Zs}*\Z/mi.match(prec)
 
           unless target = root.at("//*[@id = '#{t['bibitemid']}']")
             @log.add("Bibliography", t,
@@ -116,13 +116,12 @@ module Metanorma
         end
       end
 
-      def doctype_validate(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+      def doctype_validate(_xmldoc)
         %w(international-standard technical-specification technical-report
            publicly-available-specification international-workshop-agreement
-           guide amendment technical-corrigendum).include? doctype or
+           guide amendment technical-corrigendum).include? @doctype or
           @log.add("Document Attributes", nil,
-                   "#{doctype} is not a recognised document type")
+                   "#{@doctype} is not a recognised document type")
       end
 
       def script_validate(xmldoc)
@@ -173,8 +172,7 @@ module Metanorma
 
       def validate(doc)
         content_validate(doc)
-        doctype = doc&.at("//bibdata/ext/doctype")&.text
-        schema = case doctype
+        schema = case @doctype
                  when "amendment", "technical-corrigendum" # @amd
                    "isostandard-amd.rng"
                  else

data/lib/metanorma/iso/validate_requirements.rb

@@ -20,7 +20,7 @@ module Metanorma
 
       def requirement_re
         Regexp.new(self.class::REQUIREMENT_RE_STR.gsub(/\s/, "")
-          .gsub(/_/, "\\s"), Regexp::IGNORECASE)
+          .gsub("_", "\\s"), Regexp::IGNORECASE)
       end
 
       def requirement_check(text)
@@ -41,7 +41,7 @@ module Metanorma
 
       def recommendation_re
         Regexp.new(self.class::RECOMMENDATION_RE_STR.gsub(/\s/, "")
-          .gsub(/_/, "\\s"), Regexp::IGNORECASE)
+          .gsub("_", "\\s"), Regexp::IGNORECASE)
       end
 
       def recommendation_check(text)
@@ -64,7 +64,7 @@ module Metanorma
       def permission_re
         @lang == "en" or return
         Regexp.new(self.class::PERMISSION_RE_STR.gsub(/\s/, "")
-          .gsub(/_/, "\\s"), Regexp::IGNORECASE)
+          .gsub("_", "\\s"), Regexp::IGNORECASE)
       end
 
       def permission_check(text)
@@ -87,7 +87,7 @@ module Metanorma
       def possibility_re
         @lang == "en" or return
         Regexp.new(self.class::POSSIBILITY_RE_STR.gsub(/\s/, "")
-          .gsub(/_/, "\\s"), Regexp::IGNORECASE)
+          .gsub("_", "\\s"), Regexp::IGNORECASE)
       end
 
       def possibility_check(text)
@@ -111,7 +111,7 @@ module Metanorma
       def ambig_words_re
         @lang == "en" or return
         Regexp.new(self.class::AMBIG_WORDS_RE_STR.gsub(/\s/, "")
-          .gsub(/_/, "\\s"), Regexp::IGNORECASE)
+          .gsub("_", "\\s"), Regexp::IGNORECASE)
       end
 
       def ambig_words_check(text)

data/lib/metanorma/iso/validate_section.rb

@@ -4,8 +4,7 @@ module Metanorma
   module ISO
     class Converter < Standoc::Converter
       def section_validate(doc)
-        doctype = doc&.at("//bibdata/ext/doctype")&.text
-        unless %w(amendment technical-corrigendum).include? doctype
+        unless %w(amendment technical-corrigendum).include? @doctype
           foreword_validate(doc.root)
           normref_validate(doc.root)
           symbols_validate(doc.root)
@@ -181,7 +180,7 @@ module Metanorma
       end
 
       def tech_report_style(root)
-        root.at("//bibdata/ext/doctype")&.text == "technical-report" or return
+        @doctype == "technical-report" or return
         root.xpath("//sections/clause[not(@type = 'scope')] | //annex")
           .each do |s|
           r = requirement_check(extract_text(s)) and
@@ -193,10 +192,14 @@ module Metanorma
       NORM_BIBITEMS =
         "//references[@normative = 'true']/bibitem".freeze
 
+      ISO_PUBLISHER_XPATH = <<~XPATH.freeze
+        ./contributor[role/@type = 'publisher']/organization[abbreviation = 'ISO' or abbreviation = 'IEC' or name = 'International Organization for Standardization' or name = 'International Electrotechnical Commission']
+      XPATH
+
       # ISO/IEC DIR 2, 10.2
       def norm_bibitem_style(root)
         root.xpath(NORM_BIBITEMS).each do |b|
-          if b.at(Standoc::Converter::ISO_PUBLISHER_XPATH).nil?
+          if b.at(ISO_PUBLISHER_XPATH).nil?
             @log.add("Style", b, "#{NORM_ISO_WARN}: #{b.text}")
           end
         end

data/lib/metanorma/iso/validate_style.rb

@@ -127,7 +127,7 @@ module Metanorma
                     "possible decimal point", 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,
+        style_regex(/(?:^|\P{Zs})(?<num>-[0-9][0-9,.]*)/i,
                     "hyphen instead of minus sign U+2212", node, text)
       end
 
@@ -158,8 +158,8 @@ module Metanorma
       # ISO/IEC DIR 2, 8.4
       # ISO/IEC DIR 2, 9.3
       def style_abbrev(node, text)
-        style_regex(/(\A|\s)(?!e\.g\.|i\.e\.)
-                    (?<num>[a-z]{1,2}\.([a-z]{1,2}|\.))\b/ix,
+        style_regex(/(?:\A|\p{Zs})(?!e\.g\.|i\.e\.)
+                    (?<num>[a-z]{1,2}\.(?:[a-z]{1,2}|\.))\b/ix,
                     "no dots in abbreviations", node, text)
         style_regex(/\b(?<num>ppm)\b/i,
                     "language-specific abbreviation", node, text)
@@ -172,7 +172,7 @@ module Metanorma
 
       # ISO/IEC DIR 2, 9.3
       def style_units(node, text)
-        style_regex(/\b(?<num>[0-9][0-9,]*\s+[\u00b0\u2032\u2033])/,
+        style_regex(/\b(?<num>[0-9][0-9,]*\p{Zs}+[\u00b0\u2032\u2033])/,
                     "space between number and degrees/minutes/seconds",
                     node, text)
         style_regex(/\b(?<num>[0-9][0-9,]*#{SI_UNIT})\b/o,
@@ -188,7 +188,7 @@ module Metanorma
       # ISO/IEC DIR 2, 9.3
       def style_non_std_units(node, text)
         NONSTD_UNITS.each do |k, v|
-          style_regex(/\b(?<num>[0-9][0-9,]*\s+#{k})\b/,
+          style_regex(/\b(?<num>[0-9][0-9,]*\p{Zs}+#{k})\b/,
                       "non-standard unit (should be #{v})", node, text)
         end
       end
@@ -198,7 +198,7 @@ module Metanorma
       def style_punct(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,
+        style_regex(/\p{Zs}(?<num>&)\p{Zs}/i,
                     "Avoid ampersand in ordinary text'", node, text)
         eref_style_punct(node)
       end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.5.0".freeze
+    VERSION = "2.5.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.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.0"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-iso", "~> 0.5.0"
+  spec.add_dependency "pubid-iso", "~> 0.6.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.5.0
+  version: 2.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-09-11 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.5.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -375,6 +375,7 @@ files:
 - lib/metanorma/iso/cleanup.rb
 - lib/metanorma/iso/converter.rb
 - lib/metanorma/iso/front.rb
+- lib/metanorma/iso/front_contributor.rb
 - lib/metanorma/iso/front_id.rb
 - lib/metanorma/iso/isodoc.rng
 - lib/metanorma/iso/isostandard-amd.rng