119 |
|
for (nfile = 0; an < argc; nfile++) { |
120 |
|
if (nfile >= MAXFILE) |
121 |
|
goto toomany; |
122 |
< |
if (autolabel) |
123 |
< |
thislabel = argv[an]; |
124 |
< |
else |
125 |
< |
thislabel = NULL; |
122 |
> |
thislabel = NULL; |
123 |
|
input[nfile].hasmin = input[nfile].hasmax = 0; |
124 |
|
while (an < argc && (argv[an][0] == '-' || argv[an][0] == '+')) |
125 |
|
switch (argv[an][1]) { |
156 |
|
getfile: |
157 |
|
if (argc-an < (ncolumns ? 1 : 3)) |
158 |
|
goto userr; |
159 |
+ |
if (autolabel && thislabel == NULL) |
160 |
+ |
thislabel = argv[an]; |
161 |
|
if (!strcmp(argv[an], "-")) { |
162 |
|
input[nfile].name = "<stdin>"; |
163 |
|
input[nfile].fp = stdin; |
164 |
|
} else { |
165 |
< |
input[nfile].name = argv[an]; |
166 |
< |
if ((input[nfile].fp = argv[an][0] == '!' ? |
167 |
< |
popen(argv[an]+1, "r") : |
168 |
< |
fopen(argv[an], "r")) == NULL) { |
165 |
> |
if (argv[an][0] == '!') { |
166 |
> |
input[nfile].name = "<Command>"; |
167 |
> |
input[nfile].fp = popen(argv[an]+1, "r"); |
168 |
> |
} else { |
169 |
> |
input[nfile].name = argv[an]; |
170 |
> |
input[nfile].fp = fopen(argv[an], "r"); |
171 |
> |
} |
172 |
> |
if (input[nfile].fp == NULL) { |
173 |
|
perror(argv[an]); |
174 |
|
quit(1); |
175 |
|
} |
217 |
|
goto toomany; |
218 |
|
input[nfile].name = "<Label>"; |
219 |
|
input[nfile].hasmin = input[nfile].hasmax = 0; |
220 |
+ |
input[nfile].xres = input[nfile-1].xres; |
221 |
+ |
input[nfile].yres = labelht; |
222 |
|
if ((input[nfile].fp = lblopen(thislabel, |
223 |
|
&input[nfile].xres, |
224 |
|
&input[nfile].yres)) == NULL) |
339 |
|
char com[128]; |
340 |
|
FILE *fp; |
341 |
|
|
342 |
< |
sprintf(com, "psign -h %d '%.30s' | pfilt -1 -x /2 -y /2", |
338 |
< |
2*labelht, s); |
342 |
> |
sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s); |
343 |
|
if ((fp = popen(com, "r")) == NULL) |
344 |
|
return(NULL); |
345 |
|
if (checkheader(fp, COLRFMT, NULL) < 0) |