metanorma-iec 2.1.10 → 2.1.12

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/metanorma/iec/basicdoc.rng

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng">
-    <start>
-      <ref name="document"/>
-    </start>
-  </include>
   <define name="document">
     <element name="document">
       <optional>
@@ -1125,26 +1120,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="ext">
-    <element name="ext">
-      <ref name="BibDataExtensionType"/>
-    </element>
-  </define>
-  <define name="BibDataExtensionType">
-    <ref name="doctype"/>
-  </define>
-  <define name="doctype">
-    <element name="doctype">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
-  <define name="DocumentType">
-    <value>document</value>
-  </define>
-  <define name="BibData">
-    <ref name="BibliographicItem"/>
-    <optional>
-      <ref name="ext"/>
-    </optional>
-  </define>
 </grammar>

data/lib/metanorma/iec/biblio-standoc.rng

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <!--
+    Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
+    of relaton
+    
+    Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
+    (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
+  -->
+  <include href="biblio.rng">
+    <define name="BibData">
+      <ref name="BibliographicItem"/>
+      <optional>
+        <ref name="ext"/>
+      </optional>
+    </define>
+  </include>
+  <define name="ext">
+    <element name="ext">
+      <ref name="BibDataExtensionType"/>
+    </element>
+  </define>
+  <define name="BibDataExtensionType">
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
+    <ref name="doctype"/>
+    <optional>
+      <ref name="docsubtype"/>
+    </optional>
+    <optional>
+      <ref name="editorialgroup"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="ics"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="structuredidentifier"/>
+    </zeroOrMore>
+  </define>
+  <define name="doctype">
+    <element name="doctype">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="DocumentType">
+    <value>document</value>
+  </define>
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
+  <define name="editorialgroup">
+    <element name="editorialgroup">
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="technical-committee">
+    <element name="technical-committee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="IsoWorkgroup">
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
+    <text/>
+  </define>
+  <define name="ics">
+    <element name="ics">
+      <element name="code">
+        <text/>
+      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="structuredidentifier">
+    <element name="structuredidentifier">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <oneOrMore>
+        <element name="agency">
+          <text/>
+        </element>
+      </oneOrMore>
+      <optional>
+        <element name="class">
+          <text/>
+        </element>
+      </optional>
+      <element name="docnumber">
+        <text/>
+      </element>
+      <optional>
+        <element name="partnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="edition">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="version">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementtype">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="language">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="year">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+</grammar>

data/lib/metanorma/iec/biblio.rng

@@ -33,9 +33,10 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
-  <start>
-    <ref name="bibitem"/>
-  </start>
+  <!-- start = bibitem -->
+  <define name="BibData">
+    <ref name="BibliographicItem"/>
+  </define>
   <define name="status">
     <element name="status">
       <ref name="stage"/>
@@ -170,27 +171,30 @@
   </define>
   <define name="contributor">
     <element name="contributor">
-      <zeroOrMore>
+      <oneOrMore>
         <ref name="role"/>
-      </zeroOrMore>
+      </oneOrMore>
       <ref name="ContributorInfo"/>
     </element>
   </define>
   <define name="role">
     <element name="role">
-      <optional>
-        <attribute name="type">
-          <choice>
-            <value>author</value>
-            <value>performer</value>
-            <value>publisher</value>
-            <value>editor</value>
-            <value>adapter</value>
-            <value>translator</value>
-            <value>distributor</value>
-          </choice>
-        </attribute>
-      </optional>
+      <attribute name="type">
+        <choice>
+          <value>author</value>
+          <value>performer</value>
+          <value>publisher</value>
+          <value>editor</value>
+          <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>
         <ref name="roledescription"/>
       </zeroOrMore>
@@ -512,6 +516,17 @@
   </define>
   <define name="localityStack">
     <element name="localityStack">
+      <optional>
+        <attribute name="connective">
+          <choice>
+            <value>and</value>
+            <value>or</value>
+            <value>from</value>
+            <value>to</value>
+            <value/>
+          </choice>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="locality"/>
       </zeroOrMore>
@@ -524,6 +539,17 @@
   </define>
   <define name="sourceLocalityStack">
     <element name="sourceLocalityStack">
+      <optional>
+        <attribute name="connective">
+          <choice>
+            <value>and</value>
+            <value>or</value>
+            <value>from</value>
+            <value>to</value>
+            <value/>
+          </choice>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="sourceLocality"/>
       </zeroOrMore>
@@ -626,6 +652,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>
@@ -720,6 +749,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>

data/lib/metanorma/iec/iec.rng

@@ -1,63 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar ns="https://www.metanorma.org/ns/iec" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- default namespace = "https://www.metanorma.com/ns/iec" -->
+  <include href="relaton-iec.rng"/>
   <include href="isostandard.rng">
     <start>
       <ref name="iec-standard"/>
     </start>
-    <define name="DocumentType">
-      <choice>
-        <value>international-standard</value>
-        <value>technical-specification</value>
-        <value>technical-report</value>
-        <value>publicly-available-specification</value>
-        <value>international-workshop-agreement</value>
-        <value>guide</value>
-        <value>industry-technical-agreement</value>
-        <value>system-reference-delivrabble</value>
-      </choice>
-    </define>
-    <define name="BibDataExtensionType">
-      <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <optional>
-        <ref name="horizontal"/>
-      </optional>
-      <optional>
-        <ref name="function"/>
-      </optional>
-      <ref name="editorialgroup"/>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <ref name="structuredidentifier"/>
-      <optional>
-        <ref name="stagename"/>
-      </optional>
-      <optional>
-        <ref name="updates_document_type"/>
-      </optional>
-      <optional>
-        <ref name="accessibility-color-inside"/>
-      </optional>
-      <optional>
-        <ref name="price-code"/>
-      </optional>
-      <optional>
-        <ref name="cen-processing"/>
-      </optional>
-      <optional>
-        <ref name="secretary"/>
-      </optional>
-      <optional>
-        <ref name="interest-to-committees"/>
-      </optional>
-      <optional>
-        <ref name="tc-sc-officers-note"/>
-      </optional>
-    </define>
     <define name="term">
       <element name="term">
         <optional>
@@ -108,48 +56,6 @@
     </define>
   </include>
   <!-- end overrides -->
-  <define name="function">
-    <element name="function">
-      <choice>
-        <value>emc</value>
-        <value>safety</value>
-        <value>environment</value>
-        <value>quality-assurance</value>
-      </choice>
-    </element>
-  </define>
-  <define name="accessibility-color-inside">
-    <element name="accessibility-color-inside">
-      <data type="boolean"/>
-    </element>
-  </define>
-  <define name="price-code">
-    <element name="price-code">
-      <text/>
-    </element>
-  </define>
-  <define name="cen-processing">
-    <element name="cen-processing">
-      <data type="boolean"/>
-    </element>
-  </define>
-  <define name="secretary">
-    <element name="secretary">
-      <text/>
-    </element>
-  </define>
-  <define name="interest-to-committees">
-    <element name="interest-to-committees">
-      <text/>
-    </element>
-  </define>
-  <define name="tc-sc-officers-note">
-    <element name="tc-sc-officers-note">
-      <zeroOrMore>
-        <ref name="BasicBlock"/>
-      </zeroOrMore>
-    </element>
-  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together
@@ -186,9 +92,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="updates_document_type">
-    <element name="updates-document-type">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
 </grammar>

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>