kramdown 0.4.0 → 0.5.0

data/lib/kramdown/parser/kramdown/attribute_list.rb

@@ -95,7 +95,7 @@ module Kramdown
           add_text(@src.matched)
         end
       end
-      define_parser(:span_ial, IAL_SPAN_START)
+      define_parser(:span_ial, IAL_SPAN_START, '\{:')
 
     end
   end

data/lib/kramdown/parser/kramdown/autolink.rb

@@ -35,7 +35,7 @@ module Kramdown
         add_text(@src[1].sub(/^mailto:/, ''), el)
         @tree.children << el
       end
-      define_parser(:autolink, AUTOLINK_START)
+      define_parser(:autolink, AUTOLINK_START, '<')
 
     end
   end

data/lib/kramdown/parser/kramdown/codespan.rb

@@ -50,7 +50,7 @@ module Kramdown
           add_text(result)
         end
       end
-      define_parser(:codespan, CODESPAN_DELIMITER)
+      define_parser(:codespan, CODESPAN_DELIMITER, '`')
 
     end
   end

data/lib/kramdown/parser/kramdown/emphasis.rb

@@ -42,7 +42,7 @@ module Kramdown
           el = Element.new(elem)
           stop_re = /#{Regexp.escape(delim)}/
           found = parse_spans(el, stop_re) do
-            (@src.string[@src.pos-1, 1] !~ /\s/) &&
+            (@src.pre_match[-1, 1] !~ /\s/) &&
               (elem != :em || !@src.match?(/#{Regexp.escape(delim*2)}(?!#{Regexp.escape(delim)})/)) &&
               (type != '_' || !@src.match?(/#{Regexp.escape(delim)}[[:alpha:]]/)) && el.children.size > 0
           end
@@ -62,7 +62,7 @@ module Kramdown
           add_text(result)
         end
       end
-      define_parser(:emphasis, EMPHASIS_START)
+      define_parser(:emphasis, EMPHASIS_START, '\*|_')
 
     end
   end

data/lib/kramdown/parser/kramdown/escaped_chars.rb

@@ -24,14 +24,14 @@ module Kramdown
   module Parser
     class Kramdown
 
-      ESCAPED_CHARS = /\\([\\.*_+`()\[\]{}#!:|-])/
+      ESCAPED_CHARS = /\\([\\.*_+`()\[\]{}#!:|"'-])/
 
       # Parse the backslash-escaped character at the current location.
       def parse_escaped_chars
         @src.pos += @src.matched_size
         add_text(@src[1])
       end
-      define_parser(:escaped_chars, ESCAPED_CHARS)
+      define_parser(:escaped_chars, ESCAPED_CHARS, '\\\\')
 
     end
   end

data/lib/kramdown/parser/kramdown/extension.rb

@@ -26,6 +26,50 @@ module Kramdown
   module Parser
     class Kramdown
 
+      # The base extension class.
+      #
+      # This class provides implementations for the default extensions defined in the kramdown
+      # specification.
+      #
+      # An extension is a method called <tt>parse_EXTNAME</tt> where +EXTNAME+ is the extension name.
+      # These methods are called with three parameters:
+      #
+      # [+parser+]
+      #    The parser instance from which the extension method is called.
+      # [+opts+]
+      #    A hash containing the options set in the extension.
+      # [+body+]
+      #    A string containing the body of the extension. If no body is available, this is +nil+.
+      class Extension
+
+        # Just ignore everything and do nothing.
+        def parse_comment(parser, opts, body)
+          nil
+        end
+
+        # Add the body (if available) as <tt>:raw</tt> Element to the +parser.tree+.
+        def parse_nomarkdown(parser, opts, body)
+          parser.tree.children << Element.new(:raw, body) if body.kind_of?(String)
+        end
+
+        # Update the document and parser options with the options set in +opts+.
+        def parse_options(parser, opts, body)
+          opts.select do |k,v|
+            k = k.to_sym
+            if Kramdown::Options.defined?(k)
+              parser.doc.options[k] = Kramdown::Options.parse(k, v) rescue parser.doc.options[k]
+              false
+            else
+              true
+            end
+          end.each do |k,v|
+            parser.warning("Unknown kramdown option '#{k}'")
+          end
+        end
+
+      end
+
+
       EXT_BLOCK_START_STR = "^#{OPT_SPACE}\\{::(%s):(:)?(#{ALD_ANY_CHARS}*)\\}\s*?\n"
       EXT_BLOCK_START = /#{EXT_BLOCK_START_STR % ALD_ID_NAME}/
 
@@ -38,7 +82,7 @@ module Kramdown
         body = nil
         parse_attribute_list(@src[3], opts)
 
-        if !@doc.extension.public_methods.map {|m| m.to_s}.include?("parse_#{ext}")
+        if !@extension.public_methods.map {|m| m.to_s}.include?("parse_#{ext}")
           warning("No extension named '#{ext}' found - ignoring extension block")
           body = :invalid
         end
@@ -54,7 +98,7 @@ module Kramdown
           end
         end
 
-        @doc.extension.send("parse_#{ext}", self, opts, body) if body != :invalid
+        @extension.send("parse_#{ext}", self, opts, body) if body != :invalid
 
         true
       end

data/lib/kramdown/parser/kramdown/footnote.rb

@@ -66,7 +66,7 @@ module Kramdown
           add_text(@src.matched)
         end
       end
-      define_parser(:footnote_marker, FOOTNOTE_MARKER_START)
+      define_parser(:footnote_marker, FOOTNOTE_MARKER_START, '\[')
 
     end
   end

data/lib/kramdown/parser/kramdown/html.rb

@@ -146,7 +146,7 @@ module Kramdown
             end
           elsif parse_type == :span
             if result = @src.scan_until(/(?=<\/#{el.value}\s*>)/m)
-              add_text(@src.string[curpos...@src.pos], el)
+              add_text(extract_string(curpos...@src.pos), el)
               @src.scan(HTML_TAG_CLOSE_RE)
             else
               add_text(@src.scan(/.*/m), el)
@@ -246,7 +246,7 @@ module Kramdown
           add_text(@src.scan(/./))
         end
       end
-      define_parser(:span_html, HTML_SPAN_START)
+      define_parser(:span_html, HTML_SPAN_START, '<')
 
     end
   end

data/lib/kramdown/parser/kramdown/html_entity.rb

@@ -20,19 +20,18 @@
 #++
 #
 
-require 'rexml/parsers/baseparser'
-
 module Kramdown
   module Parser
     class Kramdown
 
+      HTML_ENTITY_RE = /&([\w:][\-\w\d\.:]*);|&#(\d+);|&\#x([0-9a-fA-F]+);/
+
       # Parse the HTML entity at the current location.
       def parse_html_entity
         @src.pos += @src.matched_size
-        @tree.children << Element.new(:entity, @src.matched)
+        @tree.children << Element.new(:entity, @src[1] || (@src[2] && @src[2].to_i) || @src[3].hex)
       end
-      define_parser(:html_entity, REXML::Parsers::BaseParser::REFERENCE_RE)
-
+      define_parser(:html_entity, HTML_ENTITY_RE, '&')
 
     end
   end

data/lib/kramdown/parser/kramdown/line_break.rb

@@ -31,7 +31,7 @@ module Kramdown
         @src.pos += @src.matched_size
         @tree.children << Element.new(:br)
       end
-      define_parser(:line_break, LINE_BREAK)
+      define_parser(:line_break, LINE_BREAK, '(  |\\\\)(?=\n)')
 
     end
   end

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

@@ -91,7 +91,7 @@ module Kramdown
           add_text(result)
           return
         end
-        alt_text = @src.string[reset_pos...@src.pos]
+        alt_text = extract_string(reset_pos...@src.pos)
         conv_link_id = alt_text.gsub(/(\s|\n)+/m, ' ').gsub(LINK_ID_NON_CHARS, '').downcase
         @src.scan(stop_re)
 
@@ -146,7 +146,7 @@ module Kramdown
           add_text(result)
         end
       end
-      define_parser(:link, LINK_START)
+      define_parser(:link, LINK_START, '!?\[')
 
     end
   end

data/lib/kramdown/parser/kramdown/smart_quotes.rb

@@ -0,0 +1,213 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown.
+#
+# kramdown is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Parts of this file are based on code from Maruku by Andrea Censi.
+# The needed license statements follow:
+#
+#   Copyright (C) 2006  Andrea Censi  <andrea (at) rubyforge.org>
+#
+#   Maruku is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   Maruku is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Maruku; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# NOTA BENE:
+#
+# The following algorithm is a rip-off of RubyPants written by
+# Christian Neukirchen.
+#
+# RubyPants is a Ruby port of SmartyPants written by John Gruber.
+#
+# This file is distributed under the GPL, which I guess is compatible
+# with the terms of the RubyPants license.
+#
+# -- Andrea Censi
+#
+# = RubyPants -- SmartyPants ported to Ruby
+#
+# Ported by Christian Neukirchen <mailto:chneukirchen@gmail.com>
+#   Copyright (C) 2004 Christian Neukirchen
+#
+# Incooporates ideas, comments and documentation by Chad Miller
+#   Copyright (C) 2004 Chad Miller
+#
+# Original SmartyPants by John Gruber
+#   Copyright (C) 2003 John Gruber
+#
+#
+# = RubyPants -- SmartyPants ported to Ruby
+#
+#
+# [snip]
+#
+# == Authors
+#
+# John Gruber did all of the hard work of writing this software in
+# Perl for Movable Type and almost all of this useful documentation.
+# Chad Miller ported it to Python to use with Pyblosxom.
+#
+# Christian Neukirchen provided the Ruby port, as a general-purpose
+# library that follows the *Cloth API.
+#
+#
+# == Copyright and License
+#
+# === SmartyPants license:
+#
+# Copyright (c) 2003 John Gruber
+# (http://daringfireball.net)
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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.
+#
+# * Neither the name "SmartyPants" nor the names of its contributors
+#   may be used to endorse or promote products derived from this
+#   software without specific prior written permission.
+#
+# 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 purpose are disclaimed. In no event shall the
+# copyright owner or contributors be liable for any direct, indirect,
+# incidental, special, exemplary, or consequential damages (including,
+# but not limited to, procurement of substitute goods or services;
+# loss of use, data, or profits; or business interruption) however
+# caused and on any theory of liability, whether in contract, strict
+# liability, or tort (including negligence or otherwise) arising in
+# any way out of the use of this software, even if advised of the
+# possibility of such damage.
+#
+# === RubyPants license
+#
+# RubyPants is a derivative work of SmartyPants and smartypants.py.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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 purpose are disclaimed. In no event shall the
+# copyright owner or contributors be liable for any direct, indirect,
+# incidental, special, exemplary, or consequential damages (including,
+# but not limited to, procurement of substitute goods or services;
+# loss of use, data, or profits; or business interruption) however
+# caused and on any theory of liability, whether in contract, strict
+# liability, or tort (including negligence or otherwise) arising in
+# any way out of the use of this software, even if advised of the
+# possibility of such damage.
+#
+# == Links
+#
+# John Gruber:: http://daringfireball.net
+# SmartyPants:: http://daringfireball.net/projects/smartypants
+#
+# Chad Miller:: http://web.chad.org
+#
+# Christian Neukirchen:: http://kronavita.de/chris
+#
+#++
+#
+
+module Kramdown
+  module Parser
+    class Kramdown
+
+      SQ_PUNCT = '[!"#\$\%\'()*+,\-.\/:;<=>?\@\[\\\\\]\^_`{|}~]'
+      SQ_CLOSE = %![^\ \\\\\t\r\n\\[{(-]!
+
+      SQ_RULES = [
+                  [/("|')(?=#{SQ_PUNCT}\B)/, [:rquote1]],
+                  # Special case for double sets of quotes, e.g.:
+                  #   <p>He said, "'Quoted' words in a larger quote."</p>
+                  [/(\s?)"'(?=\w)/, [1, :ldquo, :lsquo]],
+                  [/(\s?)'"(?=\w)/, [1, :lsquo, :ldquo]],
+                  # Special case for decade abbreviations (the '80s):
+                  [/(\s?)'(?=\d\ds)/, [1, :rsquo]],
+
+                  # Get most opening single/double quotes:
+                  [/(\s)('|")(?=\w)/, [1, :lquote2]],
+                  # Single/double closing quotes:
+                  [/(#{SQ_CLOSE})('|")/, [1, :rquote2]],
+                  # Special case for e.g. "<i>Custer</i>'s Last Stand."
+                  [/("|')(\s|s\b|$)/, [:rquote1, 2]],
+                  # Any remaining single quotes should be opening ones:
+                  [/(.?)'/, [1, :lsquo]],
+                  [/(.?)"/, [1, :ldquo]],
+                 ] #'"
+
+      SQ_SUBSTS = {
+        [:rquote1, '"'] => :rdquo,
+        [:rquote1, "'"] => :rsquo,
+        [:rquote2, '"'] => :rdquo,
+        [:rquote2, "'"] => :rsquo,
+        [:lquote1, '"'] => :ldquo,
+        [:lquote1, "'"] => :lsquo,
+        [:lquote2, '"'] => :ldquo,
+        [:lquote2, "'"] => :lsquo,
+      }
+      SMART_QUOTES_RE = /[^\\]?["']/
+
+      # Parse the smart quotes at current location.
+      def parse_smart_quotes
+        regexp, substs = SQ_RULES.find {|reg, subst| @src.scan(reg)}
+        substs.each do |subst|
+          if subst.kind_of?(Integer)
+            add_text(@src[subst].to_s)
+          else
+            val = SQ_SUBSTS[[subst, @src[subst.to_s[-1,1].to_i]]] || subst
+            @tree.children << Element.new(:smart_quote, val)
+          end
+        end
+      end
+      define_parser(:smart_quotes, SMART_QUOTES_RE, '[^\\\\]?["\']')
+
+    end
+  end
+end

data/lib/kramdown/parser/kramdown/typographic_symbol.rb

@@ -41,7 +41,7 @@ module Kramdown
           add_text(val.dup)
         end
       end
-      define_parser(:typographic_syms, TYPOGRAPHIC_SYMS_RE)
+      define_parser(:typographic_syms, TYPOGRAPHIC_SYMS_RE, '--|\\.\\.\\.|(?:\\\\| )?(?:<<|>>)')
 
     end
   end

data/lib/kramdown/version.rb

@@ -23,6 +23,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 
 end