asciidoctor-iso 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f80a4e5e9ab950e49dd4bc484f0e1d1bbe5f55b593f49de60242b36fdc0a0b
-  data.tar.gz: 4a90a72c5f48c2f4fdf6a8d2886255b1ea7e02402fbec9fb869719e56f4ace55
+  metadata.gz: de3b792b4a60d8da397a08e1dcc4f8afa083a91e6d25ce153b6eb61003c2f162
+  data.tar.gz: ef4b5b07410e3a865ee3657c7f5e0d01613c19edf854629a4b69416d6048cb5c
 SHA512:
-  metadata.gz: a9b571864d2e7c2e38508699f6ce9138d935a6776b1e5645098cc2541430445132c0bf0424118f71a5412ee78a18a336a7d336541db7185bb2cc4f09cab3e703
-  data.tar.gz: 7bd69063e480299905d44ff78c3e6480098555091ca897d3522ca499762f2d7803f9e29e3c0789e414af44c7a713779c3b96924d214b947c6fcf2f57450ecbf1
+  metadata.gz: 70a807f56e7516d3be9d3b9b93fc8c21965bc1c0aa5edd0ecda0262c1d992d8dbb5495b4b573c7da572bbdd93e5049b3fd14be1148bfc28c53aef5e89660b0aa
+  data.tar.gz: a79c9e5d0de76c3d183ef2d7d152f1853930b764f4b6a51dfec74cdabc63f6524a1b603edac7dba757b42799086ed8b7ab0548c5a3f9d83195c5b53b12d68c46

data/.travis.yml

@@ -1,7 +1,13 @@
+dist: trusty
 sudo: false
 language: ruby
 rvm:
-  - 2.5.1
+  - 2.5
+  - 2.4
+  - ruby-head
 before_install:
   - gem install bundler -v 1.16.1
   - unset _JAVA_OPTIONS
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile.lock

@@ -1,22 +1,21 @@
 GIT
   remote: git://github.com/riboseinc/relaton.git
-  revision: 19dac2282a606c97f2f25d3a6117fd3b84c344dd
+  revision: ce33a2874530a8f7bf438e26624d05a47526d346
   specs:
-    relaton (0.0.1)
-      asciidoctor (~> 1.5.7)
+    relaton (0.0.2)
       gbbib (~> 0.1.0)
       iev (~> 0.1.0)
-      iso-bib-item (~> 0.1.6)
-      isobib (~> 0.1.8)
+      isobib (~> 0.1.9)
       rfcbib (~> 0.1.0)
 
 PATH
   remote: .
   specs:
-    asciidoctor-iso (0.9.4)
+    asciidoctor-iso (0.9.5)
       asciidoctor (~> 1.5.7)
       iev (~> 0.1.0)
       isodoc (>= 0.8)
+      relaton (~> 0.0.1)
       ruby-jing
 
 GEM
@@ -26,76 +25,20 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.7.1)
-    asciidoctor-csand (0.3.1)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.9.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.8.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
-    asciidoctor-csd (0.4.1)
-      asciidoctor-iso (>= 0.9.0)
-      isodoc (>= 0.8.0)
-    asciidoctor-gb (0.3.2)
-      asciidoctor-iso (>= 0.9.0)
-      gbbib
-      isodoc (>= 0.8.0)
-      twitter_cldr
-    asciidoctor-m3d (0.3.2)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.9.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.8.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
-    asciidoctor-rfc (0.9.0)
-      asciidoctor (~> 1.5.7)
-      htmlentities (~> 4.3.4)
-      nokogiri
-      ruby-jing
-      thread_safe
-    asciidoctor-rsd (0.3.1)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.8.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.7.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
     asciimath (1.0.4)
     ast (2.4.0)
     byebug (9.1.0)
-    camertron-eprun (1.1.1)
-    cldr-plurals-runtime-rb (1.0.1)
     cnccs (0.1.1)
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
-    duplicate (1.1.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     ffi (1.9.25)
     formatador (0.2.5)
-    gbbib (0.1.4)
-      cnccs
-      iso-bib-item
+    gbbib (0.1.5)
+      cnccs (~> 0.1.1)
+      iso-bib-item (~> 0.1.10)
     guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -110,7 +53,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.0)
+    html2doc (0.8.2)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -124,20 +67,18 @@ GEM
     iev (0.1.0)
       nokogiri
     image_size (2.0.0)
-    iso-bib-item (0.1.10)
-      duplicate (~> 1.1.1)
+    iso-bib-item (0.1.11)
       isoics (~> 0.1.6)
-      nokogiri
-    isobib (0.1.9)
+      nokogiri (~> 1.8.4)
+      ruby_deep_clone (~> 0.8.0)
+    isobib (0.1.10)
       algoliasearch
       iso-bib-item (~> 0.1.10)
-    isodoc (0.8.1)
+    isodoc (0.8.4)
       asciimath
-      html2doc (>= 0.7.1)
+      html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)
-      image_size
       liquid
-      mime-types
       nokogiri
       roman-numerals
       ruby-xslt
@@ -153,15 +94,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.2.5)
-      asciidoctor-csand (>= 0.3.0)
-      asciidoctor-csd (>= 0.4.0)
-      asciidoctor-gb (>= 0.3.0)
-      asciidoctor-iso (>= 0.9.1)
-      asciidoctor-m3d (>= 0.3.1)
-      asciidoctor-rfc (>= 0.9.0)
-      asciidoctor-rsd (>= 0.3.0)
-      isodoc (>= 0.8.0)
+    metanorma (0.2.6)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -175,7 +108,7 @@ GEM
       shellany (~> 0.0)
     optout (0.0.2)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.11.3)
@@ -202,10 +135,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.57.2)
+    rubocop (0.58.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
@@ -214,6 +147,7 @@ GEM
       optout (>= 0.0.2)
     ruby-progressbar (1.9.0)
     ruby-xslt (0.9.10)
+    ruby_deep_clone (0.8.0)
     ruby_dep (1.5.0)
     sass (3.5.6)
       sass-listen (~> 4.0.0)
@@ -229,12 +163,6 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    twitter_cldr (4.4.3)
-      camertron-eprun
-      cldr-plurals-runtime-rb (~> 1.0)
-      tzinfo
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
     unicode-display_width (1.4.0)
     uuidtools (2.1.5)
 
@@ -248,7 +176,7 @@ DEPENDENCIES
   equivalent-xml (~> 0.6)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
-  metanorma (~> 0.2.5)
+  metanorma (~> 0.2.6)
   rake (~> 12.0)
   relaton!
   rspec (~> 3.6)

data/README.adoc

@@ -440,6 +440,18 @@ applicable to other products derived from rice, nor to waxy rice (glutinous rice
 _____
 --
 
+=== Image size
+
+The value `auto` is accepted for image width and height attributes. It is only passed on
+to HTML output; if the output is to Word, both the width and height attributes are stripped
+from the image.
+
+[source,asciidoctor]
+--
+[height=90,width=auto]
+image::logo.jpg
+--
+
 === Features not visible in HTML preview
 
 The gem uses built-in Asciidoc formatting as much as possible, so that users

data/asciidoctor-iso.gemspec

@@ -43,5 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.2.5"
+  spec.add_development_dependency "metanorma", "~> 0.2.6"
 end

data/lib/asciidoctor/iso/blocks.rb

@@ -124,8 +124,8 @@ module Asciidoctor
         { src: uri,
           id: Utils::anchor_or_uuid,
           imagetype: types.first.sub_type.upcase,
-          height: node.attr("height"),
-          width: node.attr("width") }
+          height: node.attr("height") || "auto",
+          width: node.attr("width") || "auto" }
       end
 
       def figure_title(node, f)

data/lib/asciidoctor/iso/inline.rb

@@ -33,16 +33,20 @@ module Asciidoctor
         c = matched.nil? ? node.text : matched[:text]
         t = node.target.gsub(/^#/, "").gsub(%r{(.)(\.xml)?#.*$}, "\\1")
         noko do |xml|
-          xml.xref c, **attr_code(target: t, type: f)
+          xml.xref **attr_code(target: t, type: f) do |x|
+            x << c
+          end
         end.join
       end
 
       def inline_anchor_link(node)
         contents = node.text
-        contents = nil if node.target.gsub(%r{^mailto:}, "") == node.text
+        contents = "" if node.target.gsub(%r{^mailto:}, "") == node.text
         attributes = { "target": node.target }
         noko do |xml|
-          xml.link contents, **attr_code(attributes)
+          xml.link **attr_code(attributes) do |l|
+            l << contents
+          end
         end.join
       end
 
@@ -51,7 +55,9 @@ module Asciidoctor
         eref_attributes = { id: node.target }
         @refids << node.target
         noko do |xml|
-          xml.ref eref_contents, **attr_code(eref_attributes)
+          xml.ref **attr_code(eref_attributes) do |r|
+            r << eref_contents
+          end
         end.join
       end
 

data/lib/asciidoctor/iso/isodoc.rng

@@ -888,12 +888,18 @@
       </attribute>
       <optional>
         <attribute name="width">
-          <data type="int"/>
+          <choice>
+            <data type="int"/>
+            <value>auto</value>
+          </choice>
         </attribute>
       </optional>
       <optional>
         <attribute name="height">
-          <data type="int"/>
+          <choice>
+            <data type="int"/>
+            <value>auto</value>
+          </choice>
         </attribute>
       </optional>
     </element>

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.9.5".freeze
+    VERSION = "0.9.6".freeze
   end
 end

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -310,6 +310,23 @@ RSpec.describe Asciidoctor::ISO do
       OUTPUT
     end
 
+    it "accepts auto for width and height attributes on images" do
+      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      [height=4,width=auto]
+      image::spec/examples/rice_images/rice_image1.png[]
+
+      INPUT
+      #{BLANK_HDR}
+              <sections>
+         <figure id="_">
+         <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="4" width="auto"/>
+       </figure>
+       </sections>
+       </iso-standard>
+      OUTPUT
+    end
+
     it "accepts alignment attribute on paragraphs" do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-iso
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-07 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 description: |
   asciidoctor-iso lets you write ISO standards in AsciiDoc syntax.