php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/plugins/serendipity_event_textwiki serendipity_event_textwiki.php,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_textwiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2227/serendipity_event_textwiki

Added Files:
	serendipity_event_textwiki.php 
Log Message:
Added markup plugins


--- NEW FILE: serendipity_event_textwiki.php ---
<?php # $Id: serendipity_event_textwiki.php,v 1.1 2004/02/26 11:29:11 garvinhicking Exp $

require_once 'Text/Wiki.php';

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_TEXTWIKI_NAME',     'Textformatierung: Wiki');
        @define('PLUGIN_EVENT_TEXTWIKI_DESC',     'Wiki-Formatierung durchführen');
        @define('PLUGIN_EVENT_TEXTWIKI_TRANSFORM', '<a href="http://c2.com/cgi/wiki">Wiki</a>-Formatierung erlaubt');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_TEXTWIKI_NAME',     'Markup: Wiki');
        @define('PLUGIN_EVENT_TEXTWIKI_DESC',     'Markup text using Text_Wiki');
        @define('PLUGIN_EVENT_TEXTWIKI_TRANSFORM', '<a href="http://c2.com/cgi/wiki">Wiki</a> format allowed');
        break;
}

class serendipity_event_textwiki extends serendipity_event
{

    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_TEXTWIKI_NAME);
        $propbag->add('description',   PLUGIN_EVENT_TEXTWIKI_DESC);
        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));

        $this->markup_elements = array(
            array(
              'name'     => ENTRY_BODY,
              'element'  => 'body',
            ),
            array(
              'name'     => EXTENDED_BODY,
              'element'  => 'extended',
            ),
            array(
              'name'     => COMMENT,
              'element'  => 'comment',
            ),
            array(
              'name'     => HTML_NUGGET,
              'element'  => 'html_nugget',
            )
        );

        $conf_array = array();
        foreach($this->markup_elements as $element) {
            $conf_array[] = $element['name'];
        }
        $propbag->add('configuration', $conf_array);
        
        $this->wiki =& new Text_Wiki;
    }


    function generate_content(&$title) {
        $title = PLUGIN_EVENT_TEXTWIKI_NAME;
    }


    function introspect_config_item($name, &$propbag)
    {
        $propbag->add('type',        'boolean');
        $propbag->add('name',        $name);
        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
        return true;
    }
    
    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
 
        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
                case 'frontend_display':
                    foreach ($this->markup_elements as $temp) {
                        if ($this->get_config($temp['name']) != 'false') {
                            $element = $temp['element'];
                            $eventData[$element] = $this->wiki->transform($eventData[$element]);
                        } 
                    }
                    return true;
                    break;

                case 'frontend_comment':
                    if ($this->get_config(COMMENT) != 'false') {
                        echo PLUGIN_EVENT_TEXTWIKI_TRANSFORM . '<br />';
                    }
                    return true;
                    break;

                default:
                  return false;
            }
        } else {
            return false;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/plugins/serendipity_event_trackexits serendipity_event_trackexits.php,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2227/serendipity_event_trackexits

Added Files:
	serendipity_event_trackexits.php 
Log Message:
Added markup plugins


--- NEW FILE: serendipity_event_trackexits.php ---
(This appears to be a binary file; contents omitted.)

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2227/serendipity_event_emoticate

Added Files:
	serendipity_event_emoticate.php 
Log Message:
Added markup plugins


--- NEW FILE: serendipity_event_emoticate.php ---
<?php # $Id: serendipity_event_emoticate.php,v 1.1 2004/02/26 11:29:10 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_EMOTICATE_NAME', 'Textformatierung: Smilies');
        @define('PLUGIN_EVENT_EMOTICATE_DESC', 'Standard Text-Smilies in Grafiken konvertieren');
        @define('PLUGIN_EVENT_EMOTICATE_TRANSFORM', 'Standard-Text Smilies wie :-) und ;-) werden zu Bildern konvertiert.');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_EMOTICATE_NAME', 'Markup: Emoticate');
        @define('PLUGIN_EVENT_EMOTICATE_DESC', 'Convert standard emoticons into graphic images');
        @define('PLUGIN_EVENT_EMOTICATE_TRANSFORM', 'Standard emoticons like :-) and ;-) are converted to images.');
        break;
}

class serendipity_event_emoticate extends serendipity_event
{

    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_EMOTICATE_NAME);
        $propbag->add('description',   PLUGIN_EVENT_EMOTICATE_DESC);
        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));

        $this->markup_elements = array(
            array(
              'name'     => ENTRY_BODY,
              'element'  => 'body',
            ),
            array(
              'name'     => EXTENDED_BODY,
              'element'  => 'extended',
            ),
            array(
              'name'     => COMMENT,
              'element'  => 'comment',
            ),
            array(
              'name'     => HTML_NUGGET,
              'element'  => 'html_nugget',
            )
        );
        $conf_array = array();
        foreach($this->markup_elements as $element) {
            $conf_array[] = $element['name'];
        }
        $propbag->add('configuration', $conf_array);

        // A Set of emoticons to rewrite
        $this->smiles = array(
            ":'("  => $serendipity['baseURL'] . 'pixel/cry_smile.gif',
            ':-)'  => $serendipity['baseURL'] . 'pixel/regular_smile.gif',
            ':-O'  => $serendipity['baseURL'] . 'pixel/embaressed_smile.gif',
            ':O'   => $serendipity['baseURL'] . 'pixel/embaressed_smile.gif',
            ':-('  => $serendipity['baseURL'] . 'pixel/sad_smile.gif',
            ':('   => $serendipity['baseURL'] . 'pixel/sad_smile.gif',
            ':)'   => $serendipity['baseURL'] . 'pixel/regular_smile.gif',
            '8-)'  => $serendipity['baseURL'] . 'pixel/shades_smile.gif',
            ':-D'  => $serendipity['baseURL'] . 'pixel/teeth_smile.gif',
            ':D'   => $serendipity['baseURL'] . 'pixel/teeth_smile.gif',
            '8)'   => $serendipity['baseURL'] . 'pixel/shades_smile.gif',
            ':-P'  => $serendipity['baseURL'] . 'pixel/tounge_smile.gif',
            ';-)'  => $serendipity['baseURL'] . 'pixel/wink_smile.gif',
            ';)'   => $serendipity['baseURL'] . 'pixel/wink_smile.gif',
            ':P'   => $serendipity['baseURL'] . 'pixel/tounge_smile.gif',
        );
    }


    function generate_content(&$title) {
        $title = PLUGIN_EVENT_EMOTICATE_NAME;
    }
    

    function introspect_config_item($name, &$propbag)
    {
        $propbag->add('type',        'boolean');
        $propbag->add('name',        $name);
        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
        return true;
    }


    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
 
        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
                case 'frontend_display':

                    foreach ($this->markup_elements as $temp) {
                        if ($this->get_config($temp['name']) != 'false') {
                            $element = $temp['element'];
    
                            foreach ($this->smiles as $key => $value) {
                                $eventData[$element] = preg_replace("/([\t\ ]?)" . preg_quote($key, '/') . "([\t\ \!\.\)]?)/m", 
                                    "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" />$2", 
                                    $eventData[$element]
                                );
                            }
                        } 
                    }
                    return true;
                    break;
            
                case 'frontend_comment':
                    if ($this->get_config(COMMENT) != 'false') {
                        echo PLUGIN_EVENT_EMOTICATE_TRANSFORM . '<br />';
                    }
                    return true;
                    break;

              default:
                return false;
            }
        } else {
            return false;
        }
    }

}

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/plugins/serendipity_event_nl2br serendipity_event_nl2br.php,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_nl2br
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2227/serendipity_event_nl2br

Added Files:
	serendipity_event_nl2br.php 
Log Message:
Added markup plugins


--- NEW FILE: serendipity_event_nl2br.php ---
<?php # $Id: serendipity_event_nl2br.php,v 1.1 2004/02/26 11:29:10 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_NL2BR_NAME',     'Textformatierung: NL2BR');
        @define('PLUGIN_EVENT_NL2BR_DESC',     'Konvertiert Zeilenumbrüche zu HTML');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_NL2BR_NAME',     'Markup: NL2BR');
        @define('PLUGIN_EVENT_NL2BR_DESC',     'Convert newlines to BR tags');
        break;
}

class serendipity_event_nl2br extends serendipity_event
{
    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_NL2BR_NAME);
        $propbag->add('description',   PLUGIN_EVENT_NL2BR_DESC);
        $propbag->add('event_hooks', array('frontend_display' => true));

        $this->markup_elements = array(
            array(
              'name'     => ENTRY_BODY,
              'element'  => 'body',
            ),
            array(
              'name'     => EXTENDED_BODY,
              'element'  => 'extended',
            ),
            array(
              'name'     => COMMENT,
              'element'  => 'comment',
            ),
            array(
              'name'     => HTML_NUGGET,
              'element'  => 'html_nugget',
            )
        );

        $conf_array = array();
        foreach($this->markup_elements as $element) {
            $conf_array[] = $element['name'];
        }
        $propbag->add('configuration', $conf_array);
    }


    function generate_content(&$title) {
        $title = PLUGIN_EVENT_NL2BR_NAME;
    }


    function introspect_config_item($name, &$propbag)
    {
        $propbag->add('type',        'boolean');
        $propbag->add('name',        $name);
        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
        return true;
    }
    
    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
 
        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
              case 'frontend_display':

                foreach ($this->markup_elements as $temp) {
                    if ($this->get_config($temp['name']) != 'false') {
                        $element = $temp['element'];
                        $eventData[$element] = nl2br($eventData[$element]);
                    } 
                }
                return true;
                break;

              default:
                return false;
            }

        } else {
            return false;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/plugins/serendipity_event_contentrewrite serendipity_event_contentrewrite.php,1.3,1.4

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2227/serendipity_event_contentrewrite

Modified Files:
	serendipity_event_contentrewrite.php 
Log Message:
Added markup plugins


Index: serendipity_event_contentrewrite.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_contentrewrite.php	13 Feb 2004 17:19:05 -0000	1.3
+++ serendipity_event_contentrewrite.php	26 Feb 2004 11:29:09 -0000	1.4
@@ -63,10 +63,10 @@
         
         $propbag->add('name',          PLUGIN_EVENT_CONTENTREWRITE_NAME);
         $propbag->add('description',   PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION);
-        $propbag->add('event_hooks',    array(
-            'frontend_display' => true
-        ));
-        
+        $propbag->add('event_hooks',    array(
+            'frontend_display' => true
+        ));
+
         if ($_POST['SAVECONF']) $this->cleanup();
         $rows = serendipity_db_query("SELECT name, value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '" . $this->instance . "/%'");
 
@@ -115,19 +115,51 @@
         $values[] = 'title'       . '_' . $counter;
         $values[] = 'description' . '_' . $counter;
         
-        $propbag->add('configuration', $values);
+        $this->markup_elements = array(
+            array(
+              'name'     => ENTRY_BODY,
+              'element'  => 'body',
+            ),
+            array(
+              'name'     => EXTENDED_BODY,
+              'element'  => 'extended',
+            ),
+            array(
+              'name'     => COMMENT,
+              'element'  => 'comment',
+            ),
+            array(
+              'name'     => HTML_NUGGET,
+              'element'  => 'html_nugget',
+            )
+        );
+
+        foreach($this->markup_elements as $element) {
+            $values[] = $element['name'];
+        }
 
+        $propbag->add('configuration', $values);
         $this->counter = $counter;
     }
 
     function introspect_config_item($name, &$propbag)
     {
+        foreach($this->markup_elements as $element) {
+            if ($name==$element['name']) {
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        $name);
+                $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+                return true;
+            }
+        }
+
         preg_match('|^(.+)_([0-9]+)$|msU', $name, $switch);
         
         if (!isset($switch[2])) {
             $switch[1] = $name;
             $switch[2] = 'empty';
         }
+
         
         switch($switch[1]) {
             case 'title':
@@ -198,14 +230,14 @@
 ?>
 </table>
 <?php
-    }
-    
+    }
+    
     function event_hook($event, &$bag, &$eventData) {
         global $serendipity;
-        
+        
         $hooks = &$bag->get('event_hooks');
-        if (isset($hooks[$event])) {
-            switch($event) {
+        if (isset($hooks[$event])) {
+            switch($event) {
                 case 'frontend_display':
                     $char   = &$this->get_config('rewrite_char');
                     $string = &$this->get_config('rewrite_string');
@@ -237,15 +269,21 @@
                             $regex = '°([^\d\w])(' . preg_quote($v_from) . ')([^\d\w])°msU';
         
                             // \1 and \3 are the prepend/append strings (usually whitespaces) and $new containing the new value
-                            $eventData   = preg_replace($regex, '\1' . $new . '\3', $eventData);
+                            foreach ($this->markup_elements as $temp) {
+                                if ($this->get_config($temp['name']) != 'false') {
+                                    $element = $temp['element'];
+                                    $eventData[$element] = preg_replace($regex, '\1' . $new . '\3', $eventData[$element]);
+                                }
+                            }
+
                         }
                     }
 
                     return true;
-                    break;
-            }
-        }
-    }
+                    break;
+            }
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity/plugins/serendipity_event_bbcode serendipity_event_bbcode.php,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2227/serendipity_event_bbcode

Added Files:
	serendipity_event_bbcode.php 
Log Message:
Added markup plugins


--- NEW FILE: serendipity_event_bbcode.php ---
<?php # $Id: serendipity_event_bbcode.php,v 1.1 2004/02/26 11:29:09 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_BBCODE_NAME',     'Textformatierung: BBCode');
        @define('PLUGIN_EVENT_BBCODE_DESC',     'BBCode-Formatierung durchführen');
        @define('PLUGIN_EVENT_BBCODE_TRANSFORM', '<a href="http://www.phpbb.com/phpBB/faq.php?mode=bbcode">BBCode</a>-Formatierung erlaubt');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_BBCODE_NAME',     'Markup: BBCode');
        @define('PLUGIN_EVENT_BBCODE_DESC',     'Markup text using BBCode');
        @define('PLUGIN_EVENT_BBCODE_TRANSFORM', '<a href="http://www.phpbb.com/phpBB/faq.php?mode=bbcode">BBCode</a> format allowed');
        break;
}

class serendipity_event_bbcode extends serendipity_event
{

    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_BBCODE_NAME);
        $propbag->add('description',   PLUGIN_EVENT_BBCODE_DESC);
        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));

        $this->markup_elements = array(
            array(
              'name'     => ENTRY_BODY,
              'element'  => 'body',
            ),
            array(
              'name'     => EXTENDED_BODY,
              'element'  => 'extended',
            ),
            array(
              'name'     => COMMENT,
              'element'  => 'comment',
            ),
            array(
              'name'     => HTML_NUGGET,
              'element'  => 'html_nugget',
            )
        );

        $conf_array = array();
        foreach($this->markup_elements as $element) {
            $conf_array[] = $element['name'];
        }
        $propbag->add('configuration', $conf_array);

        $this->bbcodes = array(
          '/(?<!\\\\)\[color(?::\w+)?=(.*?)\](.*?)\[\/color(?::\w+)?\]/si'   => "<span style=\"color:\\1\">\\2</span>",
          '/(?<!\\\\)\[size(?::\w+)?=(.*?)\](.*?)\[\/size(?::\w+)?\]/si'     => "<span style=\"font-size:\\1\">\\2</span>",
          '/(?<!\\\\)\[font(?::\w+)?=(.*?)\](.*?)\[\/font(?::\w+)?\]/si'     => "<span style=\"font-family:\\1\">\\2</span>",
          '/(?<!\\\\)\[align(?::\w+)?=(.*?)\](.*?)\[\/align(?::\w+)?\]/si'   => "<div style=\"text-align:\\1\">\\2</div>",
          '/(?<!\\\\)\[b(?::\w+)?\](.*?)\[\/b(?::\w+)?\]/si'                 => "<span style=\"font-weight:bold\">\\1</span>",
          '/(?<!\\\\)\[i(?::\w+)?\](.*?)\[\/i(?::\w+)?\]/si'                 => "<span style=\"font-style:italic\">\\1</span>",
          '/(?<!\\\\)\[u(?::\w+)?\](.*?)\[\/u(?::\w+)?\]/si'                 => "<span style=\"text-decoration:underline\">\\1</span>",
          '/(?<!\\\\)\[center(?::\w+)?\](.*?)\[\/center(?::\w+)?\]/si'       => "<div style=\"text-align:center\">\\1</div>",

          // [code] & [php]
          '/(?<!\\\\)\[code(?::\w+)?\](.*?)\[\/code(?::\w+)?\]/si'           => "<div class=\"bb-code\">\\1</div>",
          '/(?<!\\\\)\[php(?::\w+)?\](.*?)\[\/php(?::\w+)?\]/si'             => "<div class=\"bb-php\">\\1</div>",

          // [email]
          '/(?<!\\\\)\[email(?::\w+)?\](.*?)\[\/email(?::\w+)?\]/si'         => "<a href=\"mailto:\\1\" class=\"bb-email\">\\1</a>",
          '/(?<!\\\\)\[email(?::\w+)?=(.*?)\](.*?)\[\/email(?::\w+)?\]/si'   => "<a href=\"mailto:\\1\" class=\"bb-email\">\\2</a>",

          // [url]
          '/(?<!\\\\)\[url(?::\w+)?\]www\.(.*?)\[\/url(?::\w+)?\]/si'        => "<a href=\"http://www.\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
          '/(?<!\\\\)\[url(?::\w+)?\](.*?)\[\/url(?::\w+)?\]/si'             => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
          '/(?<!\\\\)\[url(?::\w+)?=(.*?)?\](.*?)\[\/url(?::\w+)?\]/si'      => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\2</a>",

          // [img]
          '/(?<!\\\\)\[img(?::\w+)?\](.*?)\[\/img(?::\w+)?\]/si'             => "<img src=\"\\1\" alt=\"\\1\" class=\"bb-image\" />",
          '/(?<!\\\\)\[img(?::\w+)?=(.*?)x(.*?)\](.*?)\[\/img(?::\w+)?\]/si' => "<img width=\"\\1\" height=\"\\2\" src=\"\\3\" alt=\"\\3\" class=\"bb-image\" />",

          // [quote]
          '/(?<!\\\\)\[quote(?::\w+)?\](.*?)\[\/quote(?::\w+)?\]/si'         => "<div>Quote:<div class=\"bb-quote\">\\1</div></div>",
          '/(?<!\\\\)\[quote(?::\w+)?=(?:&quot;|"|\')?(.*?)["\']?(?:&quot;|"|\')?\](.*?)\[\/quote\]/si'   => "<div>Quote \\1:<div class=\"bb-quote\">\\2</div></div>",

          // [list]
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\*(?::\w+)?\](.*?)(?=(?:\s*<br\s*\/?>\s*)?\[\*|(?:\s*<br\s*\/?>\s*)?\[\/?list)/si' => "\n<li class=\"bb-listitem\">\\1</li>",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list(:(?!u|o)\w+)?\](?:<br\s*\/?>)?/si'    => "\n</ul>",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list:u(:\w+)?\](?:<br\s*\/?>)?/si'         => "\n</ul>",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list:o(:\w+)?\](?:<br\s*\/?>)?/si'         => "\n</ol>",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(:(?!u|o)\w+)?\]\s*(?:<br\s*\/?>)?/si'   => "\n<ul class=\"bb-list-unordered\">",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list:u(:\w+)?\]\s*(?:<br\s*\/?>)?/si'        => "\n<ul class=\"bb-list-unordered\">",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list:o(:\w+)?\]\s*(?:<br\s*\/?>)?/si'        => "\n<ol class=\"bb-list-ordered\">",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=1\]\s*(?:<br\s*\/?>)?/si' => "\n<ol class=\"bb-list-ordered,bb-list-ordered-d\">",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=i\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-lr\">",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=I\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-ur\">",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=a\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-la\">",
          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=A\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-ua\">",

          // escaped tags like \[b], \[color], \[url], ...
          '/\\\\(\[\/?\w+(?::\w+)*\])/'                                      => "\\1"
        );
    }


    function generate_content(&$title) {
        $title = PLUGIN_EVENT_BBCODE_NAME;
    }


    function introspect_config_item($name, &$propbag)
    {
        $propbag->add('type',        'boolean');
        $propbag->add('name',        $name);
        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
        return true;
    }
    
    function bbcode($input) {
        /* Regular expressions taken from http://smarty.incutio.com/?page=BBCodePlugin Wiki (Andre Rabold) */
        return preg_replace(array_keys($this->bbcodes), array_values($this->bbcodes), $input);
}

    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
 
        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
                case 'frontend_display':

                    foreach ($this->markup_elements as $temp) {
                        if ($this->get_config($temp['name']) != 'false') {
                            $element = $temp['element'];
                            $eventData[$element] = $this->bbcode($eventData[$element]);
                        } 
                    }
                    return true;
                    break;

                case 'frontend_comment':
                    if ($this->get_config(COMMENT) != 'false') {
                        echo PLUGIN_EVENT_BBCODE_TRANSFORM . '<br />';
                    }
                    return true;
                    break;

                default:
                  return false;
            }
        } else {
            return false;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/bundled-libs/Text/Wiki/Rule blockquote.php,NONE,1.1 bold.php,NONE,1.1 code.php,NONE,1.1 deflist.php,NONE,1.1 delimiter.php,NONE,1.1 emphasis.php,NONE,1.1 entities.php,NONE,1.1 freelink.php,NONE,1.1 heading.php,NONE,1.1 horiz.php,NONE,1.1 html.php,NONE,1.1 interwiki.php,NONE,1.1 italic.php,NONE,1.1 list.php,NONE,1.1 newline.php,NONE,1.1 paragraph.php,NONE,1.1 phpcode.php,NONE,1.1 phplookup.php,NONE,1.1 prefilter.php,NONE,1.1 raw.php,NONE,1.1 revise.php,NONE,1.1 strong.php,NONE,1.1 superscript.php,NONE,1.1 table.php,NONE,1.1 tighten.php,NONE,1.1 toc.php,NONE,1.1 tt.php,NONE,1.1 url.php,NONE,1.1 wikilink.php,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/bundled-libs/Text/Wiki/Rule
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1804/Text/Wiki/Rule

Added Files:
	blockquote.php bold.php code.php deflist.php delimiter.php 
	emphasis.php entities.php freelink.php heading.php horiz.php 
	html.php interwiki.php italic.php list.php newline.php 
	paragraph.php phpcode.php phplookup.php prefilter.php raw.php 
	revise.php strong.php superscript.php table.php tighten.php 
	toc.php tt.php url.php wikilink.php 
Log Message:
Added PEAR:Text/Wiki (latest 0.8.2) bundled library


--- NEW FILE: blockquote.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: blockquote.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked as a
* blockquote, identified by any number of greater-than signs '>' at the
* start of the line, followed by a space, and then the quote text; each
* '>' indicates an additional level of quoting.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_blockquote extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = '/\n((\>).*\n)(?!(\>))/Us';
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'type' =>
    *     'start' : the start of a blockquote
    *     'end'   : the end of a blockquote
    *
    * 'level' => the indent level (0 for the first level, 1 for the
    * second, etc)
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A series of text and delimited tokens marking the different
    * list text and list elements.
    *
    */
    
    function process(&$matches)
    {
        // the replacement text we will return to parse()
        $return = '';
        
        // the list of post-processing matches
        $list = array();
        
        // $matches[1] is the text matched as a list set by parse();
        // create an array called $list that contains a new set of
        // matches for the various list-item elements.
        preg_match_all(
            '=^(\>+) (.*\n)=Ums',
            $matches[1],
            $list,
            PREG_SET_ORDER
        );
        
        // a stack of starts and ends; we keep this so that we know what
        // indent level we're at.
        $stack = array();
        
        // loop through each list-item element.
        foreach ($list as $key => $val) {
            
            // $val[0] is the full matched list-item line
            // $val[1] is the number of initial '>' chars (indent level)
            // $val[2] is the quote text
            
            // we number levels starting at 1, not zero
            $level = strlen($val[1]);
            
            // get the text of the line
            $text = $val[2];
            
            // add a level to the list?
            if ($level > count($stack)) {
                
                // the current indent level is greater than the number
                // of stack elements, so we must be starting a new
                // level.  push the new level onto the stack with a 
                // dummy value (boolean true)...
                array_push($stack, true);
                
                // ...and add a start token to the return.
                $return .= $this->addToken(
                    array(
                        'type' => 'start',
                        'level' => $level - 1
                    )
                );
                
                $return .= "\n";
            }
            
            // remove a level?
            while (count($stack) > $level) {
                
                // as long as the stack count is greater than the
                // current indent level, we need to end list types.
                // continue adding end-list tokens until the stack count
                // and the indent level are the same.
                array_pop($stack);
                
                $return .= $this->addToken(
                    array (
                        'type' => 'end',
                        'level' => count($stack)
                    )
                );
                
                $return .= "\n";
            }
            
            // add the line text.
            $return .= $text . "\n";
        }
        
        // the last line may have been indented.  go through the stack
        // and create end-tokens until the stack is empty.
        while (count($stack) > 0) {
            array_pop($stack);
            $return .= $this->addToken(
                array (
                    'type' => 'end',
                    'level' => count($stack)
                )
            );
        }
        
        // we're done!  send back the replacement text.
        return "\n$return";
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        $type = $options['type'];
        $level = $options['level'];
	
		// set up indenting so that the results look nice; we do this
		// in two steps to avoid str_pad mathematics.  ;-)
		$pad = str_pad('', $level, "\t");
		$pad = str_replace("\t", '    ', $pad);
		
		// starting
		if ($type == 'start') {
			return "$pad<blockquote>";
		}
		
		// ending
		if ($type == 'end') {
			return $pad . "</blockquote>\n";
		}
    }
}
?>
--- NEW FILE: bold.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: bold.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked for
* strong emphasis (bold) as defined by text surrounded by three
* single-quotes. On parsing, the text itself is left in place, but the
* starting and ending instances of three single-quotes are replaced with
* tokens.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_bold extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex =  "/'''(()|[^'].*)'''/U";
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'type' => ['start'|'end'] The starting or ending point of the
    * emphasized text.  The text itself is left in the source.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A pair of delimited tokens to be used as a placeholder in
    * the source text surrounding the text to be emphasized.
    *
    */
    
    function process(&$matches)
    {
        $start = $this->addToken(array('type' => 'start'));
        $end = $this->addToken(array('type' => 'end'));
        return $start . $matches[1] . $end;
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        if ($options['type'] == 'start') {
            return '<b>';
        }
        
        if ($options['type'] == 'end') {
            return '</b>';
        }
    }
}
?>
--- NEW FILE: code.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: code.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find sections marked as code
* examples.  Blocks are marked as the string <code> on a line by itself,
* followed by the inline code example, and terminated with the string
* </code> on a line by itself.  The code example is run through the
* native PHP highlight_string() function to colorize it, then surrounded
* with <pre>...</pre> tags when rendered as XHTML.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_code extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to find source text matching this
    * rule.
    * 
    * @access public
    * 
    * @var string
    * 
    */
    
    var $regex = '/^(\<code\>)\n(.+)\n(\<\/code\>)(\s|$)/Umsi';
    
    
    /**
    * 
    * Generates a token entry for the matched text.  Token options are:
    * 
    * 'text' => The full matched text, not including the <code></code> tags.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A delimited token number to be used as a placeholder in
    * the source text.
    *
    */
    
    function process(&$matches)
    {
        $options = array('text' => $matches[2]);
        return $this->addToken($options) . $matches[4];
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
		// trim opening and closing whitespace
		$text = trim($options['text']);
		
		// convert tabs to four spaces
		$text = str_replace("\t", "    ", $text);
		
		// convert entities
		$text = htmlentities($text);
		
		// done!
		return "\n<pre><code>$text</code></pre>\n";
    }
}
?>
--- NEW FILE: deflist.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: deflist.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked as a
* definition list.  In short, if a line starts with ':' then it is a
* definition list item; another ':' on the same lines indicates the end
* of the definition term and the beginning of the definition narrative.
* The list items must be on sequential lines (no blank lines between
* them) -- a blank line indicates the beginning of a new list.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_deflist extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = '/\n((:).*\n)(?!(:))/Us';
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'type' =>
    *     'list_start'    : the start of a definition list
    *     'list_end'      : the end of a definition list
    *     'term_start'    : the start of a definition term
    *     'term_end'      : the end of a definition term
    *     'narr_start'    : the start of definition narrative
    *     'narr_end'      : the end of definition narrative
    *     'unknown'       : unknown type of definition portion
    *
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A series of text and delimited tokens marking the different
    * list text and list elements.
    *
    */
    
    function process(&$matches)
    {
        // the replacement text we will return to parse()
        $return = '';
        
        // the list of post-processing matches
        $list = array();
        
        // start the deflist
        $options = array('type' => 'list_start');
        $return .= $this->addToken($options);
        
        // $matches[1] is the text matched as a list set by parse();
        // create an array called $list that contains a new set of
        // matches for the various definition-list elements.
        preg_match_all(
            '/^(:)(.*)?(:)(.*)?$/Ums',
            $matches[1],
            $list,
            PREG_SET_ORDER
        );
        
        // add each term and narrative
        foreach ($list as $key => $val) {
            $return .= (
                $this->addToken(array('type' => 'term_start')) .
                trim($val[2]) .
                $this->addToken(array('type' => 'term_end')) .
                $this->addToken(array('type' => 'narr_start')) .
                trim($val[4]) . 
                $this->addToken(array('type' => 'narr_end'))
            );
        }
        
        
        // end the deflist
        $options = array('type' => 'list_end');
        $return .= $this->addToken($options);
        
        // done!
        return $return;
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        $type = $options['type'];
        $pad = "    ";
        
        switch ($type) {
        
        case 'list_start':
            return "<dl>\n";
            break;
        
        case 'list_end':
            return "</dl>\n";
            break;
        
        case 'term_start':
            return $pad . "<dt>";
            break;
        
        case 'term_end':
            return "</dt>\n";
            break;
        
        case 'narr_start':
            return $pad . $pad . "<dd>";
            break;
        
        case 'narr_end':
            return "</dd>\n";
            break;
        
        default:
            return '';
        
        }
    }
}
?>
--- NEW FILE: delimiter.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: delimiter.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find instances of the delimiter
* character already embedded in the source text; it extracts them and replaces
* them with a delimited token, then renders them as the delimiter itself
* when the target format is XHTML.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_delimiter extends Text_Wiki_Rule {
    
    /**
    * 
    * Constructor.  Overrides the Text_Wiki_Rule constructor so that we
    * can set the $regex property dynamically (we need to include the
    * Text_Wiki $delim character.
    * 
    * @param object &$obj The calling "parent" Text_Wiki object.
    * 
    * @param string $name The token name to use for this rule.
    * 
    */
    
    function Text_Wiki_Rule_delimiter(&$obj, $name)
    {
        parent::Text_Wiki_Rule($obj, $name);
        $this->regex = '/' . $this->_wiki->delim . '/';
    }
    
    
    /**
    * 
    * Generates a token entry for the matched text.  Token options are:
    * 
    * 'text' => The full matched text.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A delimited token number to be used as a placeholder in
    * the source text.
    *
    */
    
    function process(&$matches)
    {    
        return $this->addToken();
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        return $this->_wiki->delim;
    }
}
?>
--- NEW FILE: emphasis.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: emphasis.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked for
* emphasis (italics) as defined by text surrounded by two single-quotes.
* On parsing, the text itself is left in place, but the starting and ending
* instances of two single-quotes are replaced with tokens.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_emphasis extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = "/\/\/(()|.*)\/\//U";
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'type' => ['start'|'end'] The starting or ending point of the
    * emphasized text.  The text itself is left in the source.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return string A pair of delimited tokens to be used as a
    * placeholder in the source text surrounding the text to be
    * emphasized.
    *
    */
    
    function process(&$matches)
    {
        $start = $this->addToken(array('type' => 'start'));
        $end = $this->addToken(array('type' => 'end'));
        return $start . $matches[1] . $end;
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
		if ($options['type'] == 'start') {
			return '<em>';
		}
		
		if ($options['type'] == 'end') {
			return '</em>';
		}
    }
}
?>
--- NEW FILE: entities.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: entities.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to convert HTML entities in the
* source text.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_entities extends Text_Wiki_Rule {
    
    
    /**
    * 
    * Simple parsing method to apply the rule.
    *
    * @access public
    * 
    */
    
    function parse()
    {
        // first, decode any entities already in the text so that they
        // don't get double-encoded
        $trans_table = get_html_translation_table(HTML_SPECIALCHARS);
        $this->_wiki->_source = strtr($this->_wiki->_source,
            array_flip($trans_table));
            
        // now encode all html special characters
        $this->_wiki->_source = htmlspecialchars($this->_wiki->_source);
    }

}
?>
--- NEW FILE: freelink.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: freelink.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked as a
* wiki freelink, and automatically create a link to that page.
* 
* A freelink is any page name not conforming to the standard
* StudlyCapsStyle for a wiki page name.  For example, a page normally
* named MyHomePage can be renamed and referred to as ((My Home Page)) --
* note the spaces in the page name.  You can also make a "nice-looking"
* link without renaming the target page; e.g., ((MyHomePage|My Home
* Page)).  Finally, you can use named anchors on the target page:
* ((MyHomePage|My Home Page#Section1)).
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_freelink extends Text_Wiki_Rule {
    
    
    /**
    * 
    * Constructor.  We override the Text_Wiki_Rule constructor so we can
    * explicitly comment each part of the $regex property.
    * 
    * @access public
    * 
    * @param object &$obj The calling "parent" Text_Wiki object.
    * 
    * @param string $name The token name to use for this rule.
    * 
    */
    
    function Text_Wiki_Rule_freelink(&$obj, $name)
    {
        parent::Text_Wiki_Rule($obj, $name);
        
        $this->regex =
            '/' .                                                  // START regex
            "\\(\\(" .                                             // double open-parens
            "(" .                                                  // START freelink page patter
            "[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+" . // 1 or more of just about any character
            ")" .                                                  // END  freelink page pattern
            "(" .                                                  // START display-name
            "\|" .                                                 // a pipe to start the display name
            "[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+" . // 1 or more of just about any character
            ")?" .                                                 // END display-name pattern 0 or 1
            "(" .                                                  // START pattern for named anchors
            "\#" .                                                 // a hash mark
            "[A-Za-z]" .                                           // 1 alpha
            "[-A-Za-z0-9_:.]*" .                                   // 0 or more alpha, digit, underscore
            ")?" .                                                 // END named anchors pattern 0 or 1
            "()\\)\\)" .                                           // double close-parens
            '/';                                                   // END regex
    }
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'page' => the wiki page name (e.g., HomePage).
    * 
    * 'text' => alternative text to be displayed in place of the wiki
    * page name.
    * 
    * 'anchor' => a named anchor on the target wiki page
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A delimited token to be used as a placeholder in
    * the source text, plus any text priot to the match.
    *
    */
    
    function process(&$matches)
    {
        // use nice variable names
        $page = $matches[1];
        $text = $matches[2];
        
        // get rid of the leading # from the anchor, if any
        $anchor = substr($matches[3], 1);
        
        // is the page given a new text appearance?
        if (trim($text) == '') {
            // no
            $text = $page;
        } else {
            // yes, strip the leading | character
            $text = substr($text, 1);
        }
        
        // set the options
        $options = array(
            'page'   => $page,
            'text'   => $text,
            'anchor' => $anchor
        );
        
        // return a token placeholder
        return $this->addToken($options);
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        // get nice variable names (page, text, anchor)
        extract($options);
        
        if (in_array($page, $this->_wiki->pages)) {
            // the page exists, show a link to the page
            $href = $this->_wiki->view_url . $page . "#" . $anchor;
            return "<a href=\"$href\">$text</a>";
        } else {
            // the page does not exist, show the page name and
            // the "new page" text
            $href = $this->_wiki->new_url;
            return $text . "<a href=\"$href$page\">{$this->_wiki->new_text}</a>";
        }
    }
}
?>
--- NEW FILE: heading.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: heading.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked to
* be a heading element, as defined by text on a line by itself prefixed
* with a number of plus signs (+). The heading text itself is left in
* the source, but is prefixed and suffixed with delimited tokens marking
* the start and end of the heading.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_heading extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = '/^(\+{1,6}) (.*)/m';
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'type' => ['start'|'end'] The starting or ending point of the
    * heading text.  The text itself is left in the source.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return string A pair of delimited tokens to be used as a
    * placeholder in the source text surrounding the heading text.
    *
    */
    
    function process(&$matches)
    {
        $start = $this->addToken(
            array(
                'type' => 'start',
                'level' => strlen($matches[1]),
                'text' => $matches[2]
            )
        );
        
        $end = $this->addToken(
            array(
                'type' => 'end',
                'level' => strlen($matches[1])
            )
        );
        
        return $start . $matches[2] . $end;
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        // get nice variable names (type, level)
        extract($options);
        
        if ($type == 'start') {
            return "<h$level>";
        }
        
        if ($type == 'end') {
            return "</h$level>\n";
        }
    }
}
?>
--- NEW FILE: horiz.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: horiz.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked to
* be a horizontal rule, as defined by four dashed on their own line.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_horiz extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = '/^([-]{4,})$/m';
    
    
    /**
    * 
    * Generates a replacement token for the matched text.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return string A token marking the horizontal rule.
    *
    */
    
    function process(&$matches)
    {    
        return $this->addToken();
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        return "<hr />\n";
    }
}
?>
--- NEW FILE: html.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: html.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked as
* HTML to be redndred as-is.  The block start is marked by <html> on its
* own line, and the block end is marked by </html> on its own line.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_html extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = '/^\<html\>\n(.+)\n\<\/html\>(\s|$)/Umsi';
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'text' => The text of the HTML to be rendered as-is.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A delimited token to be used as a placeholder in
    * the source text, plus any text following the HTML block.
    *
    */
    
    function process(&$matches)
    {    
        $options = array('text' => $matches[1]);
        return $this->addToken($options) . $matches[2];
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        return $options['text'];
    }
}
?>
--- NEW FILE: interwiki.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: interwiki.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked as
* an Interwiki link.  See the regex for a detailed explanation of the
* text matching procedure; e.g., "InterWikiName:PageName".
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_interwiki extends Text_Wiki_Rule {
    
    
    /**
    * 
    * Constructor.  We override the Text_Wiki_Rule constructor so we can
    * explicitly comment each part of the $regex property.
    * 
    * @access public
    * 
    * @param object &$obj The calling "parent" Text_Wiki object.
    * 
    * @param string $name The token name to use for this rule.
    * 
    */
    
    function Text_Wiki_Rule_interwiki(&$obj, $name)
    {
        parent::Text_Wiki_Rule($obj, $name);
        $this->regex = '/([A-Za-z0-9]+):([\/=&~#A-Za-z0-9]+)/';
    }
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'site' => The key name for the Text_Wiki interwiki array map, usually
    * the name of the interwiki site.
    *
    * 'page' => The page on the target interwiki to link to.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A delimited token to be used as a placeholder in
    * the source text, plus any text priot to the match.
    *
    */
    
    function process(&$matches)
    {
        $options = array(
            'site' => $matches[1],
            'page' => $matches[2]
        );
        
        // if not in the interwiki map, don't make it an interwiki link
        if (isset($this->_wiki->interwiki[$options['site']])) {
	        return $this->addToken($options);
	    } else {
	        return $matches[0];
	    }
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        $site = $options['site'];
        $page = $options['page'];
        
        if (isset($this->_wiki->interwiki[$site])) {
            $href = $this->_wiki->interwiki[$site];
        } else {
            $href = '';
        }
        
        if ($href != '') {
            return "<a href=\"$href$page\">$site:$page</a>";
        } else {
            return "$site:$page";
        }
    }
}
?>
--- NEW FILE: italic.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: italic.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked for
* emphasis (italics) as defined by text surrounded by two single-quotes.
* On parsing, the text itself is left in place, but the starting and ending
* instances of two single-quotes are replaced with tokens.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_italic extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = "/''(()|[^'].*)''/U";
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'type' => ['start'|'end'] The starting or ending point of the
    * emphasized text.  The text itself is left in the source.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return string A pair of delimited tokens to be used as a
    * placeholder in the source text surrounding the text to be
    * emphasized.
    *
    */
    
    function process(&$matches)
    {
        $start = $this->addToken(array('type' => 'start'));
        $end = $this->addToken(array('type' => 'end'));
        return $start . $matches[1] . $end;
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
		if ($options['type'] == 'start') {
			return '<i>';
		}
		
		if ($options['type'] == 'end') {
			return '</i>';
		}
    }
}
?>
--- NEW FILE: list.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: list.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to find source text marked as
* a bulleted or numbered list.  In short, if a line starts with '* ' then
* it is a bullet list item; if a line starts with '# ' then it is a 
* number list item.  Spaces in front of the * or # indicate an indented
* sub-list.  The list items must be on sequential lines (no blank lines
* between them) -- a blank line indicates the beginning of a new list.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_list extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = '/\n((\*|#) .*\n)(?! {0,}(\*|#))/Us';
    
    
    /**
    * 
    * Generates a replacement for the matched text.  Token options are:
    * 
    * 'type' =>
    *     'bullet_start' : the start of a bullet list
    *     'bullet_end'   : the end of a bullet list
    *     'number_start' : the start of a number list
    *     'number_end'   : the end of a number list
    *     'item_start'   : the start of item text (bullet or number)
    *     'item_end'     : the end of item text (bullet or number)
    *     'unknown'      : unknown type of list or item
    *
    * 'level' => the indent level (0 for the first level, 1 for the
    * second, etc)
    *
    * 'count' => the list item number at this level. not needed for
    * xhtml, but very useful for PDF and RTF.
    * 
    * @access public
    *
    * @param array &$matches The array of matches from parse().
    *
    * @return A series of text and delimited tokens marking the different
    * list text and list elements.
    *
    */
    
    function process(&$matches)
    {
        // the replacement text we will return
        $return = '';
        
        // the list of post-processing matches
        $list = array();
        
        // a stack of list-start and list-end types; we keep this
        // so that we know what kind of list we're working with
        // (bullet or number) and what indent level we're at.
        $stack = array();
        
        // the item count is the number of list items for any
        // given list-type on the stack
        $itemcount = array();
        
        // populate $list with this set of matches. $matches[1] is the
        // text matched as a list set by parse().
        preg_match_all(
            '=^( {0,})(\*|#) (.*)$=Ums',
            $matches[1],
            $list,
            PREG_SET_ORDER
        );
        
        // loop through each list-item element.
        foreach ($list as $key => $val) {
            
            // $val[0] is the full matched list-item line
            // $val[1] is the number of initial spaces (indent level)
            // $val[2] is the list item type (* or #)
            // $val[3] is the list item text
            
            // how many levels are we indented? (1 means the "root"
            // list level, no indenting.)
            $level = strlen($val[1]) + 1;
            
            // get the list item type
            if ($val[2] == '*') {
                $type = 'bullet';
            } elseif ($val[2] == '#') {
                $type = 'number';
            } else {
                $type = 'unknown';
            }
            
            // get the text of the list item
            $text = $val[3];
            
            // add a level to the list?
            if ($level > count($stack)) {
                
                // the current indent level is greater than the
                // number of stack elements, so we must be starting
                // a new list.  push the new list type onto the
                // stack...
                array_push($stack, $type);
                
                // ...and add a list-start token to the return.
                $return .= $this->addToken(
                    array(
                        'type' => $type . '_start',
                        'level' => $level - 1
                    )
                );
            }
            
            // remove a level from the list?
            while (count($stack) > $level) {
                
                // so we don't keep counting the stack, we set up a temp
                // var for the count.  -1 becuase we're going to pop the
                // stack in the next command.  $tmp will then equal the
                // current level of indent.
                $tmp = count($stack) - 1;
                
                // as long as the stack count is greater than the
                // current indent level, we need to end list types. 
                // continue adding end-list tokens until the stack count
                // and the indent level are the same.
                $return .= $this->addToken(
                    array (
                        'type' => array_pop($stack) . '_end',
                        'level' => $tmp
                    )
                );
                
                // reset to the current (previous) list type so that
                // the new list item matches the proper list type.
                $type = $stack[$tmp - 1];
                
                // reset the item count for the popped indent level
                $itemcount[$tmp + 1] = 0;
            }
            
            // add to the item count for this list (taking into account
            // which level we are at).
            if (! isset($itemcount[$level])) {
                // first count
                $itemcount[$level] = 1;
            } else {
                // increment count
                $itemcount[$level]++;
            }
            
            // create a list-item starting token.
            $start = $this->addToken(
                array(
                    'type' => 'item_start',
                    'level' => $level,
                    'count' => $itemcount[$level]
                )
            );
            
            // create a list-item ending token.
            $end = $this->addToken(
                array(
                    'type' => 'item_end',
                    'level' => $level,
                    'count' => $itemcount[$level]
                )
            );
            
            // add the starting token, list-item text, and ending token
            // to the return.
            $return .= $start . $val[3] . $end;
        }
        
        // the last list-item may have been indented.  go through the
        // list-type stack and create end-list tokens until the stack
        // is empty.
        while (count($stack) > 0) {
            $return .= $this->addToken(
                array (
                    'type' => array_pop($stack) . '_end',
                    'level' => count($stack)
                )
            );
        }
        
        // we're done!  send back the replacement text.
        return $return;
    }
    
    
    /**
    * 
    * Renders a token into text matching the requested format.
    * 
    * @access public
    * 
    * @param array $options The "options" portion of the token (second
    * element).
    * 
    * @return string The text rendered from the token options.
    * 
    */
    
    function renderXhtml($options)
    {
        // make nice variables (type, level, count)
        extract($options);
        
        // set up indenting so that the results look nice; we do this
        // in two steps to avoid str_pad mathematics.  ;-)
        $pad = str_pad('', $level, "\t");
        $pad = str_replace("\t", '    ', $pad);
        
        switch ($type) {
        
        case 'bullet_start':
            return $pad . "<ul>\n";
            break;
        
        case 'bullet_end':
            return $pad . "</ul>\n";
            break;
        
        case 'number_start':
            return $pad . "<ol>\n";
            break;
        
        case 'number_end':
            return $pad . "</ol>\n";
            break;
        
        case 'item_start':
            return $pad . "<li>";
            break;
        
        case 'item_end':
            return "</li>\n";
            break;
        
        default:
            return '';
        
        }
    }
}
?>
--- NEW FILE: newline.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: newline.php,v 1.1 2004/02/26 11:27:54 garvinhicking Exp $


/**
* 
* This class implements a Text_Wiki_Rule to mark "hard" newlines in the
* source text.
*
* @author Paul M. Jones <pm...@ci...>
*
* @package Text_Wiki
*
*/

class Text_Wiki_Rule_newline extends Text_Wiki_Rule {
    
    
    /**
    * 
    * The r...
 
[truncated message content]

[php-blog-cvs] serendipity/bundled-libs/docs HomePage.wiki.txt,NONE,1.1 SamplePage.wiki.txt,NONE,1.1 SmashWordsTogether.wiki.txt,NONE,1.1 TextWikiProposal.wiki.txt,NONE,1.1 TokenRuleKeys.wiki.txt,NONE,1.1 WikiPage.wiki.txt,NONE,1.1 WordsSmashedTogether.wiki.txt,NONE,1.1 free links.wiki.txt,NONE,1.1 index.php,NONE,1.1 stylesheet.css,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/bundled-libs/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1804/docs

Added Files:
	HomePage.wiki.txt SamplePage.wiki.txt 
	SmashWordsTogether.wiki.txt TextWikiProposal.wiki.txt 
	TokenRuleKeys.wiki.txt WikiPage.wiki.txt 
	WordsSmashedTogether.wiki.txt free links.wiki.txt index.php 
	stylesheet.css 
Log Message:
Added PEAR:Text/Wiki (latest 0.8.2) bundled library


--- NEW FILE: HomePage.wiki.txt ---
+ Text_Wiki

%%TOC%%

++ Overview and Background

We assume you know what [http://c2.com/cgi/wiki Wiki] is.  The Wiki Way entails a lot more than just rules for structured-text markup, but that's the only part of the Wiki Way that this package, {{Text_Wiki}}, is concerned with.

The {{Text_Wiki}} package allows you to transform text structured using Wiki rules into any defined target output format. For example, you can convert...

* Tavi-style Wiki text into XHTML
* Original C2-style Wiki text into XML
* !MeatBall style Wiki text into !LaTeX
* Any other Wiki markup rules into any other format (provided it's programmed properly ;-)

{{Text_Wiki}} achieves this level of flexibility by using one class per transformation rule, instead of using a monolithic set of functions.  Each Text_Wiki rule has these methods:

* A constructor that links back to the "master" Text_Wiki class, which the source text as well as any optional confugration parameters
* A parse() method that looks through the source text for strings that match a regular expression
* A process() method that takes the parsed regular expression matches and converts them to an intermediate "meta-format" (generally a delimited token that is re-inserted into the source text, along with a set of options for that specific token)
* A render() method that replaces a saved token with output for a specific target format (e.g., XHTML or !LaTeX).

{{Text_Wiki}} draws its inspiration from a number of codebases, most notably !WikkiTikkiTavi and coWiki; while no code has been directly copied from those codebases, they were indispensible in learning how to process Wiki text.

Also see these pages for more information:

* SamplePage -- for a full list of default markup rules
* TokenRuleKeys -- for a list of the tokens keys generated by different rules
* TextWikiProposal -- a modified version of the initial Text_Wiki proposal to PEAR

++ What Text_Wiki Does Not Do

The {{Text_Wiki}} package does not implement storage, saving, editing, diffs, page counts, and so on.  Those functions are more properly the domain of a full Wiki application and environment, which is outside the stated {{Text_Wiki}} goals (i.e., to transform Wiki text according to defined rules for a target output format).

++ Using Text_Wiki

Here is a quick example of how to use {{Text_Wiki}} to parse from the default markup style (combined from [http://tavi.sourceforge.net/ Tavi] and [http://develnet.org/ coWiki]), do some basic filtering, and render to XHTML.

<php>
	
	// require the Text_Wiki class and create an instance of a new wiki
	// parse-and-render object
	require_once 'Text/Wiki.php';
	$wiki = new Text_Wiki();
	
	// load up some source text
	$text = file_get_contents('sample.wiki.txt');
	
	// transform the text using the default rules for parsing and rendering.
	// the extra \n newlines seem to help with some parsing rules.
	echo $wiki->transform("\n" . $text . "\n");
	
</php>



++ Text_Wiki Options

When you create an instance of Text_Wiki, you can pass a set of options as an associative array. 

The array keys for the options are:

|| '''option key''' || '''variable type''' || '''description''' ||
|| {{delim}}        || string              || the source text delimiter for tokens ||
|| {{interwiki}}    || array               || interwiki site names and URLs ||
|| {{new_text}}     || string              || link-text for new pages ||
|| {{new_url}}      || string              || URL for new pages ||
|| {{pages}}        || array               || list of pages existing in the wiki ||
|| {{rules}}        || array               || the list of rules to be applied to source text ||
|| {{view_url}}     || string              || URL for viewing pages in the wiki ||

For example:

<php>
	// the list of rules, and in which order, to use when
	// transforming structured text; the key is the name to use for
	// identifying tokens for the rule, and the value is the file
	// name of the rule class.
	$rules = array(
        'prefilter'   => 'Text/Wiki/Rule/prefilter.php',
        'delimiter'   => 'Text/Wiki/Rule/delimiter.php',
        'code'        => 'Text/Wiki/Rule/code.php',
        'phpcode'     => 'Text/Wiki/Rule/phpcode.php',
        'html'        => 'Text/Wiki/Rule/html.php',
        'heading'     => 'Text/Wiki/Rule/heading.php',
        'horiz'       => 'Text/Wiki/Rule/horiz.php',
        'blockquote'  => 'Text/Wiki/Rule/blockquote.php',
        'deflist'     => 'Text/Wiki/Rule/deflist.php',
        'table'       => 'Text/Wiki/Rule/table.php',
        'list'        => 'Text/Wiki/Rule/list.php',
        'toc'         => 'Text/Wiki/Rule/toc.php',
        'paragraph'   => 'Text/Wiki/Rule/paragraph.php',
        'raw'         => 'Text/Wiki/Rule/raw.php',
        'phplookup'   => 'Text/Wiki/Rule/phplookup.php',
        'url'         => 'Text/Wiki/Rule/url.php',
        'interwiki'   => 'Text/Wiki/Rule/interwiki.php',
        'freelink'    => 'Text/Wiki/Rule/freelink.php',
        'wikilink'    => 'Text/Wiki/Rule/wikilink.php',
        'strong'      => 'Text/Wiki/Rule/strong.php',
        'bold'        => 'Text/Wiki/Rule/bold.php',
        'emphasis'    => 'Text/Wiki/Rule/emphasis.php',
        'italic'      => 'Text/Wiki/Rule/italic.php',
        'tt'          => 'Text/Wiki/Rule/tt.php',
        'superscript' => 'Text/Wiki/Rule/superscript.php',
        'revise'      => 'Text/Wiki/Rule/revise.php',
        'entities'    => 'Text/Wiki/Rule/entities.php',
        'tighten'     => 'Text/Wiki/Rule/tighten.php'
	);
	
	// the list of InterWiki names and URLs
	$interwiki = array(
		'MeatBall' => 'http://www.usemod.com/cgi-bin/mb.pl?',
		'Advogato' => 'http://advogato.org/',
		'Wiki'     => 'http://c2.com/cgi/wiki?'
	);
	
	// the URL used to view local WikiWeb pages
	$view_url = "http://example.com/wiki.php?page=";
	
	// create a Text_Wiki options array
	$options = array(
		'rules'     => $rules,
		'interwiki' => $interwiki,
		'view_url'  => $view_url
	);
	
	// instantiate a Text_Wiki object with the options
	$wiki =& new Text_Wiki($options);
</php>



+++ {{delim}}

The {{delim}} option is a string, and sets the value of the delimiter character used to mark a token number in the Wiki source text.  When a rule needs to set a token, it replaces the source text with a token number surrounded by this delimiter.

The default delmiter is {{```\xFF```}}, but you can change it to anything you like.  Be aware that the token you choose may be subject to Wiki rules, so be sure to choose something that the rules don't affect.

For example:

<php>
	// use a nullchar delimiter
	$options['delim'] = '\x00');
</php>



+++ {{interwiki}}

The {{interwiki}} option is an associative array where the key is an !InterWiki site name, and the value is the URL for pages at that site.  For example, if you want to refer to the !MeatBall site in your pages using the !InterWiki rule, you need to pass this option.

<php>
	// name and link to the MeatBall Wiki
	$options['interwiki'] = array(
		'MeatBall' => 'http://www.usemod.com/cgi-bin/mb.pl?'
	);
</php>




+++ {{new_text}}

The {{new_text}} option is a string.  If your wiki source text refers to a page that does not exist (as provided by the {{pages}} option) then it is considered to be a "new" page; thus, the Text_Wiki will link to a web page for creating new pages.

The {{new_text}} option specifies the literal linked text to be appended to the page name on display.  It can be text proper, or an HTML image tag, or anything else.

See also the {{new_url}} option.

<php>
	// use a question mark and a space
	$options['new_text'] = '? ';
	
	// use an image
	$options['new_text'] = '<img src="http://example.com/newpage.gif />';
</php>



+++ {{new_url}}

The {{new_url}} option is a string.  If your wiki source text refers to a page that does not exist (as provided by the {{pages}} option) then it is considered to be a "new" page; thus, Text_Wiki will link to a web page for creating new pages.

The {{new_url}} specifies the URL to the application-specific page creation utility.

See also the {{new_text}} option.

<php>
	// link to the new-page script
	$options['new_url']  = 'http://example.com/newpage.php?page=';
</php>


+++ {{pages}}

The {{pages}} option is a sequential array where each element is the name of page in the Wiki.  See also the {{view_url}} option.

<php>
	// only three pages in this wiki
	$options['pages'] = array(
		'HomePage',
		'SamplePage',
		'TokenRuleKeys'
	)
</php>


+++ {{rules}}

This option is a associative array; it specifies the rule names to apply to wiki source text.  The key is the token name to be used when idenitfying text marked by that rule, and the value is the file name of the rule class.  (Previously, rule class names and rule file names had to adhere to a specific convention; that is no longer necessary.)

<php>
	$options['rules'] = array(
        'prefilter'   => 'Text/Wiki/Rule/prefilter.php',
        'delimiter'   => 'Text/Wiki/Rule/delimiter.php',
        'code'        => 'Text/Wiki/Rule/code.php',
        'phpcode'     => 'Text/Wiki/Rule/phpcode.php',
        'html'        => 'Text/Wiki/Rule/html.php',
        'heading'     => 'Text/Wiki/Rule/heading.php',
        'horiz'       => 'Text/Wiki/Rule/horiz.php',
        'blockquote'  => 'Text/Wiki/Rule/blockquote.php',
        'deflist'     => 'Text/Wiki/Rule/deflist.php',
        'table'       => 'Text/Wiki/Rule/table.php',
        'list'        => 'Text/Wiki/Rule/list.php',
        'toc'         => 'Text/Wiki/Rule/toc.php',
        'paragraph'   => 'Text/Wiki/Rule/paragraph.php',
        'raw'         => 'Text/Wiki/Rule/raw.php',
        'phplookup'   => 'Text/Wiki/Rule/phplookup.php',
        'url'         => 'Text/Wiki/Rule/url.php',
        'interwiki'   => 'Text/Wiki/Rule/interwiki.php',
        'freelink'    => 'Text/Wiki/Rule/freelink.php',
        'wikilink'    => 'Text/Wiki/Rule/wikilink.php',
        'strong'      => 'Text/Wiki/Rule/strong.php',
        'bold'        => 'Text/Wiki/Rule/bold.php',
        'emphasis'    => 'Text/Wiki/Rule/emphasis.php',
        'italic'      => 'Text/Wiki/Rule/italic.php',
        'tt'          => 'Text/Wiki/Rule/tt.php',
        'superscript' => 'Text/Wiki/Rule/superscript.php',
        'revise'      => 'Text/Wiki/Rule/revise.php',
        'entities'    => 'Text/Wiki/Rule/entities.php',
        'tighten'     => 'Text/Wiki/Rule/tighten.php'
	);
</php>

The above is the default list of rules.  If you want to use your own (for example) {{wikilink}} rule to override the default rule, you can replace the array element with the path to your modified rule:

<php>
	// [snip] set up $options
	$wiki =& new Text_Wiki($options);
	
	// replace the 'wikilink' default rule
	$wiki->rules['wikilink'] = '/path/to/my/rules/my_wikilink.php';
</php>


+++ {{view_url}}

The {{view_url}} option is a string that specifies the URL to the application-specific page viewing utility.  If your wiki source text refers to a page listed in the {{pages}} option array, the Text_Wiki rules for 'wiki' and 'wikifreelink' will create a link to that page using this URL.

<php>
	// link to the page-viewing script
	$options['view_url'] = 'http://example.com/wiki.php?page=';
</php>
--- NEW FILE: SamplePage.wiki.txt ---
+ Sample Page for Text_Wiki Default Markup

%%TOC%%

----

++ General Notes

The markup described on this page is for the default {{Text_Wiki}} rules; \
it is a combination of the [http://tavi.sourceforge.net WikkTikkiTavi] \
and [http://develnet.org/ coWiki] markup styles.

All text is entered as plain text, and will be converted to HTML entities as \
necessary.  This means that {{<}}, {{>}}, {{&}}, and so on are converted for \
you (except in special situations where the characters are Wiki markup; \
Text_Wiki is generally smart enough to know when to convert and when not to).

Just hit "return" twice to make a paragraph break.  If you want \
to keep the same logical line but have to split it across \
two physical lines (such as when your editor only shows a certain number \
of characters per line), end the line with a backslash {{\}} and hit \
return once.  This will cause the two lines to be joined on display, and the \
backslash will not show.  (If you end a line with a backslash and a tab \
or space, it will ''not'' be joined with the next line, and the backslash \
will be printed.)


----

++ Inline Formatting

|| {{```''italic text''```}}                      || ''italic text'' ||
|| {{```'''bold text'''```}}                      || '''bold text''' ||
|| {{```'''''italic and bold'''''```}}            || '''''italic and bold''''' ||
|| {{```//emphasis//```}} || //emphasis// ||
|| {{```**strong**```}} || **strong** ||
|| {{```//**emphasis and strong**//```}} || //**emphasis and strong**// ||
|| {{```**//strong and emphasis//**```}} || **//strong and emphasis//** ||
|| {{```{{teletype text}}```}}                    || {{teletype text}} ||
|| {{<```php:function()```>}}                     || <php:function()> ||
|| {{```@@--- delete text +++ insert text @@```}} || @@--- delete text +++ insert text @@ ||
|| {{```@@--- delete only @@```}}                 || @@--- delete only @@ ||
|| {{```@@+++ insert only @@```}}                 || @@+++ insert only @@ ||
|| {{```super ^^1^^ script```}}                   || super ^^1^^ script ||

----

++ Literal Text

If you don't want Text_Wiki to parse some text, enclose it in 3 backticks (not 3 single-quotes).

<code>

This '''text''' gets {{parsed}}.

```This '''text''' does not get {{parsed}}.```

</code>

This '''text''' gets {{parsed}}.

```This '''text''' does not get {{parsed}}.```

----

++ Headings

You can make various levels of heading by putting \
equals-signs before and after the text (all on its \
own line):

<code>
+++ Level 3 Heading
++++ Level 4 Heading
+++++ Level 5 Heading
++++++ Level 6 Heading
</code>

+++ Level 3 Heading
++++ Level 4 Heading
+++++ Level 5 Heading
++++++ Level 6 Heading

----

++ Table of Contents

To create a list of every heading, with a link to that heading, put a table of contents tag on its own line.

<code>
%%TOC%%
</code>
----

++ Horizontal Rules

Use four dashes ({{```----```}}) to create a horizontal rule.

----

++ Lists

+++ Bullet Lists

You can create bullet lists by starting a paragraph with one or \
more asterisks.

<code>
* Bullet one
 * Sub-bullet
</code>

* Bullet one
 * Sub-bullet

+++ Numbered Lists

Similarly, you can create numbered lists by starting a paragraph \
with one or more hashes.

<code>
# Numero uno
# Number two
 # Sub-item
</code>

# Numero uno
# Number two
 # Sub-item


+++ Mixing Bullet and Number List Items

You can mix and match bullet and number lists:

<code>
# Number one
 * Bullet
 * Bullet
# Number two
 * Bullet
 * Bullet
  * Sub-bullet
   # Sub-sub-number
   # Sub-sub-number
# Number three
 * Bullet
 * Bullet
</code>

# Number one
 * Bullet
 * Bullet
# Number two
 * Bullet
 * Bullet
  * Sub-bullet
   # Sub-sub-number
   # Sub-sub-number
# Number three
 * Bullet
 * Bullet



+++ Definition Lists

You can create a definition (description) list with the following syntax:

<code>
:Item 1: Something
:Item 2: Something else
</code>

:Item 1: Something
:Item 2: Something else

----

++ Block Quotes

You can mark a blockquote by starting a line with one or more '>' \
characters, followed by a space and the text to be quoted.

<code>
This is normal text here.

> Indent me! The quick brown fox jumps over the lazy dog. \ 
Now this the time for all good men to come to the aid of \ 
their country. Notice how we can continue the block-quote \ 
in the same "paragraph" by using a backslash at the end of \ 
the line.
>
> Another block, leading to...
>> Second level of indenting.  This second is indented even \ 
more than the previous one.

Back to normal text.
</code>

This is normal text here.

> Indent me! The quick brown fox jumps over the lazy dog. \
Now this the time for all good men to come to the aid of \
their country. Notice how we can continue the block-quote \
in the same "paragraph" by using a backslash at the end of \
the line.
>
> Another block, leading to...
>> Second level of indenting.  This second is indented even \
more than the previous one.

Back to normal text.


----

++ Links and Images

+++ Wiki Links

SmashWordsTogether to create a page link.

You can force a WikiPage name '''not''' to be clickable by putting \
an exclamation mark in front of it.

<code>
WikiPage !WikiPage
</code>

WikiPage !WikiPage

(Note: existing wiki pages must be in the Text_Wiki {{pages}} option array, \
and the {{view_url}} option must be set for the linking to work.)

+++ Free Links

Freelinks are "non-standard" Wiki links.

* You can refer to named anchors within pages like this: \
{{```((WikiPage#NamedAnchor))```}} becomes ((WikiPage#NamedAnchor)).
* You can create nice-looking links from WordsSmashedTogether like this: \
{{```((WordsSmashedTogether|Nice Link))```}} becomes \
((WordsSmashedTogether|Nice Link)).
* Refer to named anchors within nice-looking links like this: \
{{```((WikiPage|Nice Link#Anchor))```}} becomes \
((WikiPage|Nice Link#Anchor)).
* You can also create links that aren't WordsSmashedTogether \
(i.e., that have spaces) like this: {{```((free links))```}} \
becomes ((free links)).

(Note: existing wiki pages must be in the Text_Wiki {{pages}} option array, \
and the {{view_url}} option must be set for the linking to work.)

+++ Interwiki Links

Interwiki links are links to pages on other Wiki sites. \
Type the {{```SiteName:PageName```}} like this:

* MeatBall:RecentChanges
* Advogato:proj/WikkiTikkiTavi
* Wiki:WorseIsBetter

(Note: the interwiki site must be in the Text_Wiki {{interwiki}} option array.)

+++ URLs

Create a remote link simply by typing its URL: http://ciaweb.net.

If you like, enclose it in brackets to create a numbered reference \
and avoid cluttering the page; {{```[http://ciaweb.net/free/]```}} becomes [http://ciaweb.net/free/].

Or you can have a described-reference instead of a numbered reference:
<code>
[http://pear.php.net PEAR]
</code>
[http://pear.php.net PEAR]

+++ Images

You can put a picture in a page by typing the URL to the picture \
(it must end in gif, jpg, or png).
<code>
http://c2.com/sig/wiki.gif
</code>

http://c2.com/sig/wiki.gif

You can use the described-reference URL markup to give the image an ALT tag:
<code>
[http://www.netropolisusa.biz/billthemarmet/MT/index/images/sunset_07_10_03.jpg Sunset]
</code>

[http://www.netropolisusa.biz/billthemarmet/MT/index/images/sunset_07_10_03.jpg Sunset]


----
++ Code Blocks

Create code blocks by using {{<code>...</code>}} tags (each on its own line).

<code>
This is an example code block!
</code>


To create PHP blocks that get automatically colorized when you use PHP tags, \
simply surround the code with {{<php>...</php>}} tags (the tags themselves \
should each be on their own lines, and no need for the {{&lt;?php ... ?&gt;}} tags).

<code>
<php>
// Set up the wiki options
$options = array();
$options['view_url'] = "index.php?page=";

// load the text for the requested page
$text = implode('', file($page . '.wiki.txt'));

// create a Wiki objext with the loaded options
$wiki = new Text_Wiki($options);

// transform the wiki text.
echo $wiki->transform($text);
</php>
</code>

<php>
// Set up the wiki options
$options = array();
$options['view_url'] = "index.php?page=";

// load the text for the requested page
$text = implode('', file($page . '.wiki.txt'));

// create a Wiki objext with the loaded options
$wiki = new Text_Wiki($options);

// transform the wiki text.
echo $wiki->transform($text);
</php>

----

++ Tables

You can create tables using pairs of vertical bars:

<code>
|| cell one || cell two ||
|||| big ol' line ||
|| cell four || cell five ||
|| cell six || here's a very long cell ||
</code>

|| cell one || cell two ||
|||| big ol' line ||
|| cell four || cell five ||
|| cell six || here's a very long cell ||

<code>
|| lines must start and end || with double vertical bars || nothing ||
|| cells are separated by || double vertical bars || nothing ||
|||| you can span multiple columns by || starting each cell ||
|| with extra cell |||| separators ||
|||||| but perhaps an example is the easiest way to see ||
</code>

|| lines must start and end || with double vertical bars || nothing ||
|| cells are separated by || double vertical bars || nothing ||
|||| you can span multiple columns by || starting each cell ||
|| with extra cell |||| separators ||
|||||| but perhaps an example is the easiest way to see ||


--- NEW FILE: SmashWordsTogether.wiki.txt ---
Smash words together to create a link.
--- NEW FILE: TextWikiProposal.wiki.txt ---
+ Text_Wiki Proposal

This is an updated version of the proposal to PEAR group for {{Text_Wiki}} by [mailto:pm...@ci... Paul M. Jones].

%%TOC%%

----

++ Overview

Most Wiki projects use their own internal, specialized parsing and rendering engines to transform source Wiki text to HTML.  The rule structures of different Wiki implementations are usually incompatible, leading developers to write their own engine to parse and render their own specialized Wiki markup.  This makes it difficult to extract and compare rule structure, as well as making it troublesome to add/modify/delete existing markup rules.  In addition, this makes it near-impossible to "drop in" Wiki text transformation processes to a nominally non-Wiki project.

To solve the rule-modification and drop-in problems noted above, {{Text_Wiki}} abstracts the process of displaying Wiki-formatted text by using an object-oriented rule structure for parsing and rendering.

A default set of parsing and rendering rule classes is provided with {{Text_Wiki}}; they serve to implement basic Wiki transformation into XHTML, and provide useful, well-commented examples of how to write a Wiki transformation rule.

In addition, individual parsing and rendering rules can be added, modified, and removed with a user-defined rules directory.  Depending on the rendering method for a rule, source Wiki text may be transformed into XHTML, Latex, PDF, RTF, and so on.

The properties of a {{Text_Wiki}} object determine...

* which rules are applied to the source Wiki text (and in what order),
* what the !WikiWeb URLs are for viewing and editing pages,
* Interwiki mappings,
* which pages exist in the !WikiWeb,
* and much more.

{{Text_Wiki}} does not implement a full !WikiWikiWeb; it only handles the transformation of Wiki source text to an output format.

----

++ History and Research

Please note that {{Text_Wiki}} was pre-proposed earlier this year with some positive response[http://marc.theaimsgroup.com/?t=105838978200001&r=1&w=2] and that the call for votes is complete.[http://marc.theaimsgroup.com/?t=106994688000001&r=1&w=2]

Primary research for {{Text_Wiki}} was based on two open-source Wiki projects, [http://tavi.sourceforge.net/ WikkiTikkiTavi] and [http://www.develnet.org/ coWiki].  Other Wiki engines and rule sets were also used in research, but these two provide sufficient examples for Wiki implementation.

----

++ What Is Wiki?

A !WikiWikiWeb (a "Wiki") is a web-based collaboration tool in which any user can edit any page on the site.

To quote C2: "Wiki is a composition system, it's a discussion medium, it's a repository, it's a mail system, it's a chat room, and it's a tool for collaboration."[http://c2.com/cgi/wiki]


+++ Wiki Markup Is Easy To Understand...

Wikis allow rich text markup and automatic page linking.

Because Wiki content is entered as plain text in a web environment, Wikis do not generally use HTML for rich text markup; instead, they use structured text to mark the elements of a page.

For example, in HTML, one would mark a heading using {{<hN>...</hN>}} tags.

<code>
<html>
<h3>This is a heading.</h3>
<p>This is not.</p>
</html>
</code>

To mark a heading in a Wiki, you put the heading on its own line and prefix it with a number of plus-signs.  Thus, the corresponding Wiki markup for the above example would look something like this:

<code>
+++ This is a heading.
This is not.
</code>

There are different structure rules for different markup elements.  For example, bold text might be enclosed in a paired sets of three single quotes, teletype text is set off my matched pairs of 2 curly braces, lists are noted by starting the like with a hash or a star, and so on.

Wikis also automate the creation and linking of pages.  In a Wiki, page names are made of WordsSmashedTogether; the Wiki sees WordsSmashedTogether on a page and creates a link to the corresponding page in the Wiki.  If the page exists on the Wiki, the page name itself becomes a link; if the page does not exist, a suffix is added to the page name, usually a question mark, and that suffix is linked to the "create a new page" URL.

This means that in order to translate Wiki-formatted structured text (from the source) to HTML (for display), it is necessary to do a find-and-replace on the text, looking for text lines that match the Wiki structured text rules, and convert them to HTML for display.  Most Wiki engines parse-and-render within a single class, or with a series of functions within a single include file.


+++ ...But It's Not Standardized...

The problem with Wiki markup is that it is not standardized.  Different Wiki engines use different rule structures.  In general, Wiki implementors want the source text to be make sense when read by humans, and also be translatable to HTML.  What "makes sense" to one developer or community might not make sense to another.

By way of example, let's take a look at headings.  In HTML, a heading is always marked the same way.  In different Wikis, headings are not always the same.  In !WikkiTikkiTavi, a heading-2 looks like this:

<code>
== My Heading ==
</code>

But in coWiki, it looks like this:

<code>
++ My Heading
</code>

And in another wiki, it might look like this:

<code>
---- My Heading
</code>

(Why four dashes instead of two?  Because the implementor decided that a heading-1 should use six dashes as the most-important, and work down to a heading-6 that uses one dash as the least-important.)

It's even worse when we get to bold, italics, and so on.

* Some Wikis use {{```''italic''```}}, others use {{```//italic//```}}, and others use {{```_italic_```}}.
* Some Wikis implement partial HTML support so you can embed tables, others use a double-pipe markup style to mark cells.
* Some Wikis implement XML-ish tags to mark elements.
* Some Wikis implement plugins or macros to embed custom behaviors into Wiki pages.



+++ ...And It's Hard To Share.

But what some Wikis do, others do not.  This means that if you want Wiki implementation "A" to support a rule or behavior from Wiki implementation "B", it becomes difficult or impossible, because the different implementations use different parsing and rendering routines that apply their rule structures in different ways.

Not only that, but the parsing and rendering routines generally depend on the whole remainder of the Wiki implementation.  This means the Wiki transformation engine exists within a full !WikiWikiWeb system that handles page creation, versioning, storage, and linking, sometimes along with {{diff()}} functions to see the differences between page edits.

----

++ Text_Wiki Makes It Easy To Share

{{Text_Wiki}} solves the problem of sharing rules and behaviors by using a unified parsing and rendering mechanism with an object-oriented system of rules for transforming Wiki markup elements.

Each Wiki element gets its own rule class.  The rule class handles its own parsing and rendering within the context of the primary {{Text_Wiki}} object, but has full access to the primary {{Text_Wiki}} object properties (the source text, the elements that have already been parsed, and so on).

This means that you can add, change, and remove rules for any specific Wiki markup set you happen to like.  It also means that if you see a Wiki behavior that you like, you can easily write a new rule that mimics the behavior and plug it into the {{Text_Wiki}} engine without rewriting the parser or renderer.

Thus, instead of implementing a full !WikiWikiWeb system, {{Text_Wiki}} only deals with the transformation of Wiki source text to an output format.  (Incidentally, it needs to know whether a page exists within a !WikiWeb, but that is abstracted and does not depend on any specific storage or retrieval system.)


+++ How Does This Work?

In general, {{Text_Wiki}} uses a replace-with-token methodology to mark source text matching a Wiki rule.  Any source text matching a rule (usually found through a regular expression) is replaced with a pair of delimiters surrounding a token number, and a matching token number is entered into the {{Text_Wiki}} {{$_tokens}} array property.  Any optional information about the matching text, and sometimes the matching text itself, is stored in the token entry.  After parsing, the tokens are rendered into a target format depending on the rule's render() method.

As a side-benefit, this means that once the source text has been parsed and tokenized, the combination of the source text and replacement tokens allows you to target any output format, not just XHTML.  If a rule supports it, that rule can render a token into Latex, PDF, RTF, and so on.


+++ Examples

The best example of {{Text_Wiki}} is the {{Text_Wiki}} sample page, included in the package documentation.  After you use PEAR to install {{Text_Wiki}}, look in the docs/ directory.  The index.php file show how to instantiate a {{Text_Wiki}} object with a set of custom options, and Sample.wiki.txt shows how to write up Wiki source text.  Finally, open index.php in your browser to see the Wiki source text transformed into HTML.

----

++ Download the Package

http://pear.php.net/package/Text_Wiki

+++ Known Issues

Need to create full documentation, including how to write a rule.

{{Text_Wiki}} should return {{PEAR_Error}} objects and error codes, not echo errors to output.

Should add {{renderLatex()}} method for all default rules (from !WikkiTikkiTavi?)


--- NEW FILE: TokenRuleKeys.wiki.txt ---
+ Token Rule Keys

|| '''Rule Name'''       || '''Description'''                                 || '''Options''' ||
|| {{blockquote}}        || Block-quoted text.                                || {{type:[start|end] }} ||
|| {{bold}}              || Bold text.                                        || {{type:[start|end]}} ||
|| {{code}}              || A block of generic computer code.                 || {{text}} ||
|| {{deflist}}           || Definition list element.                          || {{type:[list|term|narr]_[start|end]}} ||
|| {{delimiter}}         || An existing delimiter.                            || - ||
|| {{emphasis}}          || Emphasized (usually italic) text.                 || {{type:[start|end]}} ||
|| {{freelink}}          || A local !WikiPage reference in free link format.  || {{page}}, {{text}}, {{anchor}} ||
|| {{heading}}           || A heading.                                        || {{type:[start|end], level, text}} ||
|| {{horiz}}             || A horizontal rule.                                || - ||
|| {{html}}              || A block of HTML text to be displayed as-is.       || {{text}}  ||
|| {{interwiki}}         || An !InterWiki reference.                          || {{site}}, {{page}} ||
|| {{italic}}            || Italic text.                                      || {{type:[start|end]}} ||
|| {{list}}              || Bullet or number list elements.                   || {{type:[bullet|number|item]_[start|end], level, count}} ||
|| {{newline}}           || A new line or line break.                         || - ||
|| {{phpcode}}           || A block of PHP code to be colorized.              || {{text}} ||
|| {{phplookup}}         || A function name to link to at php.net             || {{text}} ||
|| {{raw}}               || Raw or plain text to be displayed as-is.          || {{text}} ||
|| {{strong}}            || Strong (usually bold) text.                       || {{type:[start|end]}} ||
|| {{superscript}}       || Superscript text.                                 || {{type:[start|end]}} ||
|| {{table}}             || Table elements.                                   || {{type:[table|row|cell]_[start|end], colspan}} ||
|| {{tt}}                || Teletype (monospaced) text.                 || {{type:[start|end]}} ||
|| {{url}}               || A page URL.                                       || {{type:[inline|footnote|descr]}}, {{href}}, {{text}} ||
|| {{wikilink}}          || A local !WikiPage reference.                      || {{page}}, {{anchor}} ||
|| {{toc}}               || Table of contents.                                || {{type:[list_start|list_end|item_start|item_end|target], level, count}} ||

++ Tokens Entry Format

Simple format (no options).

<code>
$_tokens[] = Array
    (
        [0] => 'rule_name'
        [1] => array
            (
            )
    )
</code>

Complex format (with options).

<code>
$_tokens[] = Array
    (
        [0] => 'rule_name'
        [1] => Array
            (
                ['opt0'] => 'value 0'
                ['opt1'] => 'value 1'
                ...
                ['optN'] => 'value N'
            )
    )
</code>

--- NEW FILE: WikiPage.wiki.txt ---
A generic blank Wiki page.
--- NEW FILE: WordsSmashedTogether.wiki.txt ---
Smash words together to create a link.
--- NEW FILE: free links.wiki.txt ---
A "free link" Wiki page.
--- NEW FILE: index.php ---
<?php

error_reporting(E_ALL);
require_once 'Text/Wiki.php';


/**
* 
* Gets microtime; for timing how long it takes to process code.
* 
*/

function getmicrotime()
{ 
    list($usec, $sec) = explode(" ",microtime()); 
    return ((float)$usec + (float)$sec); 
}

// Set up the wiki options
$options = array();
$options['view_url'] = "index.php?page=";


// Get the list of existing wiki pages, based on the .wiki.txt
// files in the current directory.
$options['pages'] = array();

$dir = opendir(dirname(__FILE__));

while ($file = readdir($dir)) {
    if (substr($file, -9) == '.wiki.txt') {
        $options['pages'][] = substr($file, 0, -9);
    }
}

closedir($dir);

// what page is being requested?
if (isset($_GET['page'])) {
    $page = $_GET['page'];
} else {
    $page = 'HomePage';
}

// load the text for the requested page
$text = implode('', file($page . '.wiki.txt'));

// create a Wiki objext with the loaded options
$wiki =& new Text_Wiki($options);

// time the operation, and transform the wiki text.
$before = getMicroTime();
$output = $wiki->transform($text);
$after = getMicroTime();
$time = (float)$after - (float)$before;


// output the page!
?>
<?xml version="1.0" encoding="iso-8859-1" ?>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
        
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

    <head>
        <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
        <title>Text_Wiki::<?php echo $page ?></title>
        <link rel="stylesheet" href="stylesheet.css" type="text/css" />
    </head>
    
    <body>
        <?php echo $output ?>
        <?php echo "<hr /><p>Transformed in $time seconds.</p>" ?>
    </body>
</html>
--- NEW FILE: stylesheet.css ---
body, p, br, th, td {
 font-family: "Verdana", "Arial", "Geneva";
 font-size: 12px;
}

th {
 font-weight: bold;
 background: black;
 color: white;
}

h1 {
 font-size: 30px;
 font-family: "Arial Narrow", "N Helvectica Narrow", "Tahoma";
 font-weight: bold;
}

h2 {
 font-size: 24px;
 font-family: "Arial Narrow", "N Helvectica Narrow", "Tahoma";
 font-weight: bold;
}

h3 {
 font-size: 18px;
 font-family: "Arial Narrow", "N Helvectica Narrow", "Tahoma";
 font-weight: bold;
}

h4 {
 font-size: 16px;
 font-family: "Arial Narrow", "N Helvectica Narrow", "Tahoma";
 font-weight: bold;
}

h5 {
 font-size: 14px;
 font-family: "Arial Narrow", "N Helvectica Narrow", "Tahoma";
 font-weight: bold;
}

h6 {
 font-size: 12px;
 font-family: "Arial Narrow", "N Helvectica Narrow", "Tahoma";
 font-weight: bold;
}

a:link {
 color: blue;
 text-decoration: none;
}

a:visited {
 color: blue;
 text-decoration: none;
}

a:hover {
 color: red;
 text-decoration: underline;
}

pre {
 border: 1px dashed #003366;
 background: #eeeeee;
 padding: 6px;
 font-family: Profont, Monaco, Courier, "Andale Mono", monospace;
}

[php-blog-cvs] serendipity/bundled-libs/Text Wiki.php,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/bundled-libs/Text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1804/Text

Added Files:
	Wiki.php 
Log Message:
Added PEAR:Text/Wiki (latest 0.8.2) bundled library


--- NEW FILE: Wiki.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: Wiki.php,v 1.1 2004/02/26 11:27:53 garvinhicking Exp $

require_once 'Text/Wiki/Rule.php';


/**
* 
* This is the "master" class for handling the management and convenience
* functions to transform Wiki-formatted text.
* 
* @author Paul M. Jones <pm...@ci...>
* 
* @version 0.8.1 alpha
* 
*/

class Text_Wiki {
    
    
    /**
    * 
    * The array of rules to apply to the source text, in order.
    *
    * This is an associative array where the key is the token-name
    * to be used for the rule, and the value is the path to the
    * rule class file.
    * 
    * @access public
    * 
    * @var array
    * 
    */
    
    var $rules = array(
    
        // pre-filters
        'prefilter'   => 'Text/Wiki/Rule/prefilter.php',
        'delimiter'   => 'Text/Wiki/Rule/delimiter.php',
        
        // capturing block elements
        'code'        => 'Text/Wiki/Rule/code.php',
        'phpcode'     => 'Text/Wiki/Rule/phpcode.php',
        'html'        => 'Text/Wiki/Rule/html.php',
        
        // non-capturing block elements
        'heading'     => 'Text/Wiki/Rule/heading.php',
        'horiz'       => 'Text/Wiki/Rule/horiz.php',
        'blockquote'  => 'Text/Wiki/Rule/blockquote.php',
        'deflist'     => 'Text/Wiki/Rule/deflist.php',
        'table'       => 'Text/Wiki/Rule/table.php',
        'list'        => 'Text/Wiki/Rule/list.php',
        'toc'         => 'Text/Wiki/Rule/toc.php',
        
        // mark paragraph blocks
        'paragraph'   => 'Text/Wiki/Rule/paragraph.php',
        
        // inline elements
        'raw'         => 'Text/Wiki/Rule/raw.php',
        'phplookup'   => 'Text/Wiki/Rule/phplookup.php',
        'url'         => 'Text/Wiki/Rule/url.php',
        'interwiki'   => 'Text/Wiki/Rule/interwiki.php',
        'freelink'    => 'Text/Wiki/Rule/freelink.php',
        'wikilink'    => 'Text/Wiki/Rule/wikilink.php',
        'strong'      => 'Text/Wiki/Rule/strong.php',
        'bold'        => 'Text/Wiki/Rule/bold.php',
        'emphasis'    => 'Text/Wiki/Rule/emphasis.php',
        'italic'      => 'Text/Wiki/Rule/italic.php',
        'tt'          => 'Text/Wiki/Rule/tt.php',
        'superscript' => 'Text/Wiki/Rule/superscript.php',
        'revise'      => 'Text/Wiki/Rule/revise.php',
        
        // post-filters
        'entities'    => 'Text/Wiki/Rule/entities.php',
        'tighten'     => 'Text/Wiki/Rule/tighten.php'
    ); 
    
    
    /**
    * 
    * An associative array of Interwiki mappings where the key is the
    * Interwiki name as entered on a wiki page, and the value is the
    * replacement URL for the target wiki web.
    * 
    * @access public
    * 
    * @var array
    * 
    */
    
    var $interwiki = array(
        'MeatBall' => 'http://www.usemod.com/cgi-bin/mb.pl?',
        'Advogato' => 'http://advogato.org/',
        'Wiki'     => 'http://c2.com/cgi/wiki?'
    );
    
    
    /**
    * 
    * An array of all pages that currently exist in the wiki.  The source
    * of the pages does not matter (database, file system, whatever).  All
    * that Text_Wiki needs to know is what pages are already in the system
    * so that it can decide what kind of link to show when that page name
    * appears in the source text.
    * 
    * @access public
    * 
    * @var array
    * 
    */
    
    var $pages = array(); 
    
    
    /**
    * 
    * The URL used to view an existing page in the wiki; the page name
    * will be appended to this base URL.
    * 
    * @access public
    * 
    * @var string
    * 
    */
    
    var $view_url = 'http://example.com/index.php?page=';
    
    
    /**
    * 
    * The URL used to create a page that does not exist in the wiki; the
    * page name will be appended to this base URL.
    * 
    * @access public
    * 
    * @var string
    * 
    */
    
    var $new_url = 'http://example.com/new.php?page=';
    
    
    /**
    * 
    * When a page does not exist in the wiki, this is the text for the
    * link to the "create" URL. (Typically, the page name itself is not
    * the linked text; instead, a question mark or an inline image is
    * used to indicate the page does not exist.)
    * 
    * @access public
    * 
    * @var string
    * 
    */
    
    var $new_text = '?';
    
    
    /**
    * 
    * The delimiter that surrounds a token number embedded in the source
    * wiki text.
    * 
    * @access public
    * 
    * @var string
    * 
    */
    
    var $delim = "\xFF"; 
    
    
    /**
    * 
    * An array of tokens generated by rules as the source text is
    * parsed.
    * 
    * As Text_Wiki applies rule classes to the source text, it will
    * replace portions of the text with a delimited token number.  This
    * is the array of those tokens, representing the replaced text and
    * any options set by the parser for that replaced text.
    * 
    * The tokens array is seqential; each element is itself a sequential
    * array where element 0 is the name of the rule that generated the
    * token, and element 1 is an associative array where the key is an
    * option name and the value is an option value.
    * 
    * @access private
    * 
    * @var string
    * 
    */
    
    var $_tokens = array();
    
    
    /**
    * 
    * The source text to which rules will be applied.  This text will be
    * transformed in-place, which means that it will change as the rules
    * are applied.
    * 
    * @access private
    * 
    * @var string
    * 
    */
    
    var $_source = '';
    
    
    /**
    * 
    * Text_Wiki creates one instance of every rule that is applied to
    * the source text; this array holds those instances.  The array key
    * is the rule name, and the array value is an instance of the rule
    * class.
    * 
    * @access private
    * 
    * @var string
    * 
    */
    
    var $_rule_obj = array();
    
    
    /**
    * 
    * Constructor.  Loads the rule objects.
    * 
    * @access public
    * 
    * @param array $options An associative array of options where the
    * key is the option name and the value is the option value.  Each
    * option key corresponds to a public property of Text_Wiki; e.g.,
    * 'rules', 'interwiki', 'pages', 'rule_dir', and so on.
    *     
    */
    
    function Text_Wiki($options = array())
    {
        if (isset($options) && is_array($options)) {
            foreach ($options as $key => $val) {
            	// don't override private properties
                if (substr($key, 0, 1) != '_') {
                    $this->$key = $val;
                }
            }
        }
        
        // load each rule class file.
        foreach ($this->rules as $name => $file) {
            $this->_loadRule($name, $file);
        }
    }
    
    
    /**
    * 
    * Transforms the source text in-place.
    * 
    * First, the method parses the source text, applying rules to the
    * text as it goes.  These rules will modify the source text
    * in-place, replacing some text with delimited tokens (and
    * populating the $this->_tokens array as it goes).
    * 
    * Next, the method renders the in-place tokens into the requested
    * output format.
    * 
    * Finally, the method returns the transformed text.  Note that the
    * source text is transformed in place; once it is transformed, it is
    * no longer the same as the original source text.
    * 
    * @access public
    * 
    * @param string $text The source text to which wiki rules should be
    * applied, both for parsing and for rendering.
    * 
    * @param string $format The target output format, typically 'xhtml'.
    *  If a rule does not support a given format, the output from that
    * rule is rule-specific.
    * 
    * @return string The transformed wiki text.
    * 
    */
    
    function transform($text, $format = 'Xhtml')
    {
        $this->parse($text);
        return $this->render($format);
    }
    
    
    /**
    * 
    * Sets the $_source text property, then parses it in place and
    * retains tokens in the $_tokens array property.
    * 
    * @access public
    * 
    * @param string $text The source text to which wiki rules should be
    * applied, both for parsing and for rendering.
    * 
    * @return void
    * 
    */
    
    function parse($text)
    {
        // set the object property for the source text
        $this->_source = $text;
        
        // apply the parse() method of each requested rule to the source
        // text.
        foreach ($this->rules as $name => $file) {
            $this->_rule_obj[$name]->parse();
        }
    }
    
    
    /**
    * 
    * Renders tokens back into the source text, based on the requested format.
    * 
    * @access public
    * 
    * @param string $format The target output format, typically 'xhtml'.
    *  If a rule does not support a given format, the output from that
    * rule is rule-specific.
    * 
    * @return string The transformed wiki text.
    * 
    */
    
    function render($format = 'Xhtml')
    {
    	// the rendering method we're going to use from each rule
        $method = "render$format";
        
    	// the eventual output text
        $output = '';
        
        // when passing through the parsed source text, keep track of when
        // we are in a delimited section
        $in_delim = false;
        
        // when in a delimited section, capture the token key number
        $key = '';
        
        // pass through the parsed source text character by character
        $k = strlen($this->_source);
        for ($i = 0; $i < $k; $i++) {
            
            // the current character
            $char = $this->_source{$i};
            
            // are alredy in a delimited section?
            if ($in_delim) {
            
                // yes; are we ending the section?
                if ($char == $this->delim) {
                    
                    // yes, get the replacement text for the delimited
                    // token number and unset the flag.
                    $key = (int)$key;
                    $rule = $this->_tokens[$key][0];
                    $opts = $this->_tokens[$key][1];
                    $output .= $this->_rule_obj[$rule]->$method($opts);
                    $in_delim = false;
                    
                } else {
                
                    // no, add to the dlimited token key number
                    $key .= $char;
                    
                }
                
            } else {
            	
            	// not currently in a delimited section.
            	// are we starting into a delimited section?
                if ($char == $this->delim) {
                	// yes, reset the previous key and
                	// set the flag.
                    $key = '';
                    $in_delim = true;
                } else {
                	// no, add to the output as-is
                    $output .= $char;
                }
            }
        }
        
        // return the rendered source text
        return $output;
    }
    
    
    /**
    * 
    * Returns the parsed source text with delimited token placeholders.
    * 
    * @access public
    * 
    * @return string The parsed source text.
    * 
    */
    
    function getSource()
    {
        return $this->_source;
    }
    
    
    /**
    * 
    * Returns tokens that have been parsed out of the source text.
    * 
    * @access public
    * 
    * @param array $rules If an array of rule names is passed, only return
    * tokens matching these rule names.  If no array is passed, return all
    * tokens.
    * 
    * @return array An array of tokens.
    * 
    */
    
    function getTokens($rules = null)
    {
        if (! is_array($rules)) {
            return $this->_tokens;
        } else {
            $result = array();
            foreach ($this->_tokens as $key => $val) {
                if (in_array($val[0], $rules)) {
                    $result[] = $val;
                }
            }
            return $result;
        }
    }
    
    
    /**
    * 
    * Loads a rule class file and creates an instance of the rule
    * object.
    * 
    * @access private
    * 
    * @param string $name The token name to use for the rule.
    * 
    * @param string $file The file name of the rule class.
    * 
    * @return void
    * 
    */
    
    function _loadRule($name, $file)
    {
        // load the class definition.
        include_once($file);
        
        // dynamically determine the name of the class 
        // we just loaded
        $tmp = get_declared_classes();
        $k = count($tmp) - 1;
        $class = $tmp[$k];
        unset($tmp);
        
        // instantiate the rule object and add to the set
        $this->_rule_obj[$name] =& new $class($this, $name);
    }
}

?>

[php-blog-cvs] serendipity/bundled-libs/tests README,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/bundled-libs/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1804/tests

Added Files:
	README 
Log Message:
Added PEAR:Text/Wiki (latest 0.8.2) bundled library


--- NEW FILE: README ---
Placeholder for Text_Wiki unit tests.

For now, attempt to transform the the docs/SamplePage.wiki.txt file.

[php-blog-cvs] serendipity/bundled-libs/Text/Wiki Rule.php,NONE,1.1

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity/bundled-libs/Text/Wiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1804/Text/Wiki

Added Files:
	Rule.php 
Log Message:
Added PEAR:Text/Wiki (latest 0.8.2) bundled library


--- NEW FILE: Rule.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at                              |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Paul M. Jones <pm...@ci...>                          |
// +----------------------------------------------------------------------+
//
// $Id: Rule.php,v 1.1 2004/02/26 11:27:53 garvinhicking Exp $

/**
* 
* Baseline rule class for extension into a "real" wiki rule.
* 
* Text_Wiki_Rule classes do not stand on their own; they are called by a
* Text_Wiki object, typcially in the transform()method. Each rule class
* performs three main activities: parse, process, and render.
* 
* The parse() method takes a regex and applies it to the whole block of
* source text at one time. Each match is sent as $matches to the
* process() method.
* 
* The process() method acts on the matched text from the source, and
* then processes the source text is some way.  This may mean the
* creation of a delimited token using addToken().  In every case, the
* process() method returns the text that should replace the matched text
* from parse().
* 
* Finally, the render*() methods take any token created by the rule and
* creates output text matching a specific format.  Individual rules may
* or may not have options for specific formats.
*
* Typically, the extended rule only needs to define the process() and
* render() methods; the parse() method is generally the same from rule
* to rule, and has been included here.  However, there is no reason that
* rules cannot override these methods, so long as the new methods operate
* in substantially the same manner; similarly, the rule need not generate
* any tokens at all, and may use a specialized parse() method to filter
* the source text.  See the default rule classes for many examples.
* 
* @author Paul M. Jones <pm...@ci...>
* 
* @package Text_Wiki
* 
*/

class Text_Wiki_Rule {
    
    
    /**
    * 
    * The regular expression used to parse the source text and find
    * matches conforming to this rule.  Used by the parse() method.
    * 
    * @access public
    * 
    * @var string
    * 
    * @see parse()
    * 
    */
    
    var $regex = null;
    
    
    /**
    * 
    * A reference to the calling Text_Wiki object.  This is needed so
    * that each rule has access to the same source text, token set,
    * URLs, interwiki maps, page names, etc.
    * 
    * @access public
    * 
    * @var object
    */
    
    var $_wiki = null;
    
    
    /**
    * 
    * The name of this rule; used when inserting new token array
    * elements.
    * 
    * @access private
    * 
    * @var string
    * 
    */
    
    var $_rule = null;
    
    
    /**
    * 
    * Constructor for the rule.
    * 
    * @access public
    * 
    * @param object &$obj The calling "parent" Text_Wiki object.
    * 
    * @param string $name The token name to use for this rule.
    * 
    */
    
    function Text_Wiki_Rule(&$obj, $name)
    {
        // set the reference to the calling Text_Wiki object;
        // this allows us access to the shared source text, token
        // array, etc.
        $this->_wiki =& $obj;
        
        // set the name of this rule; generally used when adding
        // to the tokens array.
        $this->_rule = $name;
    }
    
    
    /**
    * 
    * Add a token to the Text_Wiki tokens array, and return a delimited
    * token number.
    * 
    * @access public
    * 
    * @param array $options An associative array of options for the new
    * token array element.  The keys and values are specific to the
    * rule, and may or may not be common to other rule options.  Typical
    * options keys are 'text' and 'type' but may include others.
    * 
    * @param boolean $id_only If true, return only the token number, not
    * a delimited token string.
    * 
    * @return string|int By default, return the number of the
    * newly-created token array element with a delimiter prefix and
    * suffix; however, if $id_only is set to true, return only the token
    * number (no delimiters).
    * 
    */
    
    function addToken($options = array(), $id_only = false)
    {
        // force the options to be an array
        settype($options, 'array');
        
        // find the next token number
        $id = count($this->_wiki->_tokens);
        
        // add the token
        $this->_wiki->_tokens[$id] = array(
            0 => $this->_rule,
            1 => $options
        );
        
        // return a value
        if ($id_only) {
            // return the last token number
            return $id;
        } else {
            // return the token number with delimiters
            return $this->_wiki->delim . $id . $this->_wiki->delim;
        }
    }
    
    
    /**
    * 
    * Set or re-set a token with specific information, overwriting any
    * previous rule name and rule options.
    * 
    * @access public
    * 
    * @param int $id The token number to reset.
    * 
    * @param int $rule The rule name to use; by default, use the current
    * rule name, although you can specify any rule.
    * 
    * @param array $options An associative array of options for the
    * token array element.  The keys and values are specific to the
    * rule, and may or may not be common to other rule options.  Typical
    * options keys are 'text' and 'type' but may include others.
    * 
    * @return void
    * 
    */
    
    function setToken($id, $rule = null, $options = array())
    {
        // get a rule name
        if (is_null($rule)) {
            $rule = $this->_rule;
        }
        
        // reset the token
        $this->_wiki->_tokens[$id] = array(
            0 => $rule,
            1 => $options
        );
    }
    
    
    /**
    * 
    * Simple parsing method to apply the rule's regular expression to
    * the source text, pass every match to the process() method, and
    * replace the matched text with the results of the processing.
    *
    * @access public
    * 
    */
    
    function parse()
    {
        $this->_wiki->_source = preg_replace_callback(
            $this->regex,
            array(&$this, 'process'),
            $this->_wiki->_source
        );
    }
    
    
    /**
    * 
    * Simple processing mathod to take matched text and generate
    * replacement text. This is one of the methods you will definitely
    * want to override in your rule class extensions.
    * 
    * @access public
    * 
    * @param array $matches An array of matches from the parse() method
    * as generated by preg_replace_callback.  $matches[0] is the full
    * matched string, $matches[1] is the first matched pattern,
    * $matches[2] is the second matched pattern, and so on.
    * 
    * @return string The processed text replacement; defaults to the
    * full matched string (i.e., no changes to the text).
    * 
    */
    
    function process(&$matches)
    {
        return $matches[0];
    }
    
    
    /**
    * 
    * Simple rendering method to take a set of token options and
    * generate replacement text for it.  This is another method you will
    * definitely want to override in your rule subclass extensions.
    *
    * @access public
    * 
    * @param int $key The key number of the token being referenced from the
    * "parent" Text_Wiki object.
    * 
    * @param array $options The "options" portion of the token (second element).
    * 
    * @param string $format The target format for the text rendered from the
    * token options, typically 'xhtml', although it may be 'latex' or 'rtf'.
    * In your subclass, you should provide 'xhtml' support at a minimum.
    * 
    * @return string The text redered from the token options; by default,
    * no text is returned.  You should change this in your subclass.  ;-)
    * 
    */
    
    function renderXhtml($key, $options, $format)
    {
        return '';
    }
}
?>

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.4,1.5

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16211

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
Image scaling: Calculate height and pay attention to broadscale images.
Patch from Thomas Weinert, thanks!


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_functions_images.inc.php	17 Feb 2004 16:39:56 -0000	1.4
+++ serendipity_functions_images.inc.php	26 Feb 2004 09:54:56 -0000	1.5
@@ -301,12 +301,30 @@
     }
 
     $in = $loadfn($infilename);
-    /* todo: Never - ever - enlarge an original image */
+    $width = imagesx($in);
+    $height = imagesy($in);
+    
     if (is_null($newheight)) {
-        $newheight = (imagesy($in) / imagesx($in)) * $newwidth;
+        // calculate aspect ratio
+        $div_width  = $width  / $newwidth;
+        $div_height = $height / $newwidth;
+
+        if ($div_width <= 1 && $div_height <= 1) {
+          // do not scale small images
+          $newheight = $width;
+          $newwidth  = $height;
+        } elseif ($div_width >= $div_height) {
+          // max width - calculate height, keep width as scaling base
+          $newheight = round($height / $div_width);
+        } else {
+          // max height - calculate width, keep height as scaling base
+          $newheight = $newwidth;
+          $newwidth  = round($width / $div_height);
+        }
     }
+
     $out = imagecreatetruecolor($newwidth, $newheight);
-    imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, imagesx($in), imagesy($in));
+    imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
     $savefn($out, $outfilename);
     $out = null;
     $in  = null;

[php-blog-cvs] serendipity/templates/mt-georgiablue style.css,1.5,1.6

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-georgiablue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3149/mt-georgiablue

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-georgiablue/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	25 Feb 2004 21:14:53 -0000	1.5
+++ style.css	25 Feb 2004 21:18:43 -0000	1.6
@@ -79,10 +79,17 @@
 #serendipityRightSideBar {
   background: #ffffff;
   display: block;
-	padding-right:15px;
   vertical-align: top;
 }
 
+#serendipityLeftSideBar,
+  padding-right: 15px;
+}
+
+#serendipityRightSideBar,
+  padding-left: 15px;
+}
+
 .serendipitySideBarTitle {
   background: #eeeeee;
   color: #666666;

[php-blog-cvs] serendipity/templates/mt-plainjane style.css,1.5,1.6

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-plainjane
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042/mt-plainjane

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-plainjane/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	25 Feb 2004 18:24:18 -0000	1.5
+++ style.css	25 Feb 2004 21:14:53 -0000	1.6
@@ -66,10 +66,11 @@
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
+  background: #ffffff;
+  color: #cccccc;
   display: block;
-  padding: 10px;
+  margin-top: 35px;
   vertical-align: top;
-  width: 180px;
 }
 
 .serendipitySideBarTitle {

[php-blog-cvs] serendipity/templates/mt-clean style.css,1.4,1.5

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-clean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042/mt-clean

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	25 Feb 2004 18:24:18 -0000	1.4
+++ style.css	25 Feb 2004 21:14:52 -0000	1.5
@@ -65,10 +65,11 @@
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
+  border: 1px solid #ffffff;
   display: block;
-  padding: 10px;
+  padding: 15px;
   vertical-align: top;
-  width: 180px;
+  width: 200px;			
 }
 
 .serendipitySideBarTitle {

[php-blog-cvs] serendipity/templates/mt-gettysburg style.css,1.4,1.5

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-gettysburg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042/mt-gettysburg

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-gettysburg/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	25 Feb 2004 18:24:18 -0000	1.4
+++ style.css	25 Feb 2004 21:14:53 -0000	1.5
@@ -61,10 +61,11 @@
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
+  background: #999999;
+  border: 1px solid #ffffff;
   display: block;
-  padding: 10px;
+  padding: 15px;
   vertical-align: top;
-  width: 180px;
 }
 
 .serendipitySideBarTitle {

[php-blog-cvs] serendipity/templates/mt-georgiablue style.css,1.4,1.5

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-georgiablue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042/mt-georgiablue

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-georgiablue/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	25 Feb 2004 18:24:18 -0000	1.4
+++ style.css	25 Feb 2004 21:14:53 -0000	1.5
@@ -77,10 +77,10 @@
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
+  background: #ffffff;
   display: block;
-  padding: 10px;
+	padding-right:15px;
   vertical-align: top;
-  width: 180px;
 }
 
 .serendipitySideBarTitle {

[php-blog-cvs] serendipity/templates/mt-rusty style.css,1.4,1.5

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-rusty
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042/mt-rusty

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-rusty/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	25 Feb 2004 18:24:19 -0000	1.4
+++ style.css	25 Feb 2004 21:14:53 -0000	1.5
@@ -70,10 +70,11 @@
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
+  background: #ff9933;
+  border: 1px dotted #ffffff;
   display: block;
-  padding: 10px;
+  padding: 15px;
   vertical-align: top;
-  width: 180px;
 }
 
 .serendipitySideBarTitle {

[php-blog-cvs] serendipity/templates/mt-trendy style.css,1.11,1.12

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-trendy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042/mt-trendy

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-trendy/style.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- style.css	25 Feb 2004 18:24:20 -0000	1.11
+++ style.css	25 Feb 2004 21:15:09 -0000	1.12
@@ -73,10 +73,12 @@
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
+  background: #333333;
+  color: #cccccc;
   display: block;
+  margin-top: 35px;
   padding: 10px;
   vertical-align: top;
-  width: 180px;
 }
 
 .serendipitySideBarTitle {

[php-blog-cvs] serendipity/templates/mt-stormy style.css,1.4,1.5

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-stormy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042/mt-stormy

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-stormy/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	25 Feb 2004 18:24:19 -0000	1.4
+++ style.css	25 Feb 2004 21:15:09 -0000	1.5
@@ -72,9 +72,8 @@
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
   display: block;
-  padding: 10px;
+  padding: 15px;
   vertical-align: top;
-  width: 180px;
 }
 
 .serendipitySideBarTitle {

[php-blog-cvs] serendipity/templates/mt-rusty style.css,1.3,1.4

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-rusty
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20088/mt-rusty

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-rusty/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	23 Feb 2004 08:20:57 -0000	1.3
+++ style.css	25 Feb 2004 18:24:19 -0000	1.4
@@ -68,18 +68,36 @@
 
 /* Sidebars */
 
-#serendipityLeftSideBar {
-  display: block;
-}
-
+#serendipityLeftSideBar,
 #serendipityRightSideBar {
   display: block;
+  padding: 10px;
+  vertical-align: top;
+  width: 180px;
 }
 
 .serendipitySideBarTitle {
+  background: #ff9933;
+  color: #ffffff;
+  font-family: Verdana, Arial, sans-serif;
+  font-size: small;
+  font-weight: normal;
+  line-height: 140%;
+  padding: 2px;
+  margin-top: 10px;
+  letter-spacing: .1em;
+  border-bottom: 1px dotted #FFF;
+  text-align: center;
 }
 
 div.serendipitySideBarItem {
+  background: #ff9933;
+  color: #333333;
+  font-family: Verdana, Arial, sans-serif;
+  font-size: x-small;
+  font-weight: normal;
+  line-height: 140%;
+  padding: 2px;
 }
 
 /* Entries */

[php-blog-cvs] serendipity/templates/mt-stormy style.css,1.3,1.4

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-stormy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20088/mt-stormy

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-stormy/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	23 Feb 2004 08:20:58 -0000	1.3
+++ style.css	25 Feb 2004 18:24:19 -0000	1.4
@@ -69,18 +69,35 @@
 
 /* Sidebars */
 
-#serendipityLeftSideBar {
-  display: block;
-}
-
+#serendipityLeftSideBar,
 #serendipityRightSideBar {
   display: block;
+  padding: 10px;
+  vertical-align: top;
+  width: 180px;
 }
 
 .serendipitySideBarTitle {
+  color: #999999;
+  font-family: Verdana, Arial, sans-serif;
+  font-size: x-small;
+  font-weight: bold;
+  letter-spacing: .2em;
+  line-height: 140%;
+  margin-top: 10px;
+  padding: 2px;
+  text-align: left;
+  text-transform: uppercase;
 }
 
 div.serendipitySideBarItem {
+  background: #333333;
+  color: #003366;
+  font-family: Verdana, Arial, sans-serif;
+  font-size: x-small;
+  font-weight: normal;
+  line-height: 140%;
+  padding: 2px;
 }
 
 /* Entries */

[php-blog-cvs] serendipity/templates/mt-trendy style.css,1.10,1.11

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-trendy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20088/mt-trendy

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-trendy/style.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- style.css	18 Feb 2004 14:40:00 -0000	1.10
+++ style.css	25 Feb 2004 18:24:20 -0000	1.11
@@ -71,17 +71,9 @@
 
 /* Sidebars */
 
-#serendipityLeftSideBar {
-  display: block;
-  font-size: small;
-  padding: 10px;
-  vertical-align: top;
-  width: 180px;
-}
-
+#serendipityLeftSideBar,
 #serendipityRightSideBar {
   display: block;
-  font-size: small;
   padding: 10px;
   vertical-align: top;
   width: 180px;

[php-blog-cvs] serendipity/templates/mt-plainjane style.css,1.4,1.5

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-plainjane
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20088/mt-plainjane

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-plainjane/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	23 Feb 2004 08:20:57 -0000	1.4
+++ style.css	25 Feb 2004 18:24:18 -0000	1.5
@@ -64,12 +64,12 @@
 
 /* Sidebars */
 
-#serendipityLeftSideBar {
-  display: block;
-}
-
+#serendipityLeftSideBar,
 #serendipityRightSideBar {
   display: block;
+  padding: 10px;
+  vertical-align: top;
+  width: 180px;
 }
 
 .serendipitySideBarTitle {

[php-blog-cvs] serendipity/templates/mt-gettysburg style.css,1.3,1.4

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-gettysburg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20088/mt-gettysburg

Modified Files:
	style.css 
Log Message:
Flush.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-gettysburg/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	23 Feb 2004 08:20:57 -0000	1.3
+++ style.css	25 Feb 2004 18:24:18 -0000	1.4
@@ -59,12 +59,12 @@
 
 /* Sidebars */
 
-#serendipityLeftSideBar {
-  display: block;
-}
-
+#serendipityLeftSideBar,
 #serendipityRightSideBar {
   display: block;
+  padding: 10px;
+  vertical-align: top;
+  width: 180px;
 }
 
 .serendipitySideBarTitle {