metanorma-iec 1.2.17 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0b96b912617f9b9d39b34c274bbb5a42d3657fb23f106dfe5a683b77a1a61aa
-  data.tar.gz: 18e4b1544161cce4938d62195ecf75a610210d6209306deebf67cfbc9c36e1ee
+  metadata.gz: 896831ab7585bc0d95fa10bcef8ba276bc624f6b5b51534e136177f43c74723c
+  data.tar.gz: 2dec389207942c399e02b6cb085541f6255715f3cbb0c6c1ee8dfe29204b618d
 SHA512:
-  metadata.gz: 86ee8f3349be5a349d0e9bdaa86945ae26773c9a51f5b3807d4ad5091ad5ec5377a2a30fc7209c9524ed52a67b6c0c16028b3ff1c1637c1027ea4b459b1c6531
-  data.tar.gz: 8e9d466765a4eb73c42c68292a6001c6bdc928aff890250f0b2080a4fd134da33475f1176d536e76888d5e95e98242eff5c44cbe764400346b6e623f37cbc8de
+  metadata.gz: ca103b07a7421e67ec218b8a759fc51d997eab8185a11c0bff0fefa6f1b632ea4bd614e61028b1b94e6f372f3c73c8a7ea9a772a507cdff883d0a14d502a9717
+  data.tar.gz: ffad29f88e9171b636abf4fb7d1b85fe5a6627fd71fdbadf53cb612cae032b6f1481a3bf3dc950ea3623f93bbd45a87a4c9467358022cc250daffeac25cec956

data/lib/asciidoctor/iec/isodoc.rng

@@ -86,6 +86,35 @@
         <text/>
       </element>
     </define>
+    <define name="erefType">
+      <optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="citeas"/>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
+      <optional>
+        <attribute name="case">
+          <choice>
+            <value>capital</value>
+            <value>lowercase</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="droploc">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <ref name="CitationType"/>
+      <text/>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -775,6 +804,78 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="em">
+      <element name="em">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strong">
+      <element name="strong">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="tt">
+      <element name="tt">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="keyword">
+      <element name="keyword">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strike">
+      <element name="strike">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="underline">
+      <element name="underline">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="smallcap">
+      <element name="smallcap">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="colgroup">
@@ -793,7 +894,35 @@
     <value>internal</value>
   </define>
   <define name="TextElement" combine="choice">
-    <ref name="concept"/>
+    <choice>
+      <ref name="concept"/>
+      <ref name="add"/>
+      <ref name="del"/>
+    </choice>
+  </define>
+  <define name="add">
+    <element name="add">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
+  </define>
+  <define name="del">
+    <element name="del">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
   </define>
   <define name="concept">
     <element name="concept">

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

@@ -115,6 +115,13 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+.addition {
+  color: blue; }
+
+.deletion {
+  color: red;
+  text-decoration: line-through; }
+
 #standard-band {
   background-color: #0AC442; }
 

data/lib/isodoc/iec/html_convert.rb

@@ -27,7 +27,6 @@ module IsoDoc
           htmlstylesheet: html_doc_path("htmlstyle.scss"),
           htmlcoverpage: html_doc_path("html_iec_titlepage.html"),
           htmlintropage: html_doc_path("html_iec_intro.html"),
-          scripts: html_doc_path("scripts.html"),
         }
       end
 

data/lib/isodoc/iec/iec.international-standard.xsl

@@ -5,6 +5,7 @@
 	<xsl:param name="svg_images"/>
 	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 	
 	
 	
@@ -2953,7 +2954,7 @@
 				
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
 		
-	
+		
 	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
 		
 			<xsl:attribute name="font-size">8pt</xsl:attribute>
@@ -2965,6 +2966,12 @@
 		
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
+	</xsl:attribute-set><xsl:attribute-set name="add-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="del-style">
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -4410,8 +4417,12 @@
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='add']">
+		<fo:inline xsl:use-attribute-sets="add-style">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
-		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="del-style">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='hi']">
@@ -5029,22 +5040,37 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'image']">
-		<fo:block xsl:use-attribute-sets="image-style">
-			
-			
-			<xsl:variable name="src">
-				<xsl:choose>
-					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
-						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@src"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			
-			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
-		</fo:block>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'title']">
+				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					
+					<xsl:variable name="src">
+						<xsl:call-template name="image_src"/>
+					</xsl:variable>
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="image_src">
+		<xsl:choose>
+			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+				<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+			</xsl:when>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@src"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.2.17"
+    VERSION = "1.3.0".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "metanorma/iec/version"
 
@@ -27,18 +27,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
+  spec.add_dependency "metanorma-iso", "~> 1.8.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-iso", "~> 1.7.0"
 
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
+  spec.add_development_dependency "iev", "~> 0.2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "iev", "~> 0.2.0"
 end

data/spec/isodoc/postproc_spec.rb

@@ -74,7 +74,7 @@ RSpec.describe IsoDoc do
   it "generates HTML output docs with null configuration from file" do
     FileUtils.rm_f "spec/assets/iso.doc"
     FileUtils.rm_f "spec/assets/iso.html"
-    IsoDoc::Iec::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
+    IsoDoc::Iec::HtmlConvert.new({wordstylesheet: "word.css", htmlstylesheet: "html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.html")).to be true
     html = File.read("spec/assets/iso.html", encoding: "UTF-8")
     expect(html).to match(/<style>/)
@@ -84,7 +84,7 @@ RSpec.describe IsoDoc do
 
   it "generates Word output docs with null configuration from file" do
     FileUtils.rm_f "spec/assets/iso.doc"
-    IsoDoc::Iec::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
+    IsoDoc::Iec::WordConvert.new({wordstylesheet: "word.css", htmlstylesheet: "html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.doc")).to be true
     word = File.read("spec/assets/iso.doc", encoding: "UTF-8")
     expect(word).to match(/<w:WordDocument>/)
@@ -134,24 +134,6 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-  it "populates Word header" do
-    FileUtils.rm_f "test.doc"
-    IsoDoc::Iec::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", header: "spec/assets/header.html"}).convert("test", <<~"INPUT", false)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-               <bibdata type="article">
-                        <docidentifier>
-           <project-number part="1">1000</project-number>
-         </docidentifier>
-        </bibdata>
-</iso-standard>
-
-    INPUT
-    word = File.read("test.doc", encoding: "UTF-8").sub(%r{^.*Content-Location: file:///C:/Doc/test_files/header.html}m, "Content-Location: file:///C:/Doc/test_files/header.html").
-      sub(/------=_NextPart.*$/m, "")
-    #expect(word).to include(%{Content-Location: file:///C:/Doc/test_files/header.html\nContent-Transfer-Encoding: base64\nContent-Type: text/html charset="utf-8" })
-    expect(word).to include(%{Content-Location: file:///C:/Doc/test_files/header.html})
-  end
-
   it "processes IsoXML terms for HTML" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_f "test.doc"

metadata

@@ -1,51 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: iev
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,47 +151,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: iev
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.9'
 description: |
   metanorma-iec lets you write IEC standards in AsciiDoc syntax.
 
@@ -252,14 +252,14 @@ files:
 - lib/metanorma/iec/processor.rb
 - lib/metanorma/iec/version.rb
 - metanorma-iec.gemspec
-- spec/asciidoctor-iec/base_spec.rb
-- spec/asciidoctor-iec/blocks_spec.rb
-- spec/asciidoctor-iec/cleanup_spec.rb
-- spec/asciidoctor-iec/iev_spec.rb
-- spec/asciidoctor-iec/inline_spec.rb
-- spec/asciidoctor-iec/lists_spec.rb
-- spec/asciidoctor-iec/section_spec.rb
-- spec/asciidoctor-iec/validate_spec.rb
+- spec/asciidoctor/base_spec.rb
+- spec/asciidoctor/blocks_spec.rb
+- spec/asciidoctor/cleanup_spec.rb
+- spec/asciidoctor/iev_spec.rb
+- spec/asciidoctor/inline_spec.rb
+- spec/asciidoctor/lists_spec.rb
+- spec/asciidoctor/section_spec.rb
+- spec/asciidoctor/validate_spec.rb
 - spec/assets/header.html
 - spec/assets/html.css
 - spec/assets/iso.xml
@@ -267,15 +267,6 @@ files:
 - spec/assets/word.css
 - spec/assets/wordintro.html
 - spec/assets/xref_error.adoc
-- spec/examples/rice.adoc
-- spec/examples/rice.doc
-- spec/examples/rice.html
-- spec/examples/rice.xml
-- spec/examples/rice_img/rice_image1.png
-- spec/examples/rice_img/rice_image2.png
-- spec/examples/rice_img/rice_image3_1.png
-- spec/examples/rice_img/rice_image3_2.png
-- spec/examples/rice_img/rice_image3_3.png
 - spec/isodoc/blocks_spec.rb
 - spec/isodoc/i18n_spec.rb
 - spec/isodoc/iev_spec.rb