metanorma-iho 0.5.0 → 0.5.4

data/lib/isodoc/iho/xref.rb

@@ -6,25 +6,27 @@ module IsoDoc
     end
 
     class Xref < IsoDoc::Generic::Xref
+      def annexlbl(cond)
+        cond ? @labels["appendix"] : @labels["annex"]
+      end
+
       def annex_name_lbl(clause, num)
-        lbl = clause["obligation"] == "informative" ?
-          @labels["appendix"] : @labels["annex"]
+        lbl = annexlbl(clause["obligation"] == "informative")
         l10n("<strong>#{lbl} #{num}</strong>")
       end
 
       def annex_names(clause, num)
         appendix_names(clause, num)
-        lbl = clause["obligation"] == "informative" ?
-          @labels["appendix"] : @labels["annex"]
+        lbl = annexlbl(clause["obligation"] == "informative")
         @anchors[clause["id"]] =
-          { label: annex_name_lbl(clause, num), type: "clause",
-            xref: l10n("#{lbl} #{num}"), level: 1, value: lbl }
+          { label: annex_name_lbl(clause, num), type: "clause", elem: lbl,
+            xref: l10n("#{lbl} #{num}"), level: 1, value: num }
         if a = single_annex_special_section(clause)
-          annex_names1(a, "#{num}", 1)
+          annex_names1(a, num.to_s, 1)
         else
           i = Counter.new
-          clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
-            each do |c|
+          clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
+            .each do |c|
             i.increment(c)
             annex_names1(c, "#{num}.#{i.print}", 2)
           end
@@ -35,36 +37,36 @@ module IsoDoc
       def back_anchor_names(docxml)
         super
         i = Counter.new
-        docxml.xpath(ns("//annex[@obligation = 'informative']")).
-          each do |c|
+        docxml.xpath(ns("//annex[@obligation = 'informative']"))
+          .each do |c|
           i.increment(c)
           annex_names(c, i.print)
         end
         i = Counter.new("@", skip_i: true)
-        docxml.xpath(ns("//annex[not(@obligation = 'informative')]")).
-          each do |c|
+        docxml.xpath(ns("//annex[not(@obligation = 'informative')]"))
+          .each do |c|
           i.increment(c)
           annex_names(c, i.print)
         end
       end
 
       def annex_names1(clause, num, level)
-        lbl = clause.at("./ancestor::xmlns:annex/@obligation").
-          text == "informative" ?  @labels["appendix"] : @labels["annex"]
+        lbl = annexlbl(clause.at("./ancestor::xmlns:annex/@obligation")
+            .text == "informative")
         @anchors[clause["id"]] =
           { label: num, xref: l10n("#{lbl} #{num}"),
             level: level, type: "clause" }
-         i = Counter.new
-        clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
-          each do |c|
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
+          .each do |c|
           i.increment(c)
           annex_names1(c, "#{num}.#{i.print}", level + 1)
         end
       end
 
-      def appendix_names(clause, num)
-         i = Counter.new
-        clause.xpath(ns("./appendix")).each_with_index do |c|
+      def appendix_names(clause, _num)
+        i = Counter.new
+        clause.xpath(ns("./appendix")).each do |c|
           i.increment(c)
           @anchors[c["id"]] =
             anchor_struct(i.print, nil, @labels["appendix"], "clause")
@@ -73,16 +75,17 @@ module IsoDoc
         end
       end
 
-    def section_names1(clause, num, level)
-      @anchors[clause["id"]] =
-        { label: num, level: level, xref: l10n("#{@labels["subclause"]} #{num}"),
-          type: "clause" }
-      i = Counter.new
-      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c|
-        i.increment(c)
-        section_names1(c, "#{num}.#{i.print}", level + 1)
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level,
+            xref: l10n("#{@labels['subclause']} #{num}"),
+            type: "clause", elem: @labels["subclause"] }
+        i = Counter.new
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          i.increment(c)
+          section_names1(c, "#{num}.#{i.print}", level + 1)
+        end
       end
     end
-    end
   end
 end

data/lib/metanorma/iho/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/iho/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/iho/isodoc.rng

@@ -32,6 +32,43 @@
         <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">
@@ -115,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -151,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">
@@ -1027,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>
@@ -1041,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>
@@ -2216,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">
@@ -2563,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/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.5.0".freeze
+    VERSION = "0.5.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.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: htmlentities