asciidoctor-html 2.1.4 → 2.1.6

data/assets/favicon/favicon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35.631 35.631" width="35.631" height="35.631"><metadata><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><rdf:Description><dc:creator>RealFaviconGenerator</dc:creator><dc:source>https://realfavicongenerator.net</dc:source></rdf:Description></rdf:RDF></metadata><path d="M31.25 102.847 22.278 92.04l8.972-10.597h3.514l-9.007 10.632 9.007 10.773zm5.598-8.424h14.13v2.508h-14.13Zm0-6.464h14.13v2.49h-14.13ZM56.84 102.9h-3.514l8.972-10.826-8.972-10.632h3.514l8.937 10.597z" style="fill:#d63384;stroke-width:.5" transform="matrix(.811 0 0 1.23303 -17.891 -95.835)"></path></svg>

data/lib/asciidoctor/html/book_template.rb

@@ -186,10 +186,12 @@ module Asciidoctor
           #{%(<meta name="description" content="#{opts[:description]}">) if opts[:description]}
           #{%(<meta name="author" content="#{opts[:authors]}">) if opts[:authors]}
           <title>#{opts[:title]}</title>
-          <link rel="apple-touch-icon" sizes="180x180" href="#{FAVICON_PATH}/apple-touch-icon.png">
-          <link rel="icon" type="image/png" sizes="32x32" href="#{FAVICON_PATH}/favicon-32x32.png">
-          <link rel="icon" type="image/png" sizes="16x16" href="#{FAVICON_PATH}/favicon-16x16.png">
-          <link rel="manifest" href="#{FAVICON_PATH}/site.webmanifest" crossorigin="anonymous">
+          <link rel="icon" type="image/png" href="#{FAVICON_PATH}/favicon-96x96.png" sizes="96x96" />
+          <link rel="icon" type="image/svg+xml" href="#{FAVICON_PATH}/favicon.svg" />
+          <link rel="shortcut icon" href="#{FAVICON_PATH}/favicon.ico" />
+          <link rel="apple-touch-icon" sizes="180x180" href="#{FAVICON_PATH}/apple-touch-icon.png" />
+          <meta name="apple-mobile-web-app-title" content="#{opts[:short_title]}" />
+          <link rel="manifest" href="site.webmanifest" />
           <link rel="stylesheet" href="#{CSS_PATH}/styles.css">
           #{highlightjs(opts)}
           <script>

data/lib/asciidoctor/html/cli.rb

@@ -82,7 +82,7 @@ module Asciidoctor
       end
 
       def self.generate_webmanifest(outdir, name, short_name)
-        filename = "#{outdir}/#{FAVICON_PATH}/site.webmanifest"
+        filename = "#{outdir}/site.webmanifest"
         puts "Generating\n  #{filename}"
         puts
         File.write filename, Webmanifest.generate(name, short_name)

data/lib/asciidoctor/html/converter.rb

@@ -38,14 +38,17 @@ module Asciidoctor
         document = node.document
         level = node.level
         show_sectnum = node.numbered && level <= (document.attr("sectnumlevels") || 1).to_i
-        tag_level = [level == 1 ? level + 1 : level + 2, 6].min
-        tag_name = %(h#{tag_level})
         classes = "section#{" flip" if level == 1}#{" #{node.role}" if node.role}"
         display_sectnum = Utils.display_sectnum(node, level) if show_sectnum
-        content = %(<#{tag_name}>#{display_sectnum}#{node.title}</#{tag_name}>\n#{node.content})
+        title = "#{display_sectnum}#{node.title}"
+        content = "#{Utils.heading node, title}#{node.content}"
         Utils.wrap_id_classes content, node.id, classes, :section
       end
 
+      def convert_floating_title(node)
+        Utils.heading node, node.title, discrete: true
+      end
+
       def convert_paragraph(node)
         content = %(<p#{Utils.dyn_id_class_attr_str node, node.role}>#{node.content}</p>\n)
         Utils.wrap_node_with_title content, node
@@ -81,7 +84,7 @@ module Asciidoctor
 
       def convert_sidebar(node)
         classes = ["aside", node.role].compact.join(" ")
-        title = node.title? ? %(<h5 class="aside-title">#{node.title}</h5>\n) : ""
+        title = node.title? ? %(<h4 class="aside-title">#{node.title}</h4>\n) : ""
         content = "#{title}#{node.content}"
         %(<aside#{Utils.id_class_attr_str node.id, classes}>\n#{content}\n</aside>\n)
       end
@@ -166,7 +169,13 @@ module Asciidoctor
       end
 
       def convert_example(node)
-        Utils.wrap_node(Utils.display_title(node) + node.content, node)
+        content = Utils.display_title(node) + node.content
+        if node.option?("unstyled")
+          classes = %(block#{" #{node.role}" if node.role})
+          return Utils.wrap_id_classes(content, node.id, classes)
+        end
+
+        Utils.wrap_node content, node
       end
 
       def convert_image(node)

data/lib/asciidoctor/html/search.rb

@@ -23,7 +23,7 @@ module Asciidoctor
             </form>
           </div>
           <div id="search-results-container" class="hidden">
-          <h5 class="search-matches-title">Found <span id="search-nmatches">0 matches</span></h5>
+          <h4 class="search-matches-title">Found <span id="search-nmatches">0 matches</span></h4>
           <ul id="search-results" class="search-results list-group list-group-flush"></ul>
           </div>
         HTML

data/lib/asciidoctor/html/subnav_block_macro.rb

@@ -14,7 +14,7 @@ module Asciidoctor
 
       def process(parent, target, attrs)
         doc_key = Pathname(target).sub_ext "" unless target.empty?
-        title = %(<h5 class="block-title">#{parent.apply_subs attrs["title"]}</h5>) if attrs.include?("title")
+        title = %(<h4 class="block-title">#{parent.apply_subs attrs["title"]}</h4>) if attrs.include?("title")
         bordered_class = " bordered" if attrs.include?("border")
         border_width = attrs["border"].to_i if bordered_class
         style = %( style="border-top-width: #{border_width}px; border-bottom-width: #{border_width}px;") if border_width

data/lib/asciidoctor/html/utils.rb

@@ -34,7 +34,7 @@ module Asciidoctor
       def self.display_title(node)
         prefix = display_title_prefix node
         suffix = display_title_suffix node
-        show_title?(node) ? %(<h6 class="block-title">#{prefix}#{node.title}#{suffix}</h6>\n) : ""
+        show_title?(node) ? %(<h5 class="block-title">#{prefix}#{node.title}#{suffix}</h5>\n) : ""
       end
 
       def self.display_title_suffix(node)
@@ -103,6 +103,14 @@ module Asciidoctor
       def self.line_number_attr(line_number, live: false)
         live ? %( data-line-number="#{line_number}") : ""
       end
+
+      def self.heading(node, title, discrete: false)
+        level = node.level
+        tag_level = [level + 1, 6].min
+        tag_name = %(h#{tag_level})
+        classes = %( class="#{node.role}") if discrete && node.role
+        %(<#{tag_name}#{classes}>#{title}</#{tag_name}>\n)
+      end
     end
   end
 end

data/lib/asciidoctor/html/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Html
-    VERSION = "2.1.4"
+    VERSION = "2.1.6"
   end
 end

data/lib/asciidoctor/html/webmanifest.rb

@@ -4,14 +4,19 @@ require "json"
 
 module Asciidoctor
   module Html
-    # Generates the site.webmanifest for Android
+    # Generates the site.webmanifest
     module Webmanifest
       def self.generate(name, short_name)
         {
           name:,
           short_name:,
           icons: %w[192x192 512x512].map do |sizes|
-            { src: "#{FAVICON_PATH}/android-chrome-#{sizes}.png", sizes:, type: "image/png" }
+            {
+              src: "#{FAVICON_PATH}/web-app-manifest-#{sizes}.png",
+              sizes:,
+              type: "image/png",
+              purpose: "maskable"
+            }
           end,
           theme_color: "#ffffff",
           background_color: "#ffffff",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.6
 platform: ruby
 authors:
 - Ravi Rajani
@@ -94,16 +94,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- asciidoctor-html.svg
 - assets/css/fonts/bootstrap-icons.woff
 - assets/css/fonts/bootstrap-icons.woff2
 - assets/css/jupyterlite.css
 - assets/css/styles.css
-- assets/favicon/android-chrome-192x192.png
-- assets/favicon/android-chrome-512x512.png
 - assets/favicon/apple-touch-icon.png
-- assets/favicon/favicon-16x16.png
-- assets/favicon/favicon-32x32.png
+- assets/favicon/favicon-96x96.png
 - assets/favicon/favicon.ico
+- assets/favicon/favicon.svg
+- assets/favicon/web-app-manifest-192x192.png
+- assets/favicon/web-app-manifest-512x512.png
 - exe/adoctohtml
 - exe/build-jupyterlite
 - jupyterlite/.gitignore