RedCloth 4.1.1-universal-java → 4.1.9-universal-java

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

@@ -1,142 +1,36 @@
+# -*- encoding: utf-8 -*-
 
-# Gem::Specification for Redcloth-4.1.1
-# Originally generated by Echoe
+Gem::Specification.new do |s|
+  s.name = %q{RedCloth}
+  s.version = "4.1.9"
+  s.platform = %q{universal-java}
 
---- !ruby/object:Gem::Specification 
-extensions: []
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jason Garber"]
+  s.date = %q{2009-02-20}
+  s.default_executable = %q{redcloth}
+  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"]
+  s.files = ["bin/redcloth", "CHANGELOG", "COPYING", "ext/mingw-rbconfig.rb", "ext/redcloth_scan/extconf.rb", "ext/redcloth_scan/redcloth.h", "ext/redcloth_scan/redcloth_attributes.c.rl", "ext/redcloth_scan/redcloth_attributes.java.rl", "ext/redcloth_scan/redcloth_attributes.rl", "ext/redcloth_scan/redcloth_common.c.rl", "ext/redcloth_scan/redcloth_common.java.rl", "ext/redcloth_scan/redcloth_common.rl", "ext/redcloth_scan/redcloth_inline.c.rl", "ext/redcloth_scan/redcloth_inline.java.rl", "ext/redcloth_scan/redcloth_inline.rl", "ext/redcloth_scan/redcloth_scan.c.rl", "ext/redcloth_scan/redcloth_scan.java.rl", "ext/redcloth_scan/redcloth_scan.rl", "extras/ragel_profiler.rb", "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/formatters/latex_entities.yml", "lib/redcloth/textile_doc.rb", "lib/redcloth/version.rb", "lib/redcloth.rb", "Manifest", "Rakefile", "README", "setup.rb", "test/basic.yml", "test/code.yml", "test/definitions.yml", "test/extra_whitespace.yml", "test/filter_html.yml", "test/filter_pba.yml", "test/helper.rb", "test/html.yml", "test/images.yml", "test/instiki.yml", "test/links.yml", "test/lists.yml", "test/poignant.yml", "test/sanitize_html.yml", "test/table.yml", "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", "test/textism.yml", "test/threshold.yml", "test/validate_fixtures.rb", "RedCloth.gemspec", "lib/redcloth_scan.jar"]
+  s.has_rdoc = true
+  s.homepage = %q{http://redcloth.org}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "RedCloth", "--main", "README"]
+  s.require_paths = ["lib", "ext", "lib/case_sensitive_require"]
+  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.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"]
 
-homepage: http://redcloth.org
-executables: 
-- redcloth
-version: !ruby/object:Gem::Version 
-  version: 4.1.1
-post_install_message: 
-date: 2008-11-19 05:00:00 +00:00
-files: 
-- bin/redcloth
-- CHANGELOG
-- COPYING
-- ext/mingw-rbconfig.rb
-- ext/redcloth_scan/extconf.rb
-- ext/redcloth_scan/redcloth.h
-- ext/redcloth_scan/redcloth_attributes.c.rl
-- ext/redcloth_scan/redcloth_attributes.java.rl
-- ext/redcloth_scan/redcloth_attributes.rl
-- ext/redcloth_scan/redcloth_common.c.rl
-- ext/redcloth_scan/redcloth_common.java.rl
-- ext/redcloth_scan/redcloth_common.rl
-- ext/redcloth_scan/redcloth_inline.c.rl
-- ext/redcloth_scan/redcloth_inline.java.rl
-- ext/redcloth_scan/redcloth_inline.rl
-- ext/redcloth_scan/redcloth_scan.c.rl
-- ext/redcloth_scan/redcloth_scan.java.rl
-- ext/redcloth_scan/redcloth_scan.rl
-- extras/ragel_profiler.rb
-- 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/formatters/latex_entities.yml
-- lib/redcloth/textile_doc.rb
-- lib/redcloth/version.rb
-- lib/redcloth.rb
-- Manifest
-- Rakefile
-- README
-- setup.rb
-- test/basic.yml
-- test/code.yml
-- test/definitions.yml
-- test/extra_whitespace.yml
-- test/filter_html.yml
-- test/filter_pba.yml
-- test/helper.rb
-- test/html.yml
-- test/images.yml
-- test/instiki.yml
-- test/links.yml
-- test/lists.yml
-- test/poignant.yml
-- test/sanitize_html.yml
-- test/table.yml
-- 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
-- test/textism.yml
-- test/threshold.yml
-- test/validate_fixtures.rb
-- RedCloth.gemspec
-- lib/redcloth_scan.jar
-rubygems_version: 1.2.0
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- RedCloth
-- --main
-- README
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-name: RedCloth
-has_rdoc: true
-platform: universal-java
-summary: RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/
-default_executable: 
-bindir: bin
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  version: 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-required_ruby_version: !ruby/object:Gem::Requirement 
-  version: 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: 1.8.4
-require_paths: 
-- lib
-- ext
-- lib/case_sensitive_require
-specification_version: 2
-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
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
-  name: echoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    version: 
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version 
-        version: "0"
-description: RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/
-email: redcloth-upwards@rubyforge.org
-authors: 
-- Jason Garber
-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
-requirements: []
-
-rubyforge_project: redcloth
-autorequire: 
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  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)) \
       { \