metanorma-standoc 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021021d1bd53dd9011a83d465073805d52c54931bcb4084317a121147b556a6a
-  data.tar.gz: 3e4ea599f6df9d42a41ee7e6e1886f82553ab04cde4c38411dc48044de9277b4
+  metadata.gz: 644ddfc0c5ac5fae5afc94f5dbdfaae98e652bff498bc93babb5cba3852c0141
+  data.tar.gz: cb00da517ce5f359f348d57fee37cffc8b2148250ae6c4557ef192c1b779b865
 SHA512:
-  metadata.gz: df869dbccb358ca2de8bd49f4350fc0f45154cbf18f78f39ab8369de01302d32bccc1d8c5527bcc593bbd8ea75990be92ec592182abbb68bcc4db38652051ebe
-  data.tar.gz: 352d4574be35edc5496eac9dd3227f91fc026d0bc273d7c0e63909218366139966815765256bbbc0b5a1e8c59b2c43aa4267b72257ebd667a58520d1ba0c63cf
+  metadata.gz: 44cbc66e4d6e477aef83073e733c783461e0041b3ea4c80db24d491407716e7557814a1bf3e3acc8398d82dd778c43b2c8ff796c289ea95fb4163e98bcbdcc8d
+  data.tar.gz: dcc8047577538f25d37a6a81a73e2d78ef3fd53925489500dc72d26682fcf7bd790c419b2a1158944ff40a1ffd6792a0e39fa14c739ed4c045db536850d95404

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.0.13)
+    metanorma-standoc (1.0.14)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       iev (~> 0.2.0)
       isodoc (~> 0.9.0)
       relaton (~> 0.3.1)
       ruby-jing
-      sterile
+      sterile (~> 1.0.14)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    algoliasearch (1.24.0)
+    algoliasearch (1.25.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.8)
-    asciimath (1.0.6)
+    asciimath (1.0.7)
     ast (2.4.0)
     byebug (10.0.2)
     cnccs (0.1.3)
@@ -52,9 +52,9 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (0.3.7)
-    html2doc (0.8.6)
-      asciimath
+    hashdiff (0.3.8)
+    html2doc (0.8.8)
+      asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
       mime-types
@@ -76,11 +76,11 @@ GEM
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
-    isobib (0.4.2)
+    isobib (0.4.3)
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.13)
+    isodoc (0.9.14)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -163,7 +163,7 @@ GEM
     ruby_deep_clone (0.8.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.7.2)
+    sass (3.7.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -177,15 +177,15 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sterile (1.0.13)
+    sterile (1.0.14)
       nokogiri
     thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
     uuidtools (2.1.5)
     vcr (4.0.0)
-    webmock (3.4.2)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -194,7 +194,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.15)
+  bundler (~> 2.0.1)
   byebug
   equivalent-xml (~> 0.6)
   guard (~> 2.14)
@@ -210,4 +210,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.17.2
+   2.0.1

data/lib/asciidoctor/standoc/biblio.rng

@@ -488,6 +488,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
+    <optional>
+      <ref name="version"/>
+    </optional>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -866,6 +869,34 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="version">
+    <element name="version">
+      <optional>
+        <ref name="vedition"/>
+      </optional>
+      <optional>
+        <ref name="revision-date"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="draft"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="vedition">
+    <element name="edition">
+      <data type="int"/>
+    </element>
+  </define>
+  <define name="revision-date">
+    <element name="revision-date">
+      <data type="date"/>
+    </element>
+  </define>
+  <define name="draft">
+    <element name="draft">
+      <text/>
+    </element>
+  </define>
   <!--
     Anycontents = mixed {
     https://github.com/relaxng/jing-trang/issues/211

data/lib/asciidoctor/standoc/blocks.rb

@@ -133,7 +133,7 @@ module Asciidoctor
       end
 
       def image_attributes(node)
-        uri = node.image_uri node.attr("target")
+        uri = node.image_uri (node.attr("target") || node.target)
         types = MIME::Types.type_for(uri)
         { src: @datauriimage ? datauri(uri) : uri,
           id: Utils::anchor_or_uuid,
@@ -157,6 +157,13 @@ module Asciidoctor
         end
       end
 
+      def inline_image(node)
+        noko do |xml|
+          xml.image **attr_code(image_attributes(node))
+        end.join("")
+      end
+
+
       def paragraph(node)
         return termsource(node) if node.role == "source"
         attrs = { align: node.attr("align"),

data/lib/asciidoctor/standoc/converter.rb

@@ -55,7 +55,6 @@ module Asciidoctor
       alias_method :inline_button, :skip
       alias_method :inline_kbd, :skip
       alias_method :inline_menu, :skip
-      alias_method :inline_image, :skip
     end
   end
 end

data/lib/asciidoctor/standoc/inline.rb

@@ -107,13 +107,13 @@ module Asciidoctor
       def inline_quoted(node)
         noko do |xml|
           case node.type
-          when :emphasis then xml.em node.text
-          when :strong then xml.strong node.text
-          when :monospaced then xml.tt node.text
+          when :emphasis then xml.em { |s| s << node.text }
+          when :strong then xml.strong { |s| s << node.text }
+          when :monospaced then xml.tt { |s| s << node.text }
           when :double then xml << "\"#{node.text}\""
           when :single then xml << "'#{node.text}'"
-          when :superscript then xml.sup node.text
-          when :subscript then xml.sub node.text
+          when :superscript then xml.sup { |s| s << node.text }
+          when :subscript then xml.sub { |s| s << node.text }
           when :asciimath then stem_parse(node.text, xml)
           else
             case node.role
@@ -122,9 +122,9 @@ module Asciidoctor
             when "deprecated" then xml.deprecates { |a| a << node.text }
             when "domain" then xml.domain { |a| a << node.text }
 
-            when "strike" then xml.strike node.text
-            when "smallcap" then xml.smallcap node.text
-            when "keyword" then xml.keyword node.text
+            when "strike" then xml.strike { |s| s << node.text }
+            when "smallcap" then xml.smallcap { |s| s << node.text }
+            when "keyword" then xml.keyword { |s| s << node.text }
             else
               xml << node.text
             end

data/lib/asciidoctor/standoc/isodoc.rng

@@ -39,9 +39,6 @@
   <define name="standard-document">
     <element name="standard-document">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <optional>
         <ref name="preface"/>
       </optional>
@@ -59,34 +56,6 @@
       <ref name="BibData"/>
     </element>
   </define>
-  <define name="version">
-    <element name="version">
-      <optional>
-        <ref name="vedition"/>
-      </optional>
-      <optional>
-        <ref name="revision-date"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="draft"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="vedition">
-    <element name="edition">
-      <data type="int"/>
-    </element>
-  </define>
-  <define name="revision-date">
-    <element name="revision-date">
-      <data type="date"/>
-    </element>
-  </define>
-  <define name="draft">
-    <element name="draft">
-      <text/>
-    </element>
-  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>
@@ -1068,6 +1037,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
+    <optional>
+      <ref name="version"/>
+    </optional>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>

data/lib/asciidoctor/standoc/table.rb

@@ -23,7 +23,9 @@ module Asciidoctor
 
       def table_name(node, xml_table)
         if node.title?
-          xml_table.name node.title
+          xml_table.name do |n|
+            n << node.title
+          end
         end
       end
 

data/lib/asciidoctor/standoc/utils.rb

@@ -6,6 +6,7 @@ require "pathname"
 require "open-uri"
 require "uuidtools"
 require "sterile"
+#require_relative "../../hacks/sterile"
 
 module Asciidoctor
   module Standoc

data/lib/hacks/sterile.rb

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+
+module Sterile
+  # @private
+  class Data
+    def self.smart_format_rules
+      [
+        ["'tain't", "’tain’t"],
+        ["'twere", "’twere"],
+        ["'twas", "’twas"],
+        ["'tis", "’tis"],
+        ["'twill", "’twill"],
+        ["'til", "’til"],
+        ["'bout", "’bout"],
+        ["'nuff", "’nuff"],
+        ["'round", "’round"],
+        ["'cause", "’cause"],
+        ["'cos", "’cos"],
+        ["i'm", "i’m"],
+        ['--"', "—“"],
+        ["--'", "—‘"],
+        ["--", "—"],
+        ["...", "…"],
+        ["(tm)", "™"],
+        ["(TM)", "™"],
+        ["(c)", "©"],
+        ["(r)", "®"],
+        ["(R)", "®"],
+        [/\'(\d\d)(?!’|\')([\p{P}\p{Z}])/, "’\\1\\2"],
+        # [/<p>"/, "<p>\\1″"],
+        [/s\'([^a-zA-Z0-9])/, "s’\\1"],
+        [/"([:;])/, "”\\1"],
+        [/\'s$/, "’s"],
+        [/\'(\d\d(?:’|\')?s)/, "’\\1"],
+        [/(\s|\A|"|\(|\[)\'/, "\\1‘"],
+        # [/(\d+)"/, "\\1″"],
+        # [/(\d+)\'/, "\\1′"],
+        [/(\S)\'([^\'\s])/, "\\1’\\2"],
+        [/(\s|\A|\(|\[)"(?!\s)/, "\\1“\\2"],
+        [/"(\s|\S|\Z)/, "”\\1"],
+        [/\'([\s.]|\Z)/, "’\\1"],
+        [/(\d+)x(\d+)/, "\\1×\\2"],
+        [/([a-z])'(t|d|s|ll|re|ve)(\b)/i, "\\1’\\2\\3"],
+      ]
+    end
+  end
+
+  class << self
+    private
+     def smart_format_rules
+       Data.smart_format_rules
+     end
+  end
+end

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.13".freeze
+    VERSION = "1.0.14".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isodoc", "~> 0.9.0"
   spec.add_dependency "iev", "~> 0.2.0"
   spec.add_dependency "relaton", "~> 0.3.1"
-  spec.add_dependency "sterile"
+  spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

data/spec/asciidoctor-standoc/base_spec.rb

@@ -156,7 +156,7 @@ RSpec.describe Asciidoctor::Standoc do
   end
 
   it "processes complex metadata" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).sub(%r{</bibdata>.*$}m, "</bibdata>")).to be_equivalent_to <<~'OUTPUT'
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).sub(%r{</bibdata>.*$}m, "</bibdata>")).to be_equivalent_to <<~"OUTPUT"
       = Document title
       Author
       :docfile: test.adoc
@@ -237,7 +237,7 @@ RSpec.describe Asciidoctor::Standoc do
 <p id="_">This is the second paragraph of the abstract of the document.</p></abstract>
          <status format="plain">published</status>
          <copyright>
-           <from>2018</from>
+           <from>#{Date.today.year}</from>
            <owner>
              <organization>
                <name>IEC</name>
@@ -245,7 +245,7 @@ RSpec.describe Asciidoctor::Standoc do
            </owner>
          </copyright>
          <copyright>
-           <from>2018</from>
+           <from>#{Date.today.year}</from>
            <owner>
              <organization>
                <name>IETF</name>
@@ -253,7 +253,7 @@ RSpec.describe Asciidoctor::Standoc do
            </owner>
          </copyright>
          <copyright>
-           <from>2018</from>
+           <from>#{Date.today.year}</from>
            <owner>
              <organization>
                <name>ISO</name>

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -103,7 +103,7 @@ RSpec.describe Asciidoctor::Standoc do
          <script>Latn</script>
          <status format="plain">published</status>
          <copyright>
-           <from>2018</from>
+           <from>#{Date.today.year}</from>
          </copyright>
          <editorialgroup>
            <technical-committee/>
@@ -356,6 +356,21 @@ RSpec.describe Asciidoctor::Standoc do
       OUTPUT
     end
 
+        it "processes inline images with width and height attributes on images" do
+      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      Hello image:spec/examples/rice_images/rice_image1.png[alt, 4, 3], how are you?
+
+      INPUT
+      #{BLANK_HDR}
+              <sections>
+          <p id="_">Hello <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="3" width="4"/>, how are you?</p>
+       </figure>
+       </sections>
+       </standard-document>
+      OUTPUT
+    end
+
         it "processes images as datauri" do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to include '<image src="data:image/png;base64'
       = Document title

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -11,6 +11,7 @@ RSpec.describe Asciidoctor::Standoc do
       'single quote'
       super^script^
       sub~script~
+      sub~__scr__ipt~
       stem:[a_90]
       stem:[<mml:math><mml:msub xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">F</mml:mi> </mml:mrow> </mml:mrow> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">&#x391;</mml:mi> </mml:mrow> </mml:mrow> </mml:msub> </mml:math>]
       [alt]#alt#
@@ -29,6 +30,7 @@ RSpec.describe Asciidoctor::Standoc do
        'single quote'
        super<sup>script</sup>
        sub<sub>script</sub>
+       sub<sub><em>scr</em>ipt</sub>
        <stem type="AsciiMath">a_90</stem>
        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
        <admitted>alt</admitted>
@@ -42,6 +44,20 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
+  it "generates desired smart quotes for 'dd'" do
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      '99'.
+
+    INPUT
+            #{BLANK_HDR}
+       <sections><p id="_">‘99’.</p>
+       </sections>
+       </standard-document>
+    OUTPUT
+  end
+
+
   it "processes breaks" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -517,7 +517,7 @@ RSpec.describe Asciidoctor::Standoc do
         <script>Latn</script>
         <status format="plain">published</status>
         <copyright>
-          <from>2018</from>
+          <from>#{Date.today.year}</from>
         </copyright>
         <editorialgroup>
           <technical-committee/>

data/spec/asciidoctor-standoc/table_spec.rb

@@ -115,7 +115,7 @@ RSpec.describe Asciidoctor::Standoc do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
       [cols="<,^,^,^,^",options="header,footer",headerrows=2]
-      .Maximum permissible mass fraction of defects
+      .Maximum _permissible_ mass fraction of defects
       |===
       .2+|Defect 4+^| Maximum permissible mass fraction of defects in husked rice +
       stem:[w_max]
@@ -145,7 +145,7 @@ RSpec.describe Asciidoctor::Standoc do
             #{BLANK_HDR}
        <sections>
          <table id="_">
-         <name>Maximum permissible mass fraction of defects</name>
+         <name>Maximum <em>permissible</em> mass fraction of defects</name>
          <thead>
            <tr>
              <th rowspan="2" align="left">Defect</th>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -84,16 +84,16 @@ dependencies:
   name: sterile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.14
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -339,6 +339,7 @@ files:
 - lib/asciidoctor/standoc/utils.rb
 - lib/asciidoctor/standoc/validate.rb
 - lib/asciidoctor/standoc/validate_section.rb
+- lib/hacks/sterile.rb
 - lib/metanorma-standoc.rb
 - lib/metanorma/standoc.rb
 - lib/metanorma/standoc/processor.rb