From e068841d2fc2976d094b382e4dd5e4d6df455506 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 7 Feb 2021 03:00:48 +0000 Subject: CTAN sync 202102070300 --- fonts/utilities/ps2pk/ChangeLog | 7 +++++++ fonts/utilities/ps2pk/c-auto.in | 3 +++ fonts/utilities/ps2pk/configure.ac | 4 ++++ fonts/utilities/ps2pk/configure.texk | 5 +++++ fonts/utilities/ps2pk/mag.c | 7 ++++--- fonts/utilities/ps2pk/pfb2pfa.c | 5 +++-- fonts/utilities/ps2pk/pk2bm.c | 14 +++++++------- fonts/utilities/ps2pk/pktest.c | 5 +++-- fonts/utilities/ps2pk/ps2pk.c | 21 +++++++++++---------- 9 files changed, 47 insertions(+), 24 deletions(-) (limited to 'fonts/utilities') diff --git a/fonts/utilities/ps2pk/ChangeLog b/fonts/utilities/ps2pk/ChangeLog index 09eebc9b8b..8bd30034a5 100644 --- a/fonts/utilities/ps2pk/ChangeLog +++ b/fonts/utilities/ps2pk/ChangeLog @@ -1,3 +1,10 @@ +2021-02-06 TANAKA Takuji + + * ps2pk.c, mag.c, pfb2pfa.c, pk2bm.c, pktest.c, configure.ac: + Show TeX Live version number and bug report address in usage. + * ps2pk.c, pk2bm.c, mag.c: + Avoid compiler warnings. + 2018-12-05 Hironobu Yamashita * mag.c, pk2bm.c: check for missing arguments. diff --git a/fonts/utilities/ps2pk/c-auto.in b/fonts/utilities/ps2pk/c-auto.in index f6eb86702d..7599035ee3 100644 --- a/fonts/utilities/ps2pk/c-auto.in +++ b/fonts/utilities/ps2pk/c-auto.in @@ -139,6 +139,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define to the current TeX Live version string. */ +#undef TL_VERSION + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/fonts/utilities/ps2pk/configure.ac b/fonts/utilities/ps2pk/configure.ac index 9d0f79dc68..b4f7fbe1bf 100644 --- a/fonts/utilities/ps2pk/configure.ac +++ b/fonts/utilities/ps2pk/configure.ac @@ -32,6 +32,10 @@ AC_CHECK_FUNCS([memset]) AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) +m4_include([../../version.ac])[] dnl define tex_live_version +AC_DEFINE([TL_VERSION], ["TeX Live tex_live_version()"], + [Define to the current TeX Live version string.]) + dnl For tests AC_CHECK_PROGS([KPSEWHICH], [kpsewhich], [false]) diff --git a/fonts/utilities/ps2pk/configure.texk b/fonts/utilities/ps2pk/configure.texk index 31e8e16daa..85c6f0565d 100755 --- a/fonts/utilities/ps2pk/configure.texk +++ b/fonts/utilities/ps2pk/configure.texk @@ -13729,6 +13729,11 @@ done ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" + + +$as_echo "#define TL_VERSION \"TeX Live 2021/dev\"" >>confdefs.h + + for ac_prog in kpsewhich do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/fonts/utilities/ps2pk/mag.c b/fonts/utilities/ps2pk/mag.c index 3f5c6b61d5..5303a6e049 100644 --- a/fonts/utilities/ps2pk/mag.c +++ b/fonts/utilities/ps2pk/mag.c @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) { if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; DPI = atof(argv[0]); done = 1; break; @@ -115,8 +115,9 @@ invalid: } if (argc < 1) { - msg ("mag (ps2pk) version " PACKAGE_VERSION "\n"); - fatal("Usage: %s [-r] [-Rdpi] size . . .\n", myname); + msg ("mag (ps2pk) version " PACKAGE_VERSION " (" TL_VERSION ")\n"); + msg ("Usage: %s [-r] [-Rdpi] size . . .\n", myname); + fatal("\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT); } #ifdef WIN32 diff --git a/fonts/utilities/ps2pk/pfb2pfa.c b/fonts/utilities/ps2pk/pfb2pfa.c index 368d0a9b57..62d58fb020 100644 --- a/fonts/utilities/ps2pk/pfb2pfa.c +++ b/fonts/utilities/ps2pk/pfb2pfa.c @@ -50,8 +50,9 @@ int main (int argc, char *argv[]) } if (argc < 1) { - msg ("pfb2pfa (ps2pk) version " PACKAGE_VERSION "\n"); - fatal("Usage: %s [-v] pfbfile [pfafile]\n", myname); + msg ("pfb2pfa (ps2pk) version " PACKAGE_VERSION " (" TL_VERSION ")\n"); + msg ("Usage: %s [-v] pfbfile [pfafile]\n", myname); + fatal("\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT); } pfbname = argv[0]; argc--; argv++; diff --git a/fonts/utilities/ps2pk/pk2bm.c b/fonts/utilities/ps2pk/pk2bm.c index 5445bf7409..7f13430cab 100644 --- a/fonts/utilities/ps2pk/pk2bm.c +++ b/fonts/utilities/ps2pk/pk2bm.c @@ -64,21 +64,21 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; C = *argv[0]; done = 1; break; case 'o': if (*++argv[0] == '\0') { argc--; ++argv; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; C = atoo(argv[0]); done = 1; break; case 'H': if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; h = atoi(argv[0]); done=1; break; @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; w = atoi(argv[0]); done=1; break; @@ -104,9 +104,9 @@ invalid: } if (argc == 0) { - msg ("pk2bm (ps2pk) version " PACKAGE_VERSION "\n"); - printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname); - exit(1); + msg ("pk2bm (ps2pk) version " PACKAGE_VERSION " (" TL_VERSION ")\n"); + msg ("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname); + fatal("\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT); } #ifdef WIN32 diff --git a/fonts/utilities/ps2pk/pktest.c b/fonts/utilities/ps2pk/pktest.c index 2cc97f1c7c..bb677209a4 100644 --- a/fonts/utilities/ps2pk/pktest.c +++ b/fonts/utilities/ps2pk/pktest.c @@ -49,8 +49,9 @@ int main(int argc, char *argv[]) } if (argc == 0 || C == 0 || W*H == 0) { - msg ("pktest (ps2pk) version " PACKAGE_VERSION "\n"); - fatal("Usage: %s -c -W -H pkfile\n", myname); + msg ("pktest (ps2pk) version " PACKAGE_VERSION " (" TL_VERSION ")\n"); + msg ("Usage: %s -c -W -H pkfile\n", myname); + fatal("\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT); } pkname = argv[0]; diff --git a/fonts/utilities/ps2pk/ps2pk.c b/fonts/utilities/ps2pk/ps2pk.c index c59d9a7f82..b4c7a05c9f 100644 --- a/fonts/utilities/ps2pk/ps2pk.c +++ b/fonts/utilities/ps2pk/ps2pk.c @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; afmname = argv[0]; done = 1; break; @@ -280,7 +280,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; encname = argv[0]; add_option("-e", encname); done = 1; @@ -289,7 +289,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; efactor = atof(argv[0]); add_option("-E", argv[0]); done = 1; @@ -302,7 +302,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; pointsize = atof(argv[0]); add_option("-P", argv[0]); done = 1; @@ -311,7 +311,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; base_resolution = atoi(argv[0]); add_option("-R", argv[0]); done = 1; @@ -320,7 +320,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; slant = atof(argv[0]); add_option("-S", argv[0]); done = 1; @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; x_resolution = atoi(argv[0]); done = 1; if (y_resolution == 0) y_resolution = x_resolution; add_option("-X", argv[0]); @@ -338,7 +338,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; y_resolution = atoi(argv[0]); done = 1; if (x_resolution == 0) x_resolution = y_resolution; add_option("-Y", argv[0]); @@ -353,10 +353,11 @@ invalid: } if (argc < 1 || argc >2) { - msg ("ps2pk version " PACKAGE_VERSION " (1992-2016)\n"); + msg ("ps2pk version " PACKAGE_VERSION " (" TL_VERSION ")\n"); msg ("Usage: %s [options] type1font [pkname]\n", myname); msg ("options: -d -v -e -X -E -S\n"); - fatal("options: -O -P -Y -a -R\n"); + msg ("options: -O -P -Y -a -R\n"); + fatal("\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT); } psname = argv[0]; argc--; argv++; -- cgit v1.2.3