@@ -36,7 +36,7 @@ e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
when /java/
self.files += ['lib/redcloth_scan.jar']
else
- self.files += %w[attributes inline scan].map {|f| "ext/redcloth_scan/redcloth_#{f}.c"}
+ self.files += %w[attributes inline scan bbcode].map {|f| "ext/redcloth_scan/redcloth_#{f}.c"}
end
self.require_paths << "lib/case_sensitive_require"
Rakefile
@@ -7,45 +7,22 @@
machine redcloth_bbcode;
- action cat2html { CAT(html); }
- action failed4html { rb_str_append(block,failed_start); rb_str_append(block,rb_funcall(self, rb_intern("escape"), 1, html)); fgoto main; }
-
bbchars = (default - space - "]" - "[")+ ;
bbmtext = ( bbchars (mspace bbchars)* ) ;
- b = "[b]" >X mtext >A %T :> "[/b]" ;
- i = "[i]" >X mtext >A %T :> "[/i]" ;
- u = "[u]" >X mtext >A %T :> "[/u]" ;
- s = "[s]" >X mtext >A %T :> "[/s]" ;
- del = "[del]" >X mtext >A %T :> "[/del]" ;
- ins = "[ins]" >X mtext >A %T :> "[/ins]" ;
- sub = "[sub]" >X mtext >A %T :> "[/sub]" ;
- sup = "[sup]" >X mtext >A %T :> "[/sup]" ;
- notextile = "[notextile]" >X mtext >A %T :> "[/notextile]" ;
- innercolor = ("#"[0-9a-fA-F]{3}|"#"[0-9a-fA-F]{6}|"aqua"|"black"|"blue"|"fuchsia"|"gray"|"green"|"lime"|"maroon"|"navy"|"olive"|"purple"|"red"|"silver"|"teal"|"white"|"yellow"|"orange"|"cyan"|"magenta"|"grey") %{ STORE("color"); };
- color = ("[color=" >X innercolor >A "]" mtext >A %T :> "[/color]") ;
- innersize = space* ( (digit? "."? digit{1,2} ("em"|"pt"|"px"|"%")? )|("xx-small"|"x-small"|"small"|"medium"|"large"|"x-large"|"xx-large"|"smaller"|"larger")) %{ STORE("size"); } space* ;
- size = ("[size=" >X innersize >A "]" mtext >A %T :> "[/size]") ;
- inneralign = space* ("left"|"center"|"right") %{ STORE("align"); } space* ;
- align = ("[align=" >X inneralign >A "]" mtext >A %T :> "[/align]") ;
- acronym = ("[acronym=" >X bbmtext %{ STORE("title"); } >A "]" mtext >A %T :> "[/acronym]") ;
-
- link = "[url]" >X uri %{ STORE("href"); } >A :> "[/url]" ;
- link2 = "[url=">X uri %{ STORE("href"); } >A "]" mtext %{ STORE("name"); } >A :> "[/url]" ;
+ action bb_cat2html { CAT(html); }
+ action bb_failed4html { rb_str_append(block,failed_start); rb_str_append(block,rb_funcall(self, rb_intern("escape"), 1, html)); fgoto main; }
- img = "[img]" >X uri %{ STORE("src"); } >A :> "[/img]" ;
- img2 = "[img=">X uri %{ STORE("src"); } >A "]" mtext %{ STORE("title"); } >A :> "[/img]" ;
+ bb_pre_tag_start = "[pre" [^\]]* "]" (space* "[code]")? ;
+ bb_pre_tag_end = ("[/code]" space*)? "[/pre]" LF? ;
- pre_tag_start = "[pre" [^\]]* "]" (space* "[code]")? ;
- pre_tag_end = ("[/code]" space*)? "[/pre]" LF? ;
+ bb_quote_title = " title"? "=" bbmtext %{ STORE("cite"); } >A;
+ bb_quote_tag_start = ("[quote" bb_quote_title? "]") ;
+ bb_quote_tag_end = "[/quote]" LF? ;
- quote_title = " title"? "=" bbmtext %{ STORE("cite"); } >A;
- quote_tag_start = ("[quote" quote_title? "]") ;
- quote_tag_end = "[/quote]" LF? ;
-
- spoiler_title = " title"? "=" bbmtext %{ STORE("title"); } >A;
- spoiler_tag_start = ("[spoiler" spoiler_title? "]") ;
- spoiler_tag_end = "[/spoiler]" LF? ;
+ bb_spoiler_title = " title"? "=" bbmtext %{ STORE("title"); } >A;
+ bb_spoiler_tag_start = ("[spoiler" bb_spoiler_title? "]") ;
+ bb_spoiler_tag_end = "[/spoiler]" LF? ;
dim_digit = [0-9.]+ ;
prime = ("'" | '"')?;
@@ -54,48 +31,41 @@
other_phrase = phrase -- dim_noactions;
- pre_tag := |*
- pre_tag_end { rb_str_append(block,rb_str_new2("<pre><code>")); rb_str_append(block,rb_funcall(self, rb_intern("escape_pre"), 1, html)); rb_str_append(block,rb_str_new2("</code></pre>")); BBDONE(); fgoto main; };
+ bb_pre_tag := |*
+ bb_pre_tag_end {
+ rb_str_append(block,rb_str_new2("<pre><code>"));
+ rb_str_append(block,rb_funcall(self, rb_intern("escape_pre"), 1, html));
+ rb_str_append(block,rb_str_new2("</code></pre>"));
+ BBDONE();
+ fgoto main;
+ };
#LF { rb_str_append(html,rb_str_new2("<br/>")); };
- default => cat2html;
- EOF => failed4html;
+ default => bb_cat2html;
+ #EOF => bb_failed4html;
*|;
- quote_tag := |*
- quote_tag_end { rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_transform2(self,html)); rb_str_append(block,rb_funcall(self, rb_intern("bbquote"), 1, regs)); BBDONE(); fgoto main;};
- default => cat2html;
- EOF => failed4html;
+ bb_quote_tag := |*
+ bb_quote_tag_end {
+ rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_transform2(self,html));
+ rb_str_append(block,rb_funcall(self, rb_intern("bbquote"), 1, regs));
+ BBDONE();
+ fgoto main;
+ };
+ default => bb_cat2html;
+ #EOF => bb_failed4html;
*|;
- spoiler_tag := |*
- spoiler_tag_end { rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_transform2(self,html)); rb_str_append(block,rb_funcall(self, rb_intern("bbspoiler"), 1, regs)); BBDONE(); fgoto main;};
- default => cat2html;
- EOF => failed4html;
+ bb_spoiler_tag := |*
+ bb_spoiler_tag_end { rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_transform2(self,html)); rb_str_append(block,rb_funcall(self, rb_intern("bbspoiler"), 1, regs)); BBDONE(); fgoto main;};
+ default => bb_cat2html;
+ #EOF => bb_failed4html;
*|;
main := |*
-
- b { PASS(block, "text", "strong"); };
- i { PASS(block, "text", "em"); };
- u { PASS(block, "text", "ins"); };
- s { PASS(block, "text", "del"); };
- del { PASS(block, "text", "del"); };
- ins { PASS(block, "text", "ins"); };
- sub { PASS(block, "text", "sub"); };
- sup { PASS(block, "text", "sup"); };
- notextile => ignore;
- color { PASS(block, "text", "color"); };
- size { PASS(block, "text", "bbsize"); };
- align { PASS(block, "text", "align"); };
- acronym { PASS(block, "text", "acronym"); };
- link { PASS(block, "name", "link"); };
- link2 { PASS(block, "name", "link"); };
- img { PASS(block, "name", "image"); };
- img2 { PASS(block, "name", "image"); };
- pre_tag_start { ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); fgoto pre_tag; };
- quote_tag_start { rb_str_append(failed_start,rb_str_new(ts,te-ts)); fgoto quote_tag; };
- spoiler_tag_start { rb_str_append(failed_start,rb_str_new(ts,te-ts)); fgoto spoiler_tag; };
+ bb_pre_tag_start { ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); fgoto bb_pre_tag; };
+ bb_quote_tag_start { rb_str_append(failed_start,rb_str_new(ts,te-ts)); fgoto bb_quote_tag; };
+ bb_spoiler_tag_start { rb_str_append(failed_start,rb_str_new(ts,te-ts)); fgoto bb_spoiler_tag; };
other_phrase => cat;
PUNCT => cat;
ext/redcloth_scan/redcloth_bbcode.rl
@@ -6,6 +6,9 @@
%%{
machine redcloth_inline;
+
+ action bb_cat2html { CAT(html); }
+ action bb_failed4html { rb_str_append(block,failed_start); rb_str_append(block,rb_funcall(self, rb_intern("escape"), 1, html)); fgoto main; }
# links
mtext_noquotes = mtext -- '"' ;
@@ -88,7 +91,36 @@
copyright = ( "[" cee "]" | "(" cee ")" ) ;
entity = ( "&" %A ( '#' digit+ | ( alpha ( alpha | digit )+ ) ) %T ';' ) >X ;
- zomgtest = "&" ("amp;"|[gl]"t;");
+ # bbcode
+
+ bbchars = (default - space - "]" - "[")+ ;
+ bbmtext = ( bbchars (mspace bbchars)* ) ;
+
+ bb_b = "[b]" >X mtext >A %T :> "[/b]" ;
+ bb_i = "[i]" >X mtext >A %T :> "[/i]" ;
+ bb_u = "[u]" >X mtext >A %T :> "[/u]" ;
+ bb_s = "[s]" >X mtext >A %T :> "[/s]" ;
+ bb_del = "[del]" >X mtext >A %T :> "[/del]" ;
+ bb_ins = "[ins]" >X mtext >A %T :> "[/ins]" ;
+ bb_sub = "[sub]" >X mtext >A %T :> "[/sub]" ;
+ bb_sup = "[sup]" >X mtext >A %T :> "[/sup]" ;
+ bb_notextile = "[notextile]" >X mtext >A %T :> "[/notextile]" ;
+ bb_innercolor = ("#"[0-9a-fA-F]{3}|"#"[0-9a-fA-F]{6}|"aqua"|"black"|"blue"|"fuchsia"|"gray"|"green"|"lime"|"maroon"|"navy"|"olive"|"purple"|"red"|"silver"|"teal"|"white"|"yellow"|"orange"|"cyan"|"magenta"|"grey") %{ STORE("color"); };
+ bb_color = ("[color=" >X bb_innercolor >A "]" mtext >A %T :> "[/color]") ;
+ bb_innersize = space* ( (digit? "."? digit{1,2} ("em"|"pt"|"px"|"%")? )|("xx-small"|"x-small"|"small"|"medium"|"large"|"x-large"|"xx-large"|"smaller"|"larger")) %{ STORE("size"); } space* ;
+ bb_size = ("[size=" >X bb_innersize >A "]" mtext >A %T :> "[/size]") ;
+ bb_inneralign = space* ("left"|"center"|"right") %{ STORE("align"); } space* ;
+ bb_align = ("[align=" >X bb_inneralign >A "]" mtext >A %T :> "[/align]") ;
+ bb_acronym = ("[acronym=" >X bbmtext %{ STORE("title"); } >A "]" mtext >A %T :> "[/acronym]") ;
+
+ bb_link = "[url]" >X uri %{ STORE("href"); } >A :> "[/url]" ;
+ bb_link2 = "[url=">X uri %{ STORE("href"); } >A "]" mtext %{ STORE("name"); } >A :> "[/url]" ;
+
+ bb_img = "[img]" >X uri %{ STORE("src"); } >A :> "[/img]" ;
+ bb_img2 = "[img=">X uri %{ STORE("src"); } >A "]" mtext %{ STORE("title"); } >A :> "[/img]" ;
+
+ bb_pre_tag_start = "[pre" [^\]]* "]" (space* "[code]")? ;
+ bb_pre_tag_end = ("[/code]" space*)? "[/pre]" LF? ;
# info
redcloth_version = "[RedCloth::VERSION]" ;
@@ -104,10 +136,17 @@
bbcode_ignore_end { CAT(block); fgoto main; };
default => cat;
*|;
+
+ bb_pre_tag := |*
+ bb_pre_tag_end { rb_str_append(block,rb_str_new2("<pre><code>")); rb_str_append(block,rb_funcall(self, rb_intern("escape_pre"), 1, html)); rb_str_append(block,rb_str_new2("</code></pre>")); BBDONE(); fgoto main; };
+ #LF { rb_str_append(html,rb_str_new2("<br/>")); };
+ default => bb_cat2html;
+ EOF => bb_failed4html;
+ *|;
main := |*
- bbcode_ignore_start => { CAT(block); fgoto bbcode_ignore; };
+ #bbcode_ignore_start => { CAT(block); fgoto bbcode_ignore; };
image { UNLESS_DISABLED_INLINE(block,image,INLINE(block, "image");) };
@@ -136,6 +175,26 @@
quote1 { UNLESS_DISABLED_INLINE(block,quote1,PASS(block, "text", "quote1");) };
quote2 { UNLESS_DISABLED_INLINE(block,quote2,PASS(block, "text", "quote2");) };
multi_paragraph_quote { UNLESS_DISABLED_INLINE(block,multi_paragraph_quote,PASS(block, "text", "multi_paragraph_quote");) };
+
+ bb_b { PASS(block, "text", "strong"); };
+ bb_i { PASS(block, "text", "em"); };
+ bb_u { PASS(block, "text", "ins"); };
+ bb_s { PASS(block, "text", "del"); };
+ bb_del { PASS(block, "text", "del"); };
+ bb_ins { PASS(block, "text", "ins"); };
+ bb_sub { PASS(block, "text", "sub"); };
+ bb_sup { PASS(block, "text", "sup"); };
+ bb_notextile => ignore;
+ bb_color { PASS(block, "text", "color"); };
+ bb_size { PASS(block, "text", "bbsize"); };
+ bb_align { PASS(block, "text", "align"); };
+ bb_acronym { PASS(block, "text", "acronym"); };
+ bb_link { PASS(block, "name", "link"); };
+ bb_link2 { PASS(block, "name", "link"); };
+ bb_img { PASS(block, "name", "image"); };
+ bb_img2 { PASS(block, "name", "image"); };
+
+ bb_pre_tag_start { ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); fgoto bb_pre_tag; };
ellipsis { UNLESS_DISABLED_INLINE(block,ellipsis,INLINE(block, "ellipsis");) };
emdash { UNLESS_DISABLED_INLINE(block,emdash,INLINE(block, "emdash");) };
ext/redcloth_scan/redcloth_inline.rl
@@ -48,6 +48,9 @@ redcloth_transform(self, p, pe, refs)
char listm[10] = "";
VALUE refs_found = rb_hash_new();
+ VALUE failed_start = rb_str_new2("");
+ char *failed_start_point_p = NULL, *failed_start_point_ts = NULL, *failed_start_point_te = NULL;
+
%% write init;
%% write exec;
@@ -72,8 +75,8 @@ redcloth_transform2(self, str)
StringValue(str);
//str = redcloth_bbcode2(self, str, rb_hash_new());
rb_funcall(self, rb_intern("before_transform"), 1, str);
- str = redcloth_transform(self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1, Qnil);
- return redcloth_bbcode2(self, str, rb_hash_new());
+ //str = redcloth_transform(self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1, Qnil);
+ return redcloth_transform(self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1, Qnil);
}
/*
ext/redcloth_scan/redcloth_scan.c.rl
@@ -6,6 +6,9 @@
%%{
machine redcloth_scan;
+
+ action bb_cat2html { CAT(html); }
+ action bb_failed4html { rb_str_append(block,failed_start); rb_str_append(block,rb_funcall(self, rb_intern("escape"), 1, html)); fgoto main; }
# blocks
notextile_tag_start = "<notextile>" ;
@@ -68,10 +71,24 @@
bbcode_ignore_start = "[" ("pre"|"quote"|"spoiler");
bbcode_ignore_end = "[/" ("pre"|"quote"|"spoiler") "]";
+ bbchars = (default - space - "]" - "[")+ ;
+ bbmtext = ( bbchars (mspace bbchars)* ) ;
+
bbcode_ignore := |*
bbcode_ignore_end { CAT(block); fgoto block; };
default => cat;
*|;
+
+ bb_pre_tag_start = "[pre" [^\]]* "]" (space* "[code]")? ;
+ bb_pre_tag_end = ("[/code]" space*)? "[/pre]" LF? ;
+
+ bb_quote_title = " title"? "=" bbmtext %{ STORE("cite"); } >A;
+ bb_quote_tag_start = ("[quote" bb_quote_title? "]") ;
+ bb_quote_tag_end = "[/quote]" LF? ;
+
+ bb_spoiler_title = " title"? "=" bbmtext %{ STORE("title"); } >A;
+ bb_spoiler_tag_start = ("[spoiler" bb_spoiler_title? "]") ;
+ bb_spoiler_tag_end = "[/spoiler]" LF? ;
# info
redcloth_version = ("RedCloth" >A ("::" | " " ) "VERSION"i ":"? " ")? %{STORE("prefix");} "RedCloth::VERSION" (LF* EOF | double_return) ;
@@ -238,8 +255,42 @@
*|;
bb_pre_tag := |*
- pre_tag_end { CAT(block); fgoto block; };
- default => esc_pre;
+ bb_pre_tag_end {
+ rb_hash_aset(regs, ID2SYM(rb_intern("text")), rb_funcall(self, rb_intern("escape_pre"), 1, block));
+ rb_str_append(html,rb_funcall(self, rb_intern("bb_block_pre"), 1, regs));
+ extend = Qnil;
+ CLEAR(block);
+ CLEAR_REGS();
+ fgoto main;
+ };
+ default => cat;
+ EOF => { CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto block; };
+ *|;
+
+ bb_quote_tag := |*
+ bb_quote_tag_end {
+ rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_transform2(self,block));
+ rb_str_append(html,rb_funcall(self, rb_intern("bbquote"), 1, regs));
+ extend = Qnil;
+ CLEAR(block);
+ CLEAR_REGS();
+ fgoto main;
+ };
+ default => cat;
+ EOF => { CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto block; };
+ *|;
+
+ bb_spoiler_tag := |*
+ bb_spoiler_tag_end {
+ rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_transform2(self,block));
+ rb_str_append(html,rb_funcall(self, rb_intern("bb_block_spoiler"), 1, regs));
+ extend = Qnil;
+ CLEAR(block);
+ CLEAR_REGS();
+ fgoto main;
+ };
+ default => cat;
+ EOF => { CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto block; };
*|;
block := |*
@@ -256,7 +307,7 @@
}
};
#pre_tag_start { CAT(block); fgoto bb_pre_tag; };
- bbcode_ignore_start => { CAT(block); fgoto bbcode_ignore; };
+ #bbcode_ignore_start => { CAT(block); fgoto bbcode_ignore; };
double_return next_block_start {
if (IS_NOT_EXTENDED()) {
ADD_BLOCK();
@@ -308,6 +359,10 @@
main := |*
#bbcode_ignore_start => { CAT(block); fgoto bbcode_ignore; };
+ bb_pre_tag_start { ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; fgoto bb_pre_tag; };
+ bb_quote_tag_start { rb_str_append(failed_start,rb_str_new(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; fgoto bb_quote_tag; };
+ bb_spoiler_tag_start { rb_str_append(failed_start,rb_str_new(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; fgoto bb_spoiler_tag; };
+
noparagraph_line_start { ASET("type", "ignored_line"); fgoto noparagraph_line; };
notextile_tag_start { ASET("type", "notextile"); fgoto notextile_tag; };
notextile_block_start { ASET("type", "notextile"); fgoto notextile_block; };
ext/redcloth_scan/redcloth_scan.rl
@@ -175,13 +175,24 @@ module RedCloth::Formatters::HTML
def bbquote(opts)
quote = "<blockquote>"
quote += "<cite>#{opts[:cite]}</cite>" if opts[:cite]
- quote += opts[:text]+"</blockquote>"
+ quote += "#{opts[:text]}</blockquote>\n"
+ end
+
+ def bb_block_pre(opts)
+ #quote = "<blockquote>"
+ #quote += "<cite>#{opts[:cite]}</cite>" if opts[:cite]
+ #quote += opts[:text]+"</blockquote>\n"
+ "<pre><code>#{opts[:text]}</code></pre>\n"
end
def bbspoiler(opts)
"<span class=\"spoiler\" style=\"color:#FFF;background:#FFF;\" title=\"#{opts[:title] || "Show Spoiler"}\">#{opts[:text]}</span>"
end
+ def bb_block_spoiler(opts)
+ "<div class=\"spoiler_container\"><div class=\"spoileroncontainer\"><button type=\"button\" class=\"button spoileron\" title=\"Click to show the spoiler.\">#{opts[:title] || "Show Spoiler"}</button></div><div class=\"spoiler\"><div class=\"spoileroffcontainer\"><button type=\"button\" class=\"button spoileroff\" title=\"Click to hide the spoiler.\">hide spoiler</button><br/></div><div class=\"spoilertext\">#{opts[:text]}</div></div></div>"
+ end
+
def bbpre(opts)
"<pre#{pba(opts)}><code>#{opts[:text]}</code></pre>\n"
end
lib/redcloth/formatters/html.rb
@@ -106,15 +106,13 @@ in: |-
I made a joke about your mother!
bbcode: |-
<p>Here’s my code!</p>
- [pre]classZomg<br />
- include AModule<br />
- <p><br /><br />
- def urmom<br /><br />
- p "is fat" <b>some html</b><br /><br />
- end<br /><br />
- end[/pr]<br /><br />
- <br /><br />
- I made a joke about your mother!</p>
+ <p>[pre]class Zomg<br />
+ include AModule</p>
+ def urmom
+ p “is fat” <b>some html</b>
+ end
+ <p>end[/pr]</p>
+ <p>I made a joke about your mother!</p>
---
name: Textile does not render inside a preformatted tag
in: |-
@@ -147,7 +145,7 @@ bbcode: '<blockquote><p><strong>test</strong></p></blockquote>'
---
name: malformed quote tag
in: '[quote][b]test[/b][/quot]'
-bbcode: '<p>[quote][b]test[/b][/quot]</p>'
+bbcode: '<p>[quote]<strong>test</strong>[/quot]</p>'
---
name: MrAccident's Textile List and BBCode Quote HTML Break
in: |-
@@ -155,7 +153,12 @@ in: |-
[quote]
[/quote]
-bbcode: "<ul>\n\t<li>test<br />\n<blockquote></blockquote></li>\n</ul>"
+bbcode: |-
+ <ul>
+ <li>test<br />
+ [quote]</li>
+ </ul>
+ <p>[/quote]</p>
---
in: '[quote title=test][b]test[/b][/quote]'
bbcode: '<blockquote><cite>test</cite><p><strong>test</strong></p></blockquote>'
@@ -193,7 +196,7 @@ bbcode: '<p>I like big sized things like <span style="font-size:.7em;">you know
---
name: align tag
in: '[align=center]I am a centered title![/align]'
-bbcode: '<div style="text-align:center;">I am a centered title!</div>'
+bbcode: '<p><div style="text-align:center;">I am a centered title!</div></p>'
---
name: align tag with more junk
in: |-
@@ -201,7 +204,7 @@ in: |-
Some other text
bbcode: |-
- <div style="text-align:right;">I am a righted title!</div>
+ <p><div style="text-align:right;">I am a righted title!</div></p>
<p>Some other text</p>
---
name: acronym tag
@@ -230,11 +233,11 @@ bbcode: '<p>Hey guys, <img src="http://fangamer.com/image.jpg" title="my blog" a
---
name: spoiler tag
in: '[spoiler]test[/spoiler]'
-bbcode: "<p><span class=\"spoiler\" style=\"color:#FFF;background:#FFF;\" title=\"Show Spoiler\"><p>test</p></span></p>"
+bbcode: "<div class=\"spoiler_container\"><div class=\"spoileroncontainer\"><button type=\"button\" class=\"button spoileron\" title=\"Click to show the spoiler.\">Show Spoiler</button></div><div class=\"spoiler\"><div class=\"spoileroffcontainer\"><button type=\"button\" class=\"button spoileroff\" title=\"Click to hide the spoiler.\">hide spoiler</button><br/></div><div class=\"spoilertext\"><p>test</p></div></div></div>"
---
name: spoiler tag with title
in: '[spoiler=About Your Mother]She does not sit in the house, she sits AROUND the house![/spoiler]'
-bbcode: "<p><span class=\"spoiler\" style=\"color:#FFF;background:#FFF;\" title=\"About Your Mother\"><p>She does not sit in the house, she sits AROUND the house!</p></span></p>"
+bbcode: "<div class=\"spoiler_container\"><div class=\"spoileroncontainer\"><button type=\"button\" class=\"button spoileron\" title=\"Click to show the spoiler.\">About Your Mother</button></div><div class=\"spoiler\"><div class=\"spoileroffcontainer\"><button type=\"button\" class=\"button spoileroff\" title=\"Click to hide the spoiler.\">hide spoiler</button><br/></div><div class=\"spoilertext\"><p>She does not sit in the house, she sits AROUND the house!</p></div></div></div>"
---
#this line requires the nasty hack because of nested HTML tags inside nested Textile
name: spoiler tag with pre tag of code
@@ -247,13 +250,13 @@ in: |-
end
end[/pre][/spoiler]
bbcode: |-
- <p><span class="spoiler" style="color:#FFF;background:#FFF;" title="Some Ruby Code"><pre><code>class Zomg
+ <div class="spoiler_container"><div class="spoileroncontainer"><button type="button" class="button spoileron" title="Click to show the spoiler.">Some Ruby Code</button></div><div class="spoiler"><div class="spoileroffcontainer"><button type="button" class="button spoileroff" title="Click to hide the spoiler.">hide spoiler</button><br/></div><div class="spoilertext"><pre><code>class Zomg
include AModule
def urmom
p "is lulz" <b>some html</b>
end
- end</code></pre></span></p>
+ end</code></pre></div></div></div>
---
name: quote tag with spoiler of pre tag of code
in: |-
@@ -265,13 +268,13 @@ in: |-
end
end[/pre][/spoiler][/quote]
bbcode: |-
- <blockquote><cite>dudeddue!</cite><p><span class="spoiler" style="color:#FFF;background:#FFF;" title="Some Ruby Code"><pre><code>class Zomg
+ <blockquote><cite>dudeddue!</cite><div class="spoiler_container"><div class="spoileroncontainer"><button type="button" class="button spoileron" title="Click to show the spoiler.">Some Ruby Code</button></div><div class="spoiler"><div class="spoileroffcontainer"><button type="button" class="button spoileroff" title="Click to hide the spoiler.">hide spoiler</button><br/></div><div class="spoilertext"><pre><code>class Zomg
include AModule
def urmom
p "is lulz" <b>some html</b>
end
- end</code></pre></span></p></blockquote>
+ end</code></pre></div></div></div></blockquote>
---
name: mixed up quote tag with spoiler of pre tag of code
in: |-
@@ -283,10 +286,10 @@ in: |-
end
end[/pre][/quote][/spoiler]
bbcode: |-
- <blockquote><cite>dudeddue!</cite><p>[spoiler=Some Ruby Code][pre]class Zomg<br /><br /><br />
- include AModule<br /><br /><br />
- <br /><br /><br />
- def urmom<br /><br /><br />
- p "is lulz" <b>some html</b><br /><br /><br />
- end<br /><br /><br />
- end[/pre]</p><p></blockquote>[/spoiler]</p>
\ No newline at end of file
+ <blockquote><cite>dudeddue!</cite><p>[spoiler=Some Ruby Code][pre]class Zomg<br />
+ include AModule</p>
+ def urmom
+ p “is lulz” <b>some html</b>
+ end
+ <p>end[/pre]</p></blockquote>
+ <p>[/spoiler]</p>
\ No newline at end of file
test/bbcode.yml
@@ -47,7 +47,7 @@ class TestRestrictions < Test::Unit::TestCase
end
generate_formatter_tests('bbcode') do |doc|
- RedCloth.new(doc['in'], [:bbcode]).to_html
+ RedCloth.new(doc['in'], [:bbcode,:filter_html]).to_html
end
end
test/test_restrictions.rb
9cfbaeb4a6cca267a3cb5fa88d54b4cd36d927cf
Ryan Alyea
ryan@ROFISH-3.local
http://github.com/ROFISH/redcloth/commit/b067a5f75865c9b59279a64d609c7218e36a4ed4
b067a5f75865c9b59279a64d609c7218e36a4ed4
2009-01-08T22:56:52-08:00
2009-01-08T22:56:52-08:00
Converted the BBCode scripts to inside the redcloth methods for MUCH better support.
507782dd6725dc5a9da80c326b16888e71815fa7
Ryan Alyea
ryan@ROFISH-3.local