darkmouun 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4402d38faf236b8d8ae285750e9b6711bc8fe10e85090dba4ef04ebcefb21564
-  data.tar.gz: 6093ca51565f4b148a7f5a54043c7ebd6e17f4ff25c3dde1c8797f894e17c363
+  metadata.gz: 492ae2025363d14715feebc98f4887f2af2dc816116fe76f36f91ace07741bd5
+  data.tar.gz: '01881945504107cba0d53f15d60ab88e9117d3f693d17b0c607a8f2bb2378813'
 SHA512:
-  metadata.gz: 57b91ad4f2d72203bb195b7c8bae10ef43b8f258ca194581a62dea4e2e0acccafab5cfde498c5bb30de9ac4b68d67c0e745339a0ea1b56d803cfe85aca1a2313
-  data.tar.gz: eb212f8d4a899efe746a31731ab2e8a47a46293d8d446530b353904ed81b087bac1e0a4cc94d7c25fb4807e9ba735228c9b282127311e2e298c52e9964903373
+  metadata.gz: 9156693f93d1a156b41835ecb685b3799945bd1aee46a37f8b85b43d889e47f28b79f1664f1500badca0f5fcf89762b406c4803255975687d9443b1a9aac9f66
+  data.tar.gz: 1c0191411b440d3c97fde80a6031d3c4d3d7f29fbbd906d347652c2646fee4045ff7c55c091b0bae8b50d4930762a302cde63da7f0cc5b0528e3a6fc2766c10e

data/README.md

@@ -95,9 +95,9 @@ dkmn.convert    #=> <p>The Calculation:</p>
 
 Darkmouun has extended to kramdown. Extensions are below;
 
-1. **Plain Span element form.** `[[spanned phrase]]` is converted to `<span>spanned phrase</span>`.
+1. **Plain span element form.** `[spanned phrase]` is converted to `<span>spanned phrase</span>`.
 
-2. **Style attribute abbreviation form.** `%attritute_name:value;` in IAL is converted to `style="attribute_name:value;"`.<br/>**ex.** `{:%color:#ffffff; %font-weight:bold;}` -> `style="color:#ffffff; font-weight:bold;"`<br/>**ATTENSION:** Every attribute must be started from "`%`" and ended with "`;`".
+2. **Style IAL form.** `%attritute_name:value;` in IAL is converted to `style="attribute_name:value;"`.<br/>**ex.** `{:%color:#ffffff; %font-weight:bold;}` -> `style="color:#ffffff; font-weight:bold;"`<br/>**ATTENSION:** Every attribute must be started from "`%`" and ended with "`;`".
 
 ## Development
 

data/lib/darkmouun/kramdown/converter/html.rb

@@ -6,7 +6,11 @@ module Kramdown
   module Converter
     class Html
       def convert_span(el, indent)
-        format_as_span_html('span', el.attr, inner(el, indent))
+        if el.attr.empty?
+          "[#{inner(el, indent)}]"
+        else
+          format_as_span_html('span', el.attr, inner(el, indent))
+        end
       end
     end
   end

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)
@@ -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)
@@ -47,48 +57,54 @@ module Kramdown
               warning("No link definition for link ID '#{link_id}' found on line #{start_line_number}")
             end
             @src.revert_pos(saved_pos)
-            add_text(result)
+            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/kramdown/parser/kramdown/span.rb

@@ -6,14 +6,13 @@ module Kramdown
   module Parser
     class Kramdown
 
-      SPAN_START = /(?:\[\s*?)/
-
       # Parse the span at the current location.
       def parse_span
         start_line_number = @src.current_line_number
         saved_pos = @src.save_pos
 
-        result = @src.scan(SPAN_START)
+        span_start = /(?:\[\s*?)/
+        result = @src.scan(span_start)
         stop_re = /(?:\s*?\])/
 
         el = Element.new(:span, nil, nil, :location => start_line_number)
@@ -23,11 +22,6 @@ module Kramdown
 
         if found
           @src.scan(stop_re)
-          if @src.check(/\(/)
-            @src.revert_pos(saved_pos)
-            parse_link
-            return
-          end
           @tree.children << el
         else
           @src.revert_pos(saved_pos)
@@ -35,7 +29,6 @@ module Kramdown
           add_text(result)
         end
       end
-      define_parser(:span, SPAN_START, '\[')
 
     end
   end

data/lib/darkmouun/kramdown.rb

@@ -9,15 +9,5 @@ module Kramdown
   class Element
     CATEGORY[:span] = :span
   end
-
-  module Parser
-    class Kramdown
-      alias_method :super_initialize, :initialize
-      def initialize(source, options)
-        super_initialize(source, options)
-        @span_parsers.insert(5, :span)
-      end
-    end
-  end
 end
 

data/lib/darkmouun/version.rb

@@ -1,3 +1,3 @@
 module Darkmouun
-  VERSION = "2.0.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darkmouun
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Akinori Ichigo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-05 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: []