Changeset 1219

Timestamp:

08/11/2008 03:21:08 PM (2 years ago)

Author:

DarTar

Message:

Moving constants to top and checking if already defined, refs #503

Files:

• trunk/formatters/wakka.php (modified) (4 diffs)

trunk/formatters/wakka.php

@@ -1 +1 @@
 <?php
 /**
- * Wikka Formatting Engine
+ * The Wikka Formatting Engine
  * 
  * This is the main formatting engine used by Wikka to parse wiki markup and render valid XHTML.
@@ -34 +34 @@
 if (!defined('PATTERN_CODE')) define('PATTERN_CODE', '(.*)');
 /**#@-*/
-
 /**
  * Match heading tags.
@@ -60 +59 @@
  */
 if (!defined('PATTERN_MATCH_PAGE_FORMATOPTION')) define('PATTERN_MATCH_PAGE_FORMATOPTION', '/(^|;)page(;|$)/');
+/**
+ * Match "<a " when it isn't preceded by "</a>"
+ */
+if (!defined('PATTERN_OPEN_A_ALONE')) define('PATTERN_OPEN_A_ALONE', '(?<!</a>|^)<a ');
+/**
+ * Match the end of a string when the string doesn't end with </a>
+ */
+if (!defined('PATTERN_END_OF_STRING_ALONE')) define('PATTERN_END_OF_STRING_ALONE', '(?<!</a>)$');
+/**
+ * Match "</a>" when it is not followed by an opening link markup (<a )
+ */
+if (!defined('PATTERN_CLOSE_A_ALONE')) define('PATTERN_CLOSE_A_ALONE', '</a>(?!<a |$)');
+/**
+ * Match the start of a string when the string doesn't start with "<a "
+ */
+if (!defined('PATTERN_START_OF_STRING_ALONE')) define('PATTERN_START_OF_STRING_ALONE', '^(?!<a )');
 
 // @@@  is this condition handy? would prevent generating IDs on a page fragment
@@ -127 +142 @@
                                         $opening_anchor = '<a class="heading" href="#'.$h_id.'">';
                                         $closing_anchor = '</a>';
-                                        /**
-                                         * Match "<a " when it isn't preceded by "</a>"
-                                         */
-                                        define('PATTERN_OPEN_A_ALONE', '(?<!</a>|^)<a ');
-                                        /**
-                                         * Match the end of a string when the string doesn't end with </a>
-                                         */
-                                        define('PATTERN_END_OF_STRING_ALONE', '(?<!</a>)$');
-                                        /**
-                                         * Match "</a>" when it is not followed by an opening link markup (<a )
-                                         */
-                                        define('PATTERN_CLOSE_A_ALONE', '</a>(?!<a |$)');
-                                        /**
-                                         * Match the start of a string when the string doesn't start with "<a "
-                                         */
-                                        define('PATTERN_START_OF_STRING_ALONE', '^(?!<a )');
                                         $h_heading = preg_replace('@('.PATTERN_OPEN_A_ALONE. '|'.PATTERN_END_OF_STRING_ALONE.  ')@', $closing_anchor.'\\0', $h_heading);
                                         $h_heading = preg_replace('@('.PATTERN_CLOSE_A_ALONE.'|'.PATTERN_START_OF_STRING_ALONE.')@', '\\0'.$opening_anchor, $h_heading);
 
                                         // rebuild element, adding id
-                                        return '<'.$h_tagname.$h_attribs.' id="'.$h_id.'">'.$h_heading.'</'.$h_tagname.'>';
+                                        return '<a class="heading" href="#'.$h_id.'"><'.$h_tagname.$h_attribs.' id="'.$h_id.'">'.$h_heading.'</'.$h_tagname.'></a>';
                                 }
                         }