darkmouun 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e5ba37ba1ee837c723ff67a384a4104f24aa592c1b33d4fa328faaf089a539
-  data.tar.gz: 72e1fbe968e1a41b657918349ea2692516ece783fabfaf762e1ab7cab10b7264
+  metadata.gz: 4a2c3b66f4fb9ab93a3c8671b722b770baed774650dfc2ce0d84d300198d5c30
+  data.tar.gz: 98b7467119e5af5bd55f0b5e309db72fb3063a40eb2577a907319b87d2ddd24c
 SHA512:
-  metadata.gz: e208d87f52f188804fd3b25e28313f5d257e703984dc3f8d4091b09c7010e14721d9d64eae1ec799c37fe97ea990d260b8ad686f33f5f2bd19a3c2a54f5ce861
-  data.tar.gz: 0f58155fc090699282ca2020b48eb1a39d78c2bb6b31b619248d98b141bc2c7f8588b6d74540c9bb899e41a2c0bdf9f07f4244121ba0a6da8a8b0c71107fe17c
+  metadata.gz: 818936002fd0553e472bbf6cf3b533d80659729db7c066dbed502c42c44c17497a0e83722ae86b887b1575c68c2e4546d75ff1775f0e4fc80a0ecb90f6d78904
+  data.tar.gz: 3ce4f78657b946b1f23f8f73c4eb218ebc77a7ec70cf58387ab005f2357e96b481fbee0b3daca212bcf129837a36ee5ae4a7f235ab4d72c428fcc7ea2bcc6a69

data/lib/darkmouun/kramdown/parser/kramdown/extensions.rb

@@ -1,11 +1,18 @@
-# -*- coding: utf-8 -*-
-
-require 'kramdown'
+# -*- coding: utf-8; frozen_string_literal: true -*-
+#
+#--
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
 
 module Kramdown
   module Parser
     class Kramdown
 
+      # Parse the string +str+ and extract all attributes and add all found attributes to the hash
+      # +opts+.
       def parse_attribute_list(str, opts)
         return if str.strip.empty? || str.strip == ':'
         style_attr = []
@@ -16,8 +23,7 @@ module Kramdown
           elsif id_and_or_class
             id_and_or_class.scan(ALD_TYPE_ID_OR_CLASS).each do |id_attr, class_attr|
               if class_attr
-                opts[IAL_CLASS_ATTR] = (opts[IAL_CLASS_ATTR] || '') << " #{class_attr}"
-                opts[IAL_CLASS_ATTR].lstrip!
+                opts[IAL_CLASS_ATTR] = "#{opts[IAL_CLASS_ATTR]} #{class_attr}".lstrip
               else
                 opts['id'] = id_attr
               end
@@ -34,7 +40,7 @@ module Kramdown
           end
         end
         (opts['style'] = style_attr.join(' ')) unless style_attr.empty?
-        warning("No or invalid attributes found in IAL/ALD content: #{str}") if attrs.length == 0
+        warning("No or invalid attributes found in IAL/ALD content: #{str}") if attrs.empty?
       end
 
       ALD_TYPE_STYLE_ATTR = /%((?:--)?#{ALD_ID_NAME}:)\s*?((?:\\\}|\\;|[^\};])*?;)/

data/lib/darkmouun/kramdown/parser/kramdown/link.rb

@@ -1,10 +1,20 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
+#
+#--
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
 
 require 'kramdown/parser/kramdown/escaped_chars'
 
 module Kramdown
   module Parser
     class Kramdown
+
+      # Parse the link at the current scanner position. This method is used to parse normal links as
+      # well as image links, plain spans.
       def parse_link
         start_line_number = @src.current_line_number
         result = @src.scan(LINK_START)
@@ -16,7 +26,7 @@ module Kramdown
         # no nested links allowed
         if link_type == :a && (@tree.type == :img || @tree.type == :a ||
                                @stack.any? {|t, _| t && (t.type == :img || t.type == :a) })
-          parse_span
+          add_text(result)
           return
         end
         el = Element.new(link_type, nil, nil, location: start_line_number)
@@ -24,7 +34,7 @@ module Kramdown
         count = 1
         found = parse_spans(el, LINK_BRACKET_STOP_RE) do
           count += (@src[1] ? -1 : 1)
-          count - el.children.select {|c| c.type == :img || c.type == :span }.size == 0
+          count - el.children.select {|c| c.type == :img }.size == 0
         end
         unless found
           @src.revert_pos(saved_pos)
@@ -36,55 +46,65 @@ module Kramdown
 
         # reference style link or no link url
         if @src.scan(LINK_INLINE_ID_RE) || !@src.check(/\(/)
+          emit_warning = !@src[1]
           link_id = normalize_link_id(@src[1] || alt_text)
           if @link_defs.key?(link_id)
             link_def = @link_defs[link_id]
             add_link(el, link_def[0], link_def[1], alt_text,
                      link_def[2] && link_def[2].options[:ial])
           else
+            if emit_warning
+              warning("No link definition for link ID '#{link_id}' found on line #{start_line_number}")
+            end
             @src.revert_pos(saved_pos)
-            parse_span
+            if @src.check(/./) == ']'
+              add_text(result)
+            else
+              parse_span
+            end
           end
           return
         end
 
-        # link url in parentheses
-        if @src.scan(/\(<(.*?)>/)
-          link_url = @src[1]
-          if @src.scan(/\)/)
-            add_link(el, link_url, nil, alt_text)
-            return
-          end
-        else
-          link_url = +''
-          nr_of_brackets = 0
-          while (temp = @src.scan_until(LINK_PAREN_STOP_RE))
-            link_url << temp
-            if @src[2]
-              nr_of_brackets -= 1
-              break if nr_of_brackets == 0
-            elsif @src[1]
-              nr_of_brackets += 1
-            else
-              break
-            end
-          end
-          link_url = link_url[1..-2]
-          link_url.strip!
+       # link url in parentheses
+       if @src.scan(/\(<(.*?)>/)
+         link_url = @src[1]
+         if @src.scan(/\)/)
+           add_link(el, link_url, nil, alt_text)
+           return
+         end
+       else
+         link_url = +''
+         nr_of_brackets = 0
+         while (temp = @src.scan_until(LINK_PAREN_STOP_RE))
+           link_url << temp
+           if @src[2]
+             nr_of_brackets -= 1
+             break if nr_of_brackets == 0
+           elsif @src[1]
+             nr_of_brackets += 1
+           else
+             break
+           end
+         end
+         link_url = link_url[1..-2]
+         link_url.strip!
 
-          if nr_of_brackets == 0
-            add_link(el, link_url, nil, alt_text)
-            return
-          end
-        end
+         if nr_of_brackets == 0
+           add_link(el, link_url, nil, alt_text)
+           return
+         end
+       end
+
+       if @src.scan(LINK_INLINE_TITLE_RE)
+         add_link(el, link_url, @src[2], alt_text)
+       else
+         @src.revert_pos(saved_pos)
+         add_text(result)
+       end
+     end
+#      define_parser(:link, LINK_START, '!?\[')
 
-        if @src.scan(LINK_INLINE_TITLE_RE)
-          add_link(el, link_url, @src[2], alt_text)
-        else
-          @src.revert_pos(saved_pos)
-          add_text(result)
-        end
-      end
     end
   end
 end

data/lib/darkmouun/version.rb

@@ -1,3 +1,3 @@
 module Darkmouun
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darkmouun
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Akinori Ichigo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ metadata:
   homepage_uri: https://github.com/akinori-ichigo/darkmouun
   source_code_uri: https://github.com/akinori-ichigo/darkmouun
   changelog_uri: https://github.com/akinori-ichigo/darkmouun
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The Processting tool from Markdown to HTML
 test_files: []