From db43b5ddee54e72accf2e88d6b5fc660e30a3d14 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 6 Feb 2021 04:55:42 +0000 Subject: ttf2pk2: Add TL version number and bug report address in online help git-svn-id: svn://tug.org/texlive/trunk@57636 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ttf2pk2/ChangeLog | 6 ++++++ Build/source/texk/ttf2pk2/config.h.in | 3 +++ Build/source/texk/ttf2pk2/configure | 5 +++++ Build/source/texk/ttf2pk2/configure.ac | 4 ++++ Build/source/texk/ttf2pk2/ttf2pk.c | 4 ++-- Build/source/texk/ttf2pk2/ttf2tfm.c | 4 +++- 6 files changed, 23 insertions(+), 3 deletions(-) (limited to 'Build/source/texk/ttf2pk2') diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog index 0beb283f9a0..44b13027fb0 100644 --- a/Build/source/texk/ttf2pk2/ChangeLog +++ b/Build/source/texk/ttf2pk2/ChangeLog @@ -1,3 +1,9 @@ +2021-02-06 TANAKA Takuji + + * ttf2pk.c, ttf2tfm.c, configure.ac: + Show TeX Live version by version option. + Show bug report address in usage. + 2020-02-16 Karl Berry * pklib.c (dpi): declare extern, as also defined in ftlib.c, diff --git a/Build/source/texk/ttf2pk2/config.h.in b/Build/source/texk/ttf2pk2/config.h.in index 8a9626abb55..82fbe346d19 100644 --- a/Build/source/texk/ttf2pk2/config.h.in +++ b/Build/source/texk/ttf2pk2/config.h.in @@ -124,6 +124,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 + /* Define to 1 if declares 'z_const'. */ #undef ZLIB_CONST diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure index b6e6576f1ba..bd2aefcdea7 100755 --- a/Build/source/texk/ttf2pk2/configure +++ b/Build/source/texk/ttf2pk2/configure @@ -13472,6 +13472,11 @@ fi ac_config_headers="$ac_config_headers config.h" + + +$as_echo "#define TL_VERSION \"TeX Live 2021/dev\"" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5 $as_echo_n "checking for library containing floor... " >&6; } if ${ac_cv_search_floor+:} false; then : diff --git a/Build/source/texk/ttf2pk2/configure.ac b/Build/source/texk/ttf2pk2/configure.ac index 3c5bc733c96..db1c1cbd3f9 100644 --- a/Build/source/texk/ttf2pk2/configure.ac +++ b/Build/source/texk/ttf2pk2/configure.ac @@ -17,6 +17,10 @@ KPSE_COMMON([ttf2pk], [no-define]) AC_CONFIG_HEADERS([config.h]) +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.]) + AC_SEARCH_LIBS([floor], [m]) KPSE_KPATHSEA_FLAGS diff --git a/Build/source/texk/ttf2pk2/ttf2pk.c b/Build/source/texk/ttf2pk2/ttf2pk.c index f1e14f980ba..7673d15bb05 100644 --- a/Build/source/texk/ttf2pk2/ttf2pk.c +++ b/Build/source/texk/ttf2pk2/ttf2pk.c @@ -75,7 +75,7 @@ strip_equal(char *s, char *os, char *p) --help print this message and exit\n\ --version print version number and exit\n\ \n\ -Report bugs to tex-k@tug.org.\n\ +Report bugs to " PACKAGE_BUGREPORT ".\n\ " static void @@ -109,7 +109,7 @@ static void version(void) { fputs(ident, stdout); - fprintf(stdout, " (%s)\n", TeX_search_version()); + fprintf(stdout, " (%s, %s)\n", TeX_search_version(), TL_VERSION); fputs(VERSION, stdout); exit(0); } diff --git a/Build/source/texk/ttf2pk2/ttf2tfm.c b/Build/source/texk/ttf2pk2/ttf2tfm.c index cd25941f137..a250a22c583 100644 --- a/Build/source/texk/ttf2pk2/ttf2tfm.c +++ b/Build/source/texk/ttf2pk2/ttf2tfm.c @@ -293,7 +293,7 @@ static void version(void) { fputs(ident, stdout); - fprintf(stdout, " (%s)\n", TeX_search_version()); + fprintf(stdout, " (%s, %s)\n", TeX_search_version(), TL_VERSION); fputs(VERSION, stdout); exit(0); } @@ -328,6 +328,8 @@ version(void) -y REAL move rotated glyphs down by a factor of REAL [0.25]\n\ --help print this message and exit\n\ --version print version number and exit\n\ +\n\ +Report bugs to " PACKAGE_BUGREPORT ".\n\ " static void -- cgit v1.2.3