RedCloth 4.1.1-x86-mswin32-60 → 4.1.9-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,39 @@
+=== 4.1.9 / February 20, 2009
+
+* Make compatible with Ruby 1.9.
+
+* Image URLs and image titles can now contain parentheses. #71
+
+* Handle caps properly in link titles. #77
+
+* Remove extra preformatted line breaks after extended block code. #79
+
+* Fix inline <notextile> being recognized as block <notextile>. #81
+
+* Allow leading spaces on lists for backward compatibility with RedCloth 3.x. #89
+
+* Recognize deleted phrases when they start at the beginning of a line. #83
+
+* Fix escaped <code> tag when it has the class attribute and is in a <pre> tag. #95
+
+* Fix dimensions and primes for LaTeX. #103
+
+* Don't allow square brackets inside lang attribute so double square brackets are interpreted like Textile 2 and RedCloth 3. #101
+
+* Improve LaTeX output for tables. #96
+
+* Fix bad parsing of bracketed image links (which would hang the interpreter in some cases). #97
+
+* Handle links containing parentheses.  Brackets are no longer required. #82 [Ryan Alyea]
+
+* Made italics use the correct LaTeX tag: textit rather than emph. #98
+
+* Fixed custom block signatures calling built-in Ruby String methods. #92
+
+* Mentioned the three supported platforms and what's necessary to build RedCloth in the README file.
+
+* Fixed a require problem that caused an error when you would gem check --test RedCloth. #91
+
 === 4.1.1 / November 19, 2008
 
 * Added 'lib/case_sensitive_require' back into gemspec.  It got left out in the conversion to echoe, so "require 'RedCloth'" didn't work. #88

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Jason Garber
+Copyright (c) 2009 Jason Garber
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README

@@ -2,7 +2,7 @@
 
 Homepage::  http://redcloth.org
 Author::    Jason Garber
-Copyright:: (c) 2008 Jason Garber
+Copyright:: (c) 2009 Jason Garber
 License::   MIT
 
 (See http://redcloth.org/textile/ for a Textile reference.)
@@ -15,10 +15,38 @@ RedCloth is a Ruby library for converting Textile into HTML.
 
 RedCloth can be installed via RubyGems:
 
-  sudo gem install RedCloth
+  gem install RedCloth
+
+It will install the appropriate Ruby, JRuby, or Win32 gem.  If using JRuby, version 1.1.5 or greater is required.
+
+== Compiling
+
+If you just want to use RedCloth, you do NOT need to build/compile it.  It is compiled from C sources automatically when you install the gem on the ruby platform.  Binary gems are provided for JRuby and Win32 platforms.
+
+RedCloth can be compiled with <tt>rake compile</tt>.  Ragel 6.3 or greater and the 
+echoe gem are needed to build, compile, and package RedCloth.  Again, Ragel and echoe are NOT needed to simply use RedCloth.
+
+You can cross-compile for JRuby with rake java compile and for Win32 with rake mingw compile.
+
+== Using RedCloth
+
+RedCloth is simply an extension of the String class, which can handle
+Textile formatting.  Use it like a String and output HTML with its
+RedCloth#to_html method.
+
+Simple use:
+ text = "This is *my* text."
+ RedCloth.new(text).to_html
+
+Multi-line example:
+
+ doc = RedCloth.new <<EOD
+ h2. Test document
+ 
+ Just a simple test.
+ EOD
+ puts doc.to_html
 
-Or can be compiled from its Ragel source with <tt>rake compile</tt>.  Ragel 6.2 
-or greater is required to build RedCloth.
 
 == What is Textile?
 
@@ -140,17 +168,4 @@ Styles are applied with curly braces.
     table{border:1px solid black}.
     {background:#ddd;color:red}. |a|red|row|
 
-== Using RedCloth
-
-RedCloth is simply an extension of the String class, which can handle
-Textile formatting.  Use it like a String and output HTML with its
-RedCloth#to_html method.
-
- doc = RedCloth.new "
-
- h2. Test document
-
- Just a simple test."
-
- puts doc.to_html
 

data/Rakefile

@@ -14,6 +14,7 @@ e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
   p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/
   p.ruby_version = '>=1.8.4'
   p.extension_pattern = nil
+  p.development_dependencies = [] # remove echoe from development dependencies
   
   if Platform.gcc?
     p.platform = 'x86-mswin32-60'

data/RedCloth.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{RedCloth}
-  s.version = "4.1.1"
+  s.version = "4.1.9"
   s.platform = %q{x86-mswin32-60}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Garber"]
-  s.date = %q{2008-11-19}
+  s.date = %q{2009-02-20}
   s.default_executable = %q{redcloth}
-  s.description = %q{RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/}
+  s.description = %q{RedCloth-4.1.9 - Textile parser for Ruby. http://redcloth.org/}
   s.email = %q{redcloth-upwards@rubyforge.org}
   s.executables = ["redcloth"]
   s.extra_rdoc_files = ["CHANGELOG", "lib/case_sensitive_require/RedCloth.rb", "lib/redcloth/erb_extension.rb", "lib/redcloth/formatters/base.rb", "lib/redcloth/formatters/html.rb", "lib/redcloth/formatters/latex.rb", "lib/redcloth/textile_doc.rb", "lib/redcloth/version.rb", "lib/redcloth.rb", "README"]
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.4")
   s.rubyforge_project = %q{redcloth}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/}
+  s.summary = %q{RedCloth-4.1.9 - Textile parser for Ruby. http://redcloth.org/}
   s.test_files = ["test/test_custom_tags.rb", "test/test_erb.rb", "test/test_extensions.rb", "test/test_formatters.rb", "test/test_parser.rb", "test/test_restrictions.rb"]
 
   if s.respond_to? :specification_version then
@@ -29,11 +29,8 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/ext/redcloth_scan/redcloth.h

@@ -1,14 +1,30 @@
 #ifndef redcloth_h
 #define redcloth_h
 
-/* Backward compatibility with Ruby < 1.8.6 */
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(x) (RSTRING(x)->len)
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(arr)  RARRAY(arr)->len
+#define RSTRING_LEN(str) RSTRING(str)->len
+#define RSTRING_PTR(str) RSTRING(str)->ptr
 #endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(x) (RSTRING(x)->ptr)
+
+
+// Different string conversions for ruby 1.8 and ruby 1.9. For 1.9, 
+// we need to set the encoding of the string.
+
+// For Ruby 1.9
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#define STR_NEW(p,n) rb_enc_str_new((p),(n),rb_utf8_encoding())
+#define STR_NEW2(p) rb_enc_str_new((p),strlen(p),rb_utf8_encoding())
+
+// For Ruby 1.8
+#else
+#define STR_NEW(p,n) rb_str_new((p),(n))
+#define STR_NEW2(p) rb_str_new2((p))
+
 #endif
 
+
 /* variable defs */
 #ifndef redcloth_scan_c
 extern VALUE super_ParseError, mRedCloth, super_RedCloth;
@@ -23,6 +39,7 @@ VALUE redcloth_inline2(VALUE, VALUE, VALUE);
 VALUE redcloth_attribute_parser(int, VALUE, char *, char *);
 VALUE redcloth_attributes(VALUE, VALUE);
 VALUE redcloth_link_attributes(VALUE, VALUE);
+VALUE red_parse_title(VALUE, VALUE);
 VALUE redcloth_transform(VALUE, char *, char *, VALUE);
 VALUE redcloth_transform2(VALUE, VALUE);
 void red_inc(VALUE, VALUE);
@@ -35,14 +52,16 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 #define CLEAR_REGS()   regs = rb_hash_new();
 #define RESET_REG()    reg = NULL
 #define CAT(H)         rb_str_cat(H, ts, te-ts)
-#define CLEAR(H)       H = rb_str_new2("")
-#define SET_PLAIN_BLOCK(T) plain_block = rb_str_new2(T)
+#define CLEAR(H)       H = STR_NEW2("")
+#define RSTRIP_BANG(H)      rb_funcall(H, rb_intern("rstrip!"), 0)
+#define SET_PLAIN_BLOCK(T) plain_block = STR_NEW2(T)
 #define RESET_TYPE(T)  rb_hash_aset(regs, ID2SYM(rb_intern("type")), plain_block)
 #define INLINE(H, T)   rb_str_append(H, rb_funcall(self, rb_intern(T), 1, regs))
 #define DONE(H)        rb_str_append(html, H); CLEAR(H); CLEAR_REGS()
 #define PASS(H, A, T)  rb_str_append(H, red_pass(self, regs, ID2SYM(rb_intern(A)), rb_intern(T), refs))
 #define PARSE_ATTR(A)  red_parse_attr(self, regs, ID2SYM(rb_intern(A)))
 #define PARSE_LINK_ATTR(A)  red_parse_link_attr(self, regs, ID2SYM(rb_intern(A)))
+#define PARSE_IMAGE_ATTR(A)  red_parse_image_attr(self, regs, ID2SYM(rb_intern(A)))
 #define PASS_CODE(H, A, T, O) rb_str_append(H, red_pass_code(self, regs, ID2SYM(rb_intern(A)), rb_intern(T)))
 #define ADD_BLOCK() \
   rb_str_append(html, red_block(self, regs, block, refs)); \
@@ -54,38 +73,36 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 #define IS_NOT_EXTENDED()     NIL_P(extend)
 #define ADD_BLOCKCODE()    rb_str_append(html, red_blockcode(self, regs, block)); CLEAR(block); CLEAR_REGS()
 #define ADD_EXTENDED_BLOCKCODE()    rb_str_append(html, red_blockcode(self, regs, block)); CLEAR(block);
-#define ASET(T, V)     rb_hash_aset(regs, ID2SYM(rb_intern(T)), rb_str_new2(V));
+#define ASET(T, V)     rb_hash_aset(regs, ID2SYM(rb_intern(T)), STR_NEW2(V));
 #define AINC(T)        red_inc(regs, ID2SYM(rb_intern(T)));
 #define SET_ATTRIBUTES() \
-  VALUE buf = Qnil; \
   SET_ATTRIBUTE("class_buf", "class"); \
   SET_ATTRIBUTE("id_buf", "id"); \
   SET_ATTRIBUTE("lang_buf", "lang"); \
   SET_ATTRIBUTE("style_buf", "style");
 #define SET_ATTRIBUTE(B, A) \
-  buf = rb_hash_aref(regs, ID2SYM(rb_intern(B))); \
-  if (buf != Qnil) rb_hash_aset(regs, ID2SYM(rb_intern(A)), buf);
+  if (rb_hash_aref(regs, ID2SYM(rb_intern(B))) != Qnil) rb_hash_aset(regs, ID2SYM(rb_intern(A)), rb_hash_aref(regs, ID2SYM(rb_intern(B))));
 #define TRANSFORM(T) \
   if (p > reg && reg >= ts) { \
     VALUE str = redcloth_transform(self, reg, p, refs); \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
-  /*  printf("TRANSFORM(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
+    /*printf("TRANSFORM(" T ") '%s' (p:'%s' reg:'%s')\n", RSTRING_PTR(str), p, reg);*/  \
   } else { \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), Qnil); \
   }
 #define STORE(T)  \
   if (p > reg && reg >= ts) { \
-    VALUE str = rb_str_new(reg, p-reg); \
+    VALUE str = STR_NEW(reg, p-reg); \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
-  /*  printf("STORE(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
+    /*printf("STORE(" T ") '%s' (p:'%s' reg:'%s')\n", RSTRING_PTR(str), p, reg);*/  \
   } else { \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), Qnil); \
   }
 #define STORE_B(T)  \
   if (p > bck && bck >= ts) { \
-    VALUE str = rb_str_new(bck, p-bck); \
+    VALUE str = STR_NEW(bck, p-bck); \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
-  /*  printf("STORE_B(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
+    /*printf("STORE_B(" T ") '%s' (p:'%s' reg:'%s')\n", RSTRING_PTR(str), p, reg);*/  \
   } else { \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), Qnil); \
   }
@@ -94,8 +111,22 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
     char punct = 1; \
     while (p > reg && punct == 1) { \
       switch (*(p - 1)) { \
+        case ')': \
+          { /*needed to keep inside chars scoped for less memory usage*/\
+            char *temp_p = p - 1; \
+            char level = -1; \
+            while (temp_p > reg) { \
+              switch(*(temp_p - 1)) { \
+                case '(': ++level; break; \
+                case ')': --level; break; \
+              } \
+              --temp_p; \
+            } \
+            if (level == 0) { punct = 0; } else { --p; } \
+          } \
+          break;  \
         case '!': case '"': case '#': case '$': case '%': case ']': case '[': case '&': case '\'': \
-        case '*': case '+': case ',': case '-': case '.': case ')': case '(': case ':':  \
+        case '*': case '+': case ',': case '-': case '.': case '(':  case ':':  \
         case ';': case '=': case '?': case '@': case '\\': case '^': case '_': \
         case '`': case '|': case '~': p--; break; \
         default: punct = 0; \
@@ -118,7 +149,7 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
     { \
       rb_ary_store(list_index, nest-1, INT2NUM(aint + 1)); \
     } \
-    if (nest > RARRAY(list_layout)->len) \
+    if (nest > RARRAY_LEN(list_layout)) \
     { \
       sprintf(listm, "%s_open", list_type); \
       if (list_continue == 1) \
@@ -141,17 +172,17 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
       } \
       rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(nest)); \
       rb_str_append(html, rb_funcall(self, rb_intern(listm), 1, regs)); \
-      rb_ary_store(list_layout, nest-1, rb_str_new2(list_type)); \
+      rb_ary_store(list_layout, nest-1, STR_NEW2(list_type)); \
       CLEAR_REGS(); \
       ASET("first", "true"); \
     } \
     LIST_CLOSE(); \
-    rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(RARRAY(list_layout)->len)); \
+    rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(RARRAY_LEN(list_layout))); \
     ASET("type", "li_open")
 #define LIST_CLOSE() \
-    while (nest < RARRAY(list_layout)->len) \
+    while (nest < RARRAY_LEN(list_layout)) \
     { \
-      rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(RARRAY(list_layout)->len)); \
+      rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(RARRAY_LEN(list_layout))); \
       VALUE end_list = rb_ary_pop(list_layout); \
       if (!NIL_P(end_list)) \
       { \

data/ext/redcloth_scan/redcloth_attributes.c.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_attributes.c.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 #include <ruby.h>
 #include "redcloth.h"
@@ -24,9 +24,8 @@ redcloth_attribute_parser(machine, self, p, pe)
   char *p, *pe;
 {
   int cs, act;
-  char *ts, *te, *reg, *bck, *eof;
+  char *ts = 0, *te = 0, *reg = 0, *bck = NULL, *eof = NULL;
   VALUE regs = rb_hash_new();
-  VALUE buf = Qnil;
 
   %% write init;
 

data/ext/redcloth_scan/redcloth_attributes.java.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_attributes.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 import java.io.IOException;
 
@@ -43,14 +43,12 @@ public class RedclothAttributes extends RedclothScanService.Base {
   }
 
   public void SET_ATTRIBUTE(String B, String A) {
-    buf = ((RubyHash)regs).aref(runtime.newSymbol(B));
-    if(!buf.isNil()) {
-      ((RubyHash)regs).aset(runtime.newSymbol(A), buf);
+    if(!((RubyHash)regs).aref(runtime.newSymbol(B)).isNil()) {
+      ((RubyHash)regs).aset(runtime.newSymbol(A), ((RubyHash)regs).aref(runtime.newSymbol(B)));
     }
   }
  
   private int machine;
-  private IRubyObject buf;
    
   public RedclothAttributes(int machine, IRubyObject self, byte[] data, int p, int pe) {
     this.runtime = self.getRuntime();
@@ -68,7 +66,6 @@ public class RedclothAttributes extends RedclothScanService.Base {
     this.orig_pe = this.pe;
 
     this.regs = RubyHash.newHash(runtime);
-    this.buf = runtime.getNil();
     this.machine = machine;
   }
 
@@ -89,6 +86,8 @@ public class RedclothAttributes extends RedclothScanService.Base {
   }
 
   public static IRubyObject link_attributes(IRubyObject self, IRubyObject str) {
+    Ruby runtime = self.getRuntime();
+
     ByteList bl = str.convertToString().getByteList();
     int cs = redcloth_attributes_en_link_says;
     return new RedclothAttributes(cs, self, bl.bytes, bl.begin, bl.realSize).parse();

data/ext/redcloth_scan/redcloth_attributes.rl

@@ -1,14 +1,14 @@
 /*
  * redcloth_attributes.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 %%{
 
   machine redcloth_attributes;
   
   C2_CLAS = ( "(" ( [^)#]+ >A %{ STORE("class_buf"); } )? ("#" [^)]+ >A %{STORE("id_buf");} )? ")" ) ;
-  C2_LNGE = ( "[" [^\]]+ >A %{ STORE("lang_buf"); } "]" ) ;
+  C2_LNGE = ( "[" [^\[\]]+ >A %{ STORE("lang_buf"); } "]" ) ;
   C2_STYL = ( "{" [^}]+ >A %{ STORE("style_buf"); } "}" ) ;
   C2 = ( C2_CLAS | C2_STYL | C2_LNGE )+ ;
 

data/ext/redcloth_scan/redcloth_common.rl

@@ -77,7 +77,11 @@
   script_tag_start = ( "<script" [^>]* ">" ) >X >A %T ;
   script_tag_end = ( "</script>" >A %T LF? ) >X ;
   
-
+  code_tag_start = "<code" [^>]* ">" ;
+  code_tag_end = "</code>" ;
+  
+  notextile = "<notextile>" >X (default+ -- "</notextile>") >A %T "</notextile>";
+  
   # URI tokens (lifted from Mongrel)
   CTL = (cntrl | 127);
   safe = ("$" | "-" | "_" | ".");

data/ext/redcloth_scan/redcloth_inline.c.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_inline.c.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 #include <ruby.h>
 #include "redcloth.h"
@@ -36,16 +36,52 @@ VALUE
 red_parse_link_attr(VALUE self, VALUE regs, VALUE ref)
 {
   VALUE txt = rb_hash_aref(regs, ref);
-  VALUE new_regs = redcloth_link_attributes(self, txt);
+  VALUE new_regs = red_parse_title(redcloth_link_attributes(self, txt), ref);
+  
   return rb_funcall(regs, rb_intern("update"), 1, new_regs);
 }
 
+VALUE
+red_parse_image_attr(VALUE self, VALUE regs, VALUE ref)
+{
+  
+  return red_parse_title(regs, ref);
+}
+
+VALUE
+red_parse_title(VALUE regs, VALUE ref)
+{
+  // Store title/alt
+  VALUE txt = rb_hash_aref(regs, ref);
+  if ( txt != Qnil ) {
+    char *p = RSTRING_PTR(txt) + RSTRING_LEN(txt);
+    if (*(p - 1) == ')') {
+      char level = -1;
+      p--;
+      while (p > RSTRING_PTR(txt) && level < 0) {
+        switch(*(p - 1)) {
+          case '(': ++level; break;
+          case ')': --level; break;
+        }
+        --p;
+      }
+      VALUE title = STR_NEW(p + 1, RSTRING_PTR(txt) + RSTRING_LEN(txt) - 2 - p );
+      if (p > RSTRING_PTR(txt) && *(p - 1) == ' ') --p;
+      if (p != RSTRING_PTR(txt)) {
+        rb_hash_aset(regs, ref, STR_NEW(RSTRING_PTR(txt), p - RSTRING_PTR(txt) ));
+        rb_hash_aset(regs, ID2SYM(rb_intern("title")), title);
+      }
+    }
+  }
+  return regs;
+}
+
 VALUE
 red_pass_code(VALUE self, VALUE regs, VALUE ref, ID meth)
 {
   VALUE txt = rb_hash_aref(regs, ref);
   if (!NIL_P(txt)) {
-    VALUE txt2 = rb_str_new2("");
+    VALUE txt2 = STR_NEW2("");
     rb_str_cat_escaped_for_preformatted(self, txt2, RSTRING_PTR(txt), RSTRING_PTR(txt) + RSTRING_LEN(txt));
     rb_hash_aset(regs, ref, txt2);
   }
@@ -62,14 +98,14 @@ red_block(VALUE self, VALUE regs, VALUE block, VALUE refs)
   block = rb_funcall(block, rb_intern("strip"), 0);
   if ((!NIL_P(block)) && !NIL_P(btype))
   {
-    method = rb_intern(RSTRING_PTR(btype));
-    if (method == rb_intern("notextile")) {
+    method = rb_str_intern(btype);
+    if (method == ID2SYM(rb_intern("notextile"))) {
       rb_hash_aset(regs, sym_text, block);
     } else {
       rb_hash_aset(regs, sym_text, redcloth_inline2(self, block, refs));
     }
-    if (rb_respond_to(self, method)) {
-      block = rb_funcall(self, method, 1, regs);
+    if (rb_ary_includes(rb_funcall(self, rb_intern("formatter_methods"), 0), method)) {
+      block = rb_funcall(self, SYM2ID(method), 1, regs);
     } else {
       fallback = rb_hash_aref(regs, ID2SYM(rb_intern("fallback")));
       if (!NIL_P(fallback)) {
@@ -111,12 +147,10 @@ redcloth_inline(self, p, pe, refs)
   VALUE refs;
 {
   int cs, act;
-  char *ts, *te, *reg, *eof;
-  char *orig_p = p, *orig_pe = pe;
-  VALUE block = rb_str_new2("");
+  char *ts = NULL, *te = NULL, *reg = NULL, *eof = NULL;
+  char *orig_p = p;
+  VALUE block = STR_NEW2("");
   VALUE regs = Qnil;
-  unsigned int opts = 0;
-  VALUE buf = Qnil;
   
   %% write init;
 
@@ -135,7 +169,7 @@ rb_str_cat_escaped(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   VALUE escaped_str = rb_funcall(self, rb_intern("escape"), 1, source_str);
   rb_str_concat(str, escaped_str);
 }
@@ -145,7 +179,7 @@ rb_str_cat_escaped_for_preformatted(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   VALUE escaped_str = rb_funcall(self, rb_intern("escape_pre"), 1, source_str);
   rb_str_concat(str, escaped_str);
 }