wp/wp-includes/wp-diff.php
author ymh <ymh.work@gmail.com>
Wed, 06 Nov 2013 03:21:17 +0000
changeset 0 d970ebf37754
child 5 5e2f62d02dcd
permissions -rw-r--r--
first import
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     1
<?php
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     2
/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     3
 * WordPress Diff bastard child of old MediaWiki Diff Formatter.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     4
 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     5
 * Basically all that remains is the table structure and some method names.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     6
 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     7
 * @package WordPress
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     8
 * @subpackage Diff
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     9
 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    10
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    11
if ( !class_exists( 'Text_Diff' ) ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    12
	/** Text_Diff class */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    13
	require( dirname(__FILE__).'/Text/Diff.php' );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    14
	/** Text_Diff_Renderer class */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    15
	require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    16
	/** Text_Diff_Renderer_inline class */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    17
	require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    18
}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    19
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    20
/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    21
 * Table renderer to display the diff lines.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    22
 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    23
 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    24
 * @uses Text_Diff_Renderer Extends
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    25
 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    26
class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    27
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    28
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    29
	 * @see Text_Diff_Renderer::_leading_context_lines
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    30
	 * @var int
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    31
	 * @access protected
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    32
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    33
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    34
	var $_leading_context_lines  = 10000;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    35
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    36
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    37
	 * @see Text_Diff_Renderer::_trailing_context_lines
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    38
	 * @var int
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    39
	 * @access protected
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    40
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    41
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    42
	var $_trailing_context_lines = 10000;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    43
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    44
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    45
	 * {@internal Missing Description}}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    46
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    47
	 * @var float
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    48
	 * @access protected
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    49
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    50
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    51
	var $_diff_threshold = 0.6;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    52
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    53
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    54
	 * Inline display helper object name.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    55
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    56
	 * @var string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    57
	 * @access protected
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    58
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    59
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    60
	var $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    61
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    62
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    63
	 * Should we show the split view or not
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    64
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    65
	 * @var string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    66
	 * @access protected
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    67
	 * @since 3.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    68
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    69
	var $_show_split_view = true;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    70
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    71
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    72
	 * Constructor - Call parent constructor with params array.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    73
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    74
	 * This will set class properties based on the key value pairs in the array.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    75
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    76
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    77
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    78
	 * @param array $params
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    79
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    80
	function __construct( $params = array() ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    81
		parent::__construct( $params );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    82
		if ( isset( $params[ 'show_split_view' ] ) )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    83
			$this->_show_split_view = $params[ 'show_split_view' ];
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    84
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    85
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    86
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    87
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    88
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    89
	 * @param string $header
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    90
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    91
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    92
	function _startBlock( $header ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    93
		return '';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    94
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    95
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    96
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    97
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    98
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    99
	 * @param array $lines
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   100
	 * @param string $prefix
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   101
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   102
	function _lines( $lines, $prefix=' ' ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   103
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   104
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   105
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   106
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   107
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   108
	 * @param string $line HTML-escape the value.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   109
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   110
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   111
	function addedLine( $line ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   112
		return "<td class='diff-addedline'>{$line}</td>";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   113
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   114
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   115
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   116
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   117
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   118
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   119
	 * @param string $line HTML-escape the value.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   120
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   121
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   122
	function deletedLine( $line ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   123
		return "<td class='diff-deletedline'>{$line}</td>";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   124
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   125
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   126
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   127
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   128
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   129
	 * @param string $line HTML-escape the value.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   130
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   131
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   132
	function contextLine( $line ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   133
		return "<td class='diff-context'>{$line}</td>";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   134
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   135
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   136
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   137
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   138
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   139
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   140
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   141
	function emptyLine() {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   142
		return '<td>&nbsp;</td>';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   143
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   144
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   145
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   146
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   147
	 * @access private
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   148
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   149
	 * @param array $lines
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   150
	 * @param bool $encode
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   151
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   152
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   153
	function _added( $lines, $encode = true ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   154
		$r = '';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   155
		foreach ($lines as $line) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   156
			if ( $encode )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   157
				$line = htmlspecialchars( $line );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   158
			if ( $this->_show_split_view ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   159
				$r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   160
			} else {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   161
				$r .= '<tr>' . $this->addedLine( $line ) . "</tr>\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   162
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   163
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   164
		return $r;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   165
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   166
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   167
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   168
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   169
	 * @access private
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   170
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   171
	 * @param array $lines
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   172
	 * @param bool $encode
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   173
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   174
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   175
	function _deleted( $lines, $encode = true ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   176
		$r = '';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   177
		foreach ($lines as $line) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   178
			if ( $encode )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   179
				$line = htmlspecialchars( $line );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   180
			if ( $this->_show_split_view ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   181
				$r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   182
			} else {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   183
				$r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   184
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   185
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   186
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   187
		return $r;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   188
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   189
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   190
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   191
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   192
	 * @access private
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   193
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   194
	 * @param array $lines
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   195
	 * @param bool $encode
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   196
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   197
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   198
	function _context( $lines, $encode = true ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   199
		$r = '';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   200
		foreach ($lines as $line) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   201
			if ( $encode )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   202
				$line = htmlspecialchars( $line );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   203
			if (  $this->_show_split_view ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   204
				$r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   205
			} else {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   206
				$r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   207
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   208
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   209
		return $r;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   210
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   211
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   212
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   213
	 * Process changed lines to do word-by-word diffs for extra highlighting.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   214
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   215
	 * (TRAC style) sometimes these lines can actually be deleted or added rows.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   216
	 * We do additional processing to figure that out
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   217
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   218
	 * @access private
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   219
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   220
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   221
	 * @param array $orig
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   222
	 * @param array $final
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   223
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   224
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   225
	function _changed( $orig, $final ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   226
		$r = '';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   227
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   228
		// Does the aforementioned additional processing
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   229
		// *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   230
		//	match is numeric: an index in other column
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   231
		//	match is 'X': no match. It is a new row
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   232
		// *_rows are column vectors for the orig column and the final column.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   233
		//	row >= 0: an indix of the $orig or $final array
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   234
		//	row  < 0: a blank row for that column
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   235
		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   236
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   237
		// These will hold the word changes as determined by an inline diff
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   238
		$orig_diffs  = array();
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   239
		$final_diffs = array();
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   240
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   241
		// Compute word diffs for each matched pair using the inline diff
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   242
		foreach ( $orig_matches as $o => $f ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   243
			if ( is_numeric($o) && is_numeric($f) ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   244
				$text_diff = new Text_Diff( 'auto', array( array($orig[$o]), array($final[$f]) ) );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   245
				$renderer = new $this->inline_diff_renderer;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   246
				$diff = $renderer->render( $text_diff );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   247
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   248
				// If they're too different, don't include any <ins> or <dels>
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   249
				if ( $diff_count = preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   250
					// length of all text between <ins> or <del>
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   251
					$stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) ));
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   252
					// since we count lengith of text between <ins> or <del> (instead of picking just one),
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   253
					//	we double the length of chars not in those tags.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   254
					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   255
					$diff_ratio = $stripped_matches / $stripped_diff;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   256
					if ( $diff_ratio > $this->_diff_threshold )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   257
						continue; // Too different. Don't save diffs.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   258
				}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   259
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   260
				// Un-inline the diffs by removing del or ins
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   261
				$orig_diffs[$o]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   262
				$final_diffs[$f] = preg_replace( '|<del>.*?</del>|', '', $diff );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   263
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   264
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   265
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   266
		foreach ( array_keys($orig_rows) as $row ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   267
			// Both columns have blanks. Ignore them.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   268
			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   269
				continue;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   270
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   271
			// If we have a word based diff, use it. Otherwise, use the normal line.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   272
			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   273
				$orig_line = $orig_diffs[$orig_rows[$row]];
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   274
			elseif ( isset( $orig[$orig_rows[$row]] ) )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   275
				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   276
			else
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   277
				$orig_line = '';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   278
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   279
			if ( isset( $final_diffs[$final_rows[$row]] ) )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   280
				$final_line = $final_diffs[$final_rows[$row]];
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   281
			elseif ( isset( $final[$final_rows[$row]] ) )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   282
				$final_line = htmlspecialchars($final[$final_rows[$row]]);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   283
			else
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   284
				$final_line = '';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   285
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   286
			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   287
				$r .= $this->_added( array($final_line), false );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   288
			} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   289
				$r .= $this->_deleted( array($orig_line), false );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   290
			} else { // A true changed row.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   291
				if ( $this->_show_split_view ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   292
					$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   293
				} else {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   294
					$r .= '<tr>' . $this->deletedLine( $orig_line ) . "</tr><tr>" . $this->addedLine( $final_line ) . "</tr>\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   295
				}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   296
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   297
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   298
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   299
		return $r;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   300
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   301
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   302
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   303
	 * Takes changed blocks and matches which rows in orig turned into which rows in final.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   304
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   305
	 * Returns
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   306
	 *	*_matches ( which rows match with which )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   307
	 *	*_rows ( order of rows in each column interleaved with blank rows as
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   308
	 *		necessary )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   309
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   310
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   311
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   312
	 * @param unknown_type $orig
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   313
	 * @param unknown_type $final
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   314
	 * @return unknown
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   315
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   316
	function interleave_changed_lines( $orig, $final ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   317
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   318
		// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   319
		$matches = array();
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   320
		foreach ( array_keys($orig) as $o ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   321
			foreach ( array_keys($final) as $f ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   322
				$matches["$o,$f"] = $this->compute_string_distance( $orig[$o], $final[$f] );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   323
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   324
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   325
		asort($matches); // Order by string distance.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   326
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   327
		$orig_matches  = array();
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   328
		$final_matches = array();
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   329
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   330
		foreach ( $matches as $keys => $difference ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   331
			list($o, $f) = explode(',', $keys);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   332
			$o = (int) $o;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   333
			$f = (int) $f;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   334
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   335
			// Already have better matches for these guys
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   336
			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   337
				continue;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   338
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   339
			// First match for these guys. Must be best match
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   340
			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   341
				$orig_matches[$o] = $f;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   342
				$final_matches[$f] = $o;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   343
				continue;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   344
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   345
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   346
			// Best match of this final is already taken?  Must mean this final is a new row.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   347
			if ( isset($orig_matches[$o]) )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   348
				$final_matches[$f] = 'x';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   349
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   350
			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   351
			elseif ( isset($final_matches[$f]) )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   352
				$orig_matches[$o] = 'x';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   353
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   354
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   355
		// We read the text in this order
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   356
		ksort($orig_matches);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   357
		ksort($final_matches);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   358
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   359
		// Stores rows and blanks for each column.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   360
		$orig_rows = $orig_rows_copy = array_keys($orig_matches);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   361
		$final_rows = array_keys($final_matches);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   362
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   363
		// Interleaves rows with blanks to keep matches aligned.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   364
		// We may end up with some extraneous blank rows, but we'll just ignore them later.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   365
		foreach ( $orig_rows_copy as $orig_row ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   366
			$final_pos = array_search($orig_matches[$orig_row], $final_rows, true);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   367
			$orig_pos = (int) array_search($orig_row, $orig_rows, true);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   368
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   369
			if ( false === $final_pos ) { // This orig is paired with a blank final.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   370
				array_splice( $final_rows, $orig_pos, 0, -1 );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   371
			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   372
				$diff_pos = $final_pos - $orig_pos;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   373
				while ( $diff_pos < 0 )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   374
					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   375
			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   376
				$diff_pos = $orig_pos - $final_pos;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   377
				while ( $diff_pos < 0 )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   378
					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   379
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   380
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   381
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   382
		// Pad the ends with blank rows if the columns aren't the same length
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   383
		$diff_count = count($orig_rows) - count($final_rows);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   384
		if ( $diff_count < 0 ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   385
			while ( $diff_count < 0 )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   386
				array_push($orig_rows, $diff_count++);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   387
		} elseif ( $diff_count > 0 ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   388
			$diff_count = -1 * $diff_count;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   389
			while ( $diff_count < 0 )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   390
				array_push($final_rows, $diff_count++);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   391
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   392
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   393
		return array($orig_matches, $final_matches, $orig_rows, $final_rows);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   394
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   395
/*
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   396
		// Debug
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   397
		echo "\n\n\n\n\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   398
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   399
		echo "-- DEBUG Matches: Orig -> Final --";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   400
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   401
		foreach ( $orig_matches as $o => $f ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   402
			echo "\n\n\n\n\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   403
			echo "ORIG: $o, FINAL: $f\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   404
			var_dump($orig[$o],$final[$f]);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   405
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   406
		echo "\n\n\n\n\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   407
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   408
		echo "-- DEBUG Matches: Final -> Orig --";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   409
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   410
		foreach ( $final_matches as $f => $o ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   411
			echo "\n\n\n\n\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   412
			echo "FINAL: $f, ORIG: $o\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   413
			var_dump($final[$f],$orig[$o]);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   414
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   415
		echo "\n\n\n\n\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   416
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   417
		echo "-- DEBUG Rows: Orig -- Final --";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   418
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   419
		echo "\n\n\n\n\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   420
		foreach ( $orig_rows as $row => $o ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   421
			if ( $o < 0 )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   422
				$o = 'X';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   423
			$f = $final_rows[$row];
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   424
			if ( $f < 0 )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   425
				$f = 'X';
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   426
			echo "$o -- $f\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   427
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   428
		echo "\n\n\n\n\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   429
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   430
		echo "-- END DEBUG --";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   431
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   432
		echo "\n\n\n\n\n";
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   433
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   434
		return array($orig_matches, $final_matches, $orig_rows, $final_rows);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   435
*/
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   436
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   437
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   438
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   439
	 * Computes a number that is intended to reflect the "distance" between two strings.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   440
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   441
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   442
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   443
	 * @param string $string1
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   444
	 * @param string $string2
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   445
	 * @return int
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   446
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   447
	function compute_string_distance( $string1, $string2 ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   448
		// Vectors containing character frequency for all chars in each string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   449
		$chars1 = count_chars($string1);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   450
		$chars2 = count_chars($string2);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   451
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   452
		// L1-norm of difference vector.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   453
		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   454
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   455
		// $string1 has zero length? Odd. Give huge penalty by not dividing.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   456
		if ( !$string1 )
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   457
			return $difference;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   458
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   459
		// Return distance per charcter (of string1)
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   460
		return $difference / strlen($string1);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   461
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   462
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   463
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   464
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   465
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   466
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   467
	 * @param int $a
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   468
	 * @param int $b
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   469
	 * @return int
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   470
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   471
	function difference( $a, $b ) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   472
		return abs( $a - $b );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   473
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   474
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   475
}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   476
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   477
/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   478
 * Better word splitting than the PEAR package provides.
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   479
 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   480
 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   481
 * @uses Text_Diff_Renderer_inline Extends
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   482
 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   483
class WP_Text_Diff_Renderer_inline extends Text_Diff_Renderer_inline {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   484
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   485
	/**
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   486
	 * @ignore
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   487
	 * @since 2.6.0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   488
	 *
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   489
	 * @param string $string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   490
	 * @param string $newlineEscape
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   491
	 * @return string
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   492
	 */
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   493
	function _splitOnWords($string, $newlineEscape = "\n") {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   494
		$string = str_replace("\0", '', $string);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   495
		$words  = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   496
		$words  = str_replace( "\n", $newlineEscape, $words );
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   497
		return $words;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   498
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   499
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   500
}