metanorma-standoc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62c4c0677dbb6e87bca34d3c5d7526ceb5cf92d22e49d85f1f86a8ca183878d6
-  data.tar.gz: 62f43be22140fc902bb9a032fea49a100b8cbae54e3cf7143ffdba29b4f41fb5
+  metadata.gz: 3e25ec1e8d5bc7bd069b096125a76184bd1349bc64bc79a4e5c51f2441d3fb89
+  data.tar.gz: 888e53e4d5a11a260d74a520715c9343cf6d5889430e8491c91a1abf2476e057
 SHA512:
-  metadata.gz: b572b2f23a0db15863b7d2876d28c8fadfe16ea843043e4e9b9bd802f5f210c4a01f7df4b9ead558a023d6cf56602cb0b42f81f182b642efe44fe54af495132d
-  data.tar.gz: c6f7b9327802626322175c729b386cf8396d79fe32e1dd8b2b22c95f5a9a7cc5f7f53978ac1797de43f9902ebce0e1cf55e30551cf653e973a173034f72a649a
+  metadata.gz: d0b4f072611604bd9d6859676f98baaa6f09c95d886dbac7e5e21172fa34ccaec156c7560eccbb69a1e9bca784aae39325dce0e82bbbdf64dd0f27d05835b3b2
+  data.tar.gz: 405c4e68f48462b48249cc5d76de89b80b412f546a47992b37bd36ff68cce0a52f0cb82467439e7fe666b3b03fbf102831e17f3fb8b47757b56093627914581d

data/lib/asciidoctor/standoc/base.rb

@@ -85,6 +85,7 @@ module Asciidoctor
         @no_isobib_cache = node.attr("no-isobib-cache")
         @no_isobib = node.attr("no-isobib")
         @bibdb = nil
+        @seen_headers = []
         init_bib_caches(node)
         init_iev_caches(node)
       end

data/lib/asciidoctor/standoc/blocks.rb

@@ -102,8 +102,7 @@ module Asciidoctor
         return term_example(node) if in_terms?
         noko do |xml|
           xml.example **id_attr(node) do |ex|
-            content = node.content
-            ex << content
+            wrap_in_para(node, ex)
           end
         end.join("\n")
       end

data/lib/asciidoctor/standoc/cleanup.rb

@@ -27,11 +27,12 @@ module Asciidoctor
         biblio_cleanup(xmldoc)
         reference_names(xmldoc)
         xref_cleanup(xmldoc)
+        origin_cleanup(xmldoc)
+        iev_cleanup(xmldoc)
         bpart_cleanup(xmldoc)
         quotesource_cleanup(xmldoc)
         para_cleanup(xmldoc)
         callout_cleanup(xmldoc)
-        origin_cleanup(xmldoc)
         element_name_cleanup(xmldoc)
         footnote_renumber(xmldoc)
         empty_element_cleanup(xmldoc)

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -1,3 +1,5 @@
+require "set"
+
 module Asciidoctor
   module Standoc
     module Cleanup
@@ -120,6 +122,40 @@ module Asciidoctor
           @anchors[ref["id"]] = { xref: reference }
         end
       end
+
+      # converts generic IEV citation to citation of IEC 60050-n
+      # assumes IEV citations are of form 
+      # <eref type="inline" bibitemid="a" citeas="IEC 60050">
+      # <locality type="clause"><referenceFrom>101-01-01</referenceFrom></locality></eref>
+      def linksIev2iec60050part(xmldoc)
+        parts = Set.new()
+        xmldoc.xpath("//eref[@citeas = 'IEC 60050'] | //origin[@citeas = 'IEC 60050']").each do |x|
+          cl = x&.at("./locality[@type = 'clause']/referenceFrom")&.text || next
+          m = /^(\d+)/.match cl || next
+          parts << m[0]
+          x["citeas"] += "-#{m[0]}"
+        end
+        parts
+      end
+
+      # replace generic IEV reference with references to all extracted
+      # IEV parts
+      def refsIev2iec60050part(parts, iev)
+        new_iev = ""
+        parts.sort.each do |p|
+          hit = @bibdb&.fetch("IEC 60050-#{p}", nil, keep_year: true)
+          next if hit.nil?
+          new_iev += hit.to_xml
+        end
+        iev.replace(new_iev)
+      end
+
+      # call after xref_cleanup and origin_cleanup
+      def iev_cleanup(xmldoc)
+        iev = xmldoc.at("//bibitem[docidentifier = 'IEC 60050']") || return
+        parts = linksIev2iec60050part(xmldoc)
+        refsIev2iec60050part(parts, iev)
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/isodoc.rng

@@ -956,6 +956,11 @@
   </define>
   <define name="li">
     <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="paragraph-with-footnote"/>
       </oneOrMore>
@@ -999,7 +1004,9 @@
   </define>
   <define name="dt">
     <element name="dt">
-      <ref name="TextElement"/>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="dd">

data/lib/asciidoctor/standoc/ref.rb

@@ -80,6 +80,7 @@ module Asciidoctor
       end
 
       def fetch_ref(xml, code, year, **opts)
+        #require "byebug"; byebug
         hit = @bibdb&.fetch(code, year, opts) 
         return nil if hit.nil?
         xml.parent.add_child(hit.to_xml)

data/lib/asciidoctor/standoc/section.rb

@@ -21,18 +21,19 @@ module Asciidoctor
       end
 
       def sectiontype(node)
-        node&.attr("heading")&.downcase || node.title.downcase
+        ret = node&.attr("heading")&.downcase || node.title.downcase
+        return ret if ret == "symbols and abbreviated terms"
+        return nil unless node.level == 1
+        return nil if @seen_headers.include? ret
+        @seen_headers << ret
+        ret
       end
 
       def section(node)
         a = { id: Utils::anchor_or_uuid(node) }
         noko do |xml|
           case sectiontype(node)
-          when "introduction" then
-            if node.level == 1 then introduction_parse(a, xml, node)
-            else
-              clause_parse(a, xml, node)
-            end
+          when "introduction" then introduction_parse(a, xml, node)
           when "normative references" then norm_ref_parse(a, xml, node)
           when "terms and definitions",
             "terms, definitions, symbols and abbreviated terms",

data/lib/asciidoctor/standoc/validate.rb

@@ -13,7 +13,7 @@ module Asciidoctor
 
       def iev_validate(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          /^IEV($|\s|:)/.match(t&.at(".//origin/@citeas")&.text) or next
+          /^IEC 60050-/.match(t&.at(".//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/asciidoctor/standoc/validate_section.rb

@@ -29,7 +29,7 @@ module Asciidoctor
         root.xpath("//figure[image][not(title)]").each do |node|
           style_warning(node, "Figure should have title", nil)
         end
-        root.xpath("//table[not(title)]").each do |node|
+        root.xpath("//table[not(name)]").each do |node|
           style_warning(node, "Table should have title", nil)
         end
       end

data/lib/asciidoctor/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.0".freeze
+    VERSION = "1.0.1".freeze
   end
 end

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -757,4 +757,113 @@ r = 1 %</stem>
 </standard-document>
     OUTPUT
   end
+
+  it "separates IEV citations by top-level clause" do
+    system "mv ~/.iev.pstore ~/.iev.pstore1"
+    system "rm test.iev.pstore"
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    #{CACHED_ISOBIB_BLANK_HDR}
+
+    [bibliography]
+    == Normative References
+    * [[[iev,IEV]]], _iev_
+
+    == Terms and definitions
+    === Automation1
+
+    [.source]
+    <<iev,clause="103-01-02">>
+
+    === Automation2
+
+    [.source]
+    <<iev,clause="102-01-02">>
+
+    === Automation3
+
+    [.source]
+    <<iev,clause="103-01-02">>
+    INPUT
+        #{BLANK_HDR}
+
+        <sections>
+       <terms id="_" obligation="normative"><title>Terms and definitions</title><term id="_">
+         <preferred>Automation1</preferred>
+         <termsource status="identical">
+         <origin bibitemid="iev" type="inline" citeas="IEC 60050-103"><locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality></origin>
+       </termsource>
+       </term>
+       <term id="_">
+         <preferred>Automation2</preferred>
+         <termsource status="identical">
+         <origin bibitemid="iev" type="inline" citeas="IEC 60050-102"><locality type="clause"><referenceFrom>102-01-02</referenceFrom></locality></origin>
+       </termsource>
+       </term>
+       <term id="_">
+         <preferred>Automation3</preferred>
+         <termsource status="identical">
+         <origin bibitemid="iev" type="inline" citeas="IEC 60050-103"><locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality></origin>
+       </termsource>
+       </term></terms></sections><bibliography><references id="_" obligation="informative">
+         <title>Normative References</title>
+         <bibitem type="international-standard" id="IEC60050-102">
+         <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
+         <docidentifier>IEC 60050-102</docidentifier>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Electrotechnical Commission</name>
+             <abbreviation>IEC</abbreviation>
+             <uri>www.iec.ch</uri>
+           </organization>
+         </contributor>
+         <language>en</language>
+         <language>fr</language>
+         <script>Latn</script>
+         <status>
+           <stage>60</stage>
+         </status>
+         <copyright>
+           <from>2018</from>
+           <owner>
+             <organization>
+               <name>International Electrotechnical Commission</name>
+               <abbreviation>IEC</abbreviation>
+               <uri>www.iec.ch</uri>
+             </organization>
+           </owner>
+         </copyright>
+       </bibitem><bibitem type="international-standard" id="IEC60050-103">
+         <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
+         <docidentifier>IEC 60050-103</docidentifier>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Electrotechnical Commission</name>
+             <abbreviation>IEC</abbreviation>
+             <uri>www.iec.ch</uri>
+           </organization>
+         </contributor>
+         <language>en</language>
+         <language>fr</language>
+         <script>Latn</script>
+         <status>
+           <stage>60</stage>
+         </status>
+         <copyright>
+           <from>2018</from>
+           <owner>
+             <organization>
+               <name>International Electrotechnical Commission</name>
+               <abbreviation>IEC</abbreviation>
+               <uri>www.iec.ch</uri>
+             </organization>
+           </owner>
+         </copyright>
+       </bibitem>
+       </references></bibliography>
+       </standard-document>
+  OUTPUT
+  system "mv ~/.iev.pstore1 ~/.iev.pstore"
+  end
 end

data/spec/asciidoctor-standoc/section_spec.rb

@@ -38,6 +38,8 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Clause 4.2
 
+      == Terms and Definitions
+
       [appendix]
       == Annex
 
@@ -80,6 +82,10 @@ RSpec.describe Asciidoctor::Standoc do
        <clause id="_" inline-header="false" obligation="normative">
          <title>Clause 4.2</title>
        </clause></clause>
+       <clause id="_" inline-header="false" obligation="normative">
+        <title>Terms and Definitions</title>
+        </clause>
+
 
        </sections><annex id="_" inline-header="false" obligation="normative">
          <title>Annex</title>

data/spec/examples/rice.sh

@@ -1,4 +1,4 @@
 asciidoctor rice.adoc
 mv rice.html rice.preview.html
-asciidoctor --trace -b iso -r 'asciidoctor-iso' rice.adoc
+asciidoctor --trace -b standoc -r 'metanorma-standoc' rice.adoc
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor