head 1.10; access; symbols OPENPKG_E1_MP_HEAD:1.5 OPENPKG_E1_MP:1.5 OPENPKG_E1_MP_2_STABLE:1.4.2.2 OPENPKG_E1_FP:1.4.2.2 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.4.2.2 OPENPKG_2_STABLE:1.4.0.2; locks; strict; comment @# @; 1.10 date 2008.04.23.06.02.28; author rse; state Exp; branches; next 1.9; commitid 6ZyqcAh7HhfGfc0t; 1.9 date 2008.04.10.11.02.20; author rse; state Exp; branches; next 1.8; commitid NAlb9w1ryQbskyYs; 1.8 date 2008.04.08.06.48.04; author rse; state Exp; branches; next 1.7; commitid vg24h3Gd9dqdZgYs; 1.7 date 2007.10.20.08.07.43; author rse; state Exp; branches; next 1.6; commitid z8X3Njo7sV7lViCs; 1.6 date 2007.02.14.19.04.22; author rse; state Exp; branches; next 1.5; commitid 99E6Ypf3g5xQwu6s; 1.5 date 2006.12.04.18.52.53; author rse; state Exp; branches; next 1.4; commitid czHDcVXcRM1pMeXr; 1.4 date 2006.04.04.17.07.04; author rse; state Exp; branches 1.4.2.1; next 1.3; commitid 5smPPfpNE9Dm2Srr; 1.3 date 2005.08.28.20.05.41; author rse; state Exp; branches; next 1.2; 1.2 date 2005.06.05.11.43.00; author rse; state Exp; branches; next 1.1; 1.1 date 2005.06.05.11.32.01; author rse; state Exp; branches; next ; 1.4.2.1 date 2006.04.04.17.07.04; author rse; state dead; branches; next 1.4.2.2; commitid iZxwRSmmWscPXUQr; 1.4.2.2 date 2006.10.16.14.51.44; author rse; state Exp; branches; next 1.4.2.3; commitid iZxwRSmmWscPXUQr; 1.4.2.3 date 2006.12.07.14.36.32; author rse; state Exp; branches; next ; commitid GEkt5oHSedhtgBXr; desc @@ 1.10 log @upgrading package: leo 1.31 -> 1.33 @ text @Index: leo --- leo.orig 2008-04-22 23:09:05 +0200 +++ leo 2008-04-23 08:00:53 +0200 @@@@ -32,8 +32,8 @@@@ # my $highlight = 1; my $default_c = "\033[0m"; # reset default terminal color -my $bold_c = "\033[0;34m"; # blue color -my $copy_c = "\033[0;35m"; # copyright message color (green) +my $bold_c = "\033[0;1m"; # bold text +my $blue_c = "\033[0;34m"; # blue color my $version = "1.33"; my $config = $ENV{HOME} . "/.leo"; @@@@ -262,19 +262,14 @@@@ foreach my $entry (@@{$section->{data}}) { $entry->{left} =~ s/^(.*)$/$1 . " " x ($maxsize - length($1))/e; if ($highlight) { - $entry->{left} =~ s/(\Q$string\E)/$bold_c . $1 . $default_c/ei; - $entry->{right} =~ s/(\Q$string\E)/$bold_c . $1 . $default_c/ei; + $entry->{left} =~ s/(\Q$string\E)/$blue_c . $1 . $default_c/ei; + $entry->{right} =~ s/(\Q$string\E)/$blue_c . $1 . $default_c/ei; } print " $entry->{left}$entry->{right}\n"; } } -print "$copy_c" if $highlight; -print "\n Fetched by leo $version via http://dict.leo.org/"; -print "\n Copyright © LEO Dictionary Team 1995-2007"; -print "\n [leo] GPL Copyleft © Thomas Linden 2000-2007\n\n"; -print "$default_c" if $highlight; @ 1.9 log @fix a debug method call @ text @a0 14 Index: Org.pm --- Org.pm.orig 2008-04-07 15:29:33 +0200 +++ Org.pm 2008-04-10 13:00:20 +0200 @@@@ -330,8 +330,8 @@@@ my $leftsize = length($left); $maxsize = $leftsize if($leftsize > $maxsize); push @@match, { left => $left, right => $right }; - $this->debug( "normalized segment left: $left"); - $this->debug( "normalized segment right: $right\n"); + $this->debug( "normalized segment left: $left") if (defined $left); + $this->debug( "normalized segment right: $right\n") if (defined $right); } } else { d2 3 a4 3 --- leo.orig 2008-04-07 15:28:59 +0200 +++ leo 2008-04-10 12:58:38 +0200 @@@@ -31,8 +31,8 @@@@ d13 1 a13 1 my $version = "1.31"; d15 2 a16 2 @@@@ -267,18 +267,13 @@@@ # dict entry d24 1 a24 1 print $entry->{left} . $entry->{right} . "\n"; d28 1 d31 2 a32 2 -print "\n Copyright © LEO Dictionary Team 1995-2008"; -print "\n [leo] GPL Copyleft © Thomas Linden 2000-2008\n\n"; @ 1.8 log @upgrading package: leo 1.27 -> 1.31 @ text @d1 14 d17 1 a17 1 +++ leo 2008-04-08 08:44:13 +0200 @ 1.7 log @fix parsing of latest dict.leo.org output @ text @d2 3 a4 3 --- leo.orig 2007-02-14 09:20:42 +0100 +++ leo 2007-10-20 10:06:00 +0200 @@@@ -34,8 +34,8 @@@@ d13 3 a15 23 my $ip = "dict.leo.org"; my $port = "80"; @@@@ -378,6 +378,9 @@@@ # remove hard whitespaces $site =~ s/ //gs; + # remove special characters + $site =~ s/ //gs; + # remove remaining tags (beside td and tr) $site =~ s/<\/*(i|a|b|font|small|strong)>//gsi; @@@@ -399,6 +402,9 @@@@ # remove javascript links $site =~ s/]*>//gsi; + # remove sub/super-script word annotations + $site =~ s/<(sub|sup)>.*?<\/\1>//gsi; + # make single line per entry my @@segments = split /<\/TR>\s*/i, $site; my $progress; @@@@ -517,18 +523,13 @@@@ d30 2 a31 2 -print "\n Copyright © LEO Dictionary Team 1995-2007"; -print "\n [leo] GPL Copyleft © Thomas Linden 2000-2007\n\n"; @ 1.6 log @upgrading package: leo 1.25 -> 1.26 @ text @d3 1 a3 1 +++ leo 2007-02-14 20:03:04 +0100 d15 11 a25 1 @@@@ -399,6 +399,9 @@@@ d35 1 a35 1 @@@@ -517,18 +520,13 @@@@ @ 1.5 log @fix runtime: since today dict.leo.org seems to support gzip encodings, so don't really request this as this script isn't able to really handle it anyway @ text @d2 2 a3 2 --- leo.orig 2006-04-04 11:13:02 +0200 +++ leo 2006-12-04 19:51:10 +0100 d15 1 a15 10 @@@@ -295,7 +295,7 @@@@ "$conf{user_agent} Host: $ghost Accept: text/*;q=1.0, image/png;q=1.0, image/jpeg;q=1.0, image/gif;q=1.0, image/*;q=0.8, */*;q=0.5 -Accept-Encoding: x-gzip; q=1.0, gzip; q=1.0, identity +Accept-Encoding: identity Accept-Charset: iso-8859-1;q=1.0, *;q=0.9, utf-8;q=0.8 Accept-Language: en_US, en\r\n"; @@@@ -400,6 +400,9 @@@@ d25 1 a25 1 @@@@ -518,18 +521,13 @@@@ d40 2 a41 2 -print "\n Copyright © LEO Dictionary Team 1995-2006"; -print "\n [leo] GPL Copyleft © Thomas Linden 2000-2006\n\n"; @ 1.4 log @upgrading package: leo 1.24 -> 1.25 @ text @d3 1 a3 1 +++ leo 2006-04-04 19:03:11 +0200 d15 9 @ 1.4.2.1 log @file leo.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:44 +0000 @ text @d1 45 @ 1.4.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 45 Index: leo --- leo.orig 2006-04-04 11:13:02 +0200 +++ leo 2006-04-04 19:03:11 +0200 @@@@ -34,8 +34,8 @@@@ # my $highlight = 1; my $default_c = "\033[0m"; # reset default terminal color -my $bold_c = "\033[0;34m"; # blue color -my $copy_c = "\033[0;35m"; # copyright message color (green) +my $bold_c = "\033[0;1m"; # bold text +my $blue_c = "\033[0;34m"; # blue color my $ip = "dict.leo.org"; my $port = "80"; @@@@ -400,6 +400,9 @@@@ # remove javascript links $site =~ s/]*>//gsi; + # remove sub/super-script word annotations + $site =~ s/<(sub|sup)>.*?<\/\1>//gsi; + # make single line per entry my @@segments = split /<\/TR>\s*/i, $site; my $progress; @@@@ -518,18 +521,13 @@@@ # dict entry $entry->{left} =~ s/^(.*)$/$1 . " " x ($maxsize - length($1))/e; if ($highlight) { - $entry->{left} =~ s/(\Q$string\E)/$bold_c . $1 . $default_c/ei; - $entry->{right} =~ s/(\Q$string\E)/$bold_c . $1 . $default_c/ei; + $entry->{left} =~ s/(\Q$string\E)/$blue_c . $1 . $default_c/ei; + $entry->{right} =~ s/(\Q$string\E)/$blue_c . $1 . $default_c/ei; } print $entry->{left} . $entry->{right} . "\n"; } } -print "$copy_c" if $highlight; -print "\n Fetched by leo $version via http://dict.leo.org/"; -print "\n Copyright © LEO Dictionary Team 1995-2006"; -print "\n [leo] GPL Copyleft © Thomas Linden 2000-2006\n\n"; -print "$default_c" if $highlight; @ 1.4.2.3 log @MFC: bugfix @ text @d3 1 a3 1 +++ leo 2006-12-04 19:51:10 +0100 a14 9 @@@@ -295,7 +295,7 @@@@ "$conf{user_agent} Host: $ghost Accept: text/*;q=1.0, image/png;q=1.0, image/jpeg;q=1.0, image/gif;q=1.0, image/*;q=0.8, */*;q=0.5 -Accept-Encoding: x-gzip; q=1.0, gzip; q=1.0, identity +Accept-Encoding: identity Accept-Charset: iso-8859-1;q=1.0, *;q=0.9, utf-8;q=0.8 Accept-Language: en_US, en\r\n"; @ 1.3 log @fix output of searches with annotations (like 'behavior') @ text @d2 2 a3 2 --- leo.orig 2005-04-18 12:46:37 +0200 +++ leo 2005-08-28 22:04:45 +0200 d15 3 a17 3 @@@@ -397,6 +397,9 @@@@ # remove match hint, we are counting ourselfes $site =~ s/\d+?\s*treffer//i; d25 1 a25 1 @@@@ -511,18 +514,13 @@@@ d40 2 a41 2 -print "\n Copyright © LEO Dictionary Team 1995-2005"; -print "\n [leo] GPL Copyleft © Thomas Linden 2000-2005\n\n"; @ 1.2 log @use both bold and blue text for better readability @ text @d3 1 a3 1 +++ leo 2005-06-05 13:42:12 +0200 d15 11 a25 1 @@@@ -511,18 +511,13 @@@@ @ 1.1 log @new package: leo 1.24 (Command-line Interface to LEO Online-Dictionary) @ text @d3 22 a24 2 +++ leo 2005-06-05 13:25:52 +0200 @@@@ -518,11 +518,6 @@@@ @