- my $string=Sun::riseset($yr,$month,$day,$l->[1],$l->[2]);
- push @out,sprintf("%-2s %s %s",$l->[3],$l->[0],$string);
+ my ($rise, $set, $az, $dec )=Sun::rise_set($yr,$month,$day,$hr,$min,$l->[1],$l->[2],0);
+ $l->[3] =~ s{(-\d+|/\w+)$}{};
+ push @out,sprintf("%-6.6s %-30.30s %s %s %6.1f %6.1f ", $l->[3], $l->[0], $rise, $set, $az, $dec);