[Pgp-tools-commit] r315 - in trunk: debian gpg-key2ps
Thijs Kinkhorst
thijs at alioth.debian.org
Fri Mar 2 14:12:48 CET 2007
Author: thijs
Date: 2007-03-02 14:12:47 +0100 (Fri, 02 Mar 2007)
New Revision: 315
Modified:
trunk/debian/changelog
trunk/gpg-key2ps/README
trunk/gpg-key2ps/gpg-key2ps
Log:
* gpg-key2ps:
+ Add '-1' option to only display one column of slips, for extra
wide keys (Closes: #399474).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-03-02 12:07:08 UTC (rev 314)
+++ trunk/debian/changelog 2007-03-02 13:12:47 UTC (rev 315)
@@ -2,8 +2,11 @@
* caff:
+ Fix syntax error in example config variables (Closes: #413020).
+ * gpg-key2ps:
+ + Add '-1' option to only display one column of slips, for extra
+ wide keys (Closes: #399474).
- -- Thijs Kinkhorst <thijs at debian.org> Fri, 2 Mar 2007 13:04:36 +0100
+ -- Thijs Kinkhorst <thijs at debian.org> Fri, 2 Mar 2007 14:12:03 +0100
signing-party (0.4.9-1) unstable; urgency=low
Modified: trunk/gpg-key2ps/README
===================================================================
--- trunk/gpg-key2ps/README 2007-03-02 12:07:08 UTC (rev 314)
+++ trunk/gpg-key2ps/README 2007-03-02 13:12:47 UTC (rev 315)
@@ -1,7 +1,7 @@
gpg-key2ps
----------
-Usage: gpg-key2ps [-p papersize] [-r revoked-style] keyid-or-name
+Usage: gpg-key2ps [-p papersize] [-r revoked-style] [-1] keyid-or-name
revoked-style is one of:
grey - Print text in grey
@@ -25,7 +25,7 @@
COPYRIGHT & LICENSE
-------------------
-Copyright (C) 2001-2006 Simon Richter and Thijs Kinkhorst
+Copyright (C) 2001-2007 Simon Richter and Thijs Kinkhorst
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps 2007-03-02 12:07:08 UTC (rev 314)
+++ trunk/gpg-key2ps/gpg-key2ps 2007-03-02 13:12:47 UTC (rev 315)
@@ -2,7 +2,7 @@
#
# gpg-key2ps: convert a PGP/GnuPG key into paper slips.
# Copyright (C) 2001-2005 Simon Richter
-# Copyright (C) 2005-2006 Thijs Kinkhorst
+# Copyright (C) 2005-2007 Thijs Kinkhorst
# Copyright (C) 2005-2006 Christoph Berg <cb at df7cb.de>
# Licenced under the GNU General Public License,
# version 2 or later.
@@ -15,18 +15,19 @@
my $version = '$Rev$';
$version =~ s/\$Rev:\s*(\d+)\s*\$/$1/;
my $revokestyle = "hide";
+my $columns = 2;
my $creationdate = scalar(localtime);
sub version($) {
my $fd = shift;
- print $fd "gpg-key2ps $version - (c) 2001-2006 Simon Richter, Thijs Kinkhorst, Christoph Berg\n";
+ print $fd "gpg-key2ps $version - (c) 2001-2007 Simon Richter, Thijs Kinkhorst, Christoph Berg\n";
}
sub usage($$) {
my ($fd, $exitcode) = @_;
version ($fd);
print $fd <<EOF;
-Usage: $0 [-p papersize] [-r revoked-style] keyid-or-name ...
+Usage: $0 [-p papersize] [-r revoked-style] [-1] keyid-or-name ...
Options:
-p --paper-size
-r --revoked-style
@@ -35,6 +36,7 @@
note - Add "[revoked]"
show - List revoked uids normally
strike - Strike through lines
+ -1 Only print one column, for extra wide keys
-h --help
-v --version
EOF
@@ -52,7 +54,7 @@
'-p=s' => \$opts->{papersize},
'--paper-size=s' => \$opts->{papersize},
'-r=s' => \$opts->{revokestyle},
- '--revoked-style=s' => \$opts->{revokestyle},
+ '-1' => \$opts->{1},
)) {
usage(\*STDERR, 1);
}
@@ -74,6 +76,8 @@
usage (\*STDERR, 1);
}
+if ( $opts->{1} ) { $columns = 1; }
+
usage(\*STDERR, 1) unless scalar @ARGV >= 1;
# determine the paper size through the paperconf tool
@@ -119,7 +123,7 @@
/hline {
30 y 3 add moveto
- w 2 div 30 sub y 3 add lineto stroke
+ w $columns div 30 sub y 3 add lineto stroke
newline
} def
@@ -249,12 +253,12 @@
/y w 20 sub def
1 1 num {
gsave
- 0 0 h 2 div w rectclip
+ 0 0 h $columns div w rectclip
/upper y 11 add def
key
newline
/lower y 11 add def
- 0 upper h 2 div upper h 2 div lower 0 lower 0 upper moveto lineto lineto lineto lineto stroke
+ 0 upper h $columns div upper h $columns div lower 0 lower 0 upper moveto lineto lineto lineto lineto stroke
grestore
} for
} def
@@ -262,9 +266,17 @@
w 0 translate
90 rotate
column
-h 2 div 0 translate
+EOF
+
+if ( $columns == 2 ) {
+ print <<EOF;
+h $columns div 0 translate
column
+EOF
+}
+
+print <<EOF;
showpage
%%Trailer
More information about the Pgp-tools-commit
mailing list