ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/perl/matcher
(Generate patch)

Comparing rxvt-unicode/src/perl/matcher (file contents):
Revision 1.8 by root, Wed Jun 6 15:06:41 2012 UTC vs.
Revision 1.39 by root, Sun Nov 21 19:33:32 2021 UTC

1#! perl 1#! perl
2 2
3# Author: Tim Pope <rxvt-unicodeNOSPAM@tpope.org> 3# Author: Tim Pope <rxvt-unicodeNOSPAM@tpope.org>
4# Bob Farrell <robertanthonyfarrell@gmail.com> 4# Bob Farrell <robertanthonyfarrell@gmail.com>
5# Emanuele Giaquinta
5 6
6#:META:X_RESOURCE:%.launcher:string:default launcher command 7#:META:RESOURCE:%.launcher:string:default launcher command
7#:META:X_RESOURCE:%.button:string:the button, yeah 8#:META:RESOURCE:%.button:string:the mouse button used to activate a match
8#:META:X_RESOURCE:%.pattern.:string:extra pattern to match 9#:META:RESOURCE:%.pattern.:string:extra pattern to match
9#:META:X_RESOURCE:%.launcher.:string:custom launcher for pattern 10#:META:RESOURCE:%.launcher.:string:custom launcher for pattern
10#:META:X_RESOURCE:%.rend.:string:custom rednition for pattern 11#:META:RESOURCE:%.rend.:string:custom rendition for pattern
12
13=head1 NAME
14
15matcher - match strings in terminal output and change their rendition
16
17=head1 DESCRIPTION
18
19Uses per-line display filtering (C<on_line_update>) to underline text
20matching a certain pattern and make it clickable. When clicked with the
21mouse button specified in the C<matcher.button> resource (default 2, or
22middle), the program specified in the C<matcher.launcher> resource
23(default, the C<url-launcher> resource, C<sensible-browser>) will be started
24with the matched text as first argument. The default configuration is
25suitable for matching URLs and launching a web browser, like the
26former "mark-urls" extension.
27
28The default pattern to match URLs can be overridden with the
29C<matcher.pattern.0> resource, and additional patterns can be specified
30with numbered patterns, in a manner similar to the "selection" extension.
31The launcher can also be overridden on a per-pattern basis.
32
33It is possible to activate the most recently seen match or a list of matches
34from the keyboard. Simply bind a keysym to "matcher:last" or
35"matcher:list" as seen in the example below.
36
37The C<matcher:select> action enables a mode in which it is possible to
38iterate over the matches using the keyboard and either activate them
39or copy them to the clipboard. While the mode is active, normal terminal
40input/output is suspended and the following bindings are recognized:
41
42=over
43
44=item C<Up>
45
46Search for a match upwards.
47
48=item C<Down>
49
50Search for a match downwards.
51
52=item C<Home>
53
54Jump to the topmost match.
55
56=item C<End>
57
58Jump to the bottommost match.
59
60=item C<Escape>
61
62Leave the mode and return to the point where search was started.
63
64=item C<Enter>
65
66Activate the current match.
67
68=item C<y>
69
70Copy the current match to the clipboard.
71
72=back
73
74It is also possible to cycle through the matches using a key
75combination bound to the C<matcher:select> action.
76
77Example: load and use the matcher extension with defaults.
78
79 URxvt.perl-ext: default,matcher
80
81Example: use a custom configuration.
82
83 URxvt.url-launcher: sensible-browser
84 URxvt.keysym.C-Delete: matcher:last
85 URxvt.keysym.M-Delete: matcher:list
86 URxvt.matcher.button: 1
87 URxvt.matcher.pattern.1: \\bwww\\.[\\w-]+\\.[\\w./?&@#-]*[\\w/-]
88 URxvt.matcher.pattern.2: \\B(/\\S+?):(\\d+)(?=:|$)
89 URxvt.matcher.launcher.2: gvim +$2 $1
90
91=head2 Regex encoding/wide character matching
92
93Urxvt stores all text as unicode, in a special encoding that uses
94one character/code point per column. For various reasons, the regular
95expressions are matched directly against this encoding, which means there are a few things
96you need to keep in mind:
97
98=over
99
100=item X resources/command line arguments are locale-encoded
101
102The regexes taken from the command line or resources will be converted
103from locale encoding to unicode. This can change the number of code points
104per character.
105
106=item Wide characters are column-padded with C<$urxvt::NOCHAR>
107
108Wide characters (such as kanji and sometimes tabs) are padded with
109a special character value (C<$urxvt::NOCHAR>). That means that
110constructs such as C<\w> or C<.> will only match part of a character, as
111C<$urxvt::NOCHAR> is not matched by C<\w> and both only match the first
112"column" of a wide character.
113
114That means you have to incorporate C<$urxvt::NOCHAR> into parts of regexes
115that may match wide characters. For example, to match C<\w+> you might
116want to use C<[\w$urxvt::NOCHAR]+> instead, and to match a single character
117(C<.>) you might want to use C<.$urxvt::NOCHAR*> instead.
118
119=back
120
121=cut
11 122
12my $url = 123my $url =
13 qr{ 124 qr{
14 (?:https?://|ftp://|news://|mailto:|file://|\bwww\.) 125 (?:https?://|ftp://|news://|mailto:|file://|\bwww\.)
15 [a-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27,~#]* 126 [\w\-\@;\/?:&=%\$.+!*\x27,~#$urxvt::NOCHAR]*
16 ( 127 (
17 \([a-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27,~#]*\)| # Allow a pair of matched parentheses 128 \([\w\-\@;\/?:&=%\$.+!*\x27,~#$urxvt::NOCHAR]*\)| # Allow a pair of matched parentheses
18 [a-zA-Z0-9\-\@;\/?:&=%\$_+*~] # exclude some trailing characters (heuristic) 129 [\w\-\@;\/?:&=%\$+*~] # exclude some trailing characters (heuristic)
19 )+ 130 )+
20 }x; 131 }x;
21 132
22sub on_key_press { 133sub matchlist_key_press {
23 my ($self, $event, $keysym, $octets) = @_; 134 my ($self, $event, $keysym, $octets) = @_;
24 135
25 if (! $self->{showing} ) { 136 delete $self->{overlay};
26 return; 137 $self->disable ("key_press");
27 }
28 138
29 my $i = ($keysym == 96 ? 0 : $keysym - 48); 139 my $i = ($keysym == 96 ? 0 : $keysym - 48);
30 if (($i > scalar(@{$self->{urls}})) || ($i < 0)) { 140 if ($i >= 0 && $i < @{ $self->{matches} }) {
31 $self->matchlist(); 141 my @exec = @{ $self->{matches}[$i] };
32 return; 142 $self->exec_async (@exec[5 .. $#exec]);
143 }
144
33 } 145 1
34
35 my @args = ($self->{urls}[ -$i-1 ]);
36 $self->matchlist();
37
38 $self->exec_async( $self->{launcher}, @args );
39} 146}
40 147
148# backwards compat
41sub on_user_command { 149sub on_user_command {
42 my ($self, $cmd) = @_; 150 my ($self, $cmd) = @_;
43 151
44 if($cmd =~ s/^matcher:list\b//) { 152 if ($cmd eq "matcher:list") {
45 $self->matchlist(); 153 $self->matchlist;
46 } else { 154 } elsif ($cmd eq "matcher:last") {
47 if($cmd =~ s/^matcher:last\b//) {
48 $self->most_recent; 155 $self->most_recent;
49 } 156 } elsif ($cmd eq "matcher:select") {
157 $self->select_enter;
158 } elsif ($cmd eq "matcher") {
50 # For backward compatibility 159 # for backward compatibility
51 else {
52 if($cmd =~ s/^matcher\b//) {
53 $self->most_recent; 160 $self->most_recent;
54 }
55 }
56 } 161 }
162
163 ()
164}
165
166sub on_action {
167 my ($self, $action) = @_;
168
169 if ($action eq "list") {
170 $self->matchlist;
171 } elsif ($action eq "last") {
172 $self->most_recent;
173 } elsif ($action eq "select") {
174 $self->select_enter;
175 }
176
57 () 177 ()
58} 178}
59 179
60sub matchlist { 180sub matchlist {
61 my ($self) = @_; 181 my ($self) = @_;
62 if ( $self->{showing} ) { 182
63 $self->{url_overlay}->hide(); 183 $self->{matches} = [];
64 $self->{showing} = 0; 184 my $row = $self->nrow - 1;
65 return; 185 while ($row >= 0 && @{ $self->{matches} } < 10) {
66 }
67 @{$self->{urls}} = ();
68 my $line;
69 for (my $i = 0; $i < $self->nrow; $i ++) {
70 $line = $self->line($i); 186 my $line = $self->line ($row);
71 next if ($line->beg != $i); 187 my @matches = $self->find_matches ($row);
72 for my $url ($self->get_urls_from_line($line->t)) { 188
73 if (scalar(@{$self->{urls}}) == 10) { 189 for (sort { $b->[0] <=> $a->[0] or $b->[1] <=> $a->[1] } @matches) {
74 shift @{$self->{urls}};
75 }
76 push @{$self->{urls}}, $url; 190 push @{ $self->{matches} }, $_;
191 last if @{ $self->{matches} } == 10;
77 } 192 }
193
194 $row = $line->beg - 1;
78 } 195 }
79 196
80 if (! scalar(@{$self->{urls}})) { 197 return unless @{ $self->{matches} };
81 return;
82 }
83 198
84 my $max = 0; 199 my $width = 0;
85 my $i = scalar( @{$self->{urls}} ) - 1 ;;
86 200
87 my @temp = ();
88
89 for my $url (@{$self->{urls}}) {
90 my $url = "$i-$url";
91 my $xpos = 0;
92
93 if ($self->ncol + (length $url) >= $self->ncol) {
94 $url = substr( $url, 0, $self->ncol );
95 }
96
97 push @temp, $url;
98
99 if( length $url > $max ) {
100 $max = length $url;
101 }
102
103 $i--;
104 }
105
106 @temp = reverse @temp;
107
108 $self->{url_overlay} = $self->overlay(0, 0, $max, scalar( @temp ), urxvt::OVERLAY_RSTYLE, 2);
109 my $i = 0; 201 my $i = 0;
110 for my $url (@temp) { 202 for my $match (@{ $self->{matches} }) {
111 $self->{url_overlay}->set( 0, $i, $url, [(urxvt::OVERLAY_RSTYLE) x length $url]); 203 my $text = $match->[4];
112 $self->{showing} = 1; 204 my $w = $self->strwidth ("$i-$text");
205
206 $width = $w if $w > $width;
113 $i++; 207 $i++;
114 } 208 }
115 209
210 $width = $self->ncol - 2 if $width > $self->ncol - 2;
211
212 $self->{overlay} = $self->overlay (0, 0, $width, scalar (@{ $self->{matches} }), urxvt::OVERLAY_RSTYLE, 2);
213 my $i = 0;
214 for my $match (@{ $self->{matches} }) {
215 my $text = $match->[4];
216
217 $self->{overlay}->set (0, $i, "$i-$text");
218 $i++;
219 }
220
221 $self->enable (key_press => \&matchlist_key_press);
116} 222}
117 223
118sub most_recent { 224sub most_recent {
119 my ($self) = shift; 225 my ($self) = shift;
120 my $row = $self->nrow; 226 my $row = $self->nrow - 1;
121 my @exec; 227 my @exec;
122 while($row-- > $self->top_row) { 228 while ($row >= $self->top_row) {
229 my $line = $self->line ($row);
123 @exec = $self->command_for($row); 230 @exec = $self->command_for($row);
124 last if(@exec); 231 last if(@exec);
232
233 $row = $line->beg - 1;
125 } 234 }
126 if(@exec) { 235 if(@exec) {
127 return $self->exec_async (@exec); 236 return $self->exec_async (@exec);
128 } 237 }
129 () 238 ()
130} 239}
131 240
132sub my_resource { 241sub my_resource {
133 my $self = shift; 242 $_[0]->x_resource ("%.$_[1]")
134 $self->x_resource ("$self->{name}.$_[0]");
135} 243}
136 244
137# turn a rendition spec in the resource into a sub that implements it on $_ 245# turn a rendition spec in the resource into a sub that implements it on $_
138sub parse_rend { 246sub parse_rend {
139 my ($self, $str) = @_; 247 my ($self, $str) = @_;
150} 258}
151 259
152sub on_start { 260sub on_start {
153 my ($self) = @_; 261 my ($self) = @_;
154 262
155 ($self->{name} = __PACKAGE__) =~ s/.*:://;
156 $self->{name} =~ tr/_/-/;
157 $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser"; 263 $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser";
158 264
159 $self->{urls} = [];
160 $self->{showing} = 0;
161 $self->{button} = 2; 265 $self->{button} = 2;
162 $self->{state} = 0; 266 $self->{state} = 0;
163 if($self->{argv}[0] || $self->my_resource ("button")) { 267 if($self->{argv}[0] || $self->my_resource ("button")) {
164 my @mods = split '', $self->{argv}[0] || $self->my_resource ("button"); 268 my @mods = split '', $self->{argv}[0] || $self->my_resource ("button");
165 for my $mod (@mods) { 269 for my $mod (@mods) {
170 } elsif($mod eq "S") { 274 } elsif($mod eq "S") {
171 $self->{state} |= urxvt::ShiftMask; 275 $self->{state} |= urxvt::ShiftMask;
172 } elsif($mod eq "M") { 276 } elsif($mod eq "M") {
173 $self->{state} |= $self->ModMetaMask; 277 $self->{state} |= $self->ModMetaMask;
174 } elsif($mod ne "-" && $mod ne " ") { 278 } elsif($mod ne "-" && $mod ne " ") {
175 warn("$mod is invalid in $self->{name}<$self->{argv}[0]>\n"); 279 warn("$mod is invalid in $self->{_name}<$self->{argv}[0]>\n");
176 } 280 }
177 } 281 }
178 } 282 }
179 283
180 my @defaults = ($url); 284 my @defaults = ($url);
181 my @matchers; 285 my @matchers;
182 for (my $idx = 0; defined (my $res = $self->my_resource ("pattern.$idx") || $defaults[$idx]); $idx++) { 286 for (my $idx = 0; defined (my $res = $self->locale_decode ($self->my_resource ("pattern.$idx")) || $defaults[$idx]); $idx++) {
183 $res = $self->locale_decode ($res);
184 utf8::encode $res;
185 my $launcher = $self->my_resource ("launcher.$idx"); 287 my $launcher = $self->my_resource ("launcher.$idx");
186 $launcher =~ s/\$&|\$\{&\}/\${0}/g if $launcher; 288 $launcher =~ s/\$&|\$\{&\}/\${0}/g if $launcher;
187 my $rend = $self->parse_rend($self->my_resource ("rend.$idx")); 289 my $rend = $self->parse_rend($self->my_resource ("rend.$idx"));
188 unshift @matchers, [qr($res)x,$launcher,$rend]; 290 unshift @matchers, [qr($res)x,$launcher,$rend];
189 } 291 }
190 $self->{matchers} = \@matchers; 292 $self->{matchers} = \@matchers;
191 293
192 () 294 ()
193} 295}
194 296
195sub get_urls_from_line {
196 my ($self, $line) = @_;
197 my @urls;
198 for my $matcher (@{$self->{matchers}}) {
199 while ($line =~ /$matcher->[0]/g) {
200 push @urls, substr( $line, $-[0], $+[0] - $-[0] );
201 }
202 }
203 return @urls;
204}
205
206sub on_line_update { 297sub on_line_update {
207 my ($self, $row) = @_; 298 my ($self, $row) = @_;
208 299
209 # fetch the line that has changed 300 # fetch the line that has changed
210 my $line = $self->line ($row); 301 my $line = $self->line ($row);
211 my $text = $line->t; 302 my $text = $line->t;
212 my $i = 0; 303 my $rend;
213 304
214 # find all urls (if any) 305 # find all urls (if any)
215 for my $matcher (@{$self->{matchers}}) { 306 for my $matcher (@{$self->{matchers}}) {
216 while ($text =~ /$matcher->[0]/g) { 307 while ($text =~ /$matcher->[0]/g) {
217 #print "$&\n"; 308 #print "$&\n";
218 my $rend = $line->r; 309 $rend ||= $line->r;
219 310
220 # mark all characters as underlined. we _must_ not toggle underline, 311 # mark all characters as underlined. we _must_ not toggle underline,
221 # as we might get called on an already-marked url. 312 # as we might get called on an already-marked url.
222 &{$matcher->[2]} 313 &{$matcher->[2]}
223 for @{$rend}[ $-[0] .. $+[0] - 1]; 314 for @{$rend}[$-[0] .. $+[0] - 1];
224
225 $line->r ($rend);
226 } 315 }
227 } 316 }
317
318 $line->r ($rend) if $rend;
228 319
229 () 320 ()
230} 321}
231 322
232sub valid_button { 323sub valid_button {
235 | urxvt::ShiftMask | urxvt::ControlMask; 326 | urxvt::ShiftMask | urxvt::ControlMask;
236 return ($event->{button} == $self->{button} && 327 return ($event->{button} == $self->{button} &&
237 ($event->{state} & $mask) == $self->{state}); 328 ($event->{state} & $mask) == $self->{state});
238} 329}
239 330
240sub command_for { 331sub find_matches {
241 my ($self, $row, $col) = @_; 332 my ($self, $row, $col) = @_;
242 my $line = $self->line ($row); 333 my $line = $self->line ($row);
243 my $text = $line->t; 334 my $text = $line->t;
335 my $off = $line->offset_of ($row, $col) if defined $col;
244 336
337 my @matches;
245 for my $matcher (@{$self->{matchers}}) { 338 for my $matcher (@{$self->{matchers}}) {
246 my $launcher = $matcher->[1] || $self->{launcher}; 339 my $launcher = $matcher->[1] || $self->{launcher};
247 while (($text =~ /$matcher->[0]/g)) { 340 while ($text =~ /$matcher->[0]/g) {
248 my $match = $&; 341 my $match = substr $text, $-[0], $+[0] - $-[0];
249 my @begin = @-; 342 my @begin = @-;
250 my @end = @+; 343 my @end = @+;
344 my @exec;
345
251 if (!defined($col) || ($-[0] <= $col && $+[0] >= $col)) { 346 if (!defined($off) || ($-[0] <= $off && $+[0] >= $off)) {
252 if ($launcher !~ /\$/) { 347 if ($launcher !~ /\$/) {
253 return ($launcher,$match); 348 @exec = ($launcher, $match);
254 } else { 349 } else {
255 # It'd be nice to just access a list like ($&,$1,$2...), 350 # It'd be nice to just access a list like ($&,$1,$2...),
256 # but alas, m//g behaves differently in list context. 351 # but alas, m//g behaves differently in list context.
257 my @exec = map { s/\$(\d+)|\$\{(\d+)\}/ 352 @exec = map { s/\$(\d+)|\$\{(\d+)\}/
258 substr($text,$begin[$1||$2],$end[$1||$2]-$begin[$1||$2]) 353 substr $text, $begin[$1 || $2], $end[$1 || $2] - $begin[$1 || $2]
259 /egx; $_ } split(/\s+/, $launcher); 354 /egx; $_ } split /\s+/, $launcher;
260 return @exec;
261 } 355 }
356
357 push @matches, [ $line->coord_of ($begin[0]), $line->coord_of ($end[0]), $match, @exec ];
262 } 358 }
263 } 359 }
360 }
361
362 @matches;
363}
364
365sub command_for {
366 my ($self, $row, $col) = @_;
367
368 my @matches = $self->find_matches ($row, $col);
369 if (@matches) {
370 my @match = @{ $matches[0] };
371 return @match[5 .. $#match];
264 } 372 }
265 373
266 () 374 ()
267} 375}
268 376
294 402
295 if($row == $event->{row} && abs($col-$event->{col}) < 2 403 if($row == $event->{row} && abs($col-$event->{col}) < 2
296 && join("\x00", @$cmd) eq join("\x00", $self->command_for($row,$col))) { 404 && join("\x00", @$cmd) eq join("\x00", $self->command_for($row,$col))) {
297 if($self->valid_button($event)) { 405 if($self->valid_button($event)) {
298 406
299 $self->exec_async (@$cmd); 407 $self->exec_async (@$cmd);
300 408
301 } 409 }
302 } 410 }
303 411
304 1; 412 1;
305} 413}
306 414
415sub select_enter {
416 my ($self) = @_;
417
418 $self->{view_start} = $self->view_start;
419 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EV_NONE);
420 $self->{cur_row} = $self->nrow - 1;
421
422 $self->enable (
423 key_press => \&select_key_press,
424 refresh_begin => \&select_refresh,
425 refresh_end => \&select_refresh,
426 );
427
428 $self->{overlay} = $self->overlay (0, -1, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0);
429 $self->{overlay}->set (0, 0, "match-select");
430}
431
432sub select_leave {
433 my ($self) = @_;
434
435 $self->disable ("key_press", "refresh_begin", "refresh_end");
436 $self->pty_ev_events ($self->{pty_ev_events});
437
438 delete $self->{overlay};
439 delete $self->{matches};
440 delete $self->{id};
441}
442
443sub select_search {
444 my ($self, $dir, $row) = @_;
445
446 while ($self->nrow > $row && $row >= $self->top_row) {
447 my $line = $self->line ($row)
448 or last;
449
450 my @matches = $self->find_matches ($row);
451 if (@matches) {
452 @matches = sort { $a->[0] <=> $b->[0] or $a->[1] <=> $b->[1] } @matches;
453 $self->{matches} = \@matches;
454 $self->{cur_row} = $row;
455 $self->{id} = $dir < 0 ? @{ $self->{matches} } - 1 : 0;
456 $self->view_start ($row - ($self->nrow >> 1));
457 $self->want_refresh;
458 return 1;
459 }
460
461 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
462 }
463
464 $self->scr_bell;
465
466 ()
467}
468
469sub select_refresh {
470 my ($self) = @_;
471
472 return unless $self->{matches};
473
474 my $cur = $self->{matches}[$self->{id}];
475 $self->scr_xor_span (@$cur[0 .. 3], urxvt::RS_RVid);
476
477 ()
478}
479
480sub select_key_press {
481 my ($self, $event, $keysym, $string) = @_;
482
483 if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
484 if ($self->{matches}) {
485 my @match = @{ $self->{matches}[$self->{id}] };
486 $self->exec_async (@match[5 .. $#match]);
487 }
488 $self->select_leave;
489 } elsif ($keysym == 0x79) { # y
490 if ($self->{matches}) {
491 $self->selection ($self->{matches}[$self->{id}][4], 1);
492 $self->selection_grab (urxvt::CurrentTime, 1);
493 }
494 $self->select_leave;
495 } elsif ($keysym == 0xff1b) { # escape
496 $self->view_start ($self->{view_start});
497 $self->select_leave;
498 } elsif ($keysym == 0xff50) { # home
499 $self->select_search (+1, $self->top_row)
500 } elsif ($keysym == 0xff57) { # end
501 $self->select_search (-1, $self->nrow - 1)
502 } elsif ($keysym == 0xff52) { # up
503 if ($self->{id} > 0) {
504 $self->{id}--;
505 $self->want_refresh;
506 } else {
507 my $line = $self->line ($self->{cur_row});
508 $self->select_search (-1, $line->beg - 1)
509 if $line->beg > $self->top_row;
510 }
511 } elsif ($keysym == 0xff54) { # down
512 if ($self->{id} < @{ $self->{matches} } - 1) {
513 $self->{id}++;
514 $self->want_refresh;
515 } else {
516 my $line = $self->line ($self->{cur_row});
517 $self->select_search (+1, $line->end + 1)
518 if $line->end < $self->nrow;
519 }
520 } elsif ($self->lookup_keysym ($keysym, $event->{state}) eq "matcher:select") {
521 if ($self->{id} > 0) {
522 $self->{id}--;
523 $self->want_refresh;
524 } else {
525 my $line = $self->line ($self->{cur_row});
526 $self->select_search (-1, $self->nrow - 1)
527 unless $self->select_search (-1, $line->beg - 1);
528 }
529 }
530
531 1
532}
533
307# vim:set sw=3 sts=3 et: 534# vim:set sw=3 sts=3 et:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines