asciidoctor-bespoke 1.0.0.alpha.1 → 1.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4822d26c4ce17423d2e148a28c2d0af871853709
-  data.tar.gz: 031730a457905076d6c93c61466a9d4a7bca4ea2
+SHA256:
+  metadata.gz: 55fed4150805c6b9d534bee77b8ee667378b89b55ca8dad228d3e13febb81df2
+  data.tar.gz: 4c5c4af1b09243dbb8ff16f2a324bf680334246ec93704c528225bebdd52c9f7
 SHA512:
-  metadata.gz: 0b18f5f0137dcb3485e20278346822fbb40be1ce35bfdfa7a57a496fb014f687dd553b05c8eed20c7c2285a8c7168c72cd6bc5f9d2bee62217b363b90e740a0d
-  data.tar.gz: 407226af5536610f26a341968f8ccf67418d8948d0a3c8f91e0e6d85827d410f5c0d651defa030282fe75bba563d194341a0bb9e28a022078dced1c11230cecd
+  metadata.gz: 462481c11034ae7d4b0217d86f1ea8ab8e53024eedd7fcca82213a67aaf74dac35a5043f78c60f4197876909b05ac862a6266186a6677595624641dfddb67a75
+  data.tar.gz: c7ce8396e25df821a5790766f63a362234c61d3fdec5fd173cbd38174d87c48b385a2800e46a57cab77fa957d3889db9ca3d196031ceb0f7f09007d6c053b0d0

data/CHANGELOG.adoc

@@ -0,0 +1,42 @@
+= {project-name} Changelog
+:project-name: asciidoctor-bespoke
+:uri-repo: https://github.com/asciidoctor/asciidoctor-bespoke
+
+This document provides a high-level view of the changes introduced in {project-name} by release.
+For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
+
+== 1.0.0-alpha.2 (2023-10-28) - @mojavelinux
+
+Added::
+
+* implement start attribute on ordered list (#12)
+* add support for link attribute on block image
+* allow use of custom role on listing block (#17)
+* include middle name in title slide if provided
+* read end time for video from end attribute
+* add support for named route hashes with bespoke-hash (#9)
+* report version of converter when running asciidoctor-bespoke -v
+* enable header insertion slot for docinfo
+
+Changed::
+
+* rename role for speaker notes to "notes"
+* replace jade with pug
+* upgrade Font Awesome to 4.7.0
+* upgrade highlight.js to 9.12.0
+
+Fixed::
+
+* fix duplicate id when ordered list has title
+* set backend traits correctly (#20)
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0-alpha.2[git tag] | {url-repo}/compare/v1.0.0.alpha.1\...v1.0.0-alpha.2[full diff]
+
+== 1.0.0.alpha.1 (2015-03-25) - @mojavelinux
+
+Initial release.
+
+{uri-repo}/issues?q=milestone%3Av1.0.0.alpha.1[issues resolved] |
+{uri-repo}/releases/tag/v1.0.0.alpha.1[git tag]

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Look in asciidoctor-bespoke.gemspec for runtime and development dependencies.
+gemspec

data/{LICENSE.adoc → LICENSE}

@@ -1,6 +1,6 @@
-.The MIT License
-....
-Copyright (C) 2015-2016 Dan Allen and the Asciidoctor Project
+MIT License
+
+Copyright (C) 2015-present Dan Allen and the Asciidoctor Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-....

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}
 Dan Allen <https://github.com/mojavelinux>
-v1.0.0.alpha.1, 2016-03-25
+v1.0.0-alpha.2, 2023-10-28
 // Settings:
 :idprefix:
 :idseparator: -
@@ -12,6 +12,7 @@ ifdef::env-github,env-browser[]
 :toclevels: 2
 endif::[]
 ifdef::env-github[]
+:status:
 :outfilesuffix: .adoc
 :!toc-title:
 :caution-caption: :fire:
@@ -46,17 +47,22 @@ endif::[]
 :uri-svgo: https://github.com/svg/svgo
 :uri-yo-bespoke: https://github.com/bespokejs/generator-bespoke
 
+ifdef::status[]
+image:https://img.shields.io/gem/v/asciidoctor-bespoke.svg?label=gem[gem badge, link=https://rubygems.org/gems/asciidoctor-bespoke]
+endif::[]
+
 An {uri-asciidoctor}[Asciidoctor] converter that generates the HTML component of a {uri-bespoke}[Bespoke.js] presentation from AsciiDoc.
 
 == Overview
 
-The goal of {project-name} is to enable you to craft HTML-based presentations from reusable content while avoiding the tedium of writing HTML markup.
+The goal of {project-name} is to enable you to craft HTML-based presentations from reusable content while avoiding the tedium of writing HTML.
 This library satisfies that goal by providing a converter that generates the HTML component of a Bespoke.js presentation from an AsciiDoc document.
 In other words, it allows you to use AsciiDoc in place of HTML (or an HTML template language like Jade) in your Bespoke.js project.
 (You still need to add an ample amount of CSS in order to achieve the presentation style you want).
 
 The converter works in tandem with a typical JavaScript project structure based on npm and Gulp.
-npm is used to manage dependencies, while a Gulp build is used to combine and "`browserify`" the JavaScript, compile the CSS, execute this converter (to convert AsciiDoc to HTML), launch the preview server and publish the presentation files.
+npm is used to manage dependencies.
+A Gulp build is used to combine and "`browserify`" the JavaScript, compile the CSS, execute this converter (to convert AsciiDoc to HTML), launch the preview server and publish the presentation files.
 
 The converter is implemented as a collection of Slim templates, which are packaged for your convenience as an Asciidoctor converter.
 The templates come into play when you want to customize the HTML the converter generates.
@@ -65,15 +71,17 @@ This guide explains how to integrate the {project-name} converter into an existi
 
 == Prerequisites
 
-In order to use {project-name}, you must satisify the prerequisites of both Bespoke.js and Asciidoctor.
+In order to use {project-name}, you must satisfy the prerequisites of both Bespoke.js and Asciidoctor.
+You also need a Bespoke.js project.
+
+=== For Bespoke.js
 
-For Bespoke.js::
 . {uri-nodejs}[Node.js] >= 0.12 footnote:[We strongly recommend using {uri-nvm}[nvm] to manage Node.]
 . {uri-gulp}[Gulp] (command line interface only)
 
  $ npm install -g gulp-cli
 
-For Asciidoctor::
+=== For Asciidoctor
 
 . {uri-ruby}[Ruby] >= 2 footnote:[We strongly recommend using {uri-rvm}[RVM] to manage Ruby.]
 . {uri-bundler}[Bundler]
@@ -81,8 +89,10 @@ For Asciidoctor::
  $ rvm use 2.3.0 --install # (optional)
  $ gem install bundler
 
+=== Bespoke.js Project
+
 Naturally, you'll also need a Bespoke.js project, just as you would for any Bespoke.js presentation.
-If you don't yet have a Bespoke.js project, you can clone the following starter project:
+If you don't yet have a Bespoke.js project, you can clone the provided https://github.com/opendevise/presentation-bespoke-starter[starter project]:
 
  $ git clone https://github.com/opendevise/presentation-bespoke-starter
 
@@ -94,11 +104,11 @@ In the future, we plan to provide an updated Yeoman generator that incorporates
 
 Once you've initialized your Bespoke.js project, the next task is to replace Jade with AsciiDoc.
 
-TIP: If you're creating a new project using the starter project previously mentioned, and you switch to the `asciidoc` branch in that repository, you can skip the steps in this section and jump ahead to <<Creating Slides in AsciiDoc>>.
-If you're curious, you can review https://github.com/opendevise/presentation-bespoke-starter/compare/asciidoc?diff=split[the diff of the changes] this section goes on to cover.
+TIP: If you're creating a new project using the starter project previously mentioned, you can switch to the https://github.com/opendevise/presentation-bespoke-starter/tree/asciidoc[asciidoc branch] in that repository to skip past the steps in this section and jump ahead to <<Creating Slides in AsciiDoc>>.
+If you're curious, you can review https://github.com/opendevise/presentation-bespoke-starter/compare/asciidoc?diff=split[a diff] that contains the changes this section goes on to cover.
 
 The first step is to configure Bundler to fetch and install the required gems.
-Create the file [.path]_Gemfile_ at the root of the project and populate it with the following content:
+Create a file named [.path]_Gemfile_ at the root of the project and populate it with the following content:
 
 .Gemfile
 [source,ruby,subs=attributes+]
@@ -110,17 +120,17 @@ gem 'asciidoctor-bespoke', '{latest-release}'
 #gem 'asciidoctor-bespoke', github: 'asciidoctor/asciidoctor-bespoke'
 ----
 
-Next, run `bundle` from the root of the project to install the gems and any dependencies:
+Next, run `bundle` from the root of the project to install the gems and any dependencies they have:
 
  $ bundle
 
 [TIP]
 ====
-If you want to install the gems inside the project, you can pass the `--path` argument to `bundle`:
+If you want to install the gems inside the project, you can pass the `--path` argument to `.bundle/gems`.
 
- $ bundle --path=rubygems
+ $ bundle --path=.bundle/gems
 
-The `bundle` command will remember this setting on subsequent invocations.
+The `bundle` command will remember this setting for all successive invocations.
 ====
 
 The next step is to get the converter to generate the HTML from AsciiDoc when the presentation build runs.
@@ -137,17 +147,17 @@ Save the file and run `npm i` to install the new packages into your project:
 
  $ npm i
 
-Open [.path]_gulpfile.js_ and add the following entries to the list of requires at the top:
+Open [.path]_gulpfile.js_ and add the following entries to the list of `require` calls at the top of the file:
 
 .gulpfile.js (snippet)
 [source,js]
   chmod = require('gulp-chmod'),
   exec = require('gulp-exec'),
 
-In the same file, remove the existing `html` task and replace it with the one below:
+Also in [.path]_gulpfile.js_, replace the existing `html` task with the one below:
 
 .gulpfile.js (snippet)
-[source,js,subs=attributes+]
+[source,js]
 gulp.task('html', ['clean:html'], function() {
   return gulp.src('src/index.adoc')
     .pipe(isDist ? through() : plumber())
@@ -161,11 +171,11 @@ gulp.task('html', ['clean:html'], function() {
 
 //<1> Add `bundle exec` in front of the `asciidoctor-bespoke` command if you're using the development version from git.
 
-Finally, if you want the build to watch the AsciiDoc file(s) for changes, look for the following line in the watch task:
+Finally, to get the build to watch the AsciiDoc file(s) for changes, look for the following line in the watch task in [.path]_gulpfile.js_:
 
 .gulpfile.js (snippet)
 [source,js]
-  gulp.watch('src/**/*.jade', ['html']);
+  gulp.watch('src/**/*.pug', ['html']);
 
 and replace it with:
 
@@ -173,7 +183,7 @@ and replace it with:
 [source,js]
   gulp.watch('src/**/*.adoc', ['html']);
 
-The build is now ready.
+The build is now ready!
 Before we can use our new task, we need to create slide content in AsciiDoc.
 
 == Creating Slides in AsciiDoc
@@ -198,7 +208,7 @@ To add this presentation to your project, create the file [.path]_src/index.adoc
 
 Believe it or not, that's all it takes to make a presentation!
 
-Here's a close approximation of the HTML the converter generates for the simple presentation shown above.
+Here's a close approximation of the HTML the converter generates from the example shown above (formatted for clarity).
 
 [source,html]
 ----
@@ -227,12 +237,12 @@ Here's a close approximation of the HTML the converter generates for the simple
 
 There are a few things you should notice:
 
-* Each slide is represented as a `<section>`, which is generated for each section title.
-  - At runtime, Bespoke.js will add additional classes to each `<section>`, including `bespoke-slide`.
+* Each slide is represented as a `<section>`, which is generated per section title.
+  - At runtime, Bespoke.js adds additional classes to each `<section>`, including `bespoke-slide`.
 * The title slide has the class `title` and uses an `<h1>` heading.
 * The section title for each content slide gets put in an `<h2>` heading.
 * The presentation is wrapped in an `<article>` element with the class `deck`.
-  - At runtime, Bespoke.js will add additional classes to `<article>`, including `bespoke-parent`.
+  - At runtime, Bespoke.js adds additional classes to `<article>`, including `bespoke-parent`.
 * CSS is used to accomplish most of the styling and layout, so you'll need to spend some time on it.
 * The JavaScript and CSS to power the Bespoke.js presentation are loaded from the [.path]_build/_ folder.
 
@@ -256,6 +266,7 @@ The slide then incorporates additional information from the following attributes
 * preamble content
 
 NOTE: The title slide is a built-in transform mapped to the {uri-repo-file-prefix}templates/slim/slide_title.html.slim[slide_title.html.slim] template, which you can override.
+See <<Custom Transforms>> for information about where to put this file and how to load it.
 You'll need to incorporate CSS (optionally using the Stylus syntax) to arrange and style the title page.
 
 Here's an example of an AsciiDoc document that generates a title slide that is fully populated:
@@ -270,12 +281,12 @@ Author Name <http://example.com>
 :avatar: author-avatar.png
 :!sectids:
 
-Additional content for title slide.
+Additional content for the title slide.
 
 == First Topic
 ----
 
-If you don't want the title slide to be created, add the `noheader` attribute to the document header (or simply don't include a document header).
+If you don't want the title slide to be created, add the `noheader` attribute to the document header.
 
 .A presentation without a title slide
 [source,asciidoc]
@@ -287,6 +298,8 @@ If you don't want the title slide to be created, add the `noheader` attribute to
 == First Topic
 ----
 
+Another option is to simply leave out the document header altogether.
+
 === Content Slides
 
 Each content slide is created from a level-1 section title.
@@ -307,7 +320,7 @@ Here's an example of a typical content slide with a heading:
 ----
 
 While many of your slides may have a primary heading--perhaps as the only content on the slide--there are many slide types that don't require a heading.
-You can indicate a slide without a heading by using `!` as the section title.
+You can mark a slide without a heading by using `!` as the section title.
 Here's an example:
 
 .A slide with only content (i.e., an anonymous slide)
@@ -317,7 +330,7 @@ Here's an example:
 image::chart.svg[]
 ----
 
-If you want to assign a title to a slide, but just not show it, you can use the `conceal` option.
+If you still want to assign a title to a slide, but not show it, you can add the option named `conceal`.
 
 .A slide with a concealed heading
 [source,asciidoc]
@@ -336,6 +349,15 @@ A shorthand for the conceal option is to prefix the section title with a `!`.
 image::chart.svg[]
 ----
 
+You can also add a named hash to a slide so you get a URL like `/#intro` instead of `/#3`.
+
+.A slide with a named hash (aka named route)
+[source,asciidoc]
+----
+[#intro]
+= Intro
+----
+
 Notice how we're keeping the concerns of content and presentation cleanly separated.
 Using very little AsciiDoc, you're able to describe a lot of different functionality.
 There doesn't even have to be a direct, literal mapping between the AsciiDoc and the HTML.
@@ -362,6 +384,7 @@ The speaker slide currently incorporates the following attributes:
 * section content (if any)
 
 NOTE: The speaker slide is a built-in transform mapped to the {uri-repo-file-prefix}templates/slim/slide_speaker.html.slim[slide_speaker.html.slim] template, which you can override.
+See <<Custom Transforms>> for information about where to put this file and how to load it.
 
 Here's a rough approximation of the HTML generated for the speaker slide:
 
@@ -521,6 +544,7 @@ The effects supported out of the box are as follows:
 
 * fade
 * vanish
+* spotlight (planned)
 * replace (planned)
 
 The CSS in the <<Build Configuration>> section implements these effects.
@@ -653,6 +677,43 @@ Topic has the following benefits:
 
 To learn more about how to setup a presentation console, see the https://github.com/opendevise/bespoke-onstage[bespoke-onstage plugin].
 
+=== Supplemental Content
+
+It's possible to inject supplemental content into the output document using http://asciidoctor.org/docs/user-manual/#docinfo-file[docinfo files].
+This core feature of AsciiDoc has been adapted to work with the Bespoke converter.
+
+Currently, there are three insertion locations for docinfo content in a Bespoke document:
+
+head:: content is inserted after the last child of the `<head>` element
+header:: content is inserted before the first child of the `<article>` element (before the slides)
+footer:: content is inserted after the last child of the `<article>` element (after the slides)
+
+The content you want to insert goes into a sibling file of the slide deck document with the following filename pattern:
+
+ docinfo-<location>-bespoke.html 
+
+For example, let's say you want to embed a tweet into your slide deck.
+You might inject the shared embedding JavaScript using a footer docinfo file:
+
+.src/docinfo-footer-bespoke.html
+[source,html]
+----
+<script src="https://platform.twitter.com/widgets.js"></script>
+----
+
+You then need to set the following document attribute in the AsciiDoc header:
+
+----
+:docinfo: shared
+----
+
+When this attribute is defined, the converter will automatically read the docinfo file(s) and insert the contents into the specified location in the output document.
+
+If you want to include content in every slide, we recommend using a http://asciidoctor.org/docs/user-manual/#extension-points[tree processor extension].
+The tree processor would first query for all the level-1 sections in the document (which get transformed into slides), then append one or more blocks to each of the matched sections.
+The tree processor could even read this content from a shared file.
+In the future, the converter may support docinfo insertions per slide.
+
 === Custom Transforms
 
 While conversion from AsciiDoc is meant to save you time producing common slide types, there are cases when you find yourself going against the grain or exceeding the limits of what CSS can handle.
@@ -801,7 +862,7 @@ Bespoke.js was created by https://github.com/markdalgleish[Mark Dalgleish] and h
 
 === Copyright
 
-Copyright (C) 2015-2016 Dan Allen and the Asciidoctor Project.
+Copyright (C) 2015-present Dan Allen and the Asciidoctor Project.
+Use of this software is granted under the terms of the MIT License.
 
-Free use of this software is granted under the terms of the MIT License.
-See the <<LICENSE#,LICENSE>> file for details.
+See the link:LICENCE[LICENSE] file for the full license text.

data/Rakefile

@@ -1,7 +1,5 @@
-begin
-  require 'bundler/gem_tasks'
-rescue LoadError => e
-  warn e.message
-end
+# frozen_string_literal: true
 
-task default: ['build']
+$default_tasks = [] # rubocop:disable Style/GlobalVars
+Dir.glob('tasks/*.rake').each {|file| load file }
+task default: $default_tasks unless $default_tasks.empty? # rubocop:disable Style/GlobalVars

data/asciidoctor-bespoke.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path '../lib/asciidoctor-bespoke/version', __FILE__
+
+Gem::Specification.new do |s|
+  s.name = 'asciidoctor-bespoke'
+  s.version = Asciidoctor::Bespoke::VERSION
+  s.authors = ['Dan Allen']
+  s.email = ['dan.j.allen@gmail.com']
+  s.homepage = 'https://github.com/asciidoctor/asciidoctor-bespoke'
+  s.summary = 'Converts AsciiDoc to HTML for a Bespoke.js presentation'
+  s.description = 'An Asciidoctor converter that generates the HTML component of a Bespoke.js presentation from AsciiDoc.'
+  s.license = 'MIT'
+  s.required_ruby_version = '>= 1.9.3'
+
+  files = begin
+    (result = Open3.popen3('git ls-files -z') {|_, out| out.read }.split %(\0)).empty? ? Dir['**/*'] : result
+  rescue
+    Dir['**/*']
+  end
+  s.files = files.grep %r/^(?:(?:lib|templates)\/.+|Gemfile|Rakefile|LICENSE|(?:CHANGELOG|README)\.adoc|#{s.name}\.gemspec)$/
+
+  s.executables = ['asciidoctor-bespoke']
+  s.extra_rdoc_files = ['CHANGELOG.adoc', 'LICENSE', 'README.adoc']
+  s.require_paths = ['lib']
+
+  # QUESTION should asciidoctor be a runtime dependency?
+  s.add_runtime_dependency 'asciidoctor', '>= 1.5.0'
+  s.add_runtime_dependency 'slim', '~> 3.0.6'
+  s.add_runtime_dependency 'thread_safe', '~> 0.3.5'
+
+  s.add_development_dependency 'rake', '~> 10.4.2'
+end

data/bin/asciidoctor-bespoke

@@ -9,6 +9,18 @@ require 'asciidoctor/cli'
 
 options = Asciidoctor::Cli::Options.new backend: 'bespoke'
 
+# FIXME provide an API in Asciidoctor for sub-components to print version information
+unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
+  $stdout.write %(Asciidoctor Bespoke #{Asciidoctor::Bespoke::VERSION} using )
+  # NOTE the print_version method was added in Asciidoctor 1.5.2
+  if options.respond_to? :print_version
+    options.print_version
+  else
+    puts %(Asciidoctor #{::Asciidoctor::VERSION} [http://asciidoctor.org])
+  end
+  exit 0
+end
+
 # FIXME This is a really bizarre API. Please make me simpler.
 if Integer === (result = options.parse! ARGV)
   exit result

data/lib/asciidoctor-bespoke/converter.rb

@@ -28,9 +28,9 @@ module Bespoke
       template_opts = opts.merge htmlsyntax: 'html', template_engine: 'slim', template_engine_options: engine_opts
       template_converter = ::Asciidoctor::Converter::TemplateConverter.new backend, template_dirs, template_opts
       html5_converter = ::Asciidoctor::Converter::Html5Converter.new backend, opts
-      super backend, template_converter, html5_converter
-      basebackend 'html'
-      htmlsyntax 'html'
+      super 'html5', template_converter, html5_converter
+      backend_info
+      @backend = backend
     end
 
     def convert node, transform = nil, opts = {}

data/lib/asciidoctor-bespoke/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Bespoke
-  VERSION = '1.0.0.alpha.1'
+  VERSION = '1.0.0.alpha.2'
 end
 end

data/templates/slim/document.html.slim

@@ -21,22 +21,21 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
     link rel='stylesheet' href='build/build.css'
     - if attr? :icons, 'font'
       - if attr? 'iconfont-remote'
-        link rel='stylesheet' href=(attr 'iconfont-cdn', (cdn_uri 'font-awesome', '4.5.0', 'css/font-awesome.min.css'))
+        link rel='stylesheet' href=(attr 'iconfont-cdn', (cdn_uri 'font-awesome', '4.7.0', 'css/font-awesome.min.css'))
       - else
         link rel='stylesheet' href=(normalize_web_path 'font-awesome.css', (attr :stylesdir, ''))
     - case (_source_highlighter = attr 'source-highlighter')
     - when 'highlight.js'
-      link rel='stylesheet' href="#{_highlightjs_path = attr 'highlightjsdir', (cdn_uri 'highlight.js', '9.1.0')}/styles/#{attr 'highlightjs-theme', 'github'}.min.css"
+      link rel='stylesheet' href="#{_highlightjs_path = attr :highlightjsdir, (cdn_uri 'highlight.js', '9.12.0')}/styles/#{attr 'highlightjs-theme', 'github'}.min.css"
     - when 'prettify'
-      link rel='stylesheet' href="#{_prettify_path = attr 'prettifydir', (cdn_uri 'prettify', 'r298')}/#{attr 'prettify-theme', 'prettify'}.min.css"
+      link rel='stylesheet' href="#{_prettify_path = attr :prettifydir, (cdn_uri 'prettify', 'r298')}/#{attr 'prettify-theme', 'prettify'}.min.css"
     - unless (_docinfo = docinfo :head, '-bespoke.html').empty?
       =_docinfo
   body id=id
     article.deck
       - unless noheader
-        / TODO enable :header docinfo once Asciidoctor 1.5.5 is available
-        /- unless (_docinfo = docinfo :header, '-bespoke.html').empty?
-        /  =_docinfo
+        - unless (_docinfo = docinfo :header, '-bespoke.html').empty?
+          =_docinfo
         - if header?
           include slide_title.html.slim
       =content

data/templates/slim/helpers.rb

@@ -204,7 +204,7 @@ module Slim::Helpers
       end
       svg
     else
-      %(<span class="alt">#{local_attr 'alt'}</span>)
+      %(<span class="alt">#{local_attr :alt}</span>)
     end
   end
 

data/templates/slim/image.html.slim

@@ -1,20 +1,25 @@
-- _target, _alt, _width, _height, _format, _reload = (local_attr :target), (local_attr :alt), (local_attr :width), (local_attr :height), (local_attr :format), ('true' if option? :reload)
+- _target, _alt, _width, _height, _format, _link, _reload = (local_attr :target), (local_attr :alt), (local_attr :width), (local_attr :height), (local_attr :format), (local_attr :link), ('true' if option? :reload)
 / QUESTION support default image role?
 figure.image id=id class=[role, ('flux' if option? :flux)]
-  / TODO support link on image
-  / TODO append an index/counter to the alt attribute (since it is otherwise shared)
+  / TODO append an index/counter to the alt attribute (since it's otherwise shared)
   - _target.split(/[#,]/).each do |_target|
     =newline
-    - if _format == 'svg' || (_target.include? '.svg') && ((_svg = option? :inline) || (_obj = option? :interactive))
-      - case
-      - when _svg
-        =include_svg _target
-      - when _obj
-        object type='image/svg+xml' data=(image_uri _target) width=_width height=_height data-reload=_reload
-          / TODO support fallback option
-          span.alt=_alt
+    - content_for :img
+      - if _format == 'svg' || (_target.include? '.svg') && ((_svg = option? :inline) || (_obj = option? :interactive))
+        - case
+        - when _svg
+          =include_svg _target
+        - when _obj
+          object type='image/svg+xml' data=(image_uri _target) width=_width height=_height data-reload=_reload
+            / TODO support fallback option
+            span.alt=_alt
+      - else
+        img src=(image_uri _target) alt=_alt width=_width height=_height data-reload=_reload
+    - if _link
+      a.image href=_link
+        - yield_content :img
     - else
-      img src=(image_uri _target) alt=_alt width=_width height=_height data-reload=_reload
+      - yield_content :img
   - if title?
     =newline
     figcaption=title

data/templates/slim/listing.html.slim

@@ -1,14 +1,15 @@
 - _has_title = title?
+- _role = role
 - content_for :pre
   - if style == 'source' && (_lang = local_attr :language)
     / NOTE class attribute required for highlight.js and prettify
     / QUESTION should we add a "highlight" class to pre?
-    pre.source id=(id unless _has_title) : code data-lang=_lang class="language-#{_lang} prettyprint" =content
+    pre.source id=(id unless _has_title) class=_role : code data-lang=_lang class="language-#{_lang} prettyprint" =content
   - else
     / QUESTION should we add a class to pre?
-    pre id=(id unless _has_title) : code =content
+    pre id=(id unless _has_title) class=_role : code =content
 - if _has_title
-  figure.listing id=id
+  figure.listing id=id class=_role
     figcaption=title
     - yield_content :pre
 - else

data/templates/slim/literal.html.slim

@@ -1,9 +1,10 @@
 // NOTE if style is not set, then it's a literal paragraph (not a literal block)
 - _has_title = title?
+- _role = role
 - content_for :pre
-  pre.screen id=(id unless _has_title) class=role : samp =content
+  pre.screen id=(id unless _has_title) class=_role : samp =content
 - if _has_title
-  figure.listing id=id
+  figure.listing id=id class=_role
     figcaption=title
     - yield_content :pre
 - else

data/templates/slim/notes.html.slim

@@ -1,2 +1 @@
-/ QUESTION should the role be "note" or "notes"?
-aside role='note' =resolve_content
+aside role='notes' =resolve_content

data/templates/slim/olist.html.slim

@@ -1,6 +1,6 @@
 - _has_title = title?
 - content_for :ol
-  ol id=id class=[(style unless style == 'arabic'), ('fit' if (_fit = option? :fit)), *build_roles, role] reversed=('true' if option? :reversed)
+  ol id=(id unless _has_title) class=[(style unless style == 'arabic'), ('fit' if (_fit = option? :fit)), *build_roles, role] start=(local_attr :start) reversed=('true' if option? :reversed)
     - items.each do |_item|
       li class=('line' if _fit)
         span.primary=_item.text

data/templates/slim/section.html.slim

@@ -9,7 +9,7 @@
 - _style = nil
 - if (_bg_img = pluck_first context: :image, role: 'canvas')
   - _style = %[background-image: url(#{image_uri _bg_img.attr(:target)}); background-size: #{(_bg_img.roles & %w[cover contain])[0] || 'cover'}; background-repeat: no-repeat]
-section id=_id class=[*_roles, ('image' if _bg_img)] style=_style data-title=(local_attr 'reftext') data-bespoke-backdrop=(local_attr 'backdrop-role')
+section id=_id class=[*_roles, ('image' if _bg_img)] style=_style data-title=(local_attr :reftext) data-bespoke-backdrop=(local_attr 'backdrop-role')
   - content_for :content
     - unless (_title.start_with? '!') || (option? :conceal)
       - if (_title_obj = partition_title _title).subtitle?

data/templates/slim/slide_speaker.html.slim

@@ -2,7 +2,7 @@
 - _id = (_id = id) && title == '!' && !(local_attr? :id) ? nil : _id
 - _editable = (option? :editable) ? 'true' : nil
 - _spellcheck = _editable ? 'false' : nil
-section.speaker id=_id class=role data-title=(local_attr 'reftext')
+section.speaker id=_id class=role data-title=(local_attr :reftext)
   header
     h2 contenteditable=_editable spellcheck=_spellcheck =_author
     h3 contenteditable=_editable spellcheck=_spellcheck =document.attr :position

data/templates/slim/slide_title.html.slim

@@ -22,6 +22,8 @@ section.title id=header.id class=[role, ('image' if _bg_img)] style=_style data-
         p.author
           span.personname
             span.firstname=>attr :firstname
+            - if (attr? :middlename)
+              span.middlename=>attr :middlename
             span.surname=attr :lastname
           - if (attr? :position) || (attr? :organization)
             =newline

data/templates/slim/video.html.slim

@@ -20,7 +20,7 @@ figure.video class=_service id=id class=role
     - _params = ['enablejsapi=1', 'rel=0', 'showinfo=0', 'controls=0', 'disablekb=1']
     / NOTE start and end must be in seconds
     - _params << %(start=#{local_attr :start}) if local_attr? :start
-    - _params << %(end=#{local_attr :start}) if local_attr? :end
+    - _params << %(end=#{local_attr :end}) if local_attr? :end
     - _params += ['loop=1', %(playlist=#{_target})] if option? :loop
     - _params << 'fs=0' if option? :nofullscreen
     - _params << %(hl=#{document.attr :lang}) if document.attr? :lang

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-bespoke
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.1
+  version: 1.0.0.alpha.2
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -74,12 +74,16 @@ executables:
 - asciidoctor-bespoke
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.adoc
+- LICENSE
 - README.adoc
-- LICENSE.adoc
 files:
-- LICENSE.adoc
+- CHANGELOG.adoc
+- Gemfile
+- LICENSE
 - README.adoc
 - Rakefile
+- asciidoctor-bespoke.gemspec
 - bin/asciidoctor-bespoke
 - lib/asciidoctor-bespoke.rb
 - lib/asciidoctor-bespoke/converter.rb
@@ -121,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc to HTML for a Bespoke.js presentation