Navigation

Changeset 379

Timestamp:

06/23/08 19:11:00 (2 months ago)

Author:

ingy

Message:

0.11

Files:

r289	r379
	1	---
	2	version: 0.11
	3	date: Mon Jun 23 19:05:16 PDT 2008
	4	changes:
	5	- Lines that don't match anything else are parsed as a plain text paragraph.
	6	---
	7	version: 0.10
	8	date: Wed Jun 11 14:38:45 PDT 2008
	9	changes:
	10	- support '^Foo'
	11	- support '- foo'
	12	- support '+ foo'
1	13	---
2	14	version: 0.09

r289	r379
3	3
4	4	use 5.006.001;
5		our $VERSION = '0.09';
	5	our $VERSION = '0.11';
6	6
7	7	1;
…	…
19	19	=head1 DESCRIPTION
20	20
21		This module can convert Socialtext markup to HTML.`
	21	This module can convert Socialtext markup to HTML.
22	22
23	23	=head1 AUTHOR

r332	r379
29	29	];
30	30	my $all_blocks = [
31		qw(pre wafl_block hr hx waflparagraph ul ol blockquote table p empty)
	31	qw(
	32	pre wafl_block
	33	hr hx
	34	waflparagraph
	35	ul ol
	36	blockquote table
	37	p empty
	38	else
	39	)
32	40	];
33	41
…	…
72	80	},
73	81
	82	else => {
	83	match => qr/^(.*)\n/,
	84	phrases => [],
	85	filter => sub {
	86	my $node = shift;
	87	$node->{type} = 'p';
	88	},
	89	},
	90
74	91	pre => {
75	92	match => qr/^(?m:^\.pre\ \n)((?:.\n)?)(?m:^\.pre\ \n)(?:\s*\n)?/,
…	…
99	116
100	117	hx => {
101		match => qr/^(\^+) +(.?)(\s+=+)?\s?\n+/,
	118	match => qr/^(\^+) (.?)(\s+=+)?\s*?\n+/,
102	119	filter => sub {
103	120	my $node = shift;
…	…
108	125
109	126	ul => {
110		match => re_list('\*'),
	127	match => re_list('[\*\-\+]'),
111	128	blocks => [qw(ul ol subl li)],
112		filter => sub { s/^[\\#] //mg },
	129	filter => sub { s/^[\\-\+\#] //mg },
113	130	},
114	131
…	…
302	319	# Capture everything in $1
303	320	^$bullet+\ .*\n # Line starting with one or more bullet
304		(?:[\\#]+\ .\n)* # Lines starting with '*' or '#'
	321	(?:[\\-\+\#]+\ .\n)* # Lines starting with '*' or '#'
305	322	)(?:\s*\n)?/x, # Eat trailing lines
306	323	}