patcito-rdiscount 1.6.8 → 1.6.9

data/ext/extconf.rb

@@ -7,13 +7,8 @@ HAVE_SRANDOM = have_func('srandom')
 HAVE_RAND = have_func('rand')
 HAVE_SRAND = have_func('srand')
 
-def sized_int(size, types)
-  types.find { |type| check_sizeof(type) == 4 } ||
-    abort("no int with size #{size}")
-end
-
-DWORD = sized_int(4, ["unsigned long", "unsigned int"])
-WORD =  sized_int(2, ["unsigned int", "unsigned short"])
+DWORD = "unsigned long"
+WORD =  "unsigned short"
 BYTE = "unsigned char"
 
 $defs.push("-DDWORD='#{DWORD}'")

data/ext/generate.c

@@ -1072,7 +1072,7 @@ smartypants(int c, int *flags, MMIOT *f)
 {
     int i;
 
-    if ( f->flags & (MKD_NOPANTS|MKD_TAGTEXT|IS_LABEL|MKD_MATH) )
+    if ( f->flags & (MKD_NOPANTS|MKD_TAGTEXT|IS_LABEL) )
 	return 0;
 
     for ( i=0; i < NRSMART; i++)
@@ -1140,53 +1140,13 @@ tickhandler(MMIOT *f, int tickchar, int minticks, spanhandler spanner)
     return 0;
 }
 
-static int
-ismathleft(MMIOT *f, int offset)
-{
-    int i;
-
-    while (peek(f,offset-1) == '$')
-        --offset;
-
-    i = 1;
-    while (peek(f,offset-i) == '\\')
-	++i;
-    if ( (i % 2) == 0 )
-	return 0;
-
-    while (!isthisspace(f,offset-i)) {
-	if (isthisalnum(f,offset-i))
-	    return 0;
-	++i;
-    }
-
-    return !isthisspace(f,offset+1);
-}
-
-static int
-ismathright(MMIOT *f, int offset)
-{
-    int i;
-
-    while (peek(f,offset+1) == '$')
-        ++offset;
-
-    i = 1;
-    while (peek(f,offset-i) == '\\')
-	++i;
-    if ( (i % 2) == 0 )
-	return 0;
-
-    return !isthisalnum(f,offset+1);
-}
-
-#define protected(f)	(f->flags & (MKD_TAGTEXT|MKD_MATH))
+#define tag_text(f)	(f->flags & MKD_TAGTEXT)
 
 
 static void
 text(MMIOT *f)
 {
-    int c, j, escape;
+    int c, j;
     int rep;
     int smartyflags = 0;
 
@@ -1204,16 +1164,16 @@ text(MMIOT *f)
 	switch (c) {
 	case 0:     break;
 
-	case 3:     Qstring(protected(f) ? "  " : "<br/>", f);
+	case 3:     Qstring(tag_text(f) ? "  " : "<br/>", f);
 		    break;
 
-	case '>':   if ( protected(f) )
+	case '>':   if ( tag_text(f) )
 			Qstring("&gt;", f);
 		    else
 			Qchar(c, f);
 		    break;
 
-	case '"':   if ( protected(f) )
+	case '"':   if ( tag_text(f) )
 			Qstring("&quot;", f);
 		    else
 			Qchar(c, f);
@@ -1221,17 +1181,17 @@ text(MMIOT *f)
 			
 	case '!':   if ( peek(f,1) == '[' ) {
 			pull(f);
-			if ( protected(f) || !linkylinky(1, f) )
+			if ( tag_text(f) || !linkylinky(1, f) )
 			    Qstring("![", f);
 		    }
 		    else
 			Qchar(c, f);
 		    break;
-	case '[':   if ( protected(f) || !linkylinky(0, f) )
+	case '[':   if ( tag_text(f) || !linkylinky(0, f) )
 			Qchar(c, f);
 		    break;
 	/* A^B -> A<sup>B</sup> */
-	case '^':   if ( (f->flags & (MKD_NOSUPERSCRIPT|MKD_STRICT|MKD_TAGTEXT|MKD_MATH))
+	case '^':   if ( (f->flags & (MKD_NOSUPERSCRIPT|MKD_STRICT|MKD_TAGTEXT))
 				|| (isthisnonword(f,-1) && peek(f,-1) != ')')
 				|| isthisspace(f,1) )
 			Qchar(c,f);
@@ -1280,7 +1240,7 @@ text(MMIOT *f)
 			break;
 		    }
 		    /* else fall into the regular old emphasis case */
-		    if ( protected(f) )
+		    if ( tag_text(f) )
 			Qchar(c, f);
 		    else {
 			for (rep = 1; peek(f,1) == c; pull(f) )
@@ -1289,37 +1249,11 @@ text(MMIOT *f)
 		    }
 		    break;
 	
-	case '$':
-		    if ( (f->flags & MKD_PROTECTMATH) && !(f->flags & MKD_TAGTEXT)) {
-			escape = 1;
-			for (j = 1; peek(f,j) == '$';)
-			    ++j;
-			if ( ismathleft(f,j-1) ) {
-			    for (; (c = peek(f,j)) != EOF; j++) {
-				if ((c == '\n' && peek(f,j+1) == '\n')
-					|| (c == '$' && ismathleft(f,j)))
-				    break;
-				if (c == '$' && ismathright(f,j)) {
-				    escape = 0;
-				    f->flags |= MKD_MATH;
-				    break;
-				}
-			    }
-			} else if ( ismathright(f,j-1) ) {
-			    escape = 0;
-			    f->flags &= ~MKD_MATH;
-			}
-			if (escape)
-			    Qchar('\\', f);
-		    }
-		    Qchar('$', f);
-		    break;
-
-	case '~':   if ( (f->flags & (MKD_NOSTRIKETHROUGH|MKD_TAGTEXT|MKD_STRICT|MKD_MATH)) || !tickhandler(f,c,2,delspan) )
+	case '~':   if ( (f->flags & (MKD_NOSTRIKETHROUGH|MKD_TAGTEXT|MKD_STRICT)) || !tickhandler(f,c,2,delspan) )
 			Qchar(c, f);
 		    break;
 
-	case '`':   if ( protected(f) || !tickhandler(f,c,1,codespan) )
+	case '`':   if ( tag_text(f) || !tickhandler(f,c,1,codespan) )
 			Qchar(c, f);
 		    break;
 

data/ext/markdown.h

@@ -98,10 +98,8 @@ typedef struct mmiot {
 #define MKD_NODIVQUOTE	0x00040000
 #define MKD_NOALPHALIST	0x00080000
 #define MKD_NODLIST	0x00100000
-#define MKD_PROTECTMATH 0x00200000
 #define IS_LABEL	0x08000000
-#define MKD_MATH	0x10000000
-#define USER_FLAGS	0x1FFFFFFF
+#define USER_FLAGS	0x0FFFFFFF
 #define INPUT_MASK	(MKD_NOHEADER|MKD_TABSTOP)
 
     Callback_data *cb;

data/ext/mkdio.h

@@ -91,7 +91,7 @@ extern char markdown_version[];
 #define MKD_NODIVQUOTE	0x00040000	/* forbid >%class% blocks */
 #define MKD_NOALPHALIST	0x00080000	/* forbid alphabetic lists */
 #define MKD_NODLIST	0x00100000	/* forbid definition lists */
-#define MKD_PROTECTMATH 0x00200000	/* forbid definition lists */
+#define MKD_PROTECTMATH 0x00200000	/* treat dollar signs as math */
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
 /* special flags for mkd_in() and mkd_string()

data/rdiscount.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = 'patcito-rdiscount'
-  s.version = '1.6.8'
+  s.version = '1.6.9'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
   s.date = '2011-01-25'
   s.email = 'rtomayko@gmail.com'
-  s.homepage = 'http://github.com/patcito/rdiscount'
+  s.homepage = 'http://github.com/rtomayko/rdiscount'
   s.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White"]
   # = MANIFEST =
   s.files = %w[

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patcito-rdiscount
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -59,7 +59,7 @@ files:
 - test/benchmark.txt
 - test/markdown_test.rb
 - test/rdiscount_test.rb
-homepage: http://github.com/patcito/rdiscount
+homepage: http://github.com/rtomayko/rdiscount
 licenses: []
 post_install_message: 
 rdoc_options: []