mmmd 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8368bf270f4bdba9a1510c3c1f3106a5a56a43bdaf63673219bd7a082de436c6
-  data.tar.gz: f7a9e9a9457be72c8ffae3edfb531d4193be174df5db1714fd215809a4c41825
+  metadata.gz: 1a8790d6e9e6e5a9e3164e1f6f3ecf019cc73876d231676c562eb33925cea1a1
+  data.tar.gz: 738942fca7cea39dbd6fd4fcb15b46d643646e5c5fbb90593f7bf330f967c8ae
 SHA512:
-  metadata.gz: 53fea17654973076e1c9fab3256d8034577c04ea684ee64aaa620bf71bd228c98bed317f3c2b7028298a0eae7ccc6cef4587b3b95b83bc52396327f366d01544
-  data.tar.gz: 469aba569708c8e2b88efa34bddf594ac6cd71fb389365e69ff3ef50fc09d7611eaf96c91bbe182ef52ba1c36505bf5df5a51ea733d0231defcaa4b72bb3ffca
+  metadata.gz: cc7e8c75e20ced1af9c502ebfc5453489c427a61f2c8b7e9e0fa26d50dcaf56df3f522c5e560fca0b27f4d06603ca8e6bb9a720f9dc00929c9c847f408301709
+  data.tar.gz: 03e2bcfff6462f28dc3439afdf02667a3944b6053e2b42da86fa2e1bfd4fffb8faa1bbfe2bcd4a0eaef006e6f22c9120a6cab365d475e294ccc3780e16dbba41

data/lib/mmmd/blankshell.rb

@@ -79,11 +79,12 @@ module PointBlank
           [process_destination(result[0].gsub(/\\(?=[><])/, '')[1..-2]),
            text.delete_prefix(result[0]).lstrip]
         elsif (result = text.match(/\A\S+/)) &&
-              !result[0].start_with?('<') &&
-              result &&
-              balanced?(result[0])
-          [process_destination(result[0]),
-           text.delete_prefix(result[0]).lstrip]
+              (lnk = result[0]) &&
+              !lnk.start_with?('<') &&
+              (lnk = (ix = find_balanced_end(lnk)) ? lnk[..ix - 1] : lnk) &&
+              balanced?(lnk)
+          [process_destination(lnk),
+           text.delete_prefix(lnk).lstrip]
         else
           [nil, text]
         end
@@ -125,7 +126,7 @@ module PointBlank
           destination, remaining = read_destination(remaining[1..])
           return [nil, text] unless destination
 
-          title, remaining = read_title(remaining)
+          title, remaining = read_title(remaining.lstrip)
           properties[:uri] = destination
           properties[:title] = title
           close_bracket = true
@@ -164,7 +165,7 @@ module PointBlank
             bracketcount += 1
           elsif part == ')'
             bracketcount -= 1
-            return index if bracketcount.zero?
+            return index if bracketcount <= 0
           end
           index += part.length
         end
@@ -366,7 +367,7 @@ module PointBlank
 
       # (see ::PointBlank::Parsing::NullParser#consume)
       def consume(line, parent = nil, lazy: false)
-        @lazy_triggered = lazy || @lazy_triggered
+        @lazy_triggered = lazy || @lazy_triggered unless line.strip.empty?
         return [nil, nil] if line.match?(/\A {0,3}\Z/)
         return [nil, nil] if @closed
         return [nil, nil] if check_candidates(line, parent)
@@ -956,9 +957,9 @@ module PointBlank
         parts = tokens
         @valid_parsers.each do |parser|
           newparts = []
-          parts.each do |x|
+          parts.each_with_index do |x, i|
             if x.is_a? String
-              newparts.append(*parser.tokenize(x))
+              newparts.append(*parser.tokenize(x, newparts.last, parts[i + 1]))
             else
               newparts.append(x)
             end
@@ -1012,8 +1013,10 @@ module PointBlank
 
       # Tokenize a string
       # @param string [String]
+      # @param before [String, ::PointBlank::DOM::DOMObject]
+      # @param after [String, ::PointBlank::DOM::DOMObject]
       # @return [Array<Array(String, Class, Symbol), String>]
-      def self.tokenize(string)
+      def self.tokenize(string, _before, _after)
         [string]
       end
 
@@ -1141,18 +1144,11 @@ module PointBlank
     # Code inline parser
     class CodeInline < NullInline
       # (see ::PointBlank::Parsing::NullInline#tokenize)
-      def self.tokenize(string)
-        open = {}
+      def self.tokenize(string, *_lookaround)
         iterate_tokens(string, "`") do |_before, current_text, matched|
           if matched
             match = current_text.match(/^`+/)[0]
-            if open[match]
-              open[match] = nil
-              [match, self, :close]
-            else
-              open[match] = true
-              [match, self, :open]
-            end
+            [match, self, :open]
           else
             current_text[0]
           end
@@ -1169,9 +1165,9 @@ module PointBlank
           text = (part.is_a?(Array) ? part.first : part)
           buffer += text
           next unless part.is_a? Array
+          next if idx.zero?
 
-          break (cutoff = idx) if part.first == opening &&
-                                  part.last == :close
+          break (cutoff = idx) if part.first == opening
         end
         buffer = construct_literal(buffer[opening.length..(-1 - opening.length)])
         [cutoff.positive? ? build([buffer]) : opening, parts[(cutoff + 1)..]]
@@ -1181,7 +1177,7 @@ module PointBlank
     # Autolink inline parser
     class AutolinkInline < NullInline
       # (see ::PointBlank::Parsing::NullInline#tokenize)
-      def self.tokenize(string)
+      def self.tokenize(string, *_lookaround)
         iterate_tokens(string, /[<>]/) do |_before, current_text, matched|
           if matched
             if current_text.start_with?("<")
@@ -1237,11 +1233,10 @@ module PointBlank
         linkinfo = capture[-1][2]
         obj = build(capture[1..-2])
         if linkinfo[:label]
-          if (props = doc.root.properties[:linkdefs][linkinfo[:label]])
-            linkinfo = props
-          else
+          unless (props = doc.root.properties[:linkdefs][linkinfo[:label]])
             return nil
           end
+          linkinfo = props
         end
         obj.properties = linkinfo
         obj
@@ -1276,7 +1271,7 @@ module PointBlank
       end
 
       # (see ::PointBlank::Parsing::NullInline#tokenize)
-      def self.tokenize(string)
+      def self.tokenize(string, *_lookaround)
         iterate_tokens(string, /(?:!\[|\]\()/) do |_before, text, matched|
           next text[0] unless matched
           next ["![", self, :open] if text.start_with? "!["
@@ -1295,7 +1290,7 @@ module PointBlank
       end
 
       # (see ::PointBlank::Parsing::NullInline#tokenize)
-      def self.tokenize(string)
+      def self.tokenize(string, *_lookaround)
         iterate_tokens(string, /(?:\[|\][(\[])/) do |_before, text, matched|
           next text[0] unless matched
           next ["[", self, :open] if text.start_with? "["
@@ -1307,20 +1302,61 @@ module PointBlank
       end
     end
 
+    # TODO: this seems way too complicated for something that's supposed
+    # to be a goddamn emphasis markup parser. i'd blame it on commonmark's
+    # convoluted specs.
+    # (P.S: it could be possible to make this easier for implementers by
+    # making a claims system with pointers that do not modify the string
+    # while it's being parsed. however that would just move complexity from
+    # the parser into the scanner instead. and it does not resolve the
+    # problem of overlapping claims as efficiently as simply splitting text
+    # into tokens and remaining string bits.)
+
     # Emphasis and strong emphasis inline parser
     class EmphInline < NullInline
       INFIX_TOKENS = /^[^\p{S}\p{P}\p{Zs}_]_++[^\p{S}\p{P}\p{Zs}_]$/
       # (see ::PointBlank::Parsing::NullInline#tokenize)
-      def self.tokenize(string)
+      def self.tokenize(string, before, after)
+        bfrb = extract_left(before)
+        afra = extract_right(after)
         iterate_tokens(string, /(?:_++|\*++)/) do |bfr, text, matched|
           token, afr = text.match(/^(_++|\*++)(.?)/)[1..2]
-          left = left_token?(bfr[-1] || "", token, afr)
-          right = right_token?(bfr[-1] || "", token, afr)
+          bfr = bfr[-1] || bfrb || ""
+          afr = afr.empty? ? afra || "" : afr
+          left = left_token?(bfr, token, afr)
+          right = right_token?(bfr, token, afr)
           break_into_elements(token, [bfr[-1] || "", token, afr].join(''),
                               left, right, matched)
         end
       end
 
+      # Extract left-flanking token from before the tokenized string
+      # @param bfr [String, ::PointBlank::DOM::DOMObject, Array(String, Class, Symbol)]
+      # @return [String]
+      def self.extract_left(bfr)
+        case bfr
+        when String
+          bfr[-1]
+        when ::PointBlank::DOM::DOMObject
+          "."
+        when Array
+          bfr.first[-1]
+        end
+      end
+
+      # Extract right-flanking token from after the tokenized string
+      # @param afr [String, ::PointBlank::DOM::DOMObject, Array(String, Class, Symbol)]
+      # @return [String]
+      def self.extract_right(afr)
+        case afr
+        when String
+          afr[0]
+        when ::PointBlank::DOM::DOMObject
+          "."
+        when Array
+          afr.first[0]
+        end
+      end
       # Is this token, given these surrounding characters, left-flanking?
       # @param bfr [String]
       # @param token [String]
@@ -1385,8 +1421,9 @@ module PointBlank
                                ((blk.first.length % 3).zero? &&
                                 (closer.first.length % 3).zero?))
             (open ? capture : before).prepend(blk)
-            next unless blk.is_a?(Array)
-            return backlog unless blk[1].check_contents(capture)
+            next unless blk.is_a?(Array) && !open
+
+            return backlog unless closer[1].check_contents(capture)
           end
           return backlog if open
 
@@ -1430,7 +1467,7 @@ module PointBlank
     # Hard break
     class HardBreakInline < NullInline
       # (see ::PointBlank::Parsing::NullInline#tokenize)
-      def self.tokenize(string)
+      def self.tokenize(string, *_lookaround)
         iterate_tokens(string, /(?:  \n|\\\n)/) do |_before, token, matched|
           next ["\n", self, :close] if token.start_with?("  \n")
           next ["\n", self, :close] if matched

data/lib/mmmd/renderers/plainterm.rb

@@ -165,6 +165,12 @@ module MMMD
       TEXT
     end
 
+    # Draw a horizontal rule
+    def hrule(_text, options)
+      size = options[:hsize]
+      " #{'─' * (size - 2)} "
+    end
+
     # Draw text right-justified
     def rjust(text, options)
       size = options[:hsize]
@@ -314,11 +320,12 @@ module MMMD
           increase_level: true
         },
         "PointBlank::DOM::HorizontalRule" => {
-          underline_full_block: true
+          hrule: true
         }
       }.freeze
 
       DEFAULT_EFFECT_PRIORITY = {
+        hrule: 10_500,
         numbered: 10_000,
         leftline: 9500,
         bullet: 9000,

data/test.md

@@ -0,0 +1 @@
+tokens blahblah **[test](/pee)** more tokens

data/test2.md

@@ -0,0 +1,12 @@
+> **Quote block**
+>
+> a**.not even emphasis.**b
+>
+> a**[neither is this emphasis](/uri 'but should it be?')**x
+>
+> **[emphasized image link ![image](/uri)](/link)**
+> 
+> titlet
+> ======
+>
+> amongus

data/test3.md

@@ -0,0 +1 @@
+**test<http://autolink`>[stuff`[dat](#lonk)[`...](#stuff)**

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmmd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Yessiest
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2025-03-08 00:00:00.000000000 Z
+date: 2012-01-01 00:00:00.000000000 Z
 dependencies: []
 description: |
   MMMD (short for Mark My Manuscript Down) is a Markdown processor
@@ -23,6 +23,9 @@ extra_rdoc_files:
 - README.md
 - architecture.md
 - security.md
+- test.md
+- test2.md
+- test3.md
 files:
 - README.md
 - architecture.md
@@ -35,6 +38,9 @@ files:
 - lib/mmmd/renderers/plainterm.rb
 - lib/mmmd/util.rb
 - security.md
+- test.md
+- test2.md
+- test3.md
 homepage: https://adastra7.net/git/Yessiest/rubymark
 licenses:
 - AGPL-3.0-or-later