juicelang-theme 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d091d794594724f2fd4ddd2a8cc25650237a83517536a4bfd13ced599aac2a9c
-  data.tar.gz: 7645974aa4ce62c401c117905c266df4a23986b7dc1b31928baa03082900086e
+  metadata.gz: 0f852df9e1751836546ec0ea84f1db906a60950456da13f4b9544a672a4fe784
+  data.tar.gz: c8885eb5faa5508b89a0b04dd6044a3f4d1f1af4739f3a1fe7956a0aa688f40c
 SHA512:
-  metadata.gz: bf17f82e1968ada92376d0fadf83f4cab66fa9cf97fbf9ade047f6f779dacc6ce31c76a0045d2ac8b3eeeef921318fc9c4461457a457b0fdbe06de47d5059b84
-  data.tar.gz: 7bf696530ca7be79464512b87b728f2379867a96e3667e308012b9d86f281c633c2c6d5a0ef0ad8e0ac22d614f4e74bf324d1c20d1ab55c76e9522cb8d8dfde1
+  metadata.gz: 27994731614627460d4908dfc7accfa2e36e736b3050dc1128a92ade56104a6c7ffd3bc47c9adc228c82cc04bb2c9399e0844a410f7a21690e7e944f2d8fc6d1
+  data.tar.gz: d326873e94ae956149ca4b627fe7f17a37a5b7303fdeeb01cd213b7c3cd9cfe620d5adbc5103ec86e826e9860c06fe6e1903308a0a38c357048dbe053cbd2b81

data/_includes/nav.html

@@ -1,6 +1,6 @@
 <div id="{{ include.id }}" uk-offcanvas="mode: push{% if include.flip %}; flip: true{% endif %}">
     <div class="uk-offcanvas-bar">
-        <ul class="uk-nav-default" uk-nav='{"toggle": "> a.nav-parent-toggle"}''>
+        <ul class="uk-nav-default" uk-nav='{"toggle": "> a.nav-parent-toggle"}'>
             {% assign navigation = site.data.navigation[include.navigation] %}
             {% assign indexPage = site.pages | find: "path", navigation.index_path %}
             <li class="uk-nav-header"><a href="{{ indexPage | url_without_ext }}">{{ navigation.title }}</a></li>

data/lib/custom_tags.rb

@@ -4,8 +4,6 @@ require 'jekyll'
 require 'kramdown'
 require 'liquid'
 
-require_relative 'markdown_toc'
-
 
 class ToCTag < Liquid::Tag
     def initialize(tag_name, input, tokens)
@@ -15,22 +13,28 @@ class ToCTag < Liquid::Tag
     def render(context)
         toc = Kramdown::Document.new(context.registers[:page]['content'], {
             input: "GFM"
-        }).to_ToC
-        build_list(toc.select { |item| item[0] == 2 }, toc.first)
+        }).to_Toc
+        build_list(toc, context)
     end
 
     private
 
-    def build_list(toc, top)
-        result = '<li class="uk-active"><a href="#' + top[1] + '">' + top[2][0].value + '</a></li>' + "\n"
+    def build_list(toc, context)
+        top = toc.children.first.value
+        result = '<li class="uk-active"><a href="#' + top.attr['id'] + '">' + elementToHTML(top, context) + '</a></li>' + "\n"
 
-        for i in 0...toc.count
-            item = toc[i]
-            result += '<li><a href="#' + item[1] + '">' + item[2][0].value + "</a></li>\n"
+        for item in toc.children.first.children.map { |e| e.value }
+            result += '<li><a href="#' + item.attr['id'] + '">' + elementToHTML(item, context) + "</a></li>\n"
         end
 
         result
     end
+
+    def elementToHTML(el, context)
+        root = Kramdown::Element.new(:root, nil, nil, encoding: context.registers[:page]['content'].encoding)
+        root.children = el.children
+        Kramdown::Converter::CustomHtml.convert(root).first
+    end
 end
 
 Liquid::Template.register_tag('toc', ToCTag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: juicelang-theme
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Josef Zoller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -275,7 +275,6 @@ files:
 - lib/juice_lexer.rb
 - lib/juicelang-theme.rb
 - lib/markdown.rb
-- lib/markdown_toc.rb
 homepage: https://github.com/juice-lang/juicelang-theme
 licenses:
 - MIT

data/lib/markdown_toc.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'jekyll'
-require 'kramdown'
-
-class Kramdown::Converter::ToC < Kramdown::Converter::Html
-    def convert(el, indent = -@indent)
-        result = super
-        return result unless el.type == :root
-
-        @toc
-    end
-end