From 0bb852138e9533fc32207d5a0d67297bb540981a Mon Sep 17 00:00:00 2001 From: till Date: Sun, 20 Mar 2011 22:01:44 +0100 Subject: [PATCH] * update class names --- Text/Wiki2/Parse/Default/Anchor.php | 2 +- Text/Wiki2/Parse/Default/Blockquote.php | 2 +- Text/Wiki2/Parse/Default/Bold.php | 2 +- Text/Wiki2/Parse/Default/Break.php | 2 +- Text/Wiki2/Parse/Default/Center.php | 2 +- Text/Wiki2/Parse/Default/Code.php | 2 +- Text/Wiki2/Parse/Default/Colortext.php | 2 +- Text/Wiki2/Parse/Default/Deflist.php | 2 +- Text/Wiki2/Parse/Default/Delimiter.php | 2 +- Text/Wiki2/Parse/Default/Embed.php | 2 +- Text/Wiki2/Parse/Default/Emphasis.php | 2 +- Text/Wiki2/Parse/Default/Freelink.php | 2 +- Text/Wiki2/Parse/Default/Function.php | 2 +- Text/Wiki2/Parse/Default/Heading.php | 2 +- Text/Wiki2/Parse/Default/Horiz.php | 2 +- Text/Wiki2/Parse/Default/Html.php | 2 +- Text/Wiki2/Parse/Default/Image.php | 2 +- Text/Wiki2/Parse/Default/Include.php | 2 +- Text/Wiki2/Parse/Default/Interwiki.php | 2 +- Text/Wiki2/Parse/Default/Italic.php | 2 +- Text/Wiki2/Parse/Default/List.php | 7 ++----- Text/Wiki2/Parse/Default/Newline.php | 2 +- Text/Wiki2/Parse/Default/Paragraph.php | 2 +- Text/Wiki2/Parse/Default/Phplookup.php | 2 +- Text/Wiki2/Parse/Default/Prefilter.php | 2 +- Text/Wiki2/Parse/Default/Raw.php | 2 +- Text/Wiki2/Parse/Default/Revise.php | 2 +- Text/Wiki2/Parse/Default/Smiley.php | 4 ++-- Text/Wiki2/Parse/Default/Strong.php | 2 +- Text/Wiki2/Parse/Default/Subscript.php | 2 +- Text/Wiki2/Parse/Default/Superscript.php | 2 +- Text/Wiki2/Parse/Default/Table.php | 2 +- Text/Wiki2/Parse/Default/Tighten.php | 2 +- Text/Wiki2/Parse/Default/Toc.php | 2 +- Text/Wiki2/Parse/Default/Tt.php | 4 ++-- Text/Wiki2/Parse/Default/Underline.php | 7 +++---- Text/Wiki2/Parse/Default/Url.php | 5 ++--- Text/Wiki2/Parse/Default/Wikilink.php | 5 +++-- 38 files changed, 46 insertions(+), 50 deletions(-) diff --git a/Text/Wiki2/Parse/Default/Anchor.php b/Text/Wiki2/Parse/Default/Anchor.php index 42e25b0..5524651 100644 --- a/Text/Wiki2/Parse/Default/Anchor.php +++ b/Text/Wiki2/Parse/Default/Anchor.php @@ -33,7 +33,7 @@ * */ -class Text_Wiki2_Parse_Anchor extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Anchor extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Blockquote.php b/Text/Wiki2/Parse/Default/Blockquote.php index 4d5e37d..dba7003 100755 --- a/Text/Wiki2/Parse/Default/Blockquote.php +++ b/Text/Wiki2/Parse/Default/Blockquote.php @@ -33,7 +33,7 @@ * */ -class Text_Wiki2_Parse_Blockquote extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Blockquote extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Bold.php b/Text/Wiki2/Parse/Default/Bold.php index 720921e..f5cdb57 100755 --- a/Text/Wiki2/Parse/Default/Bold.php +++ b/Text/Wiki2/Parse/Default/Bold.php @@ -34,7 +34,7 @@ * */ -class Text_Wiki2_Parse_Bold extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Bold extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Break.php b/Text/Wiki2/Parse/Default/Break.php index 2d8d20e..3716b88 100755 --- a/Text/Wiki2/Parse/Default/Break.php +++ b/Text/Wiki2/Parse/Default/Break.php @@ -31,7 +31,7 @@ * */ -class Text_Wiki2_Parse_Break extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Break extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Center.php b/Text/Wiki2/Parse/Default/Center.php index 1960ac7..ebf38ca 100755 --- a/Text/Wiki2/Parse/Default/Center.php +++ b/Text/Wiki2/Parse/Default/Center.php @@ -31,7 +31,7 @@ * */ -class Text_Wiki2_Parse_Center extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Center extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Code.php b/Text/Wiki2/Parse/Default/Code.php index 215a400..6e47459 100755 --- a/Text/Wiki2/Parse/Default/Code.php +++ b/Text/Wiki2/Parse/Default/Code.php @@ -35,7 +35,7 @@ * */ -class Text_Wiki2_Parse_Code extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Code extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Colortext.php b/Text/Wiki2/Parse/Default/Colortext.php index e50cd72..52f8775 100755 --- a/Text/Wiki2/Parse/Default/Colortext.php +++ b/Text/Wiki2/Parse/Default/Colortext.php @@ -28,7 +28,7 @@ * */ -class Text_Wiki2_Parse_Colortext extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Colortext extends Text_Wiki2_Parse { /** * diff --git a/Text/Wiki2/Parse/Default/Deflist.php b/Text/Wiki2/Parse/Default/Deflist.php index 37999f6..41fa2e4 100755 --- a/Text/Wiki2/Parse/Default/Deflist.php +++ b/Text/Wiki2/Parse/Default/Deflist.php @@ -35,7 +35,7 @@ * */ -class Text_Wiki2_Parse_Deflist extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Deflist extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Delimiter.php b/Text/Wiki2/Parse/Default/Delimiter.php index 2890a09..b7583ad 100755 --- a/Text/Wiki2/Parse/Default/Delimiter.php +++ b/Text/Wiki2/Parse/Default/Delimiter.php @@ -33,7 +33,7 @@ * */ -class Text_Wiki2_Parse_Delimiter extends Text_Wiki2_Parse +class Text_Wiki2_Parse_Default_Delimiter extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Embed.php b/Text/Wiki2/Parse/Default/Embed.php index e1c2a4c..bd90a5c 100755 --- a/Text/Wiki2/Parse/Default/Embed.php +++ b/Text/Wiki2/Parse/Default/Embed.php @@ -38,7 +38,7 @@ * */ -class Text_Wiki2_Parse_Embed extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Embed extends Text_Wiki2_Parse { var $conf = array( 'base' => '/path/to/scripts/' diff --git a/Text/Wiki2/Parse/Default/Emphasis.php b/Text/Wiki2/Parse/Default/Emphasis.php index 2f894e9..e9c02ab 100755 --- a/Text/Wiki2/Parse/Default/Emphasis.php +++ b/Text/Wiki2/Parse/Default/Emphasis.php @@ -33,7 +33,7 @@ * */ -class Text_Wiki2_Parse_emphasis extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_emphasis extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Freelink.php b/Text/Wiki2/Parse/Default/Freelink.php index a4af3ab..43d0868 100755 --- a/Text/Wiki2/Parse/Default/Freelink.php +++ b/Text/Wiki2/Parse/Default/Freelink.php @@ -39,7 +39,7 @@ * */ -class Text_Wiki2_Parse_Freelink extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Freelink extends Text_Wiki2_Parse { var $conf = array ( 'utf-8' => false diff --git a/Text/Wiki2/Parse/Default/Function.php b/Text/Wiki2/Parse/Default/Function.php index f117f38..2c5f15c 100644 --- a/Text/Wiki2/Parse/Default/Function.php +++ b/Text/Wiki2/Parse/Default/Function.php @@ -28,7 +28,7 @@ * */ -class Text_Wiki2_Parse_Function extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Function extends Text_Wiki2_Parse { var $regex = '/^(\)\n(.+)\n(\<\/function\>)(\s|$)/Umsi'; diff --git a/Text/Wiki2/Parse/Default/Heading.php b/Text/Wiki2/Parse/Default/Heading.php index bc0f92b..7fd1b2c 100755 --- a/Text/Wiki2/Parse/Default/Heading.php +++ b/Text/Wiki2/Parse/Default/Heading.php @@ -34,7 +34,7 @@ * */ -class Text_Wiki2_Parse_Heading extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Heading extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Horiz.php b/Text/Wiki2/Parse/Default/Horiz.php index 8f29b3b..b68bced 100755 --- a/Text/Wiki2/Parse/Default/Horiz.php +++ b/Text/Wiki2/Parse/Default/Horiz.php @@ -31,7 +31,7 @@ * */ -class Text_Wiki2_Parse_Horiz extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Horiz extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Html.php b/Text/Wiki2/Parse/Default/Html.php index 5b8bda5..217d292 100755 --- a/Text/Wiki2/Parse/Default/Html.php +++ b/Text/Wiki2/Parse/Default/Html.php @@ -32,7 +32,7 @@ * */ -class Text_Wiki2_Parse_Html extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Html extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Image.php b/Text/Wiki2/Parse/Default/Image.php index 321e2d8..d1088a9 100755 --- a/Text/Wiki2/Parse/Default/Image.php +++ b/Text/Wiki2/Parse/Default/Image.php @@ -28,7 +28,7 @@ * */ -class Text_Wiki2_Parse_Image extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Image extends Text_Wiki2_Parse { /** * URL schemes recognized by this rule. diff --git a/Text/Wiki2/Parse/Default/Include.php b/Text/Wiki2/Parse/Default/Include.php index 64cbb21..0fce546 100755 --- a/Text/Wiki2/Parse/Default/Include.php +++ b/Text/Wiki2/Parse/Default/Include.php @@ -38,7 +38,7 @@ * */ -class Text_Wiki2_Parse_Include extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Include extends Text_Wiki2_Parse { var $conf = array( 'base' => '/path/to/scripts/' diff --git a/Text/Wiki2/Parse/Default/Interwiki.php b/Text/Wiki2/Parse/Default/Interwiki.php index 0c4ba89..eef5218 100755 --- a/Text/Wiki2/Parse/Default/Interwiki.php +++ b/Text/Wiki2/Parse/Default/Interwiki.php @@ -32,7 +32,7 @@ * */ -class Text_Wiki2_Parse_Interwiki extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Interwiki extends Text_Wiki2_Parse { // double-colons wont trip up now var $regex = '([A-Za-z0-9_]+):((?!:)[A-Za-z0-9_\/=&~#.:;-]+)'; diff --git a/Text/Wiki2/Parse/Default/Italic.php b/Text/Wiki2/Parse/Default/Italic.php index 9e7431d..39e6322 100755 --- a/Text/Wiki2/Parse/Default/Italic.php +++ b/Text/Wiki2/Parse/Default/Italic.php @@ -33,7 +33,7 @@ * */ -class Text_Wiki2_Parse_Italic extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Italic extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/List.php b/Text/Wiki2/Parse/Default/List.php index cdaaa7a..073257a 100755 --- a/Text/Wiki2/Parse/Default/List.php +++ b/Text/Wiki2/Parse/Default/List.php @@ -1,5 +1,4 @@ diff --git a/Text/Wiki2/Parse/Default/Newline.php b/Text/Wiki2/Parse/Default/Newline.php index aaa67c7..598c363 100755 --- a/Text/Wiki2/Parse/Default/Newline.php +++ b/Text/Wiki2/Parse/Default/Newline.php @@ -32,7 +32,7 @@ * */ -class Text_Wiki2_Parse_Newline extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Newline extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Paragraph.php b/Text/Wiki2/Parse/Default/Paragraph.php index 7a0f9f3..9ecd233 100755 --- a/Text/Wiki2/Parse/Default/Paragraph.php +++ b/Text/Wiki2/Parse/Default/Paragraph.php @@ -32,7 +32,7 @@ * */ -class Text_Wiki2_Parse_Paragraph extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Paragraph extends Text_Wiki2_Parse { /** * diff --git a/Text/Wiki2/Parse/Default/Phplookup.php b/Text/Wiki2/Parse/Default/Phplookup.php index 40da071..24252c5 100755 --- a/Text/Wiki2/Parse/Default/Phplookup.php +++ b/Text/Wiki2/Parse/Default/Phplookup.php @@ -28,7 +28,7 @@ * */ -class Text_Wiki2_Parse_Phplookup extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Phplookup extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Prefilter.php b/Text/Wiki2/Parse/Default/Prefilter.php index c464af1..c7aad2f 100755 --- a/Text/Wiki2/Parse/Default/Prefilter.php +++ b/Text/Wiki2/Parse/Default/Prefilter.php @@ -33,7 +33,7 @@ * */ -class Text_Wiki2_Parse_Prefilter extends Text_Wiki2_Parse +class Text_Wiki2_Parse_Default_Prefilter extends Text_Wiki2_Parse { /** * diff --git a/Text/Wiki2/Parse/Default/Raw.php b/Text/Wiki2/Parse/Default/Raw.php index 34baaf4..71bbc99 100755 --- a/Text/Wiki2/Parse/Default/Raw.php +++ b/Text/Wiki2/Parse/Default/Raw.php @@ -32,7 +32,7 @@ * */ -class Text_Wiki2_Parse_Raw extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Raw extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Revise.php b/Text/Wiki2/Parse/Default/Revise.php index 445f6ea..e805edf 100755 --- a/Text/Wiki2/Parse/Default/Revise.php +++ b/Text/Wiki2/Parse/Default/Revise.php @@ -28,7 +28,7 @@ * */ -class Text_Wiki2_Parse_Revise extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Revise extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Smiley.php b/Text/Wiki2/Parse/Default/Smiley.php index 430d2b5..d46f4ca 100644 --- a/Text/Wiki2/Parse/Default/Smiley.php +++ b/Text/Wiki2/Parse/Default/Smiley.php @@ -30,7 +30,7 @@ * @link http://pear.php.net/package/Text_Wiki * @see Text_Wiki2_Parse::Text_Wiki2_Parse() */ -class Text_Wiki2_Parse_Smiley extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Smiley extends Text_Wiki2_Parse { /** * Configuration keys for this rule @@ -91,7 +91,7 @@ class Text_Wiki2_Parse_Smiley extends Text_Wiki2_Parse { * @return The parser object * @access public */ - function Text_Wiki2_Parse_Smiley(&$obj) + function Text_Wiki2_Parse_Default_Smiley(&$obj) { $default = $this->conf; parent::Text_Wiki2_Parse($obj); diff --git a/Text/Wiki2/Parse/Default/Strong.php b/Text/Wiki2/Parse/Default/Strong.php index c1fa4c3..9fabdb9 100755 --- a/Text/Wiki2/Parse/Default/Strong.php +++ b/Text/Wiki2/Parse/Default/Strong.php @@ -35,7 +35,7 @@ * */ -class Text_Wiki2_Parse_Strong extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Strong extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Subscript.php b/Text/Wiki2/Parse/Default/Subscript.php index 6f784af..add0bd3 100755 --- a/Text/Wiki2/Parse/Default/Subscript.php +++ b/Text/Wiki2/Parse/Default/Subscript.php @@ -28,7 +28,7 @@ * */ -class Text_Wiki2_Parse_Subscript extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Subscript extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Superscript.php b/Text/Wiki2/Parse/Default/Superscript.php index c48f71b..514f88d 100755 --- a/Text/Wiki2/Parse/Default/Superscript.php +++ b/Text/Wiki2/Parse/Default/Superscript.php @@ -28,7 +28,7 @@ * */ -class Text_Wiki2_Parse_Superscript extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Superscript extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Table.php b/Text/Wiki2/Parse/Default/Table.php index a2ef82d..848c000 100755 --- a/Text/Wiki2/Parse/Default/Table.php +++ b/Text/Wiki2/Parse/Default/Table.php @@ -34,7 +34,7 @@ * */ -class Text_Wiki2_Parse_Table extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Table extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Tighten.php b/Text/Wiki2/Parse/Default/Tighten.php index 61ddfdf..691089a 100755 --- a/Text/Wiki2/Parse/Default/Tighten.php +++ b/Text/Wiki2/Parse/Default/Tighten.php @@ -29,7 +29,7 @@ * */ -class Text_Wiki2_Parse_Tighten extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Tighten extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Toc.php b/Text/Wiki2/Parse/Default/Toc.php index 3e85e5b..b1444c4 100755 --- a/Text/Wiki2/Parse/Default/Toc.php +++ b/Text/Wiki2/Parse/Default/Toc.php @@ -33,7 +33,7 @@ */ -class Text_Wiki2_Parse_Toc extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Toc extends Text_Wiki2_Parse { /** diff --git a/Text/Wiki2/Parse/Default/Tt.php b/Text/Wiki2/Parse/Default/Tt.php index c978749..d935653 100755 --- a/Text/Wiki2/Parse/Default/Tt.php +++ b/Text/Wiki2/Parse/Default/Tt.php @@ -37,7 +37,7 @@ * */ -class Text_Wiki2_Parse_Tt extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Tt extends Text_Wiki2_Parse { /** @@ -81,4 +81,4 @@ function process(&$matches) return $start . $matches[1] . $end; } } -?> \ No newline at end of file +?> diff --git a/Text/Wiki2/Parse/Default/Underline.php b/Text/Wiki2/Parse/Default/Underline.php index 5c4cc5a..45fc396 100644 --- a/Text/Wiki2/Parse/Default/Underline.php +++ b/Text/Wiki2/Parse/Default/Underline.php @@ -34,9 +34,8 @@ * */ -class Text_Wiki2_Parse_Underline extends Text_Wiki2_Parse { - - +class Text_Wiki2_Parse_Default_Underline extends Text_Wiki2_Parse +{ /** * * The regular expression used to parse the source text and find @@ -76,4 +75,4 @@ function process(&$matches) return $start . $matches[1] . $end; } } -?> \ No newline at end of file +?> diff --git a/Text/Wiki2/Parse/Default/Url.php b/Text/Wiki2/Parse/Default/Url.php index 774c613..975a93c 100755 --- a/Text/Wiki2/Parse/Default/Url.php +++ b/Text/Wiki2/Parse/Default/Url.php @@ -49,9 +49,8 @@ * */ -class Text_Wiki2_Parse_Url extends Text_Wiki2_Parse { - - +class Text_Wiki2_Parse_Default_Url extends Text_Wiki2_Parse +{ /** * * Keeps a running count of numbered-reference URLs. diff --git a/Text/Wiki2/Parse/Default/Wikilink.php b/Text/Wiki2/Parse/Default/Wikilink.php index 426b403..6e481ad 100755 --- a/Text/Wiki2/Parse/Default/Wikilink.php +++ b/Text/Wiki2/Parse/Default/Wikilink.php @@ -42,7 +42,8 @@ * */ -class Text_Wiki2_Parse_Wikilink extends Text_Wiki2_Parse { +class Text_Wiki2_Parse_Default_Wikilink extends Text_Wiki2_Parse +{ var $conf = array ( 'ext_chars' => false, @@ -62,7 +63,7 @@ class Text_Wiki2_Parse_Wikilink extends Text_Wiki2_Parse { * */ - function Text_Wiki2_Parse_Wikilink(&$obj) + function Text_Wiki2_Parse_Default_Wikilink(&$obj) { parent::__construct($obj);