schizm 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f17f1d1ae4d7892076dfb8cd163a999483ed2d61
-  data.tar.gz: 2138eb60e28bb56149402f8aa681c4d9f957fe57
+  metadata.gz: 1e6ade6f1678f5e9aae1e0c4addf45cb740087d4
+  data.tar.gz: f7f1a6b0271041205ba6b3d6cac552b9efbd3b85
 SHA512:
-  metadata.gz: 69974b4442b5f4ddf2f9b24d62147f96eab69f078341680bf94914a8ca09176650bcf63b963b4f3908c8ed889e709023ce1df9940aade7ce26c9332a8d3657bb
-  data.tar.gz: 76464c5dcd06ed17f21385fcb718196c65422eb1a2b8a33fb4de92fa7be214641ce45f84b97487c52d5e5e4a4e77a5631efe97db2a331b0a54089d94bab77010
+  metadata.gz: 00e2ca134b48f72d8aabb95e1a870084dd23ecdf40ec7b4857923f210458947bccd1b5a4682579d1da7f10aebaa37c56945b51ae0ba8244e7fc1f38890df1c49
+  data.tar.gz: 809d884192100de33b8242285738e29f4560d3b793a762a0f3ba5a297385e3edb98a75ffe6c62592f9eb9632d1dbc16463eef812dcf96027e77710ca0f877210

data/bin/schizm

@@ -14,11 +14,16 @@ when "init"
 when "build"
   Schizm::Env::Opts.build.order!
   Schizm::Env.build
-when "install-path"
-  puts Schizm::Env.home
+when "vim-install"
+  Schizm::Env::Opts.vim_install.order!
+  Schizm::Env.vim_install
+  exit 0
+when "vim-uninstall"
+  Schizm::Env::Opts.vim_uninstall.order!
+  Schizm::Env.vim_uninstall
   exit 0
-when "info"
-  # TODO
+when "home?"
+  puts Schizm::Env.home
   exit 0
 else
   puts <<HELP
@@ -27,10 +32,12 @@ Usage: schizm MODE [OPTIONS]
 \tNew project in working directory.
 `schizm build [OPTIONS]` 
 \tBuild project in working directory.
-`schizm install-path`
+`schizm vim-install [OPTIONS]`
+\tInstall Vim syntax files.
+`schizm vim-uninstall [OPTIONS]`
+\tUninstall Vim syntax files.
+`schizm home?`
 \tDisplay schizm's install directory.
-`schizm info`
-\tDisplay additional information.
 HELP
   exit 0
 end

data/lib/schizm/env.rb

@@ -51,29 +51,6 @@ module Env
     return false
   end
 
-  # Prompt the user with a yes/no question.
-  def self.yes? string, backup
-    backup = backup.downcase[0]
-    print "#{string} [Y/n] " if backup == "y"
-    print "#{string} [y/N] " if backup == "n"
-    answer = gets.strip.downcase[0]
-    return answer == "y" if answer != ""
-    return backup == "y"
-  end
-
-  # Write +string+ to +target+. If +target+ is an existing file and
-  # +var[:rewrite]+ is not set, prompts the user for permission to rewrite.
-  def self.write target, string
-    if (not File.file? target or
-        var? :rewrite or
-        yes? "Rewrite '#{target}'?", "n")
-      puts "Writing '#{target}'" if var? :verbose
-      file = File.open target, "wb"
-      file.write string.to_s
-      file.close
-    end
-  end
-
   # Current user's name.
   def self.thisuser
     return Etc.getpwnam(Etc.getlogin).gecos.split(/,/).first
@@ -121,6 +98,162 @@ module Env
     return File.read File.join(home, "res", *args)
   end
 
+  # Prompt the user with a yes/no question.
+  def self.yes? string, backup
+    backup = backup.downcase[0]
+    print "#{string} [Y/n] " if backup == "y"
+    print "#{string} [y/N] " if backup == "n"
+    answer = gets.strip.downcase[0]
+    return answer == "y" if answer != ""
+    return backup == "y"
+  end
+
+  # Write +string+ to +target+. If +target+ is an existing file and
+  # +var[:rewrite]+ is not set, prompts the user for permission to rewrite.
+  def self.write target, string
+    unless File.file? target and 
+        not var? :rewrite and 
+        not yes? "Rewrite '#{target}'?", "n"
+      puts "Writing '#{target}'" if var? :verbose
+      file = File.open target, "wb"
+      file.write string.to_s
+      file.close
+    end
+  end
+
+  # Delete +path+ if it exists. If +path+ is a directory, recursively
+  # delete all subdirectories.
+  def self.delete path
+    if File.exist? path
+      puts "Deleting #{path}" if var? :verbose
+      if File.file? path
+        File.delete path
+      elsif File.directory? path
+        Dir.foreach path do |subpath|
+          next if subpath == '.'
+          next if subpath == '..'
+          self.delete File.join(path, subpath)
+        end
+      end
+    end
+  end
+
+  # Create missing directories in +path+.
+  def self.blaze path
+    dir = ''
+    path = File.dirname path
+    path = File.absolute_path path
+    dirs = path.split File::SEPARATOR
+    dirs.each do |sub|
+      dir = File.join dir, sub
+      unless Dir.exist? dir
+        puts "Making '#{dir}'" if var? :verbose
+        Dir.mkdir dir
+      end
+    end
+  end
+
+  # Return path +dest+ relative to +from+.
+  def self.path_from from, dest
+    return Pathname.new(dest).relative_path_from(Pathname.new(from)).to_s
+  end
+
+  def self.docs_path path
+    return "/docs/#{path_from var[:output_doc], path}"
+  end
+
+  module Opts
+
+    def self.init
+      return OptionParser.new do |optparse|
+        optparse.banner = "Usage: schizm init [OPTIONS]"
+        optparse.on "-v", "--verbose", "Verbose messages?" do
+          Env.var[:verbose] = true
+        end
+        optparse.on "-r", "--rewrite", "Rewrite files without asking?" do
+          Env.var[:rewrite] = true
+        end
+        optparse.on "-t", "--title STR", "Set project title." do |str|
+          Env.var[:title] = str
+        end
+        optparse.on "-b", "--brief STR", "Set project brief." do |str|
+          Env.var[:brief] = str
+        end
+        optparse.on "-a", "--author STR", "Specify project author(s)." do |str|
+          Env.var[:author] = str
+        end
+        optparse.on "-y", "--year STR", "Specify project year(s)." do |str|
+          Env.var[:year] = str
+        end
+        license_enum = [
+          "BSD-2-Clause",
+          "BSD-3-Clause",
+          "GPL-2.0",
+          "GPL-3.0",
+          "LGPL-2.1",
+          "LGPL-3.0",
+          "MIT",
+          "MPL-2.0"
+        ]
+        license_help = <<LIC
+Select license, none by default.
+
+\tENUM                License
+\t"BSD-2-Clause" .... the 2-clause BSD License
+\t"BSD-3-Clause" .... the 3-clause BSD License
+\t"GPL-2.0" ......... the GNU General Public License v2.0
+\t"GPL-3.0" ......... the GNU General Public License v3.0
+\t"LGPL-2.1" ........ the GNU Lesser General Public License v2.1
+\t"LGPL-3.0" ........ the GNU Lesser General Public License v3.0
+\t"MIT" ............. the MIT License
+\t"MPL-2.0" ......... the Mozilla Public License v2.0
+
+LIC
+        optparse.on "-l", "--license ENUM",
+            license_enum,
+            license_help do |str|
+          Env.var[:license] = str
+        end
+        color_help = <<COL
+
+\tENUM                Basic color
+\t"red" ............. F4 43 36
+\t"pink" ............ E9 1E 63
+\t"purple" .......... 9C 27 B0 *** Default primary
+\t"deep-purple" ..... 67 3A B7
+\t"indigo" .......... 3F 51 B5
+\t"blue" ............ 21 96 F3
+\t"light-blue" ...... 03 A9 F4
+\t"cyan" ............ 00 BC D4
+\t"teal" ............ 00 96 88 *** Default secondary
+\t"green" ........... 4C AF 50
+\t"light-green" ..... 8B C3 4A
+\t"lime" ............ CD DC 39
+\t"yellow" .......... FF EB 3B
+\t"amber" ........... FF C1 07
+\t"orange" .......... FF 98 00
+\t"deep-orange" ..... FF 57 22
+
+\tRefer to https://material.io/guidelines/style/color.html
+
+COL
+        optparse.on "-p", "--primary-color ENUM", Env::COLORS.keys,
+          "Specify primary color." do |str|
+          Env.var[:primary_color] = str
+        end
+        optparse.on "-s", "--secondary-color ENUM", Env::COLORS.keys,
+          "Specify secondary color.", color_help do |str|
+          Env.var[:secondary_color] = str
+        end
+        optparse.on_tail "-h", "--help", "Display this help." do
+          puts optparse
+          exit 0
+        end
+      end
+    end
+
+  end # module Opts
+
   def self.init
     dirnames = [
       "src",
@@ -190,7 +323,7 @@ MAKEFILE
 *.tmp
 docs/_site
 GITIGNORE
-    write "docs/_config.yaml", <<YAMLCONFIG
+    write "docs/_config.yml", <<YMLCONFIG
 source: .
 destination: _site
 plugins_dir: _plugins
@@ -207,7 +340,7 @@ markdown_ext: "markdown,md"
 author: "#{author}"
 title: "#{title}"
 brief: "#{brief}"
-YAMLCONFIG
+YMLCONFIG
     assets = {
       "schizm.liquid" => "docs/_layouts",
       "schizm.js" => "docs/assets/js",
@@ -251,38 +384,65 @@ SASS
     write "docs/assets/css/schizm.css", Sass::Engine.new(sass_source, sass_options).render
   end
 
-  def self.delete dir
-    if Dir.exist? dir
-      Dir.foreach dir do |ent|
-        next if ent == '.'
-        next if ent == '..'
-        path = File.join dir, ent
-        File.delete path if File.file? path
-        self.delete path if File.directory? path
-      end
-    end
-  end
+  module Opts
 
-  def self.blaze path
-    dir = ''
-    path = File.dirname path
-    path = File.absolute_path path
-    dirs = path.split File::SEPARATOR
-    dirs.each do |sub|
-      dir = File.join dir, sub
-      Dir.mkdir dir unless Dir.exist? dir
+    def self.build
+      Env.var[:input] = "zrc"
+      Env.var[:output_doc] = "./docs/_docs"
+      Env.var[:output_src] = "./src"
+      Env.var[:guard] = true
+      return OptionParser.new do |optparse|
+        optparse.banner = "Usage: schizm build [OPTIONS]"
+        optparse.on "-v", "--verbose", "Verbose messages?" do
+          Env.var[:verbose] = true
+        end
+        optparse.on "-r", "--rewrite", "Rewrite files without asking?" do
+          Env.var[:rewrite] = true
+        end
+        optparse.on "-t", "--title STR", "Set project title." do |str|
+          Env.var[:title] = str
+        end
+        optparse.on "-b", "--brief STR", "Set project brief." do |str|
+          Env.var[:brief] = str
+        end
+        optparse.on "-a", "--author STR", "Specify project author(s)." do |str|
+          Env.var[:author] = str
+        end
+        optparse.on "-y", "--year STR", "Specify project year(s)." do |str|
+          Env.var[:year] = str
+        end
+        optparse.on "--input STR",
+          "Where to look for input files." do |str|
+          Env.var[:input] = str
+        end
+        optparse.on "--output-doc STR",
+          "Where to write documentation files." do |str|
+          Env.var[:output_doc] = str
+        end
+        optparse.on "--output-src STR",
+          "Where to write source files." do |str|
+          Env.var[:output_src] = str
+        end
+        optparse.on "--only-doc", "Build only documention files?" do
+          Env.var[:only_doc] = true
+        end
+        optparse.on "--only-src", "Build only source files?" do
+          Env.var[:only_src] = true
+        end
+        optparse.on "--[no-]guard", "Guard output headers?" do |ans|
+          Env.var[:guard] = ans
+        end
+        optparse.on "--[no-]share", "Share chunks by default?" do |ans|
+          Env.var[:share] = ans
+        end
+        optparse.on_tail "-h", "--help", "Display this help." do
+          puts optparse
+          exit 0
+        end
+      end
     end
-  end
 
-  def self.path_from from, dest
-    from = Pathname.new from
-    dest = Pathname.new dest
-    dest.relative_path_from(from).to_s
-  end
-
-  def self.path_href path
-    "/docs/#{path_from var[:output_doc], path}"
-  end
+  end # module Opts
 
   def self.build
     zrc_root = var[:input]
@@ -331,86 +491,17 @@ PARSE
 
   module Opts
 
-    def self.init
-      OptionParser.new do |optparse|
-        optparse.banner = "Usage: schizm init [OPTIONS]"
+    def self.vim which
+      return OptionParser.new do |optparse|
+        optparse.banner = "Usage: schizm vim-#{which} [OPTIONS]"
         optparse.on "-v", "--verbose", "Verbose messages?" do
           Env.var[:verbose] = true
         end
         optparse.on "-r", "--rewrite", "Rewrite files without asking?" do
           Env.var[:rewrite] = true
         end
-        optparse.on "-t", "--title STR", "Set project title." do |str|
-          Env.var[:title] = str
-        end
-        optparse.on "-b", "--brief STR", "Set project brief." do |str|
-          Env.var[:brief] = str
-        end
-        optparse.on "-a", "--author STR", "Specify project author(s)." do |str|
-          Env.var[:author] = str
-        end
-        optparse.on "-y", "--year STR", "Specify project year(s)." do |str|
-          Env.var[:year] = str
-        end
-        license_enum = [
-          "BSD-2-Clause",
-          "BSD-3-Clause",
-          "GPL-2.0",
-          "GPL-3.0",
-          "LGPL-2.1",
-          "LGPL-3.0",
-          "MIT",
-          "MPL-2.0"
-        ]
-        license_help = <<LIC
-Select license, none by default.
-
-\tENUM                License
-\t"BSD-2-Clause" .... the 2-clause BSD License
-\t"BSD-3-Clause" .... the 3-clause BSD License
-\t"GPL-2.0" ......... the GNU General Public License v2.0
-\t"GPL-3.0" ......... the GNU General Public License v3.0
-\t"LGPL-2.1" ........ the GNU Lesser General Public License v2.1
-\t"LGPL-3.0" ........ the GNU Lesser General Public License v3.0
-\t"MIT" ............. the MIT License
-\t"MPL-2.0" ......... the Mozilla Public License v2.0
-
-LIC
-        optparse.on "-l", "--license ENUM",
-            license_enum,
-            license_help do |str|
-          Env.var[:license] = str
-        end
-        color_help = <<COL
-
-\tENUM                Basic color
-\t"red" ............. F4 43 36
-\t"pink" ............ E9 1E 63
-\t"purple" .......... 9C 27 B0 *** Default primary
-\t"deep-purple" ..... 67 3A B7
-\t"indigo" .......... 3F 51 B5
-\t"blue" ............ 21 96 F3
-\t"light-blue" ...... 03 A9 F4
-\t"cyan" ............ 00 BC D4
-\t"teal" ............ 00 96 88 *** Default secondary
-\t"green" ........... 4C AF 50
-\t"light-green" ..... 8B C3 4A
-\t"lime" ............ CD DC 39
-\t"yellow" .......... FF EB 3B
-\t"amber" ........... FF C1 07
-\t"orange" .......... FF 98 00
-\t"deep-orange" ..... FF 57 22
-
-\tRefer to https://material.io/guidelines/style/color.html
-
-COL
-        optparse.on "-p", "--primary-color ENUM", Env::COLORS.keys,
-          "Specify primary color." do |str|
-          Env.var[:primary_color] = str
-        end
-        optparse.on "-s", "--secondary-color ENUM", Env::COLORS.keys,
-          "Specify secondary color.", color_help do |str|
-          Env.var[:secondary_color] = str
+        optparse.on "-p", "--path STR", "Specify Vim path." do |str|
+          Env.var[:vimhome] = str
         end
         optparse.on_tail "-h", "--help", "Display this help." do
           puts optparse
@@ -419,63 +510,46 @@ COL
       end
     end
 
-    def self.build
-      Env.var[:input] = "zrc"
-      Env.var[:output_doc] = "./docs/_docs"
-      Env.var[:output_src] = "./src"
-      Env.var[:guard] = true
-      OptionParser.new do |optparse|
-        optparse.banner = "Usage: schizm build [OPTIONS]"
-        optparse.on "-v", "--verbose", "Verbose messages?" do
-          Env.var[:verbose] = true
-        end
-        optparse.on "-r", "--rewrite", "Rewrite files without asking?" do
-          Env.var[:rewrite] = true
-        end
-        optparse.on "-t", "--title STR", "Set project title." do |str|
-          Env.var[:title] = str
-        end
-        optparse.on "-b", "--brief STR", "Set project brief." do |str|
-          Env.var[:brief] = str
-        end
-        optparse.on "-a", "--author STR", "Specify project author(s)." do |str|
-          Env.var[:author] = str
-        end
-        optparse.on "-y", "--year STR", "Specify project year(s)." do |str|
-          Env.var[:year] = str
-        end
-        optparse.on "--input STR",
-          "Where to look for input files." do |str|
-          Env.var[:input] = str
-        end
-        optparse.on "--output-doc STR",
-          "Where to write documentation files." do |str|
-          Env.var[:output_doc] = str
-        end
-        optparse.on "--output-src STR",
-          "Where to write source files." do |str|
-          Env.var[:output_src] = str
-        end
-        optparse.on "--only-doc", "Build only documention files?" do
-          Env.var[:only_doc] = true
-        end
-        optparse.on "--only-src", "Build only source files?" do
-          Env.var[:only_src] = true
-        end
-        optparse.on "--[no-]guard", "Guard output headers?" do |ans|
-          Env.var[:guard] = ans
-        end
-        optparse.on "--[no-]share", "Share chunks by default?" do |ans|
-          Env.var[:share] = ans
-        end
-        optparse.on_tail "-h", "--help", "Display this help." do
-          puts optparse
-          exit 0
-        end
-      end
+    def self.vim_install
+      return vim "install"
     end
 
-  end # module Opts
+    def self.vim_uninstall
+      return vim "uninstall"
+    end
+
+  end
+
+  def self.vim_install
+    vimhome = "~/.vim"
+    vimhome = var[:vimhome] if var? :vimhome
+    vimhome = File.absolute_path File.expand_path(vimhome)
+    assets = {
+      "vim/ftdetect/schizm.vim" => File.join(vimhome, "ftdetect"),
+      "vim/ftplugin/schizm.vim" => File.join(vimhome, "ftplugin"),
+      "vim/indent/schizm.vim" => File.join(vimhome, "indent"),
+      "vim/syntax/schizm.vim" => File.join(vimhome, "syntax")
+    }
+    assets.each do |from, to|
+      blaze File.join(to, File.basename(from))
+      write File.join(to, File.basename(from)), resource(from)
+    end
+  end
+
+  def self.vim_uninstall
+    vimhome = "~/.vim"
+    vimhome = var[:vimhome] if var? :vimhome
+    vimhome = File.absolute_path File.expand_path(vimhome)
+    assets = [
+      File.join(vimhome, "ftdetect/schizm.vim"),
+      File.join(vimhome, "ftplugin/schizm.vim"),
+      File.join(vimhome, "indent/schizm.vim"),
+      File.join(vimhome, "syntax/schizm.vim")
+    ]
+    assets.each do |asset|
+      delete asset
+    end
+  end
 
 end # module Env
 

data/lib/schizm/match.rb

@@ -100,16 +100,16 @@ module Schizm
   CHAR_ESCAPE = /\\(.)/u
 
   # Link definition, content put in match group 1, params put in match group 2.
-  LINK_DEF = /^\[(#{DELIM_BRACKS})\]:[ ]*(.*)[ ]*\n/u
+  LINK_DEF = /^&:\[(#{DELIM_BRACKS})\][ ]*(.*)[ ]*\n/u
 
   # Link reference, content put in match group 1, params put in match group 2.
-  LINK_REF_PARENS = /\[(#{DELIM_BRACKS})\]\((#{DELIM_PARENS})\)/um
+  LINK_REF_PARENS = /&\[(#{DELIM_BRACKS})\]\((#{DELIM_PARENS})\)/um
 
   # Link reference, content put in match group 1, params put in match group 2.
-  LINK_REF_BRACKS = /\[(#{DELIM_BRACKS})\](?:\[(#{DELIM_BRACKS})\])?/um
+  LINK_REF_BRACKS = /&\[(#{DELIM_BRACKS})\](?:\[(#{DELIM_BRACKS})\])?/um
 
   # Image definition, entry put in match group 1, params put in match group 2.
-  IMAGE_DEF = /^!\[(#{DELIM_BRACKS})\]:[ ]*(.*)[ ]*\n/u
+  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
@@ -118,13 +118,13 @@ module Schizm
   IMAGE_REF_BRACKS = /!\[(#{DELIM_BRACKS})\](?:\[(#{DELIM_BRACKS})\])?/u
 
   # Center math, content put in match group 1.
-  CENTER_MATH = /[$][$]((?:[^\\$]*(?:\\.)*)*)[$][$]/um
+  CENTER_MATH = /\$\$((?:[^\\$]*(?:\\.)*)*)\$+/um
 
   # Markup attributes for +CENTER_MATH+.
   CENTER_MATH_ATTRS = {'type' => 'math/tex; mode=display'}
 
   # Inline math, content put in match group 1.
-  INLINE_MATH = /[$]((?:[^\\$]*(?:\\.)*)*)[$]/um
+  INLINE_MATH = /\$((?:[^\\$]*(?:\\.)*)*)\$/um
 
   # Markup attributes for +INLINE_MATH+.
   INLINE_MATH_ATTRS = {'type' => 'math/tex; mode=inline'}
@@ -145,40 +145,37 @@ module Schizm
   INLINE_INS = /\+{(#{DELIM_BRACES})}/um
 
   # Inline delete, content put in match group 1.
-  INLINE_DEL = /~{(#{DELIM_BRACES})}/um
+  INLINE_DEL = /-{(#{DELIM_BRACES})}/um
 
   # Chunk label, content put in match group 1.
-  CHUNK_LABEL = /[@]\[(#{DELIM_BRACKS})\]/um
-
-  # Chunk param, content put in match group 1.
-  CHUNK_PARAM = /[#]\[(#{DELIM_BRACKS})\]/um
+  CHUNK_LABEL = /@\[(#{DELIM_BRACKS})\]/um
 
   # Chunk block, content put in match group 1.
   CHUNK_BLOCK = /\((#{DELIM_PARENS})\)/um
 
   # Enter quote block.
-  ENTER_QUOTE = /^["][ ]{3}/u #/^[ ]{0,3}[>][>][>]/u
+  ENTER_QUOTE = /^[>][ ]{3}/u 
 
   # Enter aside block.
-  ENTER_ASIDE = /^[>][ ]{3}/u #/^[ ]{0,3}[.]{3}/u
+  ENTER_ASIDE = /^[~][ ]{3}/u 
 
   # Enter alert block.
-  ENTER_ALERT = /^[!][ ]{3}/u # /^[ ]{0,3}[!]{1,3}/u
+  ENTER_ALERT = /^[!][ ]{3}/u 
 
   # Enter bug block.
-  ENTER_BUG = /^[?][ ]{3}/u #/^[ ]{0,3}[?]{1,3}/u
+  ENTER_BUG = /^[?][ ]{3}/u 
 
   # Enter olist element.
-  ENTER_OLIST = /^\d\.[ ]{2}|\d{2}\.[ ]/u #/^[ ]{0,3}--?[#]/u
+  ENTER_OLIST = /^\d\.[ ]{2}|\d{2}\.[ ]/u 
 
   # Enter ulist element.
-  ENTER_ULIST = /^[-][ ]{3}|[-]{2}[ ]{2}/u #/^[ ]{0,3}--?[%]/u
+  ENTER_ULIST = /^[-][ ]{3}|[-]{2}[ ]{2}/u 
 
   # Enter tlist element, type put in match group 1.
-  ENTER_TLIST = /^\[([x ])\][ ]/u #/^[ ]{0,3}\[([x ])\]/u
+  ENTER_TLIST = /^\[([x ])\][ ]/u 
 
   # Enter dlist element, content put in match group 1.
-  ENTER_DLIST = /^(\p{Graph}.*?)::/u #/^[ ]{0,3}(.*?)::/u
+  ENTER_DLIST = /^(\p{Graph}.*?)::/u 
 
   # Enter code block.
   ENTER_CODE = /^[ ]{4,}(?=\p{Graph})/u
@@ -188,106 +185,68 @@ module Schizm
 
   # Special ASCII sequences.
   GLYPH = [
-    [/\(tm\)/ui, 8482],     # Trademark.
-    [/\(c\)/ui, 9400],      # Copyright.
-    [/\(r\)/ui, 174],       # Registered.
-    [/\+-/u, 177],          # Plus minus.
-    [/==/u, 8801],          # Identical.
-    [/=~/u, 8773],          # Congruent.
-    [/!=/u, 8800],          # Not equal.
-    [/<=/u, 8804],          # Less equal.
-    [/>=/u, 8805],          # Greater equal.
-    [/~=/u, 8776],          # Approximately.
-    [/--/u, 8211],          # En dash.
-    [/---/u, 8212],         # Em dash.
-    [/\.{3}/u, 8230],       # Ellipsis.
-    [/<--/u, 8592],         # Left single arrow.
-    [/<==/u, 8656],         # Left double arrow.
-    [/-->/u, 8594],         # Right single arrow.
-    [/==>/u, 8658],         # Right double arrow.
-    [/<-->/u, 8596],        # Horizontal single arrow.
-    [/<==>/u, 8660],        # Horizontal double arrow.
-    [/<~~/u, 8668],         # Left squiggle arrow.
-    [/~~>/u, 8669],         # Right squiggle arrow.
-    [/<<--/u, 8606],        # Left two headed arrow.
-    [/-->>/u, 8608],        # Right two headed arrow.
-    [/<--</u, 8610],        # Left arrow with tail.
-    [/>-->/u, 8611],        # Right arrow with tail.
-    [/\|<--/u, 8676],       # Left arrow to bar.
-    [/-->\|/u, 8677],       # Right arrow to bar.
-    [/<---/u, 10229],       # Left long single arrow.
-    [/<===/u, 10232],       # Left long double arrow.
-    [/--->/u, 10230],       # Right long single arrow.
-    [/===>/u, 10233],       # Right long double arrow.
-    [/<--->/u, 10231],      # Horizontal long single arrow.
-    [/<===>/u, 10234],      # Horizontal long double arrow.
-    [/<---\|/u, 10235],     # Left long single arrow from bar.
-    [/<===\|/u, 10237],     # Left long double arrow from bar.
-    [/\|--->/u, 10236],     # Right long single arrow from bar.
-    [/\|===>/u, 10238],     # Right long double arrow from bar.
-    [/<-\/-/u, 8602],       # Left single arrow with stroke.
-    [/<=\/=/u, 8653],       # Left double arrow with stroke.
-    [/<-\|-/u, 8695],       # Left single arrow with vertical bar.
-    [/<=\|=/u, 10498],      # Left double arrow with vertical bar.
-    [/-\/->/u, 8603],       # Right single arrow with stroke.
-    [/=\/=>/u, 8655],       # Right double arrow with stroke.
-    [/-\|->/u, 8696],       # Right single arrow with vertical bar.
-    [/=\|=>/u, 10499],      # Right double arrow with vertical bar.
-    [/<-\/->/u, 8622],      # Horizontal single arrow with stroke.
-    [/<-\|->/u, 8697],      # Horizontal single arrow with vertical bar.
-    [/<=\|=>/u, 10500],     # Horizontal double arrow with vertical bar.
-    [/<--\|/u, 8612],       # Left single arrow from bar.
-    [/<==\|/u, 10502],      # Left double arrow from bar.
-    [/\|-->/u, 8614],       # Right single arrow from bar.
-    [/\|==>/u, 10503]       # Right double arrow from bar.
-  ]
-
-  # Base-2 digit sequence for C++ int literal.
-  CPP_INT_DIGITS_2 = /0[Bb][0-1]+/
-
-  # Base-8 digit sequence for C++ int literal.
-  CPP_INT_DIGITS_8 = /0[0-7]+/
-
-  # Base-10 digit sequence for C++ int literal.
-  CPP_INT_DIGITS_10 = /[1-9][0-9]*|0(?![0-9])/
-
-  # Base-16 digit sequence for C++ int literal.
-  CPP_INT_DIGITS_16 = /0[Xx][0-9A-Fa-f]+/
-
-  # Digit sequence for C++ int literal.
-  CPP_INT_DIGITS = Regexp.union [
-    CPP_INT_DIGITS_2, 
-    CPP_INT_DIGITS_8,
-    CPP_INT_DIGITS_10, 
-    CPP_INT_DIGITS_16
+    [/\(tm\)/ui, 8482], # Trademark.
+    [/\(c\)/ui, 9400], # Copyright.
+    [/\(r\)/ui, 174], # Registered.
+    [/\+-/u, 177], # Plus minus.
+    [/==/u, 8801], # Identical.
+    [/=~/u, 8773], # Congruent.
+    [/!=/u, 8800], # Not equal.
+    [/<=/u, 8804], # Less equal.
+    [/>=/u, 8805], # Greater equal.
+    [/~=/u, 8776], # Approximately.
+    [/--/u, 8211], # En dash.
+    [/---/u, 8212], # Em dash.
+    [/\.{3}/u, 8230], # Ellipsis.
+    [/<--/u, 8592], # Left single arrow.
+    [/<==/u, 8656], # Left double arrow.
+    [/-->/u, 8594], # Right single arrow.
+    [/==>/u, 8658], # Right double arrow.
+    [/<-->/u, 8596], # Horizontal single arrow.
+    [/<==>/u, 8660], # Horizontal double arrow.
+    [/<~~/u, 8668], # Left squiggle arrow.
+    [/~~>/u, 8669], # Right squiggle arrow.
+    [/<<--/u, 8606], # Left two headed arrow.
+    [/-->>/u, 8608], # Right two headed arrow.
+    [/<--</u, 8610], # Left arrow with tail.
+    [/>-->/u, 8611], # Right arrow with tail.
+    [/\|<--/u, 8676], # Left arrow to bar.
+    [/-->\|/u, 8677], # Right arrow to bar.
+    [/<---/u, 10229], # Left long single arrow.
+    [/<===/u, 10232], # Left long double arrow.
+    [/--->/u, 10230], # Right long single arrow.
+    [/===>/u, 10233], # Right long double arrow.
+    [/<--->/u, 10231], # Horizontal long single arrow.
+    [/<===>/u, 10234], # Horizontal long double arrow.
+    [/<---\|/u, 10235], # Left long single arrow from bar.
+    [/<===\|/u, 10237], # Left long double arrow from bar.
+    [/\|--->/u, 10236], # Right long single arrow from bar.
+    [/\|===>/u, 10238], # Right long double arrow from bar.
+    [/<-\/-/u, 8602], # Left single arrow with stroke.
+    [/<=\/=/u, 8653], # Left double arrow with stroke.
+    [/<-\|-/u, 8695], # Left single arrow with vertical bar.
+    [/<=\|=/u, 10498], # Left double arrow with vertical bar.
+    [/-\/->/u, 8603], # Right single arrow with stroke.
+    [/=\/=>/u, 8655], # Right double arrow with stroke.
+    [/-\|->/u, 8696], # Right single arrow with vertical bar.
+    [/=\|=>/u, 10499], # Right double arrow with vertical bar.
+    [/<-\/->/u, 8622], # Horizontal single arrow with stroke.
+    [/<-\|->/u, 8697], # Horizontal single arrow with vertical bar.
+    [/<=\|=>/u, 10500], # Horizontal double arrow with vertical bar.
+    [/<--\|/u,  8612], # Left single arrow from bar.
+    [/<==\|/u, 10502], # Left double arrow from bar.
+    [/\|-->/u,  8614], # Right single arrow from bar.
+    [/\|==>/u, 10503]  # Right double arrow from bar.
   ]
 
-  # C++ int literal.
-  CPP_INT = /#{CPP_INT_DIGITS}(?:[Uu][Ll]{0,2}|[Ll]{1,2}|_[0-9A-Za-z_]+)?/
-
-  # Base-10 digit sequence for C++ float literal.
-  CPP_FLT_DIGITS_10 = /(?:\.[0-9]+|[0-9]+\.[0-9]*|[0-9]+(?=[Ee]))(?:[Ee][+-]?[0-9]+)?/
-
-  # Base-16 digit sequence for C++ float literal.
-  CPP_FLT_DIGITS_16 = /(?:0[Xx]1\.[0-9A-Fa-f]+[Pp][+-][0-9]+)/
-
-  # Digit sequence for C++ float literal.
-  CPP_FLT_DIGITS = Regexp.union [
-    CPP_FLT_DIGITS_10, 
-    CPP_FLT_DIGITS_16
-  ]
-
-  # C++ float literal.
-  CPP_FLT = /#{CPP_FLT_DIGITS}(?:[Ii]?[FfLl]|_[A-Za-z0-9_]+)?/
-
-  # C++ int or float literal.
-  CPP_NUMBER = /[+-]?(?:#{CPP_FLT}|#{CPP_INT})/
+  # C++ string.
+  HICPPSTR = /(?:u8?|[ULR])?(["'])((?:[^\\\1]*(?:\\.)*)*)\1/u
 
-  # C++ char or string literal.
-  CPP_STRING = /(?:u8?|[ULR])?(["'])((?:[^\\\1]*(?:\\.)*)*)\1/u
+  # C++ number.
+  HICPPNUM = /[+-]?(?:(?:(?:(?:\.\d+|\d+\.\d*|\d+(?=e))(?:e[+-]?\d+)?)|0x1\.\h+p[+-]\d+)(?:i?[fl]|_\w+)?|(?:0b[01]+|0[0-7]+|[1-9]\d*|0(?!\d)|0x\h+)(?:ul?l?|ll?|_\w+)?)/i
 
-  # C++ highlighting table.
-  HIGHLIGHT_CPP = [
+  # C++ syntax highlighting.
+  HICPP = [
     ["hi-comment", /\/\/.*$/u],
     ["hi-comment", /\/\*.*?\*\//um],
     ["hi-preproc", /\#(?:ifn?def|endif|if|else|elif|define|pragma|include)\b.*?(?<=[^\\])(?:\n|\z)/um],
@@ -296,7 +255,7 @@ module Schizm
     ["hi-type-spec", /(?:constexpr|const|volatile|static|mutable|thread_local|register|extern|inline|noexcept)\b/u],
     ["hi-flow", /(?:new|delete|do|while|for|if|else|try|throw|catch|switch|case|default|break|continue|goto|return)\b/u],
     ["hi-op", /(?:(?:and|or|xor|not)(?:_eq)?|bitand|bitor|compl|(?:(?:const|dynamic|static|reinterpret)_cast))\b/u],
-    ["hi-value", /(?:true|false|this|nullptr|NULL|#{CPP_NUMBER}|#{CPP_STRING})\b/u],
+    ["hi-value", /(?:true|false|this|nullptr|NULL|#{HICPPSTR}|#{HICPPNUM})\b/u],
     ["hi-other", /(?:alignas|alignof|sizeof|decltype|template|typename|typedef|using|concept|requires|operator)\b/u],
     ["hi-other", /(?:namespace|class|struct|enum|public|protected|private|friend|final|virtual|override)\b/u],
     ["hi-ident", /[a-zA-Z]\w*/u],

data/lib/schizm/parse.rb

@@ -93,7 +93,7 @@ module Parse
       Chunk.each do |chunk|
         if chunk.label == @label and
           (chunk.where == @where or chunk.share?)
-          return "#{Env.path_href(@where)}\##{chunk.id(1)}"
+          return "#{Env.docs_path(@where)}\##{chunk.id(1)}"
         end
       end
       return ""
@@ -108,7 +108,7 @@ module Parse
     def to_s
       return "" if @index < 1
       return "" if @index > @chunk.blocks.size
-      return "#{Env.path_href(@chunk.where)}\##{@chunk.id(@index)}"
+      return "#{Env.docs_path(@chunk.where)}\##{@chunk.id(@index)}"
     end
   end
 
@@ -304,12 +304,6 @@ module Parse
           when "Local" then chunk.share = false
           else raise "Unknown attribute."
           end
-=begin
-        when sscan.skip(/[ ]*\#=[ ]*(.*?)\n/u)
-          sscan[1].split(' ').each_with_index do |param, index|
-            chunk.params[param][:index] = index
-          end
-=end
         when sscan.skip(/[ ]*\+=[ ]*(?:#{CHUNK_BLOCK})?\n/u)
           label = sscan[1]
           block = sscan.scan_until(END_INDENT)
@@ -348,7 +342,7 @@ module Parse
             ]),
             Markup.new("div")
             .add_attrs("class" => "panel-body")
-            .add_elems(Markup.new("pre").add_elems(highlight(where, block, HIGHLIGHT_CPP)))
+            .add_elems(Markup.new("pre").add_elems(highlight(where, block, HICPP)))
           ])
         end
         div

data/res/vim/ftdetect/schizm.vim

@@ -0,0 +1,2 @@
+autocmd BufNewFile,BufRead *.zrc setfiletype schizm
+autocmd BufNewFile,BufRead *.schizm setfiletype schizm

data/res/vim/ftplugin/schizm.vim

@@ -0,0 +1,2 @@
+setlocal tabstop=4 shiftwidth=4
+setlocal expandtab

data/res/vim/syntax/schizm.vim

@@ -0,0 +1,48 @@
+syn match zrcBlkSec /\v^[ ]*[!?~>][ ]{3}/
+syn match zrcBlkSec /\v^[ ]*\-{3,}[ ]*$/
+syn match zrcBlkSec /\v^[ ]*\={3,}[ ]*$/
+syn match zrcBlkSec /\v^%([ ]{4})*[#]{1,6}/
+syn match zrcBlkFmt /\v^%([ ]{4})*[-][ ]{3}/
+syn match zrcBlkFmt /\v^%([ ]{4})*%(\d\.[ ]{2}|\d{2}\.[ ])/
+syn match zrcBlkFmt /\v^%([ ]{4})*\[[ x]\][ ]/
+syn match zrcBlkFmt /\v^[ ]*%(\*[ ]?){3,}[ ]*$/
+syn match zrcBlkFmt /\v^[ ]*\^[ ]*$/
+hi link zrcBlkSec PreProc
+hi link zrcBlkFmt Delimiter
+syn cluster zrcInl contains=zrcInlScr,zrcInlIns,zrcInlDel,zrcInlMath,zrcInlCode,zrcInlEmph,zrcInlBold,zrcInlBoldEmph,zrcInlSym,zrcInlEsc
+syn region zrcInlIns matchgroup=Delimiter start=/\v[+]\{/ end=/\v\}/ contains=@zrcInl
+syn region zrcInlDel matchgroup=Delimiter start=/\v[-]\{/ end=/\v\}/ contains=@zrcInl
+syn region zrcInlScr matchgroup=Delimiter start=/\v[_^]\{/ end=/\v\}/ contains=@zrcInl
+syn region zrcInlMath matchgroup=Delimiter start=/\v\$\$?/ end=/\v\$+/ contains=zrcInlEsc
+syn region zrcInlCode matchgroup=Delimiter start=/\v\`/ end=/\v\`/ contains=zrcInlEsc
+syn region zrcInlEmph matchgroup=Delimiter start=/\v\*/ end=/\v\*+/ contains=zrcInlEsc
+syn region zrcInlBold matchgroup=Delimiter start=/\v\*{2}/ end=/\v\*+/ contains=zrcInlEsc
+syn region zrcInlBoldEmph matchgroup=Delimiter start=/\v\*{3,}/ end=/\v\*+/ contains=zrcInlEsc
+syn match zrcInlSym /\v\&%(\w+|\#\d+|\#[xX][0-9a-fA-F]+);/
+syn match zrcInlEsc /\v\\./
+hi zrcInlIns gui=underline
+hi link zrcInlDel Ignore
+hi link zrcInlMath Statement
+hi link zrcInlCode Structure
+hi zrcInlEmph gui=italic
+hi zrcInlBold gui=bold
+hi zrcInlBoldEmph gui=bold,italic
+hi link zrcInlSym Constant
+hi link zrcInlEsc SpecialChar
+syn match zrcDef /\v^\&:\[[^\]]+\].*$/
+syn match zrcDef /\v^\!:\[[^\]]+\].*$/
+syn region zrcRef matchgroup=Macro start=/\v\&\[/ end=/\v\]/ contains=@zrcInl nextgroup=zrcRefArg
+syn region zrcRef matchgroup=Macro start=/\v\!\[/ end=/\v\]/ contains=@zrcInl nextgroup=zrcRefArg
+syn region zrcRefArg matchgroup=Macro start=/\v\[/ end=/\v\]/ contains=zrcInlEsc contained
+syn region zrcRefArg matchgroup=Macro start=/\v\(/ end=/\v\)/ contains=zrcInlEsc contained
+hi link zrcDef Comment
+hi link zrcRefArg Macro
+syn region zrcChkRef matchgroup=Operator start=/\v\@\[/ end=/\v\]/ contains=@zrcInl
+syn region zrcChkRefCmd matchgroup=Operator start=/\v^%([ ]{4})*\@\[/ end=/\v\]/ contains=@zrcInl nextgroup=zrcChkCmd skipwhite
+syn region zrcChkCmd matchgroup=Operator start=/\v\:\:/ end=/\v$/ oneline contained contains=zrcChkAtt
+syn region zrcChkCmd matchgroup=Operator start=/\v\-\>/ end=/\v$/ oneline contained
+syn region zrcChkCmd matchgroup=Operator start=/\v\+\=/ end=/\v^[ ]*\^[ ]*$/ contained contains=zrcChkRef
+syn keyword zrcChkAtt Local contained
+syn keyword zrcChkAtt Share contained
+hi link zrcChkCmd String
+hi link zrcChkAtt Identifier

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schizm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - M. Grady Saunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: mgradysaunders@gmail.com
@@ -54,6 +54,10 @@ files:
 - res/scss/fonts.scss
 - res/scss/mixin.scss
 - res/scss/style.scss
+- res/vim/ftdetect/schizm.vim
+- res/vim/ftplugin/schizm.vim
+- res/vim/indent/schizm.vim
+- res/vim/syntax/schizm.vim
 homepage: https://github.com/mgradysaunders/schizm
 licenses:
 - BSD-2-Clause
@@ -74,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: A literate programming tool for C/C++