metanorma-iec 2.1.11 → 2.1.13

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -13,10 +13,12 @@ module IsoDoc
       end
 
       def clause(docxml)
-        docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
-                        "//definitions | //references | "\
+        docxml.xpath(ns("//clause[not(ancestor::annex)] | " \
+                        "//definitions | //references | " \
                         "//preface/introduction[clause]"))
           .each do |f|
+          f.parent.name == "annex" &&
+            @xrefs.klass.single_term_clause?(f.parent) and next
           clause1(f)
         end
         docxml.xpath(ns("//terms")).each do |f|
@@ -63,7 +65,7 @@ module IsoDoc
         labels = @xrefs.get_anchors.each_with_object({}) do |(k, v), m|
           m[v[:label]] = k
         end
-        docpart = docxml&.at(ns("//bibdata/ext/structuredidentifier/"\
+        docpart = docxml&.at(ns("//bibdata/ext/structuredidentifier/" \
                                 "project-number/@part"))&.text or return
         docxml.xpath(ns("//termref[@base = 'IEV']")).each do |t|
           concept_iev1(t, docpart, labels)
@@ -155,8 +157,8 @@ module IsoDoc
         return if pr.empty?
 
         prefs = pr.map do |p|
-          "<dt>#{p[:lang]}</dt>"\
-            "<dd language='#{p[:lang]}' script='#{p[:script]}'>"\
+          "<dt>#{p[:lang]}</dt>" \
+            "<dd language='#{p[:lang]}' script='#{p[:script]}'>" \
             "#{cleanup_entities(p[:designation])}</dd>"
         end
         term << "<dl type='other-lang'>#{prefs.join}</dl>"
@@ -180,7 +182,7 @@ module IsoDoc
         p = node.at(ns("./preferred"))
         ref = node.at(ns("./xref | ./eref | ./termref"))
         label = @i18n.relatedterms[node["type"]].upcase
-        node.replace(l10n("<p>#{label}: "\
+        node.replace(l10n("<p>#{label}: " \
                           "#{p.children.to_xml} (#{ref.to_xml})</p>"))
         @i18n = @i18n_lg["default"]
       end

data/lib/isodoc/iec/word_convert.rb

@@ -42,50 +42,24 @@ module IsoDoc
         }
       end
 
-      def insert_toc(intro, docxml, level)
+      def make_table_word_toc(docxml)
+        docxml.at(table_toc_xpath) or return ""
         toc = ""
-        toc += make_WordToC(docxml, level)
-        if docxml.at("//p[@class = 'TableTitle']")
-          toc += make_TableWordToC(docxml)
-        end
-        if docxml.at("//p[@class = 'FigureTitle']")
-          toc += make_FigureWordToC(docxml)
-        end
-        intro.sub(/WORDTOC/, toc)
-      end
-
-      WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
-                          <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t "TableTitle,tabletitle" <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      WORD_TOC_FIGURE_PREFACE1 = <<~TOC.freeze
-                                      <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t "FigureTitle,figuretitle" <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      def make_TableWordToC(docxml)
-        toc = ""
-        docxml.xpath("//p[@class = 'TableTitle']").each do |h|
+        docxml.xpath(table_toc_xpath).each do |h|
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) + WORD_TOC_SUFFIX1
+                %{\\1#{word_toc_table_preface1}}) + WORD_TOC_SUFFIX1
       end
 
-      def make_FigureWordToC(docxml)
+      def make_figure_word_toc(docxml)
+        docxml.at(figure_toc_xpath) or return ""
         toc = ""
-        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+        docxml.xpath(figure_toc_xpath).each do |h|
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) + WORD_TOC_SUFFIX1
+                %{\\1#{word_toc_figure_preface1}}) + WORD_TOC_SUFFIX1
       end
 
       def word_toc_preface(level)
@@ -185,7 +159,7 @@ module IsoDoc
       end
 
       def authority_cleanup(docxml)
-        auth = docxml.at("//div[@id = 'boilerplate-feedback' or "\
+        auth = docxml.at("//div[@id = 'boilerplate-feedback' or " \
                          "@class = 'boilerplate-feedback']")
         auth&.remove
         super

data/lib/metanorma/iec/biblio.rng

@@ -188,6 +188,11 @@
           <value>adapter</value>
           <value>translator</value>
           <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
         </choice>
       </attribute>
       <zeroOrMore>

data/lib/metanorma/iec/iec_intro_en.xml

@@ -9,24 +9,23 @@
         for any other purpose without permission in writing from IEC.
       {% else %}
       <p id="boilerplate-year">
-        © {{ agency }} {{ docyear }}, Published in Switzerland
+        Copyright © {{ docyear }} {{ agency }}, Geneva, Switzerland
       </p>
       <p id="boilerplate-message">
-        All rights
-        reserved. Unless otherwise specified, no part of this publication may be
-        reproduced or utilized otherwise in any form or by any means, electronic or
-        mechanical, including photocopying, or posting on the internet or an intranet,
-        without prior written permission. Permission can be requested from either IEC
-        at the address below or IEC's member body in the country of the requester.
+        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
+        either IEC or IEC's member National Committee in the country of the requester. If you have any questions about
+        {{ agency }} copyright or have an enquiry about obtaining additional rights to this publication, please contact the address
+        below or your local IEC member National Committee for further information.
       </p>
       <p id="boilerplate-name">IEC Central Office</p>
       <p id="boilerplate-address" align="left">
         3, rue de Varembé<br/>
-        CH-1211 Geneva 20, Switzerland<br/>
-        Tel.&#xa0;&#xa0;+ 41 22 919 02 11<br/>
-        Fax&#xa0;&#xa0;+ 41 22 919 03 00<br/>
-        info@iec.ch<br/>
-        www.iec.ch
+        CH-1211 Geneva 20<br/>
+        Switzerland<br/>
+        Tel.:&#xa0;+41 22 919 02 11<br/>
+        <link target="mailto:info@iec.ch">info@iec.ch</link><br/>
+        <link target="https://www.iec.ch">www.iec.ch</link>
       {% endif %}
       </p>
     </clause>

data/lib/metanorma/iec/iec_intro_fr.xml

@@ -9,26 +9,26 @@
         for any other purpose without permission in writing from IEC.
       {% else %}
       <p id="boilerplate-year">
-    © {{ agency }} {{ docyear }}, Publié en Suisse
+    Copyright © {{ docyear }} {{ agency }}, Geneva, Switzerland
   </p>
 
   <p id="boilerplate-message">
-Droits de reproduction réservés. Sauf indication contraire, 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, l’affichage sur l’internet ou sur un Intranet, sans
-autorisation écrite préalable. Les demandes d’autorisation peuvent être adressées à l’IEC à
-l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
+Droits de reproduction réservés. Sauf indication contraire, 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'IEC ou du Comité national de l'IEC du pays du demandeur. Si vous avez des
+questions sur le copyright de l'{{ agency }} ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
+les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence.
   </p>
 
   <p id="boilerplate-name">IEC Central Office</p>
 
   <p id="boilerplate-address" align="left">
     3, rue de Varembé<br/>
-    CH-1211 Geneva 20, Switzerland<br/>
-    Tel.&#xa0;&#xa0;+ 41 22 919 02 11<br/>
-    Fax&#xa0;&#xa0;+ 41 22 919 03 00<br/>
-    info@iec.ch<br/>
-    www.iec.ch
+    CH-1211 Geneva 20<br/>
+    Switzerland<br/>
+    Tel.:&#xa0;+41 22 919 02 11<br/>
+    <link target="mailto:info@iec.ch">info@iec.ch</link><br/>
+    <link target="https://www.iec.ch">www.iec.ch</link>
   </p>
   {% endif %}
 </clause>

data/lib/metanorma/iec/isodoc.rng

@@ -177,11 +177,7 @@
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
@@ -1031,6 +1027,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1045,6 +1042,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1058,6 +1056,7 @@
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1153,7 +1152,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="BibliographicItem"/>
+      <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
   <define name="image" combine="choice">
@@ -1195,6 +1194,7 @@
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
@@ -1202,6 +1202,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1214,6 +1215,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1278,6 +1280,7 @@
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -1970,6 +1973,7 @@
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -2525,6 +2529,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
@@ -2572,6 +2577,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
@@ -2620,6 +2626,15 @@
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
@@ -2628,16 +2643,35 @@
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
     </element>
   </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.1.11".freeze
+    VERSION = "2.1.13".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -23,9 +23,12 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
-  spec.files         = `git ls-files`.split("\n")
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
+  end
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-iso", "~> 2.2.0"
   spec.add_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -202,9 +202,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/automerge.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -212,8 +209,6 @@ files:
 - Gemfile
 - LICENSE
 - README.adoc
-- Rakefile
-- bin/rspec
 - lib/isodoc/iec/base_convert.rb
 - lib/isodoc/iec/html/header.html
 - lib/isodoc/iec/html/html_iec_intro.html
@@ -256,33 +251,6 @@ files:
 - lib/metanorma/iec/reqt.rng
 - lib/metanorma/iec/version.rb
 - metanorma-iec.gemspec
-- spec/assets/header.html
-- spec/assets/html.css
-- spec/assets/iso.xml
-- spec/assets/rice_image1.png
-- spec/assets/word.css
-- spec/assets/wordintro.html
-- spec/assets/xref_error.adoc
-- spec/isodoc/blocks_spec.rb
-- spec/isodoc/i18n_spec.rb
-- spec/isodoc/iev_spec.rb
-- spec/isodoc/inline_spec.rb
-- spec/isodoc/iso_spec.rb
-- spec/isodoc/metadata_spec.rb
-- spec/isodoc/postproc_spec.rb
-- spec/isodoc/ref_spec.rb
-- spec/isodoc/section_spec.rb
-- spec/isodoc/terms_spec.rb
-- spec/metanorma/base_spec.rb
-- spec/metanorma/blocks_spec.rb
-- spec/metanorma/cleanup_spec.rb
-- spec/metanorma/iev_spec.rb
-- spec/metanorma/inline_spec.rb
-- spec/metanorma/lists_spec.rb
-- spec/metanorma/processor_spec.rb
-- spec/metanorma/section_spec.rb
-- spec/metanorma/validate_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/metanorma/metanorma-iec
 licenses:
 - BSD-2-Clause
@@ -295,14 +263,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: metanorma-iec lets you write IEC standards in AsciiDoc.

data/.github/workflows/automerge.yml

@@ -1,31 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-# source: https://github.com/marketplace/actions/merge-pull-requests#usage
-name: automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - id: automerge
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.15.3"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  notify:
-    uses: metanorma/ci/.github/workflows/mn-processor-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,24 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
-    with:
-      next_version: ${{ github.event.inputs.next_version }}
-    secrets:
-      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-

data/Rakefile

@@ -1,8 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "isodoc/gem_tasks"
-
-IsoDoc::GemTasks.install
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/rspec

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-  
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
-  "../../Gemfile", Pathname.new(__FILE__).realpath
-)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")
-

data/spec/assets/header.html

@@ -1,7 +0,0 @@
-
-/* an empty header */
-
-START DOC ID: {{ docnumber }}: END DOC ID
-
-FILENAME: {{ filename }}
-

data/spec/assets/html.css

@@ -1,2 +0,0 @@
-
-/* another empty stylesheet */

data/spec/assets/iso.xml

@@ -1,71 +0,0 @@
-<iec-standard xmlns="https://www.metanorma.org/ns/iec">
-  <bibdata type="standard">
-    <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
-    <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
-    <title type="main" language="en" format="text/plain">Specifications and test methods</title>
-    <title type="title-part" language="en" format="text/plain">Rice</title>
-    <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
-    <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
-    <title type="title-part" language="fr" format="text/plain">Riz</title>
-  <docidentifier type="iso">ISO/PreCD3 17301-1</docidentifier>
-  <docidentifier type="iso-tc">17301</docidentifier>
-  <docnumber>1730</docnumber>
-  <date type="published"><on>2011</on></date>
-  <date type="accessed"><on>2012</on></date>
-  <date type="created"><from>2010</from><to>2011</to></date>
-  <date type="activated"><on>2013</on></date>
-  <date type="obsoleted"><on>2014</on></date>
-  <edition>2</edition>
-  <version>
-  <revision-date>2016-05-01</revision-date>
-  <draft>0.4</draft>
-</version>
-  <contributor>
-    <role type="author"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-  <language>en</language>
-  <script>Latn</script>
-  <status>
-    <stage abbreviation="CD">35</stage>
-    <substage abbreviation="3CD">20</substage>
-    <iteration>3</iteration>
-  </status>
-  <copyright>
-    <from>2016</from>
-    <owner>
-      <organization>
-        <abbreviation>ISO</abbreviation>
-      </organization>
-    </owner>
-  </copyright>
-  <ext>
-  <doctype>international-standard</doctype>
-  <editorialgroup>
-    <technical-committee number="34">Food products</technical-committee>
-    <subcommittee number="4">Cereals and pulses</subcommittee>
-    <workgroup number="3">Rice Group</workgroup>
-    <secretariat>GB</secretariat>
-  </editorialgroup>
-  <structuredidentifier>
-    <project-number part="1">ISO/PreCD3 17301</project-number>
-  </structuredidentifier>
-  </ext>
-</bibdata>
-    <foreword>
-    <note>
-  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-</note>
-    </foreword>
-    </iec-standard>
-

data/spec/assets/word.css

@@ -1,2 +0,0 @@
-
-/* one empty stylesheet */