asciidoctor-revealjs 5.0.0.rc1 → 5.0.1

data/lib/asciidoctor-revealjs/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Revealjs
-  VERSION = '5.0.0.rc1'
+  VERSION = '5.0.1'
 end
 end

data/templates/helpers.rb

@@ -193,6 +193,94 @@ module Slim::Helpers
     end
   end
 
+  # Retrieves the built-in html5 converter.
+  #
+  # Returns the instance of the Asciidoctor::Converter::Html5Converter
+  # associated with this node.
+  def html5_converter
+    converter.instance_variable_get("@delegate_converter")
+  end
+
+  def convert_inline_image(node = self)
+    target = node.target
+    if (node.type || 'image') == 'icon'
+      if (icons = node.document.attr 'icons') == 'font'
+        i_class_attr_val = %(#{node.attr(:set, 'fa')} fa-#{target})
+        i_class_attr_val = %(#{i_class_attr_val} fa-#{node.attr 'size'}) if node.attr? 'size'
+        if node.attr? 'flip'
+          i_class_attr_val = %(#{i_class_attr_val} fa-flip-#{node.attr 'flip'})
+        elsif node.attr? 'rotate'
+          i_class_attr_val = %(#{i_class_attr_val} fa-rotate-#{node.attr 'rotate'})
+        end
+        attrs = (node.attr? 'title') ? %( title="#{node.attr 'title'}") : ''
+        img = %(<i class="#{i_class_attr_val}"#{attrs}></i>)
+      elsif icons
+        attrs = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : ''
+        attrs = %(#{attrs} height="#{node.attr 'height'}") if node.attr? 'height'
+        attrs = %(#{attrs} title="#{node.attr 'title'}") if node.attr? 'title'
+        img = %(<img src="#{src = node.icon_uri target}" alt="#{encode_attribute_value node.alt}"#{attrs}>)
+      else
+        img = %([#{node.alt}&#93;)
+      end
+    else
+      html_attrs = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : ''
+      html_attrs = %(#{html_attrs} height="#{node.attr 'height'}") if node.attr? 'height'
+      html_attrs = %(#{html_attrs} title="#{node.attr 'title'}") if node.attr? 'title'
+      img, src = img_tag(node, target, html_attrs)
+    end
+    img_link(node, src, img)
+  end
+
+  def convert_image(node = self)
+    # When the stretch class is present, block images will take the most space
+    # they can take. Setting width and height can override that.
+    # We pinned the 100% to height to avoid aspect ratio breakage and since
+    # widescreen monitors are the most popular, chances are that height will
+    # be the biggest constraint
+    if node.has_role?('stretch') && !(node.attr?(:width) || node.attr?(:height))
+      height_value = "100%"
+    elsif node.attr? 'height'
+      height_value = node.attr 'height'
+    else
+      height_value = nil
+    end
+    html_attrs = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : ''
+    html_attrs = %(#{html_attrs} height="#{height_value}") if height_value
+    html_attrs = %(#{html_attrs} title="#{node.attr 'title'}") if node.attr? 'title'
+    html_attrs = %(#{html_attrs} style="background: #{node.attr :background}") if node.attr? 'background'
+    img, src = img_tag(node, node.attr('target'), html_attrs)
+    img_link(node, src, img)
+  end
+
+  def img_tag(node = self, target, html_attrs)
+    if ((node.attr? 'format', 'svg') || (target.include? '.svg')) && node.document.safe < ::Asciidoctor::SafeMode::SECURE
+      if node.option? 'inline'
+        img = (html5_converter.read_svg_contents node, target) || %(<span class="alt">#{node.alt}</span>)
+      elsif node.option? 'interactive'
+        fallback = (node.attr? 'fallback') ? %(<img src="#{node.image_uri node.attr 'fallback'}" alt="#{encode_attribute_value node.alt}"#{html_attrs}>) : %(<span class="alt">#{node.alt}</span>)
+        img = %(<object type="image/svg+xml" data="#{src = node.image_uri target}"#{html_attrs}>#{fallback}</object>)
+      else
+        img = %(<img src="#{src = node.image_uri target}" alt="#{encode_attribute_value node.alt}"#{html_attrs}>)
+      end
+    else
+      img = %(<img src="#{src = node.image_uri target}" alt="#{encode_attribute_value node.alt}"#{html_attrs}>)
+    end
+
+    [img, src]
+  end
+
+  # Wrap the <img> element in a <a> element if the link attribute is defined
+  def img_link(node = self, src, content)
+    if (node.attr? 'link') && ((href_attr_val = node.attr 'link') != 'self' || (href_attr_val = src))
+      if (link_preview_value = bool_data_attr :link_preview)
+        data_preview_attr = %( data-preview-link="#{link_preview_value == true ? "" : link_preview_value}")
+      end
+      return %(<a class="image" href="#{href_attr_val}"#{(append_link_constraint_attrs node).join}#{data_preview_attr}>#{content}</a>)
+    end
+
+    content
+  end
+
   def revealjs_dependencies(document, node, revealjsdir)
     dependencies = []
     dependencies << "{ src: '#{revealjsdir}/plugin/zoom/zoom.js', async: true, callback: function () { Reveal.registerPlugin(RevealZoom) } }" unless (node.attr? 'revealjs_plugin_zoom', 'disabled')
@@ -201,7 +289,6 @@ module Slim::Helpers
     dependencies.join(",\n      ")
   end
 
-
   # Between delimiters (--) is code taken from asciidoctor-bespoke 1.0.0.alpha.1
   # Licensed under MIT, Copyright (C) 2015-2016 Dan Allen and the Asciidoctor Project
   #--
@@ -276,6 +363,23 @@ module Slim::Helpers
     nil
   end
 
+  # Copied from asciidoctor/lib/asciidoctor/converter/html5.rb (method is private)
+  def append_link_constraint_attrs node, attrs = []
+    rel = 'nofollow' if node.option? 'nofollow'
+    if (window = node.attributes['window'])
+      attrs << %( target="#{window}")
+      attrs << (rel ? %( rel="#{rel} noopener") : ' rel="noopener"') if window == '_blank' || (node.option? 'noopener')
+    elsif rel
+      attrs << %( rel="#{rel}")
+    end
+    attrs
+  end
+
+  # Copied from asciidoctor/lib/asciidoctor/converter/html5.rb (method is private)
+  def encode_attribute_value val
+    (val.include? '"') ? (val.gsub '"', '&quot;') : val
+  end
+
   # Copied from asciidoctor/lib/asciidoctor/converter/semantic-html5.rb which is not yet shipped
   # @todo remove this code when the new converter becomes available in the main gem
   def generate_authors node

data/templates/image.html.slim

@@ -1,21 +1,6 @@
-- width = (attr? :width) ? (attr :width) : nil
-- height = (attr? :height) ? (attr :height) : nil
-
-/ When the stretch class is present, block images will take the most space
-/ they can take. Setting width and height can override that.
-/ We pinned the 100% to height to avoid aspect ratio breakage and since
-/ widescreen monitors are the most popular, chances are that height will
-/ be the biggest constraint
-- if (has_role? 'stretch') && !((attr? :width) || (attr? :height))
-  - height = "100%"
-
 - unless attributes[1] == 'background' || attributes[1] == 'canvas'
   - inline_style = [("text-align: #{attr :align}" if attr? :align),("float: #{attr :float}" if attr? :float)].compact.join('; ')
   = html_tag('div', { :id => @id, :class => ['imageblock', role, ('fragment' if (option? :step) || (attr? 'step'))], :style => inline_style }.merge(data_attrs(@attributes)))
-    - if attr? :link
-      a.image href=(attr :link) target=(attr :window) data-preview-link=(bool_data_attr :link_preview)
-        img src=image_uri(attr :target) alt=(attr :alt) width=(width) height=(height) style=((attr? :background) ? "background: #{attr :background}" : nil)
-    - else
-      img src=image_uri(attr :target) alt=(attr :alt) width=(width) height=(height) style=((attr? :background) ? "background: #{attr :background}" : nil)
+    = convert_image
   - if title?
     .title=captioned_title

data/templates/inline_image.html.slim

@@ -1,21 +1,2 @@
 = html_tag('span', { :class => [@type, role, ('fragment' if (option? :step) || (attr? 'step'))], :style => ("float: #{attr :float}" if attr? :float) }.merge(data_attrs(@attributes)))
-  - if @type == 'icon' && (@document.attr? :icons, 'font')
-    - style_class = [(attr :set, 'fa'), "fa-#{@target}", ("fa-#{attr :size}" if attr? :size), ("fa-rotate-#{attr :rotate}" if attr? :rotate), ("fa-flip-#{attr :flip}" if attr? :flip)]
-    - if attr? :link
-      a.image href=(attr :link) target=(attr :window) data-preview-link=(bool_data_attr :link_preview)
-        i class=style_class title=(attr :title)
-    - else
-      i class=style_class title=(attr :title)
-  - elsif @type == 'icon' && !(@document.attr? :icons)
-    - if attr? :link
-      a.image href=(attr :link) target=(attr :window) data-preview-link=(bool_data_attr :link_preview)
-        |[#{attr :alt}]
-    - else
-      |[#{attr :alt}]
-  - else
-    - src = (@type == 'icon' ? (icon_uri @target) : (image_uri @target))
-    - if attr? :link
-      a.image href=(attr :link) target=(attr :window) data-preview-link=(bool_data_attr :link_preview)
-        img src=src alt=(attr :alt) width=(attr :width) height=(attr :height) title=(attr :title)
-    - else
-      img src=src alt=(attr :alt) width=(attr :width) height=(attr :height) title=(attr :title)
+  = convert_inline_image

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-revealjs
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.1
 platform: ruby
 authors:
 - Olivier Bilodeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2023-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,20 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.0
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-doctest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta.7
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +243,7 @@ files:
 - examples/images/flock-of-seagulls_daniel-simion.mp3
 - examples/images/meme-2.jpg
 - examples/images/meme-7.png
+- examples/images/sample.svg
 - examples/images/web_surfing_time.gif
 - examples/issue-grid-layout-images.adoc
 - examples/keyboard-shortcuts.adoc
@@ -345,6 +332,8 @@ files:
 - examples/source-rouge.adoc
 - examples/speaker-notes.adoc
 - examples/steps.adoc
+- examples/svg-images-docinfo-revealjs.html
+- examples/svg-images.adoc
 - examples/tables-styles.adoc
 - examples/text-alignments.adoc
 - examples/text-formatting.adoc
@@ -423,9 +412,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: