metanorma-un 0.8.0 → 0.8.4

data/lib/isodoc/un/xref.rb

@@ -3,24 +3,25 @@ require "roman-numerals"
 module IsoDoc
   module UN
     class Xref < IsoDoc::Xref
-      def initial_anchor_names(d)
-        preface_names(d.at(ns("//preface/abstract")))
-        preface_names(d.at(ns("//foreword")))
-        preface_names(d.at(ns("//introduction")))
-        d.xpath(ns("//preface/clause")).each do |c| 
+      def initial_anchor_names(doc)
+        preface_names(doc.at(ns("//preface/abstract")))
+        preface_names(doc.at(ns("//foreword")))
+        preface_names(doc.at(ns("//introduction")))
+        doc.xpath(ns("//preface/clause")).each do |c|
           preface_names(c)
         end
-        preface_names(d.at(ns("//acknowledgements")))
+        preface_names(doc.at(ns("//acknowledgements")))
         sequential_asset_names(
-          d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
-                     "//preface/clause | //acknowledgements")))
-        middle_section_asset_names(d)
-        clause_names(d, 0)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
+          doc.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+                       "//preface/clause | //acknowledgements")),
+        )
+        middle_section_asset_names(doc)
+        clause_names(doc, 0)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
       end
 
-      def clause_names(docxml, sect_num)
+      def clause_names(docxml, _sect_num)
         q = "//clause[parent::sections]"
         @paranumber = 0
         i = 0
@@ -57,24 +58,28 @@ module IsoDoc
 
       def label_leaf_section(clause, lvl)
         @paranumber += 1
-        @anchors[clause["id"]] = {label: @paranumber.to_s, 
-                                  xref: l10n("#{@labels['paragraph']} #{@paranumber}"), 
-                                  level: lvl, type: "paragraph" }
+        @anchors[clause["id"]] =
+          { label: @paranumber.to_s, elem: @labels["paragraph"],
+            xref: l10n("#{@labels['paragraph']} #{@paranumber}"),
+            level: lvl, type: "paragraph" }
       end
 
       def label_annex_leaf_section(clause, num, lvl)
         @paranumber += 1
-        @anchors[clause["id"]] = {label: @paranumber.to_s, 
-                                  xref: l10n("#{@labels['paragraph']} #{num}.#{@paranumber}"), 
-                                  level: lvl, type: "paragraph" }
+        @anchors[clause["id"]] =
+          { label: @paranumber.to_s, elem: @labels["paragraph"],
+            xref: l10n("#{@labels['paragraph']} #{num}.#{@paranumber}"),
+            level: lvl, type: "paragraph" }
       end
 
       def section_names(clause, num, lvl)
         return num if clause.nil?
+
         leaf_section?(clause) and label_leaf_section(clause, lvl) and return
         num = num + 1
         lbl = levelnumber(num, 1)
         @anchors[clause["id"]] = { label: lbl, level: lvl, type: "clause",
+                                   elem: @labels["clause"],
                                    xref: l10n("#{@labels['clause']} #{lbl}") }
         i = 1
         clause.xpath(ns(NONTERMINAL)).each do |c|
@@ -89,6 +94,7 @@ module IsoDoc
         /\.(?<leafnum>[^.]+$)/ =~ num
         clause["unnumbered"] == "true" or
           @anchors[clause["id"]] = { label: leafnum, level: level, type: "clause",
+                                     elem: @labels["clause"],
                                      xref: l10n("#{@labels['clause']} #{num}") }
         i = 1
         clause.xpath(ns(NONTERMINAL)).each do |c|
@@ -97,27 +103,32 @@ module IsoDoc
         end
       end
 
-      def annex_name_lbl(clause, num)
+      def annex_name_lbl(_clause, num)
         l10n("<strong>#{@labels['annex']} #{num}</strong>")
       end
 
       SUBCLAUSES =
         "./clause | ./references | ./term  | ./terms | ./definitions".freeze
 
+      def annex_name_anchors(clause, num)
+        { label: annex_name_lbl(clause, num),
+          elem: @labels["annex"],
+          type: "clause", value: num.to_s, level: 1,
+          xref: "#{@labels['annex']} #{num}" }
+      end
 
       def annex_names(clause, num)
         hierarchical_asset_names(clause, num)
         leaf_section?(clause) and
           label_annex_leaf_section(clause, num, 1) and return
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                   type: "clause", value: num,
-                                   xref: l10n("#{@labels['annex']} #{num}"), level: 1 }
+        @anchors[clause["id"]] = annex_name_anchors(clause, num)
         if a = single_annex_special_section(clause)
-          annex_names1(a, "#{num}", 1)
+          annex_names1(a, num.to_s, 1)
         else
           i = 1
           clause.xpath(ns(SUBCLAUSES)).each do |c|
             next if c["unnumbered"] == "true"
+
             annex_names1(c, "#{num}.#{annex_levelnum(i, 2)}", 2)
             i += 1 if !leaf_section?(c)
           end
@@ -129,10 +140,11 @@ module IsoDoc
           label_annex_leaf_section(clause, num, level) and return
         /\.(?<leafnum>[^.]+$)/ =~ num
         @anchors[clause["id"]] = { label: leafnum, xref: l10n("#{@labels['annex']} #{num}"),
-                                   level: level, type: "clause" }
+                                   level: level, type: "clause", elem: @labels["annex"] }
         i = 1
         clause.xpath(ns("./clause | ./references")).each do |c|
           next if c["unnumbered"] == "true"
+
           annex_names1(c, "#{num}.#{annex_levelnum(i, level + 1)}", level + 1)
           i += 1 if !leaf_section?(c)
         end
@@ -156,6 +168,7 @@ module IsoDoc
         i = 0
         clause.xpath(ns(".//admonition")).each do |t|
           next if t["id"].nil? || t["id"].empty?
+
           i += 1 unless t["unnumbered"] == "true"
           @anchors[t["id"]] = anchor_struct(i.to_s, nil, @labels["admonition"],
                                             "box", t["unnumbered"])
@@ -166,6 +179,7 @@ module IsoDoc
         i = 0
         clause.xpath(ns(".//admonition")).each do |t|
           next if t["id"].nil? || t["id"].empty?
+
           i += 1 unless t["unnumbered"] == "true"
           @anchors[t["id"]] =
             anchor_struct("#{num}.#{i}", nil, @labels["admonition"], "box",

data/lib/metanorma/un/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/un/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -401,9 +398,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/un/isodoc.rng

@@ -32,6 +32,56 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="index">
+      <element name="index">
+        <optional>
+          <attribute name="to">
+            <data type="IDREF"/>
+          </attribute>
+        </optional>
+        <element name="primary">
+          <oneOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </oneOrMore>
+        </element>
+        <optional>
+          <element name="secondary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+        <optional>
+          <element name="tertiary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+    </define>
+    <define name="bibitem">
+      <element name="bibitem">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="hidden">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="BibliographicItem"/>
+      </element>
+    </define>
     <define name="section-title">
       <element name="title">
         <zeroOrMore>
@@ -102,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -138,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">
@@ -690,6 +774,7 @@
             <ref name="terms"/>
             <ref name="term-clause"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </oneOrMore>
       </element>
@@ -1013,6 +1098,26 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="sub">
+      <element name="sub">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sup">
+      <element name="sup">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="pagebreak">
       <element name="pagebreak">
         <optional>
@@ -1027,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>
@@ -1680,6 +1795,7 @@
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
+          <ref name="floating-title"/>
         </choice>
       </oneOrMore>
     </choice>
@@ -1722,6 +1838,7 @@
           <ref name="terms"/>
           <ref name="definitions"/>
           <ref name="references"/>
+          <ref name="floating-title"/>
         </choice>
       </zeroOrMore>
     </group>
@@ -2200,7 +2317,18 @@
           <ref name="MultilingualRenderingType"/>
         </attribute>
       </optional>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="figure"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termsource">
@@ -2534,4 +2662,43 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="floating-title">
+    <element name="floating-title">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="depth">
+        <data type="int"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </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/un/un.rng

@@ -96,7 +96,10 @@
     <define name="sections">
       <element name="sections">
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="floating-title"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
@@ -186,6 +189,7 @@
             <ref name="clause-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>
@@ -233,6 +237,7 @@
             <ref name="terms"/>
             <ref name="definitions"/>
             <ref name="references"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.8.0".freeze
+    VERSION = "0.8.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639