1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
<?php
/**
* "Inline" diff renderer.
*
* This class renders diffs in the Wiki-style "inline" format.
*
* $Horde: framework/Text_Diff/Diff/Renderer/inline.php,v 1.4.10.1 2005/03/22 09:54:05 jan Exp $
*
* @author Ciprian Popovici
* @package Text_Diff
*/
class Text_Diff_Renderer_inline extends Text_Diff_Renderer {
/**
* Number of leading context "lines" to preserve.
*/
var $_leading_context_lines = 10000;
/**
* Number of trailing context "lines" to preserve.
*/
var $_trailing_context_lines = 10000;
/**
* Prefix for inserted text.
*/
var $_ins_prefix = '<ins>';
/**
* Suffix for inserted text.
*/
var $_ins_suffix = '</ins>';
/**
* Prefix for deleted text.
*/
var $_del_prefix = '<del>';
/**
* Suffix for deleted text.
*/
var $_del_suffix = '</del>';
/**
* Header for each change block.
*/
var $_block_header = '';
/**
* What are we currently splitting on? Used to recurse to show word-level
* changes.
*/
var $_split_level = 'lines';
function _lines($lines, $prefix = ' ')
{
if ($this->_split_level == 'words') {
return implode($lines, ' ');
} else {
return implode($lines, "\n") . "\n";
}
}
function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
{
return $this->_block_header;
}
function _startBlock($header)
{
return $header;
}
function _added($lines, $words = false)
{
if ($words) {
$lines[0] = $this->_ins_prefix . $lines[0];
$lines[count($lines) - 1] .= $this->_ins_suffix;
} else {
array_unshift($lines, $this->_ins_prefix);
array_push($lines, $this->_ins_suffix);
}
return $this->_lines($lines);
}
function _deleted($lines, $words = false)
{
if ($words) {
$lines[0] = $this->_del_prefix . $lines[0];
$lines[count($lines) - 1] .= $this->_del_suffix;
} else {
array_unshift($lines, $this->_del_prefix);
array_push($lines, $this->_del_suffix);
}
return $this->_lines($lines);
}
function _changed($orig, $final)
{
/* If we've already split on words, don't try to do so again - just
* display. */
if ($this->_split_level == 'words') {
return $this->_deleted($orig, true) . $this->_added($final, true);
}
$text1 = implode("\n", $orig);
$text2 = implode("\n", $final);
/* Pad to make sure we can split on word boundaries. */
$text1 = str_replace("\n", " \n", $text1);
$text2 = str_replace("\n", " \n", $text2);
/* Non-printing newline marker. */
$nl = "\0";
/* Save newlines. */
$text1 = str_replace("\n", $nl, $text1);
$text2 = str_replace("\n", $nl, $text2);
/* Create the diff, splitting on word boundaries (loosely defined as
* spaces). */
$diff = &new Text_Diff(explode(' ', $text1),
explode(' ', $text2));
/* Get the diff in inline format.
* FIXME: should propagate other parameters here too. */
$renderer = &new Text_Diff_Renderer_inline(array('split_level' => 'words'));
/* Run the diff and get the output. */
return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
}
}
|
