metanorma-iec 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0478aec1aa1acf4dbf00c1992325723e57ebe14121769810ef6a230b2dfbf7a9'
-  data.tar.gz: 3d63928086246375072c6039e814e6b3c2344fbbdf84fc5ba0725b9ee3389548
+  metadata.gz: 5441a7cb520a15e832819d028708f0cd859794de377cc8cc38c24c4a748338c6
+  data.tar.gz: df973bae07cbf8d9be4eff4d33a2b3f5fed9c780aa497a7b6fbcfbeefbd17af8
 SHA512:
-  metadata.gz: 6374795004440b778feaf50fc4f0ddb6fe515e673428ce4c743d81aed019ad311b97cc038a7038318e9d92a881454e058df17c19c54cc9f01131fe44ff188b3b
-  data.tar.gz: '098debb725126f728718996db03b5adad76e2a13badd47808f9f51f602a2f2724fe7acad96f2b45c00820c00a4656b2ee2b0daedf22d0758b74578e5fe132f8b'
+  metadata.gz: '00190704a6285a58a466d9a25fc8f877f038f438030d1cc2e299db072d4d85862372204f76db233f76e236acb0b0baed7b351a0c6be4e25a3bf732126f56a905'
+  data.tar.gz: 171bb257c17a0b100da9cf3fb64d3ee72f675359a3281b123292dce13927395e9bc62496d75ec0ed1d406d37c77af1145400fa31b395b6db8eb1c878b01df08e

data/lib/asciidoctor/iec/converter.rb

@@ -70,7 +70,7 @@ module Asciidoctor
         %w(international-standard technical-specification technical-report 
         publicly-available-specification international-workshop-agreement 
         guide interpretation-sheet).include? doctype or
-        warn "IEC Document Attributes: #{doctype} is not a recognised document type"
+        @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
       end
 
       def validate(doc)

data/lib/asciidoctor/iec/isodoc.rng

@@ -645,6 +645,11 @@
     <optional>
       <attribute name="script"/>
     </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="obligation">
         <choice>

data/lib/asciidoctor/iec/isostandard.rng

@@ -73,6 +73,19 @@
         </choice>
       </element>
     </define>
+    <define name="ul">
+      <element name="ul">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <oneOrMore>
+          <ref name="ul_li"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="sections">
       <element name="sections">
         <ref name="clause"/>
@@ -325,6 +338,51 @@
         </oneOrMore>
       </choice>
     </define>
+    <define name="table">
+      <element name="table">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="width"/>
+        </optional>
+        <optional>
+          <attribute name="unnumbered">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="subsequence"/>
+        </optional>
+        <optional>
+          <attribute name="alt"/>
+        </optional>
+        <optional>
+          <attribute name="summary"/>
+        </optional>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <optional>
+          <ref name="thead"/>
+        </optional>
+        <ref name="tbody"/>
+        <optional>
+          <ref name="tfoot"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="table-note"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="dl"/>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -431,4 +489,26 @@
       <ref name="Clause-Section"/>
     </element>
   </define>
+  <define name="ul_li">
+    <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="uncheckedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="checkedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="paragraph-with-footnote"/>
+      </oneOrMore>
+    </element>
+  </define>
 </grammar>

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

@@ -675,6 +675,10 @@ ol > li > p:before {
     @include formulaBlock(#f7f7f7)
 }
 
+dl.formula_dl {
+background-color: #f7f7f7;
+}
+
 /*
 Keywords
 */

data/lib/isodoc/iec/html/isodoc.scss

@@ -563,6 +563,9 @@ p.Formula, li.Formula, div.Formula
 	letter-spacing:.4pt;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:ZH-CN;}
+table.formula_dl {
+        margin-left:0.0cm;
+}
 p.FOREWORD, li.FOREWORD, div.FOREWORD
 	{mso-style-name:FOREWORD;
 	mso-style-unhide:no;

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end
 

data/metanorma-iec.gemspec

@@ -40,6 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.3.0"
   spec.add_development_dependency "iev", "~> 0.2.0"
 end

data/spec/asciidoctor-iec/validate_spec.rb

@@ -4,7 +4,8 @@ require "fileutils"
 RSpec.describe Asciidoctor::Iec do
 
 it "Warns of illegal doctype" do
-    expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(/pizza is not a recognised document type/).to_stderr
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) 
   = Document title
   Author
   :docfile: test.adoc
@@ -14,119 +15,6 @@ it "Warns of illegal doctype" do
 
   text
   INPUT
+    expect(File.read("test.err")).to include "pizza is not a recognised document type"
 end
-
-it "Warns of illegal script" do
-    expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(/pizza is not a recognised script/).to_stderr
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :script: pizza
-
-  text
-  INPUT
-end
-
-it "Warns of illegal stage" do
-    expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(/pizza is not a recognised stage/).to_stderr
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :status: pizza
-
-  text
-  INPUT
-end
-
-it "Warns of illegal substage" do
-    expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(/pizza is not a recognised substage/).to_stderr
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :status: 60
-  :docsubstage: pizza
-
-  text
-  INPUT
-end
-
-it "Warns of illegal iteration" do
-    expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(/pizza is not a recognised iteration/).to_stderr
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :status: 60
-  :iteration: pizza
-
-  text
-  INPUT
-end
-
-it "Warns of illegal script" do
-    expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(/pizza is not a recognised script/).to_stderr
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :script: pizza
-
-  text
-  INPUT
-end
-
-
-it "Warning if invalid technical committee type" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(%r{invalid technical committee type}).to_stderr
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :technical-committee-type: X
-  :no-isobib:
-
-  INPUT
-end
-
-it "Warning if invalid subcommittee type" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(%r{invalid subcommittee type}).to_stderr
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :subcommittee-type: X
-  :no-isobib:
-
-  INPUT
-end
-
-it "Warning if invalid subcommittee type" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(%r{invalid subcommittee type}).to_stderr
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :subcommittee-type: X
-  :no-isobib:
-
-  INPUT
-end
-
-it "validates document against ISO XML schema" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) }.to output(%r{value of attribute "align" is invalid; must be equal to}).to_stderr
-  #{VALIDATING_BLANK_HDR}
-
-  [align=mid-air]
-  Para
-  INPUT
-end
-
 end

data/spec/isodoc/postproc_spec.rb

@@ -220,13 +220,22 @@ RSpec.describe IsoDoc do
     INPUT
     word = File.read("test.doc", encoding: "UTF-8").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
       sub(%r{<br[^>]*>\s*<div class="colophon">.*$}m, "")
-    expect((word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
          <div class="WordSection3">
-         #{IEC_TITLE}
+    #{IEC_TITLE.gsub(/\&#160;/, "&#xA0;")}
              <p class="MsoNormal">
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
              </p>
              <div class="Section3"><a name="P" id="P"></a>
+             <h1 class='Annex'>
+  <b>Annex A</b>
+  <br/>
+  <br/>
+  (normative)
+  <br/>
+  <br/>
+  <b/>
+</h1>
                <div class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
                  <p class="example"><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#xA0; </span>'1M', '01M', and '0001M' all describe the calendar month January.</p>
                </div>
@@ -264,6 +273,15 @@ RSpec.describe IsoDoc do
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
              </p>
              <div class="Section3"><a name="P" id="P"></a>
+             <h1 class='Annex'>
+  <b>Annex A</b>
+  <br/>
+  <br/>
+  (normative)
+  <br/>
+  <br/>
+  <b/>
+</h1>
                <p class="Sourcecode" style='page-break-after:avoid;'><a name="A" id="A"></a>puts "Hello, world."</p>
                <p class='SourceTitle' style='text-align:center;'>Figure A.1</p>
                <p class="TableTitle" style="text-align:center;">Table A.1</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -178,20 +178,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: metanorma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: iev
   requirement: !ruby/object:Gem::Requirement