rdiscount 1.6.5 → 1.6.8

data/BUILDING

@@ -0,0 +1,34 @@
+BUILDING rdiscount
+==================
+
+You'll be needing Ruby, rake, and a basic build environment.
+
+Build the rdiscount extension for tests and local development:
+
+    $ rake build
+
+Use your rdiscount working copy when running ruby programs:
+
+    $ export RUBYLIB=~/rdiscount/lib:$RUBYLIB
+    $ ruby some-program.rb
+
+Gathering changes from an upstream Orc/discount.git clone requires first
+grabbing the discount submodule into the root of the project and then running
+the rake gather task to copy discount source files into the ext/ directory:
+
+    $ git submodule init
+    Submodule 'discount' (git://github.com/rtomayko/discount.git) registered for path 'discount'
+    $ rake gather
+    $ rake build
+
+The rtomayko/discount.git repository's master branch is the default submodule
+head. It exists to merge branches for rdiscount specific patches to the upstream
+discount codebase.
+
+Do work in the submodule and then add a remote for your clone THAT YOU FORKED ON
+GITHUB BECAUSE YOU'RE GOING TO SEND ME A PULL REQUEST. After you've committed
+your great changes somewhere, push them up with:
+
+    $ cd discount
+    $ git remote add you git@github.com:you/discount.git
+    $ git push you HEAD:topic-branch-name

data/README.markdown

@@ -31,7 +31,10 @@ The RDiscount sources are available via Git:
     $ cd rdiscount
     $ rake --tasks
 
+See the file [BUILDING][] for hacking instructions.
+
 [gemcutter]: http://gemcutter.org/gems/rdiscount
+[BUILDING]: BUILDING
 
 USAGE
 -----

data/Rakefile

@@ -8,7 +8,7 @@ task :default => :test
 # Ruby Extension
 # ==========================================================
 
-DLEXT = Config::CONFIG['DLEXT']
+DLEXT = Config::MAKEFILE_CONFIG['DLEXT']
 RUBYDIGEST = Digest::MD5.hexdigest(`#{RUBY} --version`)
 
 file "ext/ruby-#{RUBYDIGEST}" do |f|
@@ -109,7 +109,7 @@ CLEAN.include 'doc'
 # ==========================================================
 
 desc 'Gather required discount sources into extension directory'
-task :gather => 'discount' do |t|
+task :gather => 'discount/markdown.h' do |t|
   files =
     FileList[
       'discount/{markdown,mkdio,amalloc,cstring,tags}.h',
@@ -121,22 +121,8 @@ task :gather => 'discount' do |t|
   cp 'discount/markdown.7', 'man/'
 end
 
-# best. task. ever.
-file 'discount' do |f|
-  STDERR.puts((<<-TEXT).gsub(/^ +/, ''))
-    Sorry, this operation requires a human. Tell your human to:
-
-    Grab a discount tarball from:
-    http://www.pell.portland.or.us/~orc/Code/discount/
-
-    Extract here with something like:
-    tar xvzf discount-1.2.9.tar.gz
-
-    Create a discount symlink pointing at the version directory:
-    ln -hsf discount-1.2.9 discount
-
-  TEXT
-  fail "discount sources required."
+file 'discount/markdown.h' do |t|
+  abort "The discount submodule is required. See the file BUILDING for getting set up."
 end
 
 # PACKAGING =================================================================

data/ext/generate.c

@@ -18,7 +18,7 @@
 #include "amalloc.h"
 
 typedef int (*stfu)(const void*,const void*);
-
+typedef void (*spanhandler)(MMIOT*,int);
 
 /* forward declarations */
 static void text(MMIOT *f);
@@ -164,16 +164,6 @@ Qprintf(MMIOT *f, char *fmt, ...)
 }
 
 
-/* Qcopy()
- */
-static void
-Qcopy(int count, MMIOT *f)
-{
-    while ( count-- > 0 )
-	Qchar(pull(f), f);
-}
-
-
 /* Qem()
  */
 static void
@@ -272,12 +262,12 @@ parenthetical(int in, int out, MMIOT *f)
     for ( indent=1,size=0; indent; size++ ) {
 	if ( (c = pull(f)) == EOF )
 	    return EOF;
-	else if ( c == in )
-	    ++indent;
-	else if ( (c == '\\') && (peek(f,1) == out) ) {
+	else if ( (c == '\\') && (peek(f,1) == out || peek(f,1) == in) ) {
 	    ++size;
 	    pull(f);
 	}
+	else if ( c == in )
+	    ++indent;
 	else if ( c == out )
 	    --indent;
     }
@@ -664,11 +654,11 @@ mangle(char *s, int len, MMIOT *f)
 /* nrticks() -- count up a row of tick marks
  */
 static int
-nrticks(int offset, MMIOT *f)
+nrticks(int offset, int tickchar, MMIOT *f)
 {
     int  tick = 0;
 
-    while ( peek(f, offset+tick) == '`' ) tick++;
+    while ( peek(f, offset+tick) == tickchar ) tick++;
 
     return tick;
 } /* nrticks */
@@ -677,36 +667,34 @@ nrticks(int offset, MMIOT *f)
 /* matchticks() -- match a certain # of ticks, and if that fails
  *                 match the largest subset of those ticks.
  *
- *                 if a subset was matched, modify the passed in
- *                 # of ticks so that the caller (text()) can
- *                 appropriately process the horrible thing.
+ *                 if a subset was matched, return the # of ticks
+ *		   that were matched.
  */
 static int
-matchticks(MMIOT *f, int *ticks)
+matchticks(MMIOT *f, int tickchar, int ticks, int *endticks)
 {
-    int size, tick, c;
+    int size, count, c;
     int subsize=0, subtick=0;
     
-    for (size = *ticks; (c=peek(f,size)) != EOF; ) {
-	if ( c == '`' )
-	    if ( (tick=nrticks(size,f)) == *ticks )
+    *endticks = ticks;
+    for (size = 0; (c=peek(f,size+ticks)) != EOF; size ++) {
+	if ( (c == tickchar) && ( count = nrticks(size+ticks,tickchar,f)) ) {
+	    if ( count == ticks )
 		return size;
-	    else {
-		if ( tick > subtick ) {
+	    else if ( count ) {
+		if ( (count > subtick) && (count < ticks) ) {
 		    subsize = size;
-		    subtick = tick;
+		    subtick = count;
 		}
-		size += tick;
+		size += count;
 	    }
-	else
-	    size++;
+	}
     }
     if ( subsize ) {
-	*ticks = subtick;
+	*endticks = subtick;
 	return subsize;
     }
     return 0;
-    
 } /* matchticks */
 
 
@@ -727,13 +715,24 @@ code(MMIOT *f, char *s, int length)
 } /* code */
 
 
+/*  delspan() -- write out a chunk of text, blocking with <del>...</del>
+ */
+static void
+delspan(MMIOT *f, int size)
+{
+    Qstring("<del>", f);
+    ___mkd_reparse(cursor(f)-1, size, 0, f);
+    Qstring("</del>", f);
+}
+
+
 /*  codespan() -- write out a chunk of text as code, trimming one
  *                space off the front and/or back as appropriate.
  */
 static void
 codespan(MMIOT *f, int size)
 {
-    int i=0, c;
+    int i=0;
 
     if ( size > 1 && peek(f, size-1) == ' ' ) --size;
     if ( peek(f,i) == ' ' ) ++i, --size;
@@ -864,7 +863,7 @@ maybe_tag_or_link(MMIOT *f)
 	}
 	else if ( isspace(c) )
 	    break;
-	else if ( ! (c == '/' || isalnum(c) ) )
+	else if ( ! (c == '/' || c == '-' || c == '_' || isalnum(c) ) )
 	    maybetag=0;
     }
 
@@ -1058,6 +1057,30 @@ smartypants(int c, int *flags, MMIOT *f)
 } /* smartypants */
 
 
+/* process a body of text encased in some sort of tick marks.   If it
+ * works, generate the output and return 1, otherwise just return 0 and
+ * let the caller figure it out.
+ */
+static int
+tickhandler(MMIOT *f, int tickchar, int minticks, spanhandler spanner)
+{
+    int endticks, size;
+    int tick = nrticks(0, tickchar, f);
+
+    if ( (tick >= minticks) && (size = matchticks(f,tickchar,tick,&endticks)) ) {
+	if ( endticks < tick ) {
+	    size += (tick - endticks);
+	    tick = endticks;
+	}
+
+	shift(f, tick);
+	(*spanner)(f,size);
+	shift(f, size+tick-1);
+	return 1;
+    }
+    return 0;
+}
+
 #define tag_text(f)	(f->flags & INSIDE_TAG)
 
 
@@ -1151,21 +1174,12 @@ text(MMIOT *f)
 		    }
 		    break;
 	
-	case '`':   if ( tag_text(f) )
+	case '~':   if ( (f->flags & (NOSTRIKETHROUGH|INSIDE_TAG|STRICT)) || !tickhandler(f,c,2,delspan) )
 			Qchar(c, f);
-		    else {
-			int size, tick = nrticks(0, f);
+		    break;
 
-			if ( size = matchticks(f, &tick) ) {
-			    shift(f, tick);
-			    codespan(f, size-tick);
-			    shift(f, size-1);
-			}
-			else {
-			    Qchar(c, f);
-			    Qcopy(tick-1, f);
-			}
-		    }
+	case '`':   if ( tag_text(f) || !tickhandler(f,c,1,codespan) )
+			Qchar(c, f);
 		    break;
 
 	case '\\':  switch ( c = pull(f) ) {
@@ -1333,8 +1347,8 @@ static int
 printblock(Paragraph *pp, MMIOT *f)
 {
     Line *t = pp->text;
-    static char *Begin[] = { "", "<p>", "<center>"  };
-    static char *End[]   = { "", "</p>","</center>" };
+    static char *Begin[] = { "", "<p>", "<p style=\"text-align:center;\">"  };
+    static char *End[]   = { "", "</p>","</p>" };
 
     while (t) {
 	if ( S(t->text) ) {

data/ext/markdown.h

@@ -86,6 +86,7 @@ typedef struct mmiot {
 #define NO_PSEUDO_PROTO	0x0040
 #define CDATA_OUTPUT	0x0080
 #define NOTABLES	0x0400
+#define NOSTRIKETHROUGH	0x0800
 #define TOC		0x1000
 #define MKD_1_COMPAT	0x2000
 #define AUTOLINK	0x4000

data/ext/mkdio.h

@@ -74,6 +74,7 @@ extern char markdown_version[];
 #define MKD_NO_EXT	0x0040	/* don't allow pseudo-protocols */
 #define MKD_CDATA	0x0080	/* generate code for xml ![CDATA[...]] */
 #define MKD_NOTABLES	0x0400	/* disallow tables */
+#define MKD_NOSTRIKETHROUGH 0x0800/* forbid ~~strikethrough~~ */
 #define MKD_TOC		0x1000	/* do table-of-contents processing */
 #define MKD_1_COMPAT	0x2000	/* compatability with MarkdownTest_1.0 */
 #define MKD_AUTOLINK	0x4000	/* make http://foo.com link even without <>s */

data/ext/tags.c

@@ -83,6 +83,7 @@ mkd_prepare_tags()
     KW("CENTER");
     KW("DFN");
     KW("DIV");
+    KW("OBJECT");
     KW("H1");
     KW("H2");
     KW("H3");

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '1.6.5'
+  VERSION = '1.6.8'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -1,18 +1,20 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '1.6.5'
+  s.version = '1.6.8'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2010-06-15'
+  s.date = '2011-01-25'
   s.email = 'rtomayko@gmail.com'
   s.homepage = 'http://github.com/rtomayko/rdiscount'
   s.has_rdoc = true
   s.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White"]
   # = MANIFEST =
   s.files = %w[
+    BUILDING
     COPYING
     README.markdown
     Rakefile
     bin/rdiscount
+    discount
     ext/Csio.c
     ext/amalloc.h
     ext/basename.c

data/test/rdiscount_test.rb

@@ -103,4 +103,9 @@ EOS
     rd = RDiscount.new("[foo](id:bar)", :no_pseudo_protocols)
     assert_equal "<p>[foo](id:bar)</p>\n", rd.to_html
   end
+
+  def test_that_tags_can_have_dashes_and_underscores
+    rd = RDiscount.new("foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b>")
+    assert_equal "<p>foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b></p>\n", rd.to_html
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdiscount
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 6
-  - 5
-  version: 1.6.5
+  - 8
+  version: 1.6.8
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -07:00
+date: 2011-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +30,7 @@ extensions:
 extra_rdoc_files: 
 - COPYING
 files: 
+- BUILDING
 - COPYING
 - README.markdown
 - Rakefile
@@ -75,23 +77,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: wink
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fast Implementation of Gruber's Markdown in C