asciidoctor-revealjs 3.1.0 → 4.0.0

data/lib/asciidoctor-revealjs/highlightjs.rb

@@ -6,15 +6,34 @@ module Asciidoctor
       class HighlightJsAdapter < Asciidoctor::SyntaxHighlighter::Base
         register_for 'highlightjs', 'highlight.js'
 
+        HIGHLIGHT_JS_VERSION = '9.18.1'
+
         def initialize *args
           super
           @name = @pre_class = 'highlightjs'
         end
 
+        # Convert between highlight notation formats
+        # In addition to Asciidoctor's linenum converter leveraging core's resolve_lines_to_highlight,
+        # we also support reveal.js step-by-step highlights.
+        # The steps are split using the | character
+        # For example, this method makes "1..3|6,7" into "1,2,3|6,7"
+        def _convert_highlight_to_revealjs node
+          return node.attributes["highlight"].split("|").collect { |linenums|
+            node.resolve_lines_to_highlight(node.content, linenums).join(",")
+          }.join("|")
+        end
+
         def format node, lang, opts
           super node, lang, (opts.merge transform: proc { |_, code|
             code['class'] = %(language-#{lang || 'none'} hljs)
             code['data-noescape'] = true
+
+            if node.attributes.key?("highlight")
+              code['data-line-numbers'] = self._convert_highlight_to_revealjs(node)
+            elsif node.attributes.key?("linenums")
+              code['data-line-numbers'] = ''
+            end
           })
         end
 
@@ -31,10 +50,322 @@ module Asciidoctor
           if doc.attr? 'highlightjs-theme'
             theme_href = doc.attr 'highlightjs-theme'
           else
-            theme_href = "#{revealjsdir}/lib/css/zenburn.css"
+            theme_href = "#{revealjsdir}/lib/css/monokai.css"
           end
-          %(<link rel="stylesheet" href="#{theme_href}"#{opts[:self_closing_tag_slash]}>)
+          base_url = doc.attr 'highlightjsdir', %(#{opts[:cdn_base_url]}/highlight.js/#{HIGHLIGHT_JS_VERSION})
+          %(<link rel="stylesheet" href="#{theme_href}"#{opts[:self_closing_tag_slash]}>
+<script src="#{base_url}/highlight.min.js"></script>
+#{(doc.attr? 'highlightjs-languages') ? ((doc.attr 'highlightjs-languages').split ',').map {|lang| %[<script src="#{base_url}/languages/#{lang.lstrip}.min.js"></script>\n] }.join : ''}
+<script>
+#{HIGHLIGHT_PLUGIN_SOURCE}
+hljs.initHighlightingOnLoad();
+</script>)
         end
+
+        # this file was copied-pasted from https://raw.githubusercontent.com/hakimel/reveal.js/3.9.2/plugin/highlight/highlight.js
+        # please note that the bundled highlight.js code was removed so we can use the latest version from cdnjs.
+        HIGHLIGHT_PLUGIN_SOURCE = %q{
+/* highlightjs-line-numbers.js 2.6.0 | (C) 2018 Yauheni Pakala | MIT License | github.com/wcoder/highlightjs-line-numbers.js */
+/* Edited by Hakim for reveal.js; removed async timeout */
+!function(n,e){"use strict";function t(){var n=e.createElement("style");n.type="text/css",n.innerHTML=g(".{0}{border-collapse:collapse}.{0} td{padding:0}.{1}:before{content:attr({2})}",[v,L,b]),e.getElementsByTagName("head")[0].appendChild(n)}function r(t){"interactive"===e.readyState||"complete"===e.readyState?i(t):n.addEventListener("DOMContentLoaded",function(){i(t)})}function i(t){try{var r=e.querySelectorAll("code.hljs,code.nohighlight");for(var i in r)r.hasOwnProperty(i)&&l(r[i],t)}catch(o){n.console.error("LineNumbers error: ",o)}}function l(n,e){"object"==typeof n&&f(function(){n.innerHTML=s(n,e)})}function o(n,e){if("string"==typeof n){var t=document.createElement("code");return t.innerHTML=n,s(t,e)}}function s(n,e){e=e||{singleLine:!1};var t=e.singleLine?0:1;return c(n),a(n.innerHTML,t)}function a(n,e){var t=u(n);if(""===t[t.length-1].trim()&&t.pop(),t.length>e){for(var r="",i=0,l=t.length;i<l;i++)r+=g('<tr><td class="{0}"><div class="{1} {2}" {3}="{5}"></div></td><td class="{4}"><div class="{1}">{6}</div></td></tr>',[j,m,L,b,p,i+1,t[i].length>0?t[i]:" "]);return g('<table class="{0}">{1}</table>',[v,r])}return n}function c(n){var e=n.childNodes;for(var t in e)if(e.hasOwnProperty(t)){var r=e[t];h(r.textContent)>0&&(r.childNodes.length>0?c(r):d(r.parentNode))}}function d(n){var e=n.className;if(/hljs-/.test(e)){for(var t=u(n.innerHTML),r=0,i="";r<t.length;r++){var l=t[r].length>0?t[r]:" ";i+=g('<span class="{0}">{1}</span>\n',[e,l])}n.innerHTML=i.trim()}}function u(n){return 0===n.length?[]:n.split(y)}function h(n){return(n.trim().match(y)||[]).length}function f(e){e()}function g(n,e){return n.replace(/\{(\d+)\}/g,function(n,t){return e[t]?e[t]:n})}var v="hljs-ln",m="hljs-ln-line",p="hljs-ln-code",j="hljs-ln-numbers",L="hljs-ln-n",b="data-line-number",y=/\r\n|\r|\n/g;n.hljs?(n.hljs.initLineNumbersOnLoad=r,n.hljs.lineNumbersBlock=l,n.hljs.lineNumbersValue=o,t()):n.console.error("highlight.js not detected!")}(window,document);
+
+/**
+ * This reveal.js plugin is wrapper around the highlight.js
+ * syntax highlighting library.
+ */
+(function( root, factory ) {
+  if (typeof define === 'function' && define.amd) {
+    root.RevealHighlight = factory();
+  } else if( typeof exports === 'object' ) {
+    module.exports = factory();
+  } else {
+    // Browser globals (root is window)
+    root.RevealHighlight = factory();
+  }
+}( this, function() {
+
+  // Function to perform a better "data-trim" on code snippets
+  // Will slice an indentation amount on each line of the snippet (amount based on the line having the lowest indentation length)
+  function betterTrim(snippetEl) {
+    // Helper functions
+    function trimLeft(val) {
+      // Adapted from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/Trim#Polyfill
+      return val.replace(/^[\s\uFEFF\xA0]+/g, '');
+    }
+    function trimLineBreaks(input) {
+      var lines = input.split('\n');
+
+      // Trim line-breaks from the beginning
+      for (var i = 0; i < lines.length; i++) {
+        if (lines[i].trim() === '') {
+          lines.splice(i--, 1);
+        } else break;
+      }
+
+      // Trim line-breaks from the end
+      for (var i = lines.length-1; i >= 0; i--) {
+        if (lines[i].trim() === '') {
+          lines.splice(i, 1);
+        } else break;
+      }
+
+      return lines.join('\n');
+    }
+
+    // Main function for betterTrim()
+    return (function(snippetEl) {
+      var content = trimLineBreaks(snippetEl.innerHTML);
+      var lines = content.split('\n');
+      // Calculate the minimum amount to remove on each line start of the snippet (can be 0)
+      var pad = lines.reduce(function(acc, line) {
+        if (line.length > 0 && trimLeft(line).length > 0 && acc > line.length - trimLeft(line).length) {
+          return line.length - trimLeft(line).length;
+        }
+        return acc;
+      }, Number.POSITIVE_INFINITY);
+      // Slice each line with this amount
+      return lines.map(function(line, index) {
+        return line.slice(pad);
+      })
+        .join('\n');
+    })(snippetEl);
+  }
+
+  var RevealHighlight = {
+
+    HIGHLIGHT_STEP_DELIMITER: '|',
+    HIGHLIGHT_LINE_DELIMITER: ',',
+    HIGHLIGHT_LINE_RANGE_DELIMITER: '-',
+
+    init: function() {
+
+      // Read the plugin config options and provide fallbacks
+      var config = Reveal.getConfig().highlight || {};
+      config.highlightOnLoad = typeof config.highlightOnLoad === 'boolean' ? config.highlightOnLoad : true;
+      config.escapeHTML = typeof config.escapeHTML === 'boolean' ? config.escapeHTML : true;
+
+      [].slice.call( document.querySelectorAll( '.reveal pre code' ) ).forEach( function( block ) {
+
+        // Trim whitespace if the "data-trim" attribute is present
+        if( block.hasAttribute( 'data-trim' ) && typeof block.innerHTML.trim === 'function' ) {
+          block.innerHTML = betterTrim( block );
+        }
+
+        // Escape HTML tags unless the "data-noescape" attrbute is present
+        if( config.escapeHTML && !block.hasAttribute( 'data-noescape' )) {
+          block.innerHTML = block.innerHTML.replace( /</g,"&lt;").replace(/>/g, '&gt;' );
+        }
+
+        // Re-highlight when focus is lost (for contenteditable code)
+        block.addEventListener( 'focusout', function( event ) {
+          hljs.highlightBlock( event.currentTarget );
+        }, false );
+
+        if( config.highlightOnLoad ) {
+          RevealHighlight.highlightBlock( block );
+        }
+      } );
+
+    },
+
+    /**
+     * Highlights a code block. If the <code> node has the
+     * 'data-line-numbers' attribute we also generate slide
+     * numbers.
+     *
+     * If the block contains multiple line highlight steps,
+     * we clone the block and create a fragment for each step.
+     */
+    highlightBlock: function( block ) {
+
+      hljs.highlightBlock( block );
+
+      // Don't generate line numbers for empty code blocks
+      if( block.innerHTML.trim().length === 0 ) return;
+
+      if( block.hasAttribute( 'data-line-numbers' ) ) {
+        hljs.lineNumbersBlock( block, { singleLine: true } );
+
+        // If there is at least one highlight step, generate
+        // fragments
+        var highlightSteps = RevealHighlight.deserializeHighlightSteps( block.getAttribute( 'data-line-numbers' ) );
+        if( highlightSteps.length > 1 ) {
+
+          // If the original code block has a fragment-index,
+          // each clone should follow in an incremental sequence
+          var fragmentIndex = parseInt( block.getAttribute( 'data-fragment-index' ), 10 );
+          if( typeof fragmentIndex !== 'number' || isNaN( fragmentIndex ) ) {
+            fragmentIndex = null;
+          }
+
+          // Generate fragments for all steps except the original block
+          highlightSteps.slice(1).forEach( function( highlight ) {
+
+            var fragmentBlock = block.cloneNode( true );
+            fragmentBlock.setAttribute( 'data-line-numbers', RevealHighlight.serializeHighlightSteps( [ highlight ] ) );
+            fragmentBlock.classList.add( 'fragment' );
+            block.parentNode.appendChild( fragmentBlock );
+            RevealHighlight.highlightLines( fragmentBlock );
+
+            if( typeof fragmentIndex === 'number' ) {
+              fragmentBlock.setAttribute( 'data-fragment-index', fragmentIndex );
+              fragmentIndex += 1;
+            }
+            else {
+              fragmentBlock.removeAttribute( 'data-fragment-index' );
+            }
+
+          } );
+
+          block.removeAttribute( 'data-fragment-index' )
+          block.setAttribute( 'data-line-numbers', RevealHighlight.serializeHighlightSteps( [ highlightSteps[0] ] ) );
+
+        }
+
+        RevealHighlight.highlightLines( block );
+
+      }
+
+    },
+
+    /**
+     * Visually emphasize specific lines within a code block.
+     * This only works on blocks with line numbering turned on.
+     *
+     * @param {HTMLElement} block a <code> block
+     * @param {String} [linesToHighlight] The lines that should be
+     * highlighted in this format:
+     * "1" 		= highlights line 1
+     * "2,5"	= highlights lines 2 & 5
+     * "2,5-7"	= highlights lines 2, 5, 6 & 7
+     */
+    highlightLines: function( block, linesToHighlight ) {
+
+      var highlightSteps = RevealHighlight.deserializeHighlightSteps( linesToHighlight || block.getAttribute( 'data-line-numbers' ) );
+
+      if( highlightSteps.length ) {
+
+        highlightSteps[0].forEach( function( highlight ) {
+
+          var elementsToHighlight = [];
+
+          // Highlight a range
+          if( typeof highlight.end === 'number' ) {
+            elementsToHighlight = [].slice.call( block.querySelectorAll( 'table tr:nth-child(n+'+highlight.start+'):nth-child(-n+'+highlight.end+')' ) );
+          }
+          // Highlight a single line
+          else if( typeof highlight.start === 'number' ) {
+            elementsToHighlight = [].slice.call( block.querySelectorAll( 'table tr:nth-child('+highlight.start+')' ) );
+          }
+
+          if( elementsToHighlight.length ) {
+            elementsToHighlight.forEach( function( lineElement ) {
+              lineElement.classList.add( 'highlight-line' );
+            } );
+
+            block.classList.add( 'has-highlights' );
+          }
+
+        } );
+
+      }
+
+    },
+
+    /**
+     * Parses and formats a user-defined string of line
+     * numbers to highlight.
+     *
+     * @example
+     * RevealHighlight.deserializeHighlightSteps( '1,2|3,5-10' )
+     * // [
+     * //   [ { start: 1 }, { start: 2 } ],
+     * //   [ { start: 3 }, { start: 5, end: 10 } ]
+     * // ]
+     */
+    deserializeHighlightSteps: function( highlightSteps ) {
+
+      // Remove whitespace
+      highlightSteps = highlightSteps.replace( /\s/g, '' );
+
+      // Divide up our line number groups
+      highlightSteps = highlightSteps.split( RevealHighlight.HIGHLIGHT_STEP_DELIMITER );
+
+      return highlightSteps.map( function( highlights ) {
+
+        return highlights.split( RevealHighlight.HIGHLIGHT_LINE_DELIMITER ).map( function( highlight ) {
+
+          // Parse valid line numbers
+          if( /^[\d-]+$/.test( highlight ) ) {
+
+            highlight = highlight.split( RevealHighlight.HIGHLIGHT_LINE_RANGE_DELIMITER );
+
+            var lineStart = parseInt( highlight[0], 10 ),
+              lineEnd = parseInt( highlight[1], 10 );
+
+            if( isNaN( lineEnd ) ) {
+              return {
+                start: lineStart
+              };
+            }
+            else {
+              return {
+                start: lineStart,
+                end: lineEnd
+              };
+            }
+
+          }
+          // If no line numbers are provided, no code will be highlighted
+          else {
+
+            return {};
+
+          }
+
+        } );
+
+      } );
+
+    },
+
+    /**
+     * Serializes parsed line number data into a string so
+     * that we can store it in the DOM.
+     */
+    serializeHighlightSteps: function( highlightSteps ) {
+
+      return highlightSteps.map( function( highlights ) {
+
+        return highlights.map( function( highlight ) {
+
+          // Line range
+          if( typeof highlight.end === 'number' ) {
+            return highlight.start + RevealHighlight.HIGHLIGHT_LINE_RANGE_DELIMITER + highlight.end;
+          }
+          // Single line
+          else if( typeof highlight.start === 'number' ) {
+            return highlight.start;
+          }
+          // All lines
+          else {
+            return '';
+          }
+
+        } ).join( RevealHighlight.HIGHLIGHT_LINE_DELIMITER );
+
+      } ).join( RevealHighlight.HIGHLIGHT_STEP_DELIMITER );
+
+    }
+
+  }
+
+  Reveal.registerPlugin( 'highlight', RevealHighlight );
+
+  return RevealHighlight;
+
+}));
+        }
       end
     end
   end

data/lib/asciidoctor-revealjs/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Revealjs
-  VERSION = '3.1.0'
+  VERSION = '4.0.0'
 end
 end

data/templates/asciidoctor-compatibility.css

@@ -0,0 +1,141 @@
+.reveal div.right{float:right}
+
+/* listing block */
+.reveal .listingblock.stretch>.content{height: 100%}
+.reveal .listingblock.stretch>.content>pre{height: 100%}
+.reveal .listingblock.stretch>.content>pre>code{height:100%;max-height:100%}
+
+/* tables */
+table{border-collapse:collapse;border-spacing:0}
+table{margin-bottom:1.25em;border:solid 1px #dedede}
+table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;text-align:left}
+table tr th,table tr td{padding:.5625em .625em;font-size:inherit}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
+td.tableblock>.content{margin-bottom:1.25em}
+td.tableblock>.content>:last-child{margin-bottom:-1.25em}
+table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
+table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
+table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
+table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
+table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
+table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
+table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
+table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
+table.frame-all{border-width:1px}
+table.frame-sides{border-width:0 1px}
+table.frame-topbot,table.frame-ends{border-width:1px 0}
+.reveal table th.halign-left,.reveal table td.halign-left{text-align:left}
+.reveal table th.halign-right,.reveal table td.halign-right{text-align:right}
+.reveal table th.halign-center,.reveal table td.halign-center{text-align:center}
+.reveal table th.valign-top,.reveal table td.valign-top{vertical-align:top}
+.reveal table th.valign-bottom,.reveal table td.valign-bottom{vertical-align:bottom}
+.reveal table th.valign-middle,.reveal table td.valign-middle{vertical-align:middle}
+table thead th,table tfoot th{font-weight:bold}
+tbody tr th{display:table-cell;line-height:1.6}
+tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{font-weight:bold}
+thead{display:table-header-group}
+
+.reveal table.grid-none th,.reveal table.grid-none td{border-bottom:0!important}
+
+/* kbd macro */
+kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
+.keyseq kbd:first-child{margin-left:0}
+.keyseq kbd:last-child{margin-right:0}
+
+/* callouts */
+.conum[data-value] {display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value] *{color:#fff!important}
+.conum[data-value]+b{display:none}
+.conum[data-value]:after{content:attr(data-value)}
+pre .conum[data-value]{position:relative;top:-.125em}
+b.conum *{color:inherit!important}
+.conum:not([data-value]):empty{display:none}
+/* Callout list */
+.hdlist>table,.colist>table{border:0;background:none}
+.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
+td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
+td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+/* Disabled from Asciidoctor CSS because it caused callout list to go under the
+ * source listing when .stretch is applied (see #335)
+ * .literalblock+.colist,.listingblock+.colist{margin-top:-.5em} */
+.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
+.colist td:not([class]):first-child img{max-width:none}
+.colist td:not([class]):last-child{padding:.25em 0}
+
+/* Override Asciidoctor CSS that causes issues with reveal.js features */
+.reveal .hljs table{border: 0}
+/* Callout list rows would have a bottom border with some reveal.js themes (see #335) */
+.reveal .colist>table th, .reveal .colist>table td {border-bottom:0}
+/* Fixes line height with Highlight.js source listing when linenums enabled (see #331) */
+.reveal .hljs table thead tr th, .reveal .hljs table tfoot tr th, .reveal .hljs table tbody tr td, .reveal .hljs table tr td, .reveal .hljs table tfoot tr td{line-height:inherit}
+
+/* Columns layout */
+.columns .slide-content {
+  display: flex;
+}
+
+.columns.wrap .slide-content {
+  flex-wrap: wrap;
+}
+
+.columns.is-vcentered .slide-content {
+  align-items: center;
+}
+
+.columns .slide-content > .column {
+  display: block;
+  flex-basis: 0;
+  flex-grow: 1;
+  flex-shrink: 1;
+  padding: .75rem;
+}
+
+.columns .slide-content > .column.is-full {
+  flex: none;
+  width: 100%;
+}
+
+.columns .slide-content > .column.is-four-fifths {
+  flex: none;
+  width: 80%;
+}
+
+.columns .slide-content > .column.is-three-quarters {
+  flex: none;
+  width: 75%;
+}
+
+.columns .slide-content > .column.is-two-thirds {
+  flex: none;
+  width: 66.6666%;
+}
+
+.columns .slide-content > .column.is-three-fifths {
+  flex: none;
+  width: 60%;
+}
+
+.columns .slide-content > .column.is-half {
+  flex: none;
+  width: 50%;
+}
+
+.columns .slide-content > .column.is-two-fifths {
+  flex: none;
+  width: 40%;
+}
+
+.columns .slide-content > .column.is-one-third {
+  flex: none;
+  width: 33.3333%;
+}
+
+.columns .slide-content > .column.is-one-quarter {
+  flex: none;
+  width: 25%;
+}
+
+.columns .slide-content > .column.is-one-fifth {
+  flex: none;
+  width: 20%;
+}