2011-09-19 15:58:11 +02:00
|
|
|
|
--- a2ps-j.orig 2011-09-19 17:05:32.000000000 +0900
|
|
|
|
|
+++ a2ps-j 2011-09-19 17:09:07.000000000 +0900
|
1997-09-07 21:38:45 +02:00
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
|
-#!/usr/local/bin/perl
|
|
|
|
|
+#!/usr/bin/perl
|
|
|
|
|
;#
|
|
|
|
|
;# a2ps: ascii to ps
|
|
|
|
|
;#
|
2010-05-09 18:26:11 +02:00
|
|
|
|
@@ -192,7 +192,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',
|
2011-09-19 15:58:11 +02:00
|
|
|
|
@@ -208,8 +209,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 +483,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 +535,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 +559,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;
|