asciidoctor-fb2 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4c7f00f477ddb1d95bb04eb0a834308288cae185c008ee0206197c9c4403d95
-  data.tar.gz: '08772d526c95b49df5956b0ba12868aa58e4c1684b5e947aa5e233ee222c891f'
+  metadata.gz: bcbbc6c8b9fbfbb6eb2444a9054f8676aed178409809cc47977bccdd5011e94c
+  data.tar.gz: 5fd22ce5a853988ce66c483637b1b2fe0ca42154d2ab4ee0b277bbb84a96fa7b
 SHA512:
-  metadata.gz: 56fbb9d6633d5b3ed3b55fc1b9aa8698c4805ddacae41c44cd376952e998ad89d379fb44bca7fa5ff42454ff6bec7cd717100b7408e013850c762bde7df0bedf
-  data.tar.gz: 63a52028f548239dcc0d349f2d1ae8d371f53618c56aa47b04acb3eb1c42b9a93276dd579752d3ce143f36f61548b421e1f681d83ef47db3788cde303488aa0b
+  metadata.gz: b18f69261c30b1c486c6ef2ec41df8ef23e45ccb818cdc1869d5e525dc67eb841bbb83e51b473e5c6d50a868535a49530b0ac260c790597254df01656b1bb859
+  data.tar.gz: bbe16778d9bc390c7d492bea0a9588ac24bc9a67490d74950ccf68c65e699f42a0f4112b42d67c1a8aca472dae335ca038a529caaf087f6017f5bfad7e04c1e3

data/CHANGELOG.adoc

@@ -7,6 +7,12 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-project}/commits/master[commit history] on GitHub.
 
+== 0.2.3 (2020-11-24) - @slonopotamus
+
+* add support for literal blocks
+* fix crash for `menu` inline macro without submenu. https://github.com/slonopotamus/asciidoctor-fb2/issues/15[#15]
+* add initial support for sidebar
+
 == 0.2.2 (2020-11-24) - @slonopotamus
 
 * do not crash on inline line break macro. https://github.com/slonopotamus/asciidoctor-fb2/issues/14[#14]

data/lib/asciidoctor_fb2.rb

@@ -137,7 +137,7 @@ module Asciidoctor
       # @param node [Asciidoctor::Block]
       def convert_verse(node)
         body = node.content&.split("\n\n")&.map do |stanza|
-          %(<stanza>\n<v>#{stanza.split("\n").join("</v>\n<v>")}</v>\n</stanza>)
+          %(<stanza>\n<v>#{stanza.split("\n") * "</v>\n<v>"}</v>\n</stanza>)
         end&.join("\n")
 
         citetitle = node.attr('citetitle')
@@ -155,6 +155,11 @@ module Asciidoctor
 
       # @param node [Asciidoctor::Block]
       def convert_listing(node)
+        convert_literal(node)
+      end
+
+      # @param node [Asciidoctor::Block]
+      def convert_literal(node)
         lines = []
         node.content.split("\n").each do |line|
           lines << %(<p><code>#{line}</code></p>)
@@ -186,11 +191,11 @@ module Asciidoctor
         caret = '&#160;<strong>&#8250;</strong> '
         menu = node.attr('menu')
         menuitem = node.attr('menuitem')
-        submenus = node.attr('submenus').join(%(</b>#{caret}<b>))
+        submenus = node.attr('submenus') * %(</b>#{caret}<b>)
 
         result = %(<strong>#{menu}</strong>)
-        result += %(#{caret}<strong>#{submenus}</strong>) unless submenus.empty?
-        result += %(#{caret}<strong>#{menuitem}</strong>) unless menuitem.empty?
+        result += %(#{caret}<strong>#{submenus}</strong>) unless submenus.nil_or_empty?
+        result += %(#{caret}<strong>#{menuitem}</strong>) unless menuitem.nil_or_empty?
 
         result
       end
@@ -207,7 +212,7 @@ module Asciidoctor
 
       # @param node [Asciidoctor::Inline]
       def convert_inline_kbd(node)
-        %(<strong>#{node.attr('keys').join('</strong>+<strong>')}</strong>)
+        %(<strong>#{node.attr('keys') * '</strong>+<strong>'}</strong>)
       end
 
       # @param node [Asciidoctor::Inline]
@@ -287,6 +292,13 @@ module Asciidoctor
         lines * "\n"
       end
 
+      # @param node [Asciidoctor::Block]
+      def convert_sidebar(node)
+        title_tag = node.title.nil_or_empty? ? '' : %(<p><strong>#{node.title}</strong></p>)
+        %(#{title_tag}
+#{node.content})
+      end
+
       # @param node [Asciidoctor::List]
       def convert_ulist(node)
         lines = []
@@ -365,7 +377,7 @@ module Asciidoctor
                                when :literal
                                  %(<p><pre>#{cell.text}</pre></p>)
                                else
-                                 (cell_content = cell.content).empty? ? '' : %(<p>#{cell_content.join "</p>\n<p>"}</p>)
+                                 (cell_content = cell.content).empty? ? '' : %(<p>#{cell_content * "</p>\n<p>"}</p>)
                                end
                              end
 

data/lib/asciidoctor_fb2/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module FB2
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-fb2
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Marat Radchenko