metanorma-itu 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37546876b8125697954fc7ff980c07cf756aae329566249a31c9ea51fa48ec6a
-  data.tar.gz: 5ce41dcc79d10901912a44bbaa7bdb0ed8da9cd1f1bf7a23d5e8d336fbe0f183
+  metadata.gz: 9dd5351d92f3cb7d79552e4953b44f4468db9145c8edc8e7c044b50c7027ef5f
+  data.tar.gz: d1eac96d771822fbd30f7b34afe1e62ad75d76d5377c7bc4449bbef3426dec73
 SHA512:
-  metadata.gz: dadba1953785697e5f6f49ec05696b86c3ceeaca9c437dcd6804f8270d6ebc37cab2926ec9a961232ed727af30cca7691a1799c8c8389f4245611684b6fd5d41
-  data.tar.gz: 7b7bd5a5024cbd4b81a4dd52556bd50a0c4583394b97e3b01b159e98338a3c85748e9d238278b9b38a7501b2fff1a64fe7653ead1ff1755f86b11e3625d1b2b8
+  metadata.gz: c0781a46a8af37f88eaa80ea091bdde5926da2e9f94a8478b852860cf93a9e2a2c792861e3eb52301ffadbb457b30a6bd9a0281a45048c435eaa588cf141f8d7
+  data.tar.gz: 508002933e801a0d77be589fae9146f7570b26cc156e05fba80effe2a07299e67acbe983c8109c48fea7a57da5a55cd7fa649b5cd0eb845c6c140f5cf4c49fe1

data/lib/asciidoctor/itu/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -452,9 +458,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +480,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -1028,12 +1058,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/lib/asciidoctor/itu/validate.rb

@@ -45,7 +45,7 @@ module Asciidoctor
       def extract_text(node)
         return "" if node.nil?
         node1 = Nokogiri::XML.fragment(node.to_s)
-        node1.xpath("//link | //locality").each(&:remove)
+        node1.xpath("//link | //locality | //localityStack").each(&:remove)
         ret = ""
         node1.traverse { |x| ret += x.text if x.text? }
         ret

data/lib/isodoc/itu/base_convert.rb

@@ -120,8 +120,8 @@ module IsoDoc
 
       def get_eref_linkend(node)
         link = "[#{anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))}]"
-        link += eref_localities(node.xpath(ns("./locality")), link)
-        contents = node.children.select { |c| c.name != "locality" }
+        link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
+        contents = node.children.select { |c| !%w{locality localityStack}.include? c.name }
         return link if contents.nil? || contents.empty?
         Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
       end

data/lib/isodoc/itu/html/htmlstyle.scss

@@ -161,10 +161,14 @@ pre {
 }
 
 .document-stage-band {
-  @include docBand($order: 1, $textLength: 160px, $color: black, $fontWeight: 300);
+  @include docBand($order: 1, $textLength: 160px, $color: white, $fontWeight: 300);
 }
 .document-type-band {
-  @include docBand($order: 2, $textLength: 210px, $color: black, $offset: 180px);
+  @include docBand($order: 2, $offset: 180px);
+
+  .document-type {
+    top: 20px;
+  }
 }
 
 .logo-wrapper {
@@ -316,7 +320,7 @@ ul {
 
     &:before {
       content: "\2014";
-      display: inline-block; 
+      display: inline-block;
       width: 1em;
       margin-left: -1.2em;
     }
@@ -365,7 +369,7 @@ p.Biblio, p.NormRef {
 }
 
 .example {
-  @include exampleBlock(#e1eef1, null, 1.2em, 2em); 
+  @include exampleBlock(#e1eef1, null, 1.2em, 2em);
 
   .example-title {
     margin-top: 0;

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.12"
+    VERSION = "1.0.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities