RedCloth 4.0.4-x86-mswin32-60 → 4.1.0-x86-mswin32-60

data/RedCloth.gemspec

@@ -0,0 +1,37 @@
+Gem::Specification.new do |s|
+  s.name = %q{RedCloth}
+  s.version = "4.1.0"
+  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-10}
+  s.default_executable = %q{redcloth}
+  s.description = %q{RedCloth-4.1.0 - 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", "RedCloth.gemspec", "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", "lib/redcloth_scan.so"]
+  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"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.4")
+  s.rubyforge_project = %q{redcloth}
+  s.rubygems_version = %q{1.2.0}
+  s.summary = %q{RedCloth-4.1.0 - 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
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 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

@@ -33,14 +33,17 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 
 /* parser macros */
 #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 INLINE(H, T)   rb_str_append(H, rb_funcall(self, rb_intern(#T), 1, regs))
+#define SET_PLAIN_BLOCK(T) plain_block = rb_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 PASS_CODE(H, A, T, O) rb_str_append(H, red_pass_code(self, regs, ID2SYM(rb_intern(#A)), rb_intern(#T)))
+#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 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)); \
   extend = Qnil; \
@@ -48,10 +51,11 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
   CLEAR_REGS()
 #define ADD_EXTENDED_BLOCK()    rb_str_append(html, red_block(self, regs, block, refs)); CLEAR(block);
 #define END_EXTENDED()     extend = Qnil; CLEAR_REGS();
+#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 AINC(T)        red_inc(regs, ID2SYM(rb_intern(#T)));
+#define ASET(T, V)     rb_hash_aset(regs, ID2SYM(rb_intern(T)), rb_str_new2(V));
+#define AINC(T)        red_inc(regs, ID2SYM(rb_intern(T)));
 #define SET_ATTRIBUTES() \
   VALUE buf = Qnil; \
   SET_ATTRIBUTE("class_buf", "class"); \
@@ -64,26 +68,26 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 #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);*/  \
+    rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
+  /*  printf("TRANSFORM(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
   } else { \
-    rb_hash_aset(regs, ID2SYM(rb_intern(#T)), Qnil); \
+    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); \
-    rb_hash_aset(regs, ID2SYM(rb_intern(#T)), str); \
-  /*  printf("STORE(" #T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, 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);*/  \
   } else { \
-    rb_hash_aset(regs, ID2SYM(rb_intern(#T)), Qnil); \
+    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); \
-    rb_hash_aset(regs, ID2SYM(rb_intern(#T)), str); \
-  /*  printf("STORE_B(" #T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
+    rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
+  /*  printf("STORE_B(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
   } else { \
-    rb_hash_aset(regs, ID2SYM(rb_intern(#T)), Qnil); \
+    rb_hash_aset(regs, ID2SYM(rb_intern(T)), Qnil); \
   }
 #define STORE_URL(T) \
   if (p > reg && reg >= ts) { \
@@ -100,9 +104,12 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
     te = p; \
   } \
   STORE(T); \
-  if ( !NIL_P(refs) && rb_funcall(refs, rb_intern("has_key?"), 1, rb_hash_aref(regs, ID2SYM(rb_intern(#T)))) ) { \
-    rb_hash_aset(regs, ID2SYM(rb_intern(#T)), rb_hash_aref(refs, rb_hash_aref(regs, ID2SYM(rb_intern(#T))))); \
+  if ( !NIL_P(refs) && rb_funcall(refs, rb_intern("has_key?"), 1, rb_hash_aref(regs, ID2SYM(rb_intern(T)))) ) { \
+    rb_hash_aset(regs, ID2SYM(rb_intern(T)), rb_hash_aref(refs, rb_hash_aref(regs, ID2SYM(rb_intern(T))))); \
   }
+#define STORE_LINK_ALIAS() \
+  rb_hash_aset(refs_found, rb_hash_aref(regs, ID2SYM(rb_intern("text"))), rb_hash_aref(regs, ID2SYM(rb_intern("href"))))
+#define CLEAR_LIST() list_layout = rb_ary_new()
 #define LIST_ITEM() \
     int aint = 0; \
     VALUE aval = rb_ary_entry(list_index, nest-1); \
@@ -136,11 +143,11 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
       rb_str_append(html, rb_funcall(self, rb_intern(listm), 1, regs)); \
       rb_ary_store(list_layout, nest-1, rb_str_new2(list_type)); \
       CLEAR_REGS(); \
-      ASET(first, true); \
+      ASET("first", "true"); \
     } \
     LIST_CLOSE(); \
     rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(RARRAY(list_layout)->len)); \
-    ASET(type, li_open)
+    ASET("type", "li_open")
 #define LIST_CLOSE() \
     while (nest < RARRAY(list_layout)->len) \
     { \

data/ext/redcloth_scan/redcloth_attributes.c.rl

@@ -0,0 +1,56 @@
+/*
+ * redcloth_attributes.c.rl
+ *
+ * Copyright (C) 2008 Jason Garber
+ */
+#include <ruby.h>
+#include "redcloth.h"
+
+%%{
+
+  machine redcloth_attributes;
+  include redcloth_common "redcloth_common.c.rl";
+  include redcloth_attributes "redcloth_attributes.rl";
+
+}%%
+
+%% write data nofinal;
+
+
+VALUE
+redcloth_attribute_parser(machine, self, p, pe)
+  int machine;
+  VALUE self;
+  char *p, *pe;
+{
+  int cs, act;
+  char *ts, *te, *reg, *bck, *eof;
+  VALUE regs = rb_hash_new();
+  VALUE buf = Qnil;
+
+  %% write init;
+
+  cs = machine;
+
+  %% write exec;
+
+  return regs;
+}
+
+VALUE
+redcloth_attributes(self, str)
+  VALUE self, str;
+{
+  StringValue(str);
+  int cs = redcloth_attributes_en_inline;
+  return redcloth_attribute_parser(cs, self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1);
+}
+
+VALUE
+redcloth_link_attributes(self, str)
+  VALUE self, str;
+{
+  StringValue(str);
+  int cs = redcloth_attributes_en_link_says;
+  return redcloth_attribute_parser(cs, self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1);
+}

data/ext/redcloth_scan/redcloth_attributes.java.rl

@@ -0,0 +1,96 @@
+/*
+ * redcloth_attributes.rl
+ *
+ * Copyright (C) 2008 Jason Garber
+ */
+import java.io.IOException;
+
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyHash;
+import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.RubySymbol;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.CallbackFactory;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.load.BasicLibraryService;
+
+import org.jruby.util.ByteList;
+
+public class RedclothAttributes extends RedclothScanService.Base {
+
+%%{
+
+  machine redcloth_attributes;
+  include redcloth_common "redcloth_common.java.rl";
+  include redcloth_attributes "redcloth_attributes.rl";
+
+}%%
+
+%% write data nofinal;
+
+  public void SET_ATTRIBUTES() {
+    SET_ATTRIBUTE("class_buf", "class");
+    SET_ATTRIBUTE("id_buf", "id");
+    SET_ATTRIBUTE("lang_buf", "lang");
+    SET_ATTRIBUTE("style_buf", "style");
+  }
+
+  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);
+    }
+  }
+ 
+  private int machine;
+  private IRubyObject buf;
+   
+  public RedclothAttributes(int machine, IRubyObject self, byte[] data, int p, int pe) {
+    this.runtime = self.getRuntime();
+    this.self = self;
+
+    // This is GROSS but necessary for EOF matching
+    this.data = new byte[pe+1];
+    System.arraycopy(data, p, this.data, 0, pe);
+    this.data[pe] = 0;
+
+    this.p = 0;
+    this.pe = pe+1;
+    this.eof = this.pe;
+    this.orig_p = 0;
+    this.orig_pe = this.pe;
+
+    this.regs = RubyHash.newHash(runtime);
+    this.buf = runtime.getNil();
+    this.machine = machine;
+  }
+
+  public IRubyObject parse() {
+    %% write init;
+  
+    cs = machine;
+
+    %% write exec;
+
+    return regs;
+  }
+
+  public static IRubyObject attributes(IRubyObject self, IRubyObject str) {
+    ByteList bl = str.convertToString().getByteList();
+    int cs = redcloth_attributes_en_inline;
+    return new RedclothAttributes(cs, self, bl.bytes, bl.begin, bl.realSize).parse();
+  }
+
+  public static IRubyObject link_attributes(IRubyObject self, IRubyObject str) {
+    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

@@ -3,17 +3,13 @@
  *
  * Copyright (C) 2008 Jason Garber
  */
-#include <ruby.h>
-#include "redcloth.h"
-
 %%{
 
   machine redcloth_attributes;
-  include redcloth_common "redcloth_common.rl";
   
-  C2_CLAS = ( "(" ( [^)#]+ >A %{ STORE(class_buf) } )? ("#" [^)]+ >A %{STORE(id_buf)} )? ")" ) ;
-  C2_LNGE = ( "[" [^\]]+ >A %{ STORE(lang_buf) } "]" ) ;
-  C2_STYL = ( "{" [^}]+ >A %{ STORE(style_buf) } "}" ) ;
+  C2_CLAS = ( "(" ( [^)#]+ >A %{ STORE("class_buf"); } )? ("#" [^)]+ >A %{STORE("id_buf");} )? ")" ) ;
+  C2_LNGE = ( "[" [^\]]+ >A %{ STORE("lang_buf"); } "]" ) ;
+  C2_STYL = ( "{" [^}]+ >A %{ STORE("style_buf"); } "}" ) ;
   C2 = ( C2_CLAS | C2_STYL | C2_LNGE )+ ;
 
   mtext_with_attributes = ( C2 mtext >A %T ) >X ;
@@ -24,8 +20,8 @@
 
   *|;
 
-  link_text_with_attributes = C2 "."* " "* ( mtext+ ) >A %{ STORE(name) } ;
-  link_text_without_attributes = ( mtext+ ) >B %{ STORE_B(name_without_attributes) } ;
+  link_text_with_attributes = C2 "."* " "* ( mtext+ ) >A %{ STORE("name"); } ;
+  link_text_without_attributes = ( mtext+ ) >B %{ STORE_B("name_without_attributes"); } ;
 
   link_says := |*
 
@@ -34,45 +30,4 @@
 
   *|;
 
-}%%
-
-%% write data nofinal;
-
-
-VALUE
-redcloth_attribute_parser(machine, self, p, pe)
-  int machine;
-  VALUE self;
-  char *p, *pe;
-{
-  int cs, act;
-  char *ts, *te, *reg, *bck, *eof;
-  VALUE regs = rb_hash_new();
-  VALUE buf = Qnil;
-  
-  %% write init;
-  
-  cs = machine;
-
-  %% write exec;
-
-  return regs;
-}
-
-VALUE
-redcloth_attributes(self, str)
-  VALUE self, str;
-{
-  StringValue(str);
-  int cs = redcloth_attributes_en_inline;
-  return redcloth_attribute_parser(cs, self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1);
-}
-
-VALUE
-redcloth_link_attributes(self, str)
-  VALUE self, str;
-{
-  StringValue(str);
-  int cs = redcloth_attributes_en_link_says;
-  return redcloth_attribute_parser(cs, self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1);
-}
+}%%;

data/ext/redcloth_scan/redcloth_common.c.rl

@@ -0,0 +1,18 @@
+%%{
+  
+  machine redcloth_common;
+  include redcloth_common "redcloth_common.rl";
+  
+  action esc { rb_str_cat_escaped(self, block, ts, te); }
+  action esc_pre { rb_str_cat_escaped_for_preformatted(self, block, ts, te); }
+  action ignore { rb_str_append(block, rb_funcall(self, rb_intern("ignore"), 1, regs)); }
+  
+  # conditionals
+  action starts_line {
+    p == orig_p || *(p-1) == '\r' || *(p-1) == '\n' || *(p-1) == '\f'
+  }
+  action starts_phrase {
+    p == orig_p || *(p-1) == '\r' || *(p-1) == '\n' || *(p-1) == '\f' || *(p-1) == ' '
+  }
+  
+}%%;

data/ext/redcloth_scan/redcloth_common.java.rl

@@ -0,0 +1,18 @@
+%%{
+
+  machine redcloth_common;
+  include redcloth_common "redcloth_common.rl";
+
+  action esc { strCatEscaped(self, block, data, ts, te); }
+  action esc_pre { strCatEscapedForPreformatted(self, block, data, ts, te); }
+  action ignore { ((RubyString)block).append(self.callMethod(runtime.getCurrentContext(), "ignore", regs)); }
+  
+  # conditionals
+  action starts_line {
+    p == orig_p || data[(p-1)] == '\r' || data[(p-1)] == '\n' || data[(p-1)] == '\f'
+  }
+  action starts_phrase {
+    p == orig_p || data[(p-1)] == '\r' || data[(p-1)] == '\n' || data[(p-1)] == '\f' || data[(p-1)] == ' '
+  }
+
+}%%;

data/ext/redcloth_scan/redcloth_common.rl

@@ -4,12 +4,9 @@
 
   action A { reg = p; }
   action B { bck = p; }
-  action T { STORE(text); }
-  action X { CLEAR_REGS(); reg = NULL; }
+  action T { STORE("text"); }
+  action X { CLEAR_REGS(); RESET_REG(); }
   action cat { CAT(block); }
-  action esc { rb_str_cat_escaped(self, block, ts, te); }
-  action esc_pre { rb_str_cat_escaped_for_preformatted(self, block, ts, te); }
-  action ignore { rb_str_append(block, rb_funcall(self, rb_intern("ignore"), 1, regs)); }
 
   # simple
   LF = ( '\n' ) ;
@@ -17,28 +14,28 @@
   EOF = 0 ;
 
   # textile modifiers
-  A_LEFT = "<" %{ ASET(align, left) } ;
-  A_RIGHT = ">" %{ ASET(align, right) } ;
-  A_JUSTIFIED = "<>" %{ ASET(align, justify) } ;
-  A_CENTER = "=" %{ ASET(align, center) } ;
-  A_PADLEFT = "(" >A %{ AINC(padding-left) } ;
-  A_PADRIGHT = ")" >A %{ AINC(padding-right) } ;
+  A_LEFT = "<" %{ ASET("align", "left"); } ;
+  A_RIGHT = ">" %{ ASET("align", "right"); } ;
+  A_JUSTIFIED = "<>" %{ ASET("align", "justify"); } ;
+  A_CENTER = "=" %{ ASET("align", "center"); } ;
+  A_PADLEFT = "(" >A %{ AINC("padding-left"); } ;
+  A_PADRIGHT = ")" >A %{ AINC("padding-right"); } ;
   A_HLGN = ( A_LEFT | A_RIGHT | A_JUSTIFIED | A_CENTER | A_PADLEFT | A_PADRIGHT ) ;
   A_LIMIT = ( A_LEFT | A_CENTER | A_RIGHT ) ;
-  A_VLGN = ( "-" %{ ASET(vertical-align, middle) } | "^" %{ ASET(vertical-align, top) } | "~" %{ ASET(vertical-align, bottom) } ) ;
-  C_CLAS = ( "(" ( [^)#]+ >A %{ STORE(class) } )? ("#" [^)]+ >A %{STORE(id)} )? ")" ) ;
-  C_LNGE = ( "[" [^\]]+ >A %{ STORE(lang) } "]" ) ;
-  C_STYL = ( "{" [^}]+ >A %{ STORE(style) } "}" ) ;
-  S_CSPN = ( "\\" [0-9]+ >A %{ STORE(colspan) } ) ;
-  S_RSPN = ( "/" [0-9]+ >A %{ STORE(rowspan) } ) ;
-  D_HEADER = "_" %{ ASET(th, true) } ;
+  A_VLGN = ( "-" %{ ASET("vertical-align", "middle"); } | "^" %{ ASET("vertical-align", "top"); } | "~" %{ ASET("vertical-align", "bottom"); } ) ;
+  C_CLAS = ( "(" ( [^)#]+ >A %{ STORE("class"); } )? ("#" [^)]+ >A %{STORE("id");} )? ")" ) ;
+  C_LNGE = ( "[" [^\]]+ >A %{ STORE("lang"); } "]" ) ;
+  C_STYL = ( "{" [^}]+ >A %{ STORE("style"); } "}" ) ;
+  S_CSPN = ( "\\" [0-9]+ >A %{ STORE("colspan"); } ) ;
+  S_RSPN = ( "/" [0-9]+ >A %{ STORE("rowspan"); } ) ;
+  D_HEADER = "_" %{ ASET("th", "true"); } ;
   A = ( ( A_HLGN | A_VLGN )* ) ;
   A2 = ( A_LIMIT? ) ;
   S = ( S_CSPN | S_RSPN )* ;
   C = ( C_CLAS | C_STYL | C_LNGE )* ;
   D = ( D_HEADER ) ;
   N_CONT = "_" %{ list_continue = 1; };
-  N_NUM = digit+ >A %{ STORE(start) };
+  N_NUM = digit+ >A %{ STORE("start"); };
   N = ( N_CONT | N_NUM )? ;
   PUNCT = ( "!" | '"' | "#" | "$" | "%" | "&" | "'" | "," | "-" | "." | "/" | ":" | ";" | "=" | "?" | "\\" | "^" | "`" | "|" | "~" | "[" | "]" | "(" | ")" | "<" ) ;
   dotspace = ("." " "*) ;
@@ -105,17 +102,10 @@
   uri = (target | absolute_uri | absolute_path | rel_path) ;
 
   # common
-  title = ( '(' default+ >A %{ STORE(title) } :> ')' ) ;
+  title = ( '(' default+ >A %{ STORE("title"); } :> ')' ) ;
   word = ( alnum | safe | " " ) ;
   mspace = ( ( " " | "\t" | LF )+ ) -- LF{2} ;
   mtext = ( chars (mspace chars)* ) ;
   
-  # conditionals
-  action starts_line {
-    p == orig_p || *(p-1) == '\r' || *(p-1) == '\n' || *(p-1) == '\f'
-  }
-  action starts_phrase {
-    p == orig_p || *(p-1) == '\r' || *(p-1) == '\n' || *(p-1) == '\f' || *(p-1) == ' '
-  }
 
 }%%;