metanorma-standoc 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ab7132a76a53ee303ac53204ca6ed7f3c7c08fbed11630735cd977c709b9d8
-  data.tar.gz: 39bfe93c825d14a28f480018a8d7b454dde14820560ae0e7afac68003bfe2bba
+  metadata.gz: b4827ca730cad759d95fc6d9a2cde854fc4579bb0554cdf3c4cbb8b6139d67d5
+  data.tar.gz: 3b591c74d89dc060f0f88e98ef7de25a38e558a66b8dfa31561931ba5ecf1e99
 SHA512:
-  metadata.gz: b9b36882ea7259d3fd618e1c1ed804f91d5ffa36503ee924f19e78e7ed52e67f1317fb47c0056705cb1e3542ff65fbd2e4c8871e9a1c503223c6cf34446a7895
-  data.tar.gz: b62285a6f373777087a57becc2a5a028a65f3f61e5d658daa6e93af61d078a15b239f5ff0da5498b3561457c4a7f664bb83e01e6ccc6d184c82de3b672828a85
+  metadata.gz: 88ec93016754b952a3cc289f49a38d45734dfc628ed320d8de080b790323d752b86e8d2902754ee713984bd247a07f3a0cc624b4e4320421ebdcdbb58f596924
+  data.tar.gz: 2ecae2ef176588738cc0f95306cd9868c52a3699e6a192bfea16cb307abfbe98d6d6c5ec6392c167ac07eab724545e35ee7cc98a68d42ed4636458eb15ec5ad6

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -21,10 +21,10 @@ module Asciidoctor
 
       # move Key dl after table footer
       def dl_table_cleanup(xmldoc)
-        q = "//table/following-sibling::*[1]"\
-          "[self::p and normalize-space() = 'Key']"
+        q = "//table/following-sibling::*[1][self::p]"
         xmldoc.xpath(q).each do |s|
-          if !s.next_element.nil? && s.next_element.name == "dl"
+          if s.text =~ /^\s*key[^a-z]*$/i && !s.next_element.nil? && 
+              s.next_element.name == "dl"
             s.previous_element << s.next_element.remove
             s.remove
           end
@@ -73,10 +73,10 @@ module Asciidoctor
 
       # include where definition list inside stem block
       def formula_cleanup(x)
-        q = "//formula/following-sibling::*[1]"\
-          "[self::p and text() = 'where']"
+        q = "//formula/following-sibling::*[1][self::p]"
         x.xpath(q).each do |s|
-          if !s.next_element.nil? && s.next_element.name == "dl"
+          if s.text =~ /^\s*where[^a-z]*$/i && !s.next_element.nil? &&
+              s.next_element.name == "dl"
             s.previous_element << s.next_element.remove
             s.remove
           end
@@ -85,10 +85,10 @@ module Asciidoctor
 
       # include key definition list inside figure
       def figure_dl_cleanup(xmldoc)
-        q = "//figure/following-sibling::*"\
-          "[self::p and normalize-space() = 'Key']"
+        q = "//figure/following-sibling::*[self::p]"
         xmldoc.xpath(q).each do |s|
-          if !s.next_element.nil? && s.next_element.name == "dl"
+          if s.text =~ /^\s*key[^a-z]*$/i && !s.next_element.nil? &&
+              s.next_element.name == "dl"
             s.previous_element << s.next_element.remove
             s.remove
           end

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -137,6 +137,7 @@ module Asciidoctor
           m = /^(\d+)/.match cl || next
           parts << m[0]
           x["citeas"] = x["citeas"].sub(/60050/, "60050-#{m[0]}")
+          x["bibitemid"] = x["bibitemid"].sub(/IEV/, "IEC60050-#{m[0]}")
         end
         parts
       end
@@ -148,7 +149,7 @@ module Asciidoctor
         parts.sort.each do |p|
           hit = @bibdb&.fetch("IEC 60050-#{p}", nil, keep_year: true)
           next if hit.nil?
-          new_iev += hit.to_xml
+          new_iev += hit.to_xml.sub(/ id="[^"]+"/, %{ id="IEC60050-#{p}"})
         end
         iev.replace(new_iev)
       end

data/lib/asciidoctor/standoc/validate.rb

@@ -9,11 +9,11 @@ module Asciidoctor
   module Standoc
     module Validate
 
-      SOURCELOCALITY = ".//locality[@type = 'clause']/referenceFrom".freeze
+      SOURCELOCALITY = "./termsource/origin/locality[@type = 'clause']/referenceFrom".freeze
 
       def iev_validate(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          /^IEC 60050-/.match(t&.at(".//origin/@citeas")&.text) or next
+          /^IEC 60050-/.match(t&.at("./termsource/origin/@citeas")&.text) or next
           pref = t.xpath("./preferred").inject([]) { |m, x| m << x&.text&.downcase }
           locality = t.xpath(SOURCELOCALITY)&.text or next
           iev = @iev.fetch(locality, xmldoc&.at("//language")&.text || "en") or next

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.5".freeze
+    VERSION = "1.0.6".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -44,5 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.2.6"
   spec.add_development_dependency "isobib", "~> 0.3.0"
-  spec.add_development_dependency "ietfbib", "~> 0.3.0"
+  spec.add_development_dependency "ietfbib", "~> 0.4.0"
 end

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -517,7 +517,7 @@ r = 1 %</stem>
       Formula
       ++++
 
-      where
+      Where,
 
       a:: b
     INPUT
@@ -565,7 +565,7 @@ r = 1 %</stem>
       #{ASCIIDOC_BLANK_HDR}
       image::spec/examples/rice_images/rice_image1.png[]
 
-      Key
+      key:
 
       a:: b
     INPUT
@@ -852,7 +852,7 @@ r = 1 %</stem>
        </termsource>
        </term></terms></sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
-         <bibitem type="international-standard" id="IEC60050-102-2011">
+         <bibitem type="international-standard" id="IEC60050-102">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
          <docidentifier>IEC 60050-102:2011</docidentifier>
          <date type="published">
@@ -882,7 +882,7 @@ r = 1 %</stem>
              </organization>
            </owner>
          </copyright>
-       </bibitem><bibitem type="international-standard" id="IEC60050-103-2011">
+       </bibitem><bibitem type="international-standard" id="IEC60050-103">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
          <docidentifier>IEC 60050-103:2011</docidentifier>
          <date type="published">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 description: |
   metanorma-standoc realises standards following the Metanorma standoc model