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
|
--- a2ps-j.orig 2011-09-19 17:05:32.000000000 +0900
+++ a2ps-j 2012-08-07 08:58:02.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
;#
;# a2ps: ascii to ps
;#
@@ -56,9 +56,12 @@
@param_b4 = (10.15, 14.31, 1.40, 1.2, 8.50, 9.5, 0.29, 0.22, 0.08, 'b4');
sub paper {
local(*param) = 'param_' . $_[0];
- die "Unknown paper type: $_[0]\n" unless defined @param;
+ if (@param) {
($width, $height, $lmargin, $smargin, $fontsize_l, $fontsize_p,
$portrait_header, $landscape_header, $paper_adjust, $paper_tray) = @param;
+ } else {
+ die "Unknown paper type: $_[0]\n";
+ }
}
&paper($default_paper);
@@ -192,7 +195,8 @@
if ($debug == 2) {
require('dumpvar.pl');
- local($#) = '%.6g';
+## Perl 5.10.1 says $# is no longer supported
+## local($#) = '%.6g';
&dumpvar('main',
'width', 'height', 'lmargin', 'smargin', 'font_size',
'sheet_height', 'sheet_width', 'char_width', 'skip_column',
@@ -208,8 +212,14 @@
$file = shift;
if ($file && !-r $file) { warn "$file: $!\n"; next; }
if ($jisconvert) {
- require 'flush.pl';
- &flush(STDOUT);
+ # flush.pl obsolete (originally in Perl 4)
+ # replaced with equivalent code of &flush(STDOUT)
+ local($old_stdout) = select(STDOUT);
+ $| = 1;
+ print "";
+ $| = 0;
+ select($old_stdout);
+ # end of equivalent code
open(F, "-|") || &jis($file);
} else {
$file = '-' if $file eq '';
@@ -476,10 +486,13 @@
}
sub print_header {
- require('ctime.pl');
return if $header_is_printed++;
- chop(local($date) = &ctime(time));
+ # ctime.pl obsolete (originally in Perl 4)
+ # ctime.pl behaves differently when TZ is not set,
+ # but the behavior will not affect the PostScript file details
+ local($date) = scalar localtime;
+
local($orientation) = $portrait ? "Portrait" : "Landscape";
print <<"---";
@@ -525,7 +538,8 @@
printf("/lines %d def\n", $linesperpage);
printf("/columns %d def\n", $columnsperline);
$sublabel = $default_sublabel unless defined $sublabel;
- print "/date (", &date($sublabel, time), ") def\n";
+ # function name changed to a2ps_date to avoid confusion
+ print "/date (", &a2ps_date($sublabel, time), ") def\n";
if ($ascii_mag) {
printf("/doasciimag true def /asciimagsize %f def\n", $ascii_mag);
} else {
@@ -548,7 +562,8 @@
print "%%EndProlog\n\n";
}
-sub date {
+# function name changed to a2ps_date to avoid confusion
+sub a2ps_date {
local($_, $time) = @_;
local($sec, $min, $hour, $mday, $mon, $year, $wday) = localtime($time);
$year += 1900;
|
