Page MenuHomePhabricator

EasyTimeline-ttf-and-url-fix.diff

Authored By
bzimport
Nov 21 2014, 8:55 PM
Size
1 KB
Referenced Files
None
Subscribers
None

EasyTimeline-ttf-and-url-fix.diff

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.
Index: EasyTimeline.pl
===================================================================
RCS file: /cvsroot/wikipedia/extensions/timeline/EasyTimeline.pl,v
retrieving revision 1.13
diff -u -r1.13 EasyTimeline.pl
--- EasyTimeline.pl 5 Apr 2005 21:24:41 -0000 1.13
+++ EasyTimeline.pl 19 Nov 2005 06:13:22 -0000
@@ -87,17 +87,6 @@
@lines = <FILE_IN> ;
close "FILE_IN" ;
- # until real unicode support is available: translate extended ASCII chars
- foreach $line (@lines)
- {
- $line =~ s/([\xc0-\xdf][\x80-\xbf]|
- [\xe0-\xef][\x80-\xbf]{2}|
- [\xf0-\xf7][\x80-\xbf]{3})/&UnicodeToAscii($1)/gxeo ;
- # unfortunately Ploticus uses an odd character mapping lots of unicode chars
- # in extended ascii range are not available
- $line =~ tr /¡¢£¥¦©ª«¬­®¯±²³µ¶·¹º»¼½¾¿ÀÅÆÇÈÊÌÏÒÖØÛÞàåæèêìïðòøþÿ/_________________________AAACEEIIOO0Ü_aaaeeii_o0_y/ ;
- }
-
&InitVars ;
&ParseScript ;
@@ -3401,7 +3390,8 @@
# $cmd = "$pl $map -" . $fmt . " -o $file_bitmap $file_script -tightcrop" ; # -v $file_bitmap" ;
# $cmd = "$pl $map -" . $fmt . " -o $file_bitmap $file_script -tightcrop -diagfile $file_pl_info -errfile $file_pl_err" ;
$cmd = EscapeShellArg($pl) . " $map -" . $fmt . " -o " .
- EscapeShellArg($file_bitmap) . " " . EscapeShellArg($file_script) . " -tightcrop" ;
+ EscapeShellArg($file_bitmap) . " " . EscapeShellArg($file_script) . " -tightcrop -font FreeSans.ttf" .
+ " -mapfile " . EscapeShellArg($file_htmlmap) ;
print "$cmd\n";
system ($cmd) ;
@@ -4590,7 +4580,10 @@
sub EncodeURL
{
my $url = shift ;
- $url =~ s/([^0-9a-zA-Z\%\:\/\.])/"%".sprintf ("%X",ord($1))/ge ;
+ # For some reason everything gets run through this weird internal
+ # encoding that's similar to URL-encoding. Armor against this as well,
+ # or else adjacent encoded bytes will be corrupted.
+ $url =~ s/([^0-9a-zA-Z\%\:\/\._])/"%25%".sprintf ("%02X",ord($1))/ge ;
return ($url) ;
}

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2029
Default Alt Text
EasyTimeline-ttf-and-url-fix.diff (1 KB)

Event Timeline