asciidoctor-html5s 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b2c1800e1bde512e39ea85bdd3bda2d69c37a54ab28af8a357eabb419ef59f1
-  data.tar.gz: c30420facc2b355e067154bd0a6f4efd284df39b3bbad00a1b2e6d1960089699
+  metadata.gz: 17192d6ef251b997cf21bd27f3f6c5af60031d17d8e44370f582e03b63a309d6
+  data.tar.gz: 0543d25c6cf4492434466268c9c5a18d10c05c50d6ef85cc99ffb5ae0c4adb9a
 SHA512:
-  metadata.gz: 4d7c938ce6468cc2d124e003534ae58ab4fbf9db41fcbd701c4d29f7780066672919dcd786dea1c094b0b5cf23940decfbf65556cae5311868a83418eeed0f17
-  data.tar.gz: 6912e276e0fc6be5044f7ce0b74fbd4488ab3d2a89cd9a1702e872f0b92b9e9665a3914e6879d864a47119e9aecfa2c42a3197bbda876ce83355d7433863524c
+  metadata.gz: cd24b1973f48a795e212273da1e09e67eb9ea92e6ba8b5ec4592ffc440972cbef01f4d592bfa1aa7e2e22a20946f956c5596e4d2b7c41e7469e2116bfb8da1f2
+  data.tar.gz: 64316e3f00ccefec49487b96f0e9024d7814d2644e4f8cc22a93cae473185bb6fc5f1cac95ce7b12e5191e92539fc68538c8334d8b1eaad64ade64ddd4c39c45

data/README.adoc

@@ -125,6 +125,19 @@ link=none / link=false::
 Both block image and inline image supports additional attribute `loading` (see https://developer.mozilla.org/en-US/docs/Web/Performance/Lazy_loading#Images[Lazy loading] on MDN for more information).
 
 
+=== Additional Inline Formatting Roles
+
+del::
+  `++[del]#deleted text#++` is rendered as `<del>deleted text</del>`.
+
+ins::
+  `++[ins]#inserted text#++` is rendered as `<ins>inserted text</ins>`.
+
+strike::
+  `++[strike]#inserted text#++` is rendered as `<s>inserted text</s>`.
+  This is an alias for `line-through`.
+
+
 == Requirements
 
 Note: This converter consists of https://github.com/slim-template/slim/[Slim] templates, but they are precompiled into pure Ruby code using https://github.com/jirutka/asciidoctor-templates-compiler/[asciidoctor-templates-compiler], so you don’t need Slim to use it!

data/data/templates/dlist.html.slim

@@ -1,13 +1,7 @@
-- case style
-- when 'qanda'
-  include _qanda.html
-- when 'horizontal'
-  include _hdlist.html
-- else
-  = block_with_title :class=>['dlist', style]
-    dl class=style
-      - items.each do |terms, dd|
-        - [*terms].each do |dt|
-          dt =dt.text
-        - unless dd.nil?
-          dd =(print_item_content dd)
+= block_with_title :class=>['dlist', style], :role=>('doc-qna' if style == 'qanda')
+  dl class=style
+    - items.each do |terms, dd|
+      - [*terms].each do |dt|
+        dt =dt.text
+      - unless dd.nil?
+        dd =(print_item_content dd)

data/data/templates/inline_button.html.slim

@@ -1 +1,2 @@
-b.button =text
+kbd.button
+  samp =text

data/data/templates/inline_kbd.html.slim

@@ -1,7 +1,7 @@
 - if (keys = attr 'keys').size == 1
-  kbd =keys.first
+  kbd.key =keys.first
 - else
   kbd.keyseq
     - keys.each_with_index do |key, idx|
       ="+" unless idx.zero?
-      kbd =key
+      kbd.key =key

data/data/templates/inline_menu.html.slim

@@ -1,15 +1,18 @@
 - if local_attr :menuitem
   - capture
     |  
-    b.caret ›
-  span.menuseq
-    b.menu
-      =(attr :menu)
-      - yield_capture
+    span.caret ›
+    |  
+  kbd.menuseq
+    kbd.menu
+      samp =(attr :menu)
+    - yield_capture
     - (attr 'submenus').each do |submenu|
-      b.submenu
-        =submenu
-        - yield_capture
-    b.menuitem =(local_attr :menuitem)
+      kbd.menu
+        samp =submenu
+      - yield_capture
+    kbd.menu
+      samp =(local_attr :menuitem)
 - else
-  b.menuref =(attr :menu)
+  kbd.menu
+    samp =(attr :menu)

data/data/templates/inline_quoted.html.slim

@@ -20,8 +20,13 @@
 - when :asciimath, :latexmath
   span.math id=id data-lang=stem_lang =(delimit_stem text, type)
 - else
-  - if role == 'line-through' || role == 'del'
+  - case role
+  - when 'line-through', 'strike'
+    s id=id =text
+  - when 'del'
     del id=id =text
+  - when 'ins'
+    ins id=id =text
   - else
     = html_tag_if role? || id, :span, :id=>id, :class=>role
       =text

data/lib/asciidoctor/html5s/converter.rb

@@ -960,52 +960,14 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def dlist(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      _buf = []; case style; 
-      ; when 'qanda'; 
-      ; _slim_controls1 = block_with_title :class=>'qlist qanda', :role=>'doc-qna' do; _slim_controls2 = []; 
-      ; _slim_controls2 << ("<dl class=\"qanda\">"); 
-      ; items.each do |questions, answer|; 
-      ; [*questions].each do |question|; 
-      ; _slim_controls2 << ("<dt class=\"qanda-question\">"); _slim_controls2 << (question.text); 
-      ; _slim_controls2 << ("</dt>"); end; unless answer.nil?; 
-      ; _slim_controls2 << ("<dd class=\"qanda-answer\">"); 
-      ; if answer.text?; 
-      ; _slim_controls3 = html_tag_if answer.blocks?, :p do; _slim_controls4 = []; 
-      ; _slim_controls4 << (answer.text); 
-      ; _slim_controls4 = _slim_controls4.join(""); end; _slim_controls2 << (_slim_controls3); end; if answer.blocks?; 
-      ; _slim_controls2 << (answer.content); 
-      ; end; _slim_controls2 << ("</dd>"); end; end; _slim_controls2 << ("</dl>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); 
-      ; when 'horizontal'; 
-      ; _slim_controls5 = block_with_title :class=>'hdlist' do; _slim_controls6 = []; 
-      ; _slim_controls6 << ("<table>"); 
-      ; if (attr? :labelwidth) || (attr? :itemwidth); 
-      ; _slim_controls6 << ("<colgroup><col"); 
-      ; _slim_codeattributes1 = style_value(width: [(attr :labelwidth), '%']); if _slim_codeattributes1; if _slim_codeattributes1 == true; _slim_controls6 << (" style"); else; _slim_controls6 << (" style=\""); _slim_controls6 << (_slim_codeattributes1); _slim_controls6 << ("\""); end; end; _slim_controls6 << ("><col"); 
-      ; _slim_codeattributes2 = style_value(width: [(attr :itemwidth), '%']); if _slim_codeattributes2; if _slim_codeattributes2 == true; _slim_controls6 << (" style"); else; _slim_controls6 << (" style=\""); _slim_controls6 << (_slim_codeattributes2); _slim_controls6 << ("\""); end; end; _slim_controls6 << ("></colgroup>"); 
-      ; end; items.each do |terms, dd|; 
-      ; _slim_controls6 << ("<tr><th"); 
-      ; _temple_html_attributeremover1 = []; _temple_html_attributemerger1 = []; _temple_html_attributemerger1[0] = "hdlist1"; _temple_html_attributemerger1[1] = []; _slim_codeattributes3 = ('strong' if option? 'strong'); if Array === _slim_codeattributes3; _slim_codeattributes3 = _slim_codeattributes3.flatten; _slim_codeattributes3.map!(&:to_s); _slim_codeattributes3.reject!(&:empty?); _temple_html_attributemerger1[1] << (_slim_codeattributes3.join(" ")); else; _temple_html_attributemerger1[1] << (_slim_codeattributes3); end; _temple_html_attributemerger1[1] = _temple_html_attributemerger1[1].join(""); _temple_html_attributeremover1 << (_temple_html_attributemerger1.reject(&:empty?).join(" ")); _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls6 << (" class=\""); _slim_controls6 << (_temple_html_attributeremover1); _slim_controls6 << ("\""); end; _slim_controls6 << (">"); 
-      ; terms = [*terms]; 
-      ; terms.each_with_index do |dt, idx|; 
-      ; _slim_controls6 << (dt.text); 
-      ; unless idx >= terms.count - 1; 
-      ; _slim_controls6 << ("<br>"); 
-      ; end; end; _slim_controls6 << ("</th><td class=\"hdlist2\">"); 
-      ; unless dd.nil?; 
-      ; if dd.text?; 
-      ; _slim_controls6 << ("<p>"); _slim_controls6 << (dd.text); 
-      ; _slim_controls6 << ("</p>"); end; if dd.blocks?; 
-      ; _slim_controls6 << (dd.content); 
-      ; end; end; _slim_controls6 << ("</td></tr>"); end; _slim_controls6 << ("</table>"); _slim_controls6 = _slim_controls6.join(""); end; _buf << (_slim_controls5); 
-      ; else; 
-      ; _slim_controls7 = block_with_title :class=>['dlist', style] do; _slim_controls8 = []; 
-      ; _slim_controls8 << ("<dl"); _temple_html_attributeremover2 = []; _slim_codeattributes4 = style; if Array === _slim_codeattributes4; _slim_codeattributes4 = _slim_codeattributes4.flatten; _slim_codeattributes4.map!(&:to_s); _slim_codeattributes4.reject!(&:empty?); _temple_html_attributeremover2 << (_slim_codeattributes4.join(" ")); else; _temple_html_attributeremover2 << (_slim_codeattributes4); end; _temple_html_attributeremover2 = _temple_html_attributeremover2.join(""); if !_temple_html_attributeremover2.empty?; _slim_controls8 << (" class=\""); _slim_controls8 << (_temple_html_attributeremover2); _slim_controls8 << ("\""); end; _slim_controls8 << (">"); 
+      _buf = []; _slim_controls1 = block_with_title :class=>['dlist', style], :role=>('doc-qna' if style == 'qanda') do; _slim_controls2 = []; 
+      ; _slim_controls2 << ("<dl"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = style; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_controls2 << (">"); 
       ; items.each do |terms, dd|; 
       ; [*terms].each do |dt|; 
-      ; _slim_controls8 << ("<dt>"); _slim_controls8 << (dt.text); 
-      ; _slim_controls8 << ("</dt>"); end; unless dd.nil?; 
-      ; _slim_controls8 << ("<dd>"); _slim_controls8 << ((print_item_content dd)); 
-      ; _slim_controls8 << ("</dd>"); end; end; _slim_controls8 << ("</dl>"); _slim_controls8 = _slim_controls8.join(""); end; _buf << (_slim_controls7); end; _buf = _buf.join("")
+      ; _slim_controls2 << ("<dt>"); _slim_controls2 << (dt.text); 
+      ; _slim_controls2 << ("</dt>"); end; unless dd.nil?; 
+      ; _slim_controls2 << ("<dd>"); _slim_controls2 << ((print_item_content dd)); 
+      ; _slim_controls2 << ("</dd>"); end; end; _slim_controls2 << ("</dl>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
     end
   end
 
@@ -1057,12 +1019,12 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     node.extend(Helpers)
     node.instance_eval do
       _buf = []; if (keys = attr 'keys').size == 1; 
-      ; _buf << ("<kbd>"); _buf << (keys.first); 
+      ; _buf << ("<kbd class=\"key\">"); _buf << (keys.first); 
       ; _buf << ("</kbd>"); else; 
       ; _buf << ("<kbd class=\"keyseq\">"); 
       ; keys.each_with_index do |key, idx|; 
       ; _buf << ("+" unless idx.zero?); 
-      ; _buf << ("<kbd>"); _buf << (key); 
+      ; _buf << ("<kbd class=\"key\">"); _buf << (key); 
       ; _buf << ("</kbd>"); end; _buf << ("</kbd>"); end; _buf = _buf.join("")
     end
   end
@@ -1156,9 +1118,14 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       ; _slim_controls4 = _slim_controls4.join(""); end; _buf << (_slim_controls3); when :asciimath, :latexmath; 
       ; _buf << ("<span class=\"math\""); _slim_codeattributes13 = id; if _slim_codeattributes13; if _slim_codeattributes13 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes13); _buf << ("\""); end; end; _slim_codeattributes14 = stem_lang; if _slim_codeattributes14; if _slim_codeattributes14 == true; _buf << (" data-lang"); else; _buf << (" data-lang=\""); _buf << (_slim_codeattributes14); _buf << ("\""); end; end; _buf << (">"); _buf << ((delimit_stem text, type)); 
       ; _buf << ("</span>"); else; 
-      ; if role == 'line-through' || role == 'del'; 
-      ; _buf << ("<del"); _slim_codeattributes15 = id; if _slim_codeattributes15; if _slim_codeattributes15 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes15); _buf << ("\""); end; end; _buf << (">"); _buf << (text); 
-      ; _buf << ("</del>"); else; 
+      ; case role; 
+      ; when 'line-through', 'strike'; 
+      ; _buf << ("<s"); _slim_codeattributes15 = id; if _slim_codeattributes15; if _slim_codeattributes15 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes15); _buf << ("\""); end; end; _buf << (">"); _buf << (text); 
+      ; _buf << ("</s>"); when 'del'; 
+      ; _buf << ("<del"); _slim_codeattributes16 = id; if _slim_codeattributes16; if _slim_codeattributes16 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes16); _buf << ("\""); end; end; _buf << (">"); _buf << (text); 
+      ; _buf << ("</del>"); when 'ins'; 
+      ; _buf << ("<ins"); _slim_codeattributes17 = id; if _slim_codeattributes17; if _slim_codeattributes17 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes17); _buf << ("\""); end; end; _buf << (">"); _buf << (text); 
+      ; _buf << ("</ins>"); else; 
       ; _slim_controls5 = html_tag_if role? || id, :span, :id=>id, :class=>role do; _slim_controls6 = []; 
       ; _slim_controls6 << (text); 
       ; _slim_controls6 = _slim_controls6.join(""); end; _buf << (_slim_controls5); end; end; _buf = _buf.join("")
@@ -1205,20 +1172,23 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     node.instance_eval do
       _buf = []; if local_attr :menuitem; 
       ; capture do; 
-      ; _buf << ("&#160;<b class=\"caret\">&#8250;</b>"); 
+      ; _buf << ("&#160;<span class=\"caret\">&#8250;</span>&#32;"); 
+      ; 
       ; 
-      ; end; _buf << ("<span class=\"menuseq\"><b class=\"menu\">"); 
+      ; end; _buf << ("<kbd class=\"menuseq\"><kbd class=\"menu\"><samp>"); 
       ; 
       ; _buf << ((attr :menu)); 
-      ; yield_capture; 
-      ; _buf << ("</b>"); (attr 'submenus').each do |submenu|; 
-      ; _buf << ("<b class=\"submenu\">"); 
+      ; _buf << ("</samp></kbd>"); yield_capture; 
+      ; (attr 'submenus').each do |submenu|; 
+      ; _buf << ("<kbd class=\"menu\"><samp>"); 
       ; _buf << (submenu); 
-      ; yield_capture; 
-      ; _buf << ("</b>"); end; _buf << ("<b class=\"menuitem\">"); _buf << ((local_attr :menuitem)); 
-      ; _buf << ("</b></span>"); else; 
-      ; _buf << ("<b class=\"menuref\">"); _buf << ((attr :menu)); 
-      ; _buf << ("</b>"); end; _buf = _buf.join("")
+      ; _buf << ("</samp></kbd>"); yield_capture; 
+      ; end; _buf << ("<kbd class=\"menu\"><samp>"); 
+      ; _buf << ((local_attr :menuitem)); 
+      ; _buf << ("</samp></kbd></kbd>"); else; 
+      ; _buf << ("<kbd class=\"menu\"><samp>"); 
+      ; _buf << ((attr :menu)); 
+      ; _buf << ("</samp></kbd>"); end; _buf = _buf.join("")
     end
   end
 
@@ -1393,8 +1363,9 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_button(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      _buf = []; _buf << ("<b class=\"button\">"); _buf << (text); 
-      ; _buf << ("</b>"); _buf = _buf.join("")
+      _buf = []; _buf << ("<kbd class=\"button\"><samp>"); 
+      ; _buf << (text); 
+      ; _buf << ("</samp></kbd>"); _buf = _buf.join("")
     end
   end
 

data/lib/asciidoctor/html5s/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Html5s
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html5s
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Jakub Jirutka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -158,9 +158,7 @@ files:
 - data/templates/_attribution.html.slim
 - data/templates/_footer.html.slim
 - data/templates/_footnotes.html.slim
-- data/templates/_hdlist.html.slim
 - data/templates/_header.html.slim
-- data/templates/_qanda.html.slim
 - data/templates/_toc.html.slim
 - data/templates/admonition.html.slim
 - data/templates/audio.html.slim

data/data/templates/_hdlist.html.slim

@@ -1,20 +0,0 @@
-= block_with_title :class=>'hdlist'
-  table
-    - if (attr? :labelwidth) || (attr? :itemwidth)
-      colgroup
-        col style=style_value(width: [(attr :labelwidth), '%'])
-        col style=style_value(width: [(attr :itemwidth), '%'])
-    - items.each do |terms, dd|
-      tr
-        th.hdlist1 class=('strong' if option? 'strong')
-          - terms = [*terms]
-          - terms.each_with_index do |dt, idx|
-            =dt.text
-            - unless idx >= terms.count - 1
-              br
-        td.hdlist2
-          - unless dd.nil?
-            - if dd.text?
-              p =dd.text
-            - if dd.blocks?
-              =dd.content

data/data/templates/_qanda.html.slim

@@ -1,12 +0,0 @@
-= block_with_title :class=>'qlist qanda', :role=>'doc-qna'
-  dl.qanda
-    - items.each do |questions, answer|
-      - [*questions].each do |question|
-        dt.qanda-question =question.text
-      - unless answer.nil?
-        dd.qanda-answer
-          - if answer.text?
-            = html_tag_if answer.blocks?, :p
-              =answer.text
-          - if answer.blocks?
-            =answer.content