metanorma-iso 2.7.2 → 2.7.4

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -120,11 +120,6 @@ module IsoDoc
         "#{xml} — "
       end
 
-      def bibrenderer
-        ::Relaton::Render::Iso::General.new(language: @lang,
-                                            i18nhash: @i18n.get)
-      end
-
       def bibrender_formattedref(formattedref, xml)
         %w(techreport standard).include? xml["type"] and return
         super

data/lib/metanorma/iso/base.rb

@@ -83,14 +83,6 @@ module Metanorma
         node.attr("document-scheme") || "2024"
       end
 
-      def metadata_attrs(node)
-        ret = super
-        a = document_scheme(node) and
-          ret += "<presentation-metadata><name>document-scheme</name>" \
-            "<value>#{a}</value></presentation-metadata>"
-        ret
-      end
-
       def outputs(node, ret)
         File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert("#{@filename}.xml")

data/lib/metanorma/iso/biblio.rng

@@ -338,29 +338,32 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <oneOrMore>
-        <ref name="orgname"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="subdivision"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="abbreviation"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="org-identifier"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="contact"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="logo"/>
-      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
+  <define name="OrganizationType">
+    <oneOrMore>
+      <ref name="orgname"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subdivision"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="abbreviation"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="uri"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="org-identifier"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contact"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="logo"/>
+    </optional>
+  </define>
   <define name="orgname">
     <element name="name">
       <choice>
@@ -371,10 +374,10 @@
   </define>
   <define name="subdivision">
     <element name="subdivision">
-      <choice>
-        <ref name="LocalizedString"/>
-        <ref name="NameWithVariants"/>
-      </choice>
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
   <define name="logo">

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

@@ -18,11 +18,45 @@ Imprimé en Suisse
 Ce document est également édité en anglais et en russe. Il peut être obtenu auprès des organisations +
 nationales de normalisation.
 
+{% elsif document_scheme == "1972" or document_scheme == "1987" %}
+
+=== {blank}
+
+[[boilerplate-year]]
+©   span:std_publisher[*Organisation Nationale de Normalisation*], span:date[*{{ docyear }}*]   ●
+
+[[boilerplate-place]]
+Publié en Suisse
+
+
+{% elsif document_scheme == "1989" %}
+
+=== {blank}
+
+[[boilerplate-year]]
+© span:std_publisher[{{ agency }} ]span:date[{{ docyear }}]
+
+[[boilerplate-message]]
+Droits de reproduction réservés. Sauf prescription différente, aucune partie de cette publication 
+ne peut être reproduite ni utilisée sous quelque forme que ce soit et par aucun procédé, 
+électronique ou mécanique, y compris la photocopie et les microfilms, sans l'accord écrit de l'éditeur. 
+
+[[boilerplate-address]]
+[align=left]
+Organisation internationale de normalisation +
+Case postale 56 • CH-1211 Genève 20 • Suisse +
+Internet   central@iso.ch +
+X.400      c=ch; a=400net; p=iso; o=isocs; s=central 
+
+[[boilerplate-place]]
+Imprimé en Suisse
+
+
 {% else %}
 === {% if stage_int >= 40 %}DOCUMENT PROTÉGÉ PAR COPYRIGHT{%else%}{blank}{%endif%}
 
 [[boilerplate-year]]
-© span:std_publisher:[{{ agency }} ]span:std_docNumber[{{ docyear }}]
+© span:std_publisher:[{{ agency }} ]span:date[{{ docyear }}]
 
 [[boilerplate-message]]
 Droits de reproduction réservés. Sauf indication contraire, ou requise dans le cadre de sa mise en œuvre,

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

@@ -1,9 +1,43 @@
 == copyright-statement
 
+{% if document_scheme == "1972" or document_scheme == "1987" %}
+
+=== {blank}
+
+[[boilerplate-year]]
+©   span:std_publisher[*Международная Организация по Стандартизации*], span:date[*{{ docyear }}*]   ●
+
+[[boilerplate-place]]
+Издано в Швейцарии
+
+{% elsif document_scheme == "1989" %}
+
+=== {blank}
+
+[[boilerplate-year]]
+© span:std_publisher[{{ agency }} ]span:date[{{ docyear }}]
+
+[[boilerplate-message]]
+Охраняется авторским правом. Если это особо не указано, то никакая часть данной публикации не может быть воспроизведена и 
+использована в любой форме или любыми средствами, электронными или механическими, включая фотокопирование и
+микрофильмирование, без предварительного письменного разрешения издателя.
+
+[[boilerplate-address]]
+[align=left]
+Международная Организация по Стандартизации +
+Почтовый адрес: 56 • CH-1211 Geneva 20 • Switzerland +
+Адрес в Интернете: central@iso.ch +
+X.400          c=ch; a=400net; p=iso; o=isocs; s=central
+
+[[boilerplate-place]]
+Напечатано в Швейцарии
+
+{% else %}
+
 === {% if stage_int >= 40 %}ДОКУМЕНТ, ОХРАНЯЕМЫЙ АВТОРСКИМ ПРАВОМ{% else %}{blank}{% endif %}
 
 [[boilerplate-year]]
-© span:std_publisher[{{ agency }} ]span:std_docNumber[{{ docyear }}]
+© span:std_publisher[{{ agency }} ]span:date[{{ docyear }}]
 
 [[boilerplate-message]]
 Все права защищены. Если иначе не определено или не требуется в контексте его реализации, никакая часть этой публикации не может быть воспроизведена или использована иначе в любой форме или каким-либо образом, электронным или механическим, включая фотокопирование, или публикацию в Интернете или интранете, без предварительного письменного разрешения. Разрешение может быть запрошено ISO по адресу, указанному ниже, или у органа — члена ISO страны запрашивающего.
@@ -28,3 +62,4 @@ CH-1214 Vernier, Geneva +
 
 Получателям этого проекта предлагается представить вместе со своими комментариями уведомление о любых соответствующих патентных правах, о которых им известно, и предоставить подтверждающую документацию.
 {% endif %}
+{% endif %}

data/lib/metanorma/iso/boilerplate.adoc

@@ -18,12 +18,45 @@ Printed in Switzerland
 
 Also issued in French and Russian. Copies to be obtained through the national standards organizations.
 
+{% elsif document_scheme == "1972" or document_scheme == "1987" %}
+
+=== {blank}
+
+[[boilerplate-year]]
+©   span:std_publisher[*International Organization for Standardization*], span:date[*{{ docyear }}*]   ●
+
+[[boilerplate-place]]
+Printed in Switzerland
+
+
+{% elsif document_scheme == "1989" %}
+
+=== {blank}
+
+[[boilerplate-year]]
+© span:std_publisher[{{ agency }} ]span:date[{{ docyear }}]
+
+[[boilerplate-message]]
+All rights reserved. Unless otherwise specified, no part of this publication may be reproduced
+or utilized in any form or by any means, electronic or mechanical, including photocopying and
+microfilm, without permission in writing from the publisher.
+
+[[boilerplate-address]]
+[align=left]
+International Organization for Standardization +
+Case postale 56 • CH-1211 Genève 20 • Switzerland +
+Internet   central@iso.ch +
+X.400     c=ch; a=400net; p=iso; o=isocs; s=central
+
+[[boilerplate-place]]
+Printed in Switzerland
+
 {% else %}
 
 === {% if stage_int >= 40 %}COPYRIGHT PROTECTED DOCUMENT{% else %}{blank}{% endif %}
 
 [[boilerplate-year]]
-© span:std_publisher[{{ agency }} ]span:std_docNumber[{{ docyear }}]
+© span:std_publisher[{{ agency }} ]span:date[{{ docyear }}]
 
 [[boilerplate-message]]
 All rights reserved. Unless otherwise specified, or required in the context of its implementation,

data/lib/metanorma/iso/front_id.rb

@@ -1,5 +1,4 @@
 require "date"
-require "pathname"
 require "twitter_cldr"
 require "pubid-iso"
 require "pubid-cen"
@@ -22,7 +21,7 @@ module Metanorma
         { directive: :dir, "technical-report": :tr, "guide": :guide,
           "technical-specification": :ts,
           "publicly-available-specification": :pas,
-          "committee-document": :tc }.freeze
+          "committee-document": :tc, "recommendation": :r }.freeze
 
       # @param type [nil, :tr, :ts, :amd, :cor, :guide, :dir, :tc, Type]
       # document's type, eg. :tr, :ts, :amd, :cor, Type.new(:tr)
@@ -111,12 +110,12 @@ module Metanorma
 
       def tc_number(ret, node)
         doctype(node) == "committee-document" or return ret
-        n = node.attr("subcommittee-number") and
-          ret.merge!({ sctype: node.attr("subcommittee-type") || "SC",
-                       scnumber: n })
-        n = node.attr("technical-committee-number") and
-          ret.merge!({ tctype: node.attr("technical-committee-type") || "TC",
-                       tcnumber: n })
+        { sc: "subcommittee", tc: "technical-committee",
+          wg: "workgroup" }.each do |k, v|
+          n = node.attr("#{v}-number") and
+            ret.merge!({ "#{k}type": node.attr("#{v}-type") || k.to_s.upcase,
+                         "#{k}number": n })
+        end
         ret
       end
 
@@ -185,9 +184,7 @@ module Metanorma
       def iso_id_default(params)
         params_nolang = params.dup.tap { |hs| hs.delete(:language) }
         params1 = if params[:unpublished]
-                    params_nolang.dup.tap do |hs|
-                      hs.delete(:year)
-                    end
+                    params_nolang.dup.tap { |hs| hs.delete(:year) }
                   else params_nolang
                   end
         params1.delete(:unpublished)
@@ -205,9 +202,7 @@ module Metanorma
 
       def iso_id_with_lang(params)
         params1 = if params[:unpublished]
-                    params.dup.tap do |hs|
-                      hs.delete(:year)
-                    end
+                    params.dup.tap { |hs| hs.delete(:year) }
                   else params end
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)

data/lib/metanorma/iso/relaton-iso.rng

@@ -98,6 +98,7 @@
         <value>publicly-available-specification</value>
         <value>international-workshop-agreement</value>
         <value>guide</value>
+        <value>recommendation</value>
         <value>amendment</value>
         <value>technical-corrigendum</value>
         <value>directive</value>

data/lib/metanorma/iso/validate.rb

@@ -119,7 +119,7 @@ module Metanorma
       def doctype_validate(_xmldoc)
         %w(international-standard technical-specification technical-report
            publicly-available-specification international-workshop-agreement
-           guide amendment technical-corrigendum committee-document)
+           guide amendment technical-corrigendum committee-document recommendation)
           .include? @doctype or
           @log.add("Document Attributes", nil,
                    "#{@doctype} is not a recognised document type")

data/lib/metanorma/iso/version.rb

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

data/metanorma-iso.gemspec

@@ -32,7 +32,7 @@ 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.8.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.8.4"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid-cen"
   spec.add_dependency "pubid-iec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-03-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.8.2
+        version: 2.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: 2.8.4
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement