schizm 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7974c85b370377641c71f2530a078dbe7fcbc8a
-  data.tar.gz: 122f46ff65ee2704ea0da40cc26bb62eedfcef80
+  metadata.gz: e2123141f335e7349ec095d5b078acc21f09ed75
+  data.tar.gz: 7751549bb232c6cd6d9d4e63e5a3fd5d3a659574
 SHA512:
-  metadata.gz: 4d96e2d5a4ee028fe26fdb14f63e05a493ad6a01fe0600697f3c6e377c8ef1050188928c74c28344ed0716c32126191f7894a647694d05dfd7213930aa198931
-  data.tar.gz: 065ce47ca1aa7e726a9c7f2b551f577d9ead32d02c8f417775b326ba221c20a7fddda6def39ad9aa598205ecdc65a46bf88ab19fa7127675e9bde866faa8d647
+  metadata.gz: a5c82e3b896e625eaf65d54dbef821c192f9bbd742beeb1f2a4d0e73e42a258caf9766ca7c96efb2d3db7dd4f13948c0e85c289a20f8f89c948fb04bd2f79d5c
+  data.tar.gz: a2919358945784a928cc2d48201e23013ae5ce72983a2bf4e644c055dd1d4381db3877707f84c959dae8ae4bfff209766ef82f55ca7759680d927bddc38afff4

data/lib/schizm/match.rb

@@ -33,6 +33,12 @@ module Schizm
   # Source path, extension put in match group 1.
   SOURCE_PATH = /^.*\.(c|cc|cpp|cxx|inl|tcc)$/
 
+  # Single quotes.
+  QUOTE1_STRING = /'((?:[^\\']*(?:\\.)*)*)'/u
+
+  # Double quotes.
+  QUOTE2_STRING = /"((?:[^\\"]*(?:\\.)*)*)"/u
+
   # Space sequence.
   SPACE = /\p{Space}+/u
 
@@ -100,13 +106,22 @@ module Schizm
   CHAR_ESCAPE = /\\(.)/u
 
   # Link definition, content put in match group 1, params put in match group 2.
-  LINK_DEF = /^\((#{DELIM_PARENS})\):[ ]*(.*)[ ]*\n/u
+  LINK_DEF = /^\[(#{DELIM_BRACKS})\]:[ ]*(.*)[ ]*\n/u
 
   # Link reference, content put in match group 1, params put in match group 2.
-  LINK_REF = /\[(#{DELIM_BRACKS})\]\((#{DELIM_PARENS})\)/um
+  LINK_REF_BRACKS = /\[(#{DELIM_BRACKS})\]\[(#{DELIM_BRACKS})\]/um
+ 
+  # Link reference, content put in match group 1, params put in match group 2.
+  LINK_REF_PARENS = /\[(#{DELIM_BRACKS})\]\((#{DELIM_PARENS})\)/um
+
+  # Image definition, entry put in match group 1, params put in match group 2.
+  IMAGE_DEF = /^!\[(#{DELIM_BRACKS})\]:[ ]*(.*)[ ]*\n/u
+
+  # Image reference, alt put in match group 1, params put in match group 2.
+  IMAGE_REF_PARENS = /!\[(#{DELIM_BRACKS})\]\((#{DELIM_PARENS})\)/u
 
-  # Link params, title put in match group 1, target put in match group 2.
-  LINK_PARAMS = /(?:"(.+?)"[ ]+)?(.+)/um
+  # Image reference, alt put in match group 1, params put in match group 2.
+  IMAGE_REF_BRACKS = /!\[(#{DELIM_BRACKS})\]\[(#{DELIM_BRACKS})\]/u
 
   # Center math, content put in match group 1.
   CENTER_MATH = /[$][$]((?:[^\\$]*(?:\\.)*)*)[$][$]/um
@@ -162,16 +177,16 @@ module Schizm
   ENTER_BUG = /^[ ]{0,3}[(][?][)]/u
 
   # Enter olist element.
-  ENTER_OLIST = /^[ ]{0,3}--[#]/u
+  ENTER_OLIST = /^[ ]{0,3}--?[#]/u
 
   # Enter ulist element.
-  ENTER_ULIST = /^[ ]{0,3}--[%]/u
+  ENTER_ULIST = /^[ ]{0,3}--?[%]/u
 
   # Enter tlist element, content put in match group 1.
   ENTER_TLIST = /^[ ]{0,3}\[([x ])\]/u
 
   # Enter dlist element, content put in match group 1.
-  ENTER_DLIST = /^[ ]{0,3}\[(#{DELIM_BRACKS})\]:/u
+  ENTER_DLIST = /^[ ]{0,3}(.*?)::/u
 
   # Enter code block.
   ENTER_CODE = /^[ ]{4,}(?=\p{Graph})/u
@@ -186,11 +201,11 @@ module Schizm
     [/\(r\)/ui, 174],       # Registered.
     [/\+-/u, 177],          # Plus minus.
     [/==/u, 8801],          # Identical.
-    [/~=/u, 8773],          # Congruent.
+    [/=~/u, 8773],          # Congruent.
     [/!=/u, 8800],          # Not equal.
     [/<=/u, 8804],          # Less equal.
     [/>=/u, 8805],          # Greater equal.
-    [/~~/u, 8776],          # Approximately.
+    [/~=/u, 8776],          # Approximately.
     [/--/u, 8211],          # En dash.
     [/---/u, 8212],         # Em dash.
     [/\.{3}/u, 8230],       # Ellipsis.

data/lib/schizm/parse.rb

@@ -1,18 +1,18 @@
 # Copyright (c) 2017 M. Grady Saunders
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
-# 
+#
 #   1. Redistributions of source code must retain the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer.
-# 
+#
 #   2. Redistributions in binary form must reproduce the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer in the documentation and/or other materials
 #      provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -61,6 +61,18 @@ module Parse
     return @@links
   end
 
+  @@images =
+    Hash.new do |hash, where|
+    hash[where] =
+      Hash.new do |hash, entry|
+      hash[entry] = Hash.new
+      end
+    end
+
+  def self.images
+    return @@images
+  end
+
   # Hash attribute reference.
   class HashAttr
     def initialize hash, attr
@@ -116,7 +128,7 @@ module Parse
           max_glyph = glyph
         end
       end
-      sscan.pointer = 
+      sscan.pointer =
       sscan.pointer + max_glyph_len
       return false if max_glyph_len == 0
       return true
@@ -128,23 +140,31 @@ module Parse
       when sscan.skip(HTML_ENTITY) then sscan[0]
       when sscan.skip(HTML_ESCAPE) then sscan[0].codepoints[0]
       when sscan.skip(CHAR_ESCAPE) then sscan[0].codepoints[0]
-      when sscan.skip(LINK_REF)
-        attrs = Hash.new
-        attrs["target"] = "_blank"
+      when sscan.skip(LINK_REF_PARENS)
         shown = String.new(sscan[1]).unescape("]")
         param = String.new(sscan[2]).unescape(")")
-        param = LINK_PARAMS.match(param)
-        if (param[2] =~ URI::regexp)
-          attrs["href"] = param[2]
-          attrs["title"] = param[1]
-        else
-          entry = param[2]
-          attrs["href"] = HashAttr.new @@links[where][entry], "href"
-          attrs["title"] = HashAttr.new @@links[where][entry], "title"
+        attrs = Hash.new
+        sscan2 = StringScanner.new(param)
+        until sscan2.eos?
+          case
+          when sscan2.skip(QUOTE1_STRING) then attrs["title"] = String.new(sscan2[1]).unescape("'")
+          when sscan2.skip(QUOTE2_STRING) then attrs["title"] = String.new(sscan2[1]).unescape("\"").gsub(/"/u, "'")
+          when sscan2.skip(/\p{Graph}+/u) then attrs["href"] = sscan2[0]
+          when sscan2.skip(/\p{Space}+/u) then nil
+          end
         end
         Markup.new("a")
+        .add_attrs("target" => "_blank")
         .add_attrs(attrs)
         .add_elems(line_elems(where, shown))
+      when sscan.skip(LINK_REF_BRACKS)
+        shown = String.new(sscan[1]).unescape("]")
+        param = String.new(sscan[2]).unescape("]")
+        Markup.new("a")
+        .add_attrs("target" => "_blank")
+        .add_attrs("title" => HashAttr.new(@@links[where][param], "title"))
+        .add_attrs("href" => HashAttr.new(@@links[where][param], "href"))
+        .add_elems(line_elems(where, shown))
       when sscan.skip(CENTER_MATH)
         Markup.new("script")
         .add_attrs(CENTER_MATH_ATTRS)
@@ -194,11 +214,11 @@ module Parse
     until sscan.eos?
       elems.add_elems(
       case
-      when (sscan.skip EMPTY_LINE) then nil
-      when (sscan.skip EOB_MARKER) then nil
-      when (sscan.skip HRULE)
+      when sscan.skip(EMPTY_LINE) then nil
+      when sscan.skip(EOB_MARKER) then nil
+      when sscan.skip(HRULE)
         Markup.new "hr"
-      when (sscan.skip HEADING_ATX)
+      when sscan.skip(HEADING_ATX)
         type = String.new sscan[1]
         text = String.new sscan[2]
         slug = text.slugify
@@ -211,7 +231,7 @@ module Parse
           when 5 then "h5"
           when 6 then "h6"
           end).add_elems(line_elems(where, text))
-      when (sscan.skip HEADING_SETEXT)
+      when sscan.skip(HEADING_SETEXT)
         type = String.new sscan[2]
         text = String.new sscan[1]
         slug = text.slugify
@@ -222,30 +242,72 @@ module Parse
           end).add_attrs("id" => slug)
               .add_attrs("class" => "title")
               .add_elems(line_elems(where, text))
-      when (sscan.skip LINK_DEF)
-        entry = String.new(sscan[1]).unescape(")")
-        param = String.new(sscan[2])#.unescape("]")
-        param_match = LINK_PARAMS.match param
-        @@links[where][entry]["href"] = param_match[2]
-        @@links[where][entry]["title"] = param_match[1]
+      when sscan.skip(LINK_DEF)
+        entry = String.new(sscan[1]).unescape("]")
+        sscan2 = StringScanner.new(sscan[2])
+        until sscan2.eos?
+          case
+          when sscan2.skip(QUOTE1_STRING) then @@links[where][entry]["title"] = String.new(sscan2[1]).unescape("'")
+          when sscan2.skip(QUOTE2_STRING) then @@links[where][entry]["title"] = String.new(sscan2[1]).unescape("\"").gsub(/"/u, "'")
+          when sscan2.skip(/\p{Graph}+/u) then @@links[where][entry]["href"] = sscan2[0]
+          when sscan2.skip(/\p{Space}+/u) then nil
+          end
+        end
         nil
-      when (sscan.skip /^#{CHUNK_LABEL}/u)
+      when sscan.skip(IMAGE_DEF)
+        entry = String.new(sscan[1]).unescape("]")
+        sscan2 = StringScanner.new(sscan[2])
+        until sscan2.eos?
+          case
+          when sscan2.skip(/w=(\d+)/u) then @@images[where][entry]["width"] = sscan2[1]
+          when sscan2.skip(/h=(\d+)/u) then @@images[where][entry]["height"] = sscan2[1]
+          when sscan2.skip(/\p{Graph}+/u) then @@images[where][entry]["src"] = sscan2[0]
+          when sscan2.skip(/\p{Space}+/u) then nil
+          end
+        end
+      when sscan.skip(/^[ ]{0,3}#{IMAGE_REF_PARENS}$/u)
+        alt = String.new(sscan[1]).unescape("]")
+        param = String.new(sscan[2]).unescape(")")
+        sscan2 = StringScanner.new(param)
+        attrs = Hash.new
+        until sscan2.eos?
+          case
+          when sscan2.skip(/w=(\d+)/u) then attrs["width"] = sscan2[1]
+          when sscan2.skip(/h=(\d+)/u) then attrs["height"] = sscan2[1]
+          when sscan2.skip(/\p{Graph}+/u) then attrs["src"] = sscan2[0]
+          when sscan2.skip(/\p{Space}+/u) then nil
+          end
+        end
+        Markup.new("img")
+        .add_attrs("alt" => alt)
+        .add_attrs(attrs)
+      when sscan.skip(/^[ ]{0,3}#{IMAGE_REF_BRACKS}$/u)
+        alt = String.new(sscan[1]).unescape("]")
+        entry = String.new(sscan[2]).unescape("]")
+        Markup.new("img")
+        .add_attrs("alt" => alt)
+        .add_attrs("src" => HashAttr.new(@@images[where][entry], "src"))
+        .add_attrs("width" => HashAttr.new(@@images[where][entry], "width"))
+        .add_attrs("height" => HashAttr.new(@@images[where][entry], "height"))
+      when sscan.skip(/^#{CHUNK_LABEL}/u)
         div = nil
         chunk = Chunk.hash[where][String.new(sscan[1]).unescape("]")]
         case
-        when (sscan.skip /[ ]*->[ ]*(.*?)\n/u)
+        when sscan.skip(/[ ]*->[ ]*(.*?)\n/u)
           chunk.target = sscan[1].strip
-        when (sscan.skip /[ ]*::[ ]*(.*?)\n/u)
+        when sscan.skip(/[ ]*::[ ]*(.*?)\n/u)
           case sscan[1].strip
           when "Share" then chunk.share = true
           when "Local" then chunk.share = false
           else raise "Unknown attribute."
           end
-        when (sscan.skip /[ ]*\#=[ ]*(.*?)\n/u)
+=begin
+        when sscan.skip(/[ ]*\#=[ ]*(.*?)\n/u)
           sscan[1].split(' ').each_with_index do |param, index|
             chunk.params[param][:index] = index
           end
-        when (sscan.skip /[ ]*\+=[ ]*(?:#{CHUNK_BLOCK})?\n/u)
+=end
+        when sscan.skip(/[ ]*\+=[ ]*(?:#{CHUNK_BLOCK})?\n/u)
           label = sscan[1]
           block = sscan.scan_until(END_INDENT)
           block = String.new(block).erase(INDENT).trim
@@ -287,7 +349,7 @@ module Parse
           ])
         end
         div
-      when (sscan.skip ENTER_ASIDE)
+      when sscan.skip(ENTER_ASIDE)
         text = sscan.scan_until END_INDENT
         text = String.new(text).erase INDENT
         Markup.new("div")
@@ -300,7 +362,7 @@ module Parse
             .add_attrs("class" => "genericons-neue genericons-neue-info")),
           page_elems(where, text)
         ])
-      when (sscan.skip ENTER_ALERT)
+      when sscan.skip(ENTER_ALERT)
         text = sscan.scan_until END_INDENT
         text = String.new(text).erase INDENT
         Markup.new("div")
@@ -313,7 +375,7 @@ module Parse
             .add_attrs("class" => "genericons-neue genericons-neue-notice")),
           page_elems(where, text)
         ])
-      when (sscan.skip ENTER_BUG)
+      when sscan.skip(ENTER_BUG)
         text = sscan.scan_until END_INDENT
         text = String.new(text).erase INDENT
         Markup.new("div")
@@ -326,7 +388,7 @@ module Parse
             .add_attrs("class" => "genericons-neue genericons-neue-bug")),
           page_elems(where, text)
         ])
-      when (sscan.skip ENTER_QUOTE)
+      when sscan.skip(ENTER_QUOTE)
         text = sscan.scan_until END_INDENT
         text = String.new(text).erase INDENT
         Markup.new("blockquote")
@@ -371,7 +433,6 @@ module Parse
         while sscan.skip ENTER_DLIST
           term = sscan[1]
           text = sscan.scan_until END_INDENT
-          term = String.new(term).unescape("]")
           text = String.new(text).erase INDENT
           list.add_elems(Markup.new("dt").add_elems(line_elems(where, term)))
           list.add_elems(Markup.new("dd").add_elems(page_elems(where, text)))

data/res/scss/style.scss

@@ -177,7 +177,7 @@ hr {
     padding-left: 48pt;
     padding-right: 48pt;
     margin-left: 192pt;
-    max-width: 512pt;
+    max-width: 384pt;
     min-width: 192pt;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schizm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - M. Grady Saunders