jekyll-zettel 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b6da890e13652de4456d21ad0d8f880dff08e04e1a26fab37a6d14cb9ba81bf
-  data.tar.gz: f7bbaa9687435ed01409d8fde19f71e7ca19020e25c60eb261ba49c3ff938518
+  metadata.gz: 6dc8ae8e1d8e9f8b35d24f2a711c77e1cac2bf42a8a7b3dd33d363a23fee5518
+  data.tar.gz: 79ef605ddec8abf5b96258b743f5c15772ffcf4c029d32d67dd45c654442fe1f
 SHA512:
-  metadata.gz: a4d14c20181512d33bbf3bec360cb9a8ab7e5582d4f8ba38d8cfaee5558d604c3685501ad08db20a3c01c48cdbec8a638f29a9f67d055eaaeba8928f66f14a32
-  data.tar.gz: 51f95e04a356377ac683e0421c587d263d830acd55d1396be9f10b4cdf2b35fbc4124e52c17b7b99ae30340e54c26ea127ea803e67d39eacefc59d4c541d0132
+  metadata.gz: 49dfaef4d13597586bd7c198440e2bf81de9beecf9820b75321925fac61b2dd2390546f4e62510e94de8831eff84402c352e347e14fdf58f742b9ec83b36af9a
+  data.tar.gz: 41b2e42ac0ab78a5f8b28f3261aaa502e3d2fd42ddbd22e1b7fdbe0a80ef04600f6ffa022e0fb274d7af8725b6ef65b545277915d59ed80559156606429dae8c

data/CHANGELOG.md

@@ -10,3 +10,10 @@
 
 - Changed inline citation regex to be compatible with pandoc [@<key>…]
 - Emit warning when no reference for given _cite-key_ is found
+
+### 0.7.2
+
+- Objektkatalog aliases.json mit Mapping von Tag Klarnamen und Alternativen wird jetzt generiert
+- Log-Level beim Serialisieren der Objektkataloge auf debug gestellt
+- Jetzt werden auch Links auf Keywords erkannt und automatisch mit der jeweiligen Glosse verlinkt
+- 

data/lib/jekyll/zettel/citedown.rb

@@ -5,10 +5,17 @@ module Kramdown
 
       def initialize(source, options)
         super
-        @citeproc = Jekyll.sites[0].config['citeproc']
-        @references = Jekyll.sites[0].data['references']
-        @zettel = Jekyll.sites[0].data['zettelkasten']
-        @span_parsers.unshift(:citation)
+        site = Jekyll.sites[0]
+
+        @citeproc = site.config['citeproc']
+        @references = site.data['references']
+        @keywords = site.data['aliases']
+        @zettel = site.data['zettelkasten']
+
+        @span_parsers.unshift(:citation, :keyword)
+
+        # So geht’s mit <i>, <b>, <em> und <strong> weiter
+        # @span_parsers.delete(:emphasis)
       end
 
       CITATION = /\[@([\w,:]+)(;\s*(.*))?\]/.freeze
@@ -23,7 +30,7 @@ module Kramdown
         if @references.key?(cite_key)
           add_citation(cite_key, note, start_line_number)
         else
-          add_error(cite_key)
+          log_warning('cite-key', cite_key)
         end
       end
 
@@ -31,8 +38,8 @@ module Kramdown
         citation = @citeproc.render :citation, id: cite_key, locator: note, label: :note
         attributes = {
           'href' => "/zettel/#{@references[cite_key]['id']}/",
-          'title' => @zettel[@references[cite_key]['id']]['description'],
-          'style' => 'box-shadow: initial; border: none;'
+          'title' => @zettel[@references[cite_key]['id']]['title'],
+          'class' => 'citation'
         }
         link = Element.new(:a, nil, attributes, location: start_line_number)
 
@@ -40,12 +47,40 @@ module Kramdown
         @tree.children << link
       end
 
-      def add_error(cite_key)
-        Jekyll.logger.warn 'Zettel:', "Missing entry for cite-key @#{cite_key}"
-        @tree.children << Element.new(:raw, "<span class=\"error\">Missing entry for cite-key @#{cite_key}</span>")
+      define_parser(:citation, CITATION, '\[@')
+
+      KEYWORD = /\[#([\w]+)\]/.freeze
+
+      def parse_keyword
+        start_line_number = @src.current_line_number
+        @src.pos += @src.matched_size
+
+        keyword = @src[1]
+        if @keywords.key?(keyword)
+          add_keyword(keyword, start_line_number)
+        else
+          log_warning('keyword', keyword)
+        end
       end
 
-      define_parser(:citation, CITATION, '\[@')
+      def add_keyword(keyword, start_line_number)
+        attributes = {
+          'href' => "/glosse/#{@keywords[keyword]['slug']}/",
+          'title' => @keywords[keyword]['tag'],
+          'class' => 'keyword'
+        }
+        link = Element.new(:a, nil, attributes, location: start_line_number)
+
+        link.children << Element.new(:raw, keyword)
+        @tree.children << link
+      end
+
+      define_parser(:keyword, KEYWORD, '\[#')
+
+      def log_warning(catalog, entry)
+        Jekyll.logger.warn 'Zettel:', "Missing entry for #{catalog} `#{entry}`"
+        @tree.children << Element.new(:raw, "<span class=\"error\">Missing entry for #{catalog} `#{entry}`</span>")
+      end
 
     end
   end

data/lib/jekyll/zettel/tags.rb

@@ -10,17 +10,26 @@ module Jekyll
 
       def generate(site)
         @site = site
+
+        @site.data['aliases'] = {}
         @site.data['tags'] = {}
         @site.data['tag2glosse'] = {}
 
-        site.pages.each do |page|
+        register
+
+        write_catalog 'aliases'
+        write_catalog 'tags'
+        write_catalog 'tag2glosse'
+      end
+
+      def register
+        @site.pages.each do |page|
           next unless SLUG_FORMAT.match?(page.path.to_s)
 
           register_tag(page)
+          register_tags(page)
+          register_aliases(page)
         end
-
-        write_catalog 'tags'
-        write_catalog 'tag2glosse'
       end
 
       def register_tag(doc)
@@ -33,17 +42,33 @@ module Jekyll
           'tags' => doc.data['tags']
         }
         doc.data['slug'] = parts[:slug]
-        register_tags(doc)
+      end
+
+      def register_aliases(doc)
+        @site.data['aliases'][doc.data['tag']] = {
+          'slug' => doc.data['slug'],
+          'tag' => doc.data['tag'],
+          'description' => doc.data['description']
+        }
+        return unless doc.data.key?('aliases')
+
+        doc.data['aliases'].each do |item|
+          @site.data['aliases'][item] = {
+            'slug' => doc.data['slug'],
+            'tag' => doc.data['tag'],
+            'description' => doc.data['description']
+          }
+        end
       end
 
       def register_tags(doc)
         return unless doc.data.key?('tags')
 
-        doc.data['tags'].each { |tag|
+        doc.data['tags'].each do |tag|
           @site.data['tag2glosse'][tag] = [] unless @site.data['tag2glosse'].key?(tag)
 
           @site.data['tag2glosse'][tag] << doc.data['slug']
-        }
+        end
       end
     end
   end

data/lib/jekyll/zettel/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Zettel
-    VERSION = '0.7.1'.freeze
+    VERSION = '0.7.2'.freeze
   end
 end

data/lib/jekyll/zettel.rb

@@ -16,7 +16,7 @@ module Jekyll
     class Error < StandardError; end
 
     def write_catalog(object)
-      Jekyll.logger.info LOG_KEY, "Created references in `#{@site.in_dest_dir('.objects', "#{object}.json")}`"
+      Jekyll.logger.debug LOG_KEY, "Created references in `#{@site.in_dest_dir('.objects', "#{object}.json")}`"
 
       page = Jekyll::PageWithoutAFile.new(@site, @site.source, '.objects', "#{object}.json").tap do |file|
         file.content = JSON.pretty_generate(@site.data[object.to_s])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zettel
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Michael Gerzabek
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citeproc-ruby