metanorma-iec 2.0.2 → 2.0.5

data/lib/isodoc/iec/xref.rb

@@ -13,22 +13,22 @@ module IsoDoc
         return super unless @is_iev
       end
 
-      def initial_anchor_names(d)
+      def initial_anchor_names(docxml)
         super
         return unless @is_iev
 
-        terms_iev_names(d)
-        middle_section_asset_names(d)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
+        terms_iev_names(docxml)
+        middle_section_asset_names(docxml)
+        termnote_anchor_names(docxml)
+        termexample_anchor_names(docxml)
       end
 
-      def terms_iev_names(d)
-        d.xpath(ns("//sections/clause/terms")).each_with_index do |t, i|
+      def terms_iev_names(docxml)
+        docxml.xpath(ns("//sections/clause/terms")).each_with_index do |t, i|
           num = "#{@iev_part}-%02d" % [i + 1]
           @anchors[t["id"]] =
             { label: num, xref: l10n("#{@labels['section_iev']} #{num}"),
-              level: 2, type: "clause" }
+              level: 2, type: "clause", elem: @labels["section_iev"] }
           t.xpath(ns("./term")).each_with_index do |c, j|
             num2 = "%02d" % [j + 1]
             section_names1(c, "#{num}-#{num2}", 3)
@@ -38,7 +38,8 @@ module IsoDoc
 
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
-        obl = l10n("(#{@labels['norm_annex']})") if clause["obligation"] == "normative"
+        clause["obligation"] == "normative" and
+          obl = l10n("(#{@labels['norm_annex']})")
         l10n("<strong>#{@labels['annex']} #{num}</strong><br/>#{obl}")
       end
     end

data/lib/metanorma/iec/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/metanorma/iec/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/iec/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </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>
+      </element>
+    </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>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.5".freeze
   end
 end
 

data/spec/isodoc/iev_spec.rb

@@ -169,6 +169,8 @@ RSpec.describe IsoDoc do
           <script current="true">Latn</script>
           <status>
             <stage language="">60</stage>
+                  <stage language='fr'>Norme internationale</stage>
+                  <stage language='en'>International standard</stage>
             <substage language="">60</substage>
           </status>
           <copyright>
@@ -397,9 +399,7 @@ RSpec.describe IsoDoc do
                    </ul>
                  </div>
                  <p>
-                   SOURCE: 
-                   <a href='#ISO7301'>ISO 7301:2011, 3.1</a>
-                   , modified &#8211; The term "cargo rice" is shown as deprecated, and
+                   SOURCE: ISO 7301:2011, 3.1, modified &#8211; The term "cargo rice" is shown as deprecated, and
                    Note 1 to entry is not included here
                  </p>
                  <p class='TermNum' id='paddy'>192-01-02</p>
@@ -438,10 +438,7 @@ RSpec.describe IsoDoc do
                      </p>
                    </p>
                  </div>
-                 <p>
-                   SOURCE: 
-                   <a href='#ISO7301'>ISO 7301:2011, 3.1</a>
-                 </p>
+                 <p>SOURCE: ISO 7301:2011, 3.1 </p>
                </div>
              </div>
            </div>
@@ -551,9 +548,7 @@ RSpec.describe IsoDoc do
                  rice retaining its husk after threshing
                </p>
                <p class='MsoNormal'>
-                 SOURCE:
-                 <a href='#ISO7301'>ISO 7301:2011, 3.1</a>
-                 , modified &#x2013; The term "cargo rice" is shown as deprecated, and
+                 SOURCE: ISO 7301:2011, 3.1, modified &#x2013; The term "cargo rice" is shown as deprecated, and
                  Note 1 to entry is not included here
                </p>
              </div>

data/spec/isodoc/postproc_spec.rb

@@ -147,7 +147,7 @@ RSpec.describe IsoDoc do
                  <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1 class="main">1<span style="mso-tab-count:1">&#xA0; </span>Terms and Definitions</h1>
          <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
          <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
-         <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &#x2014; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
+         <p class="MsoNormal">[SOURCE: ISO 7301:2011, 3.1, modified &#x2014; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
                </div>
     OUTPUT
   end

data/spec/isodoc/terms_spec.rb

@@ -129,7 +129,7 @@ RSpec.describe IsoDoc do
          </div>
 
          <p>[SOURCE:
-           <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &#8211; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]
+           ISO 7301:2011, 3.1, modified &#8211; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]
          </p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
          <p class="AltTerms" style="text-align:left;">rough rice</p>
          <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
@@ -141,8 +141,7 @@ RSpec.describe IsoDoc do
          </div>
          <div id="_671a1994-4783-40d0-bc81-987d06ffb74e" class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
          <div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
-         <p>[SOURCE:
-           <a href="#ISO7301">ISO 7301:2011, 3.1</a>]</p></div>
+         <p>[SOURCE: ISO 7301:2011, 3.1]</p></div>
              </div>
            </body>
          </html>
@@ -162,8 +161,7 @@ RSpec.describe IsoDoc do
            </ul>
          </div>
 
-         <p>[SOURCE:
-           <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &#8211;
+         <p>[SOURCE: ISO 7301:2011, 3.1, modified &#8211;
              The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
          <p class="AltTerms" style="text-align:left;">rough rice</p>
          <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
@@ -176,8 +174,7 @@ RSpec.describe IsoDoc do
 
 
 
-         <p>[SOURCE:
-           <a href="#ISO7301">ISO 7301:2011, 3.1</a>]</p></div>
+         <p>[SOURCE: ISO 7301:2011, 3.1]</p></div>
     OUTPUT
     expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
       .convert("test", input, true)))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso