diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/groff.texinfo | 22 | ||||
| -rw-r--r-- | man/roff.man | 9 | ||||
| -rw-r--r-- | src/devices/grodvi/dvi.cc | 1 | ||||
| -rw-r--r-- | src/devices/grolj4/lj4.cc | 1 | ||||
| -rw-r--r-- | src/devices/grops/ps.cc | 1 | ||||
| -rw-r--r-- | src/include/config.hin | 9 | ||||
| -rw-r--r-- | src/include/lib.h | 6 | ||||
| -rw-r--r-- | src/preproc/grn/main.cc | 1 | ||||
| -rw-r--r-- | src/preproc/pic/main.cc | 1 |
13 files changed, 62 insertions, 17 deletions
@@ -1,3 +1,23 @@ +2003-04-03 Sergey A. Osokin <osa@freebsd.org.ru> + + * man/roff.man: Small fixes. + +2003-04-03 Werner LEMBERG <wl@gnu.org> + + Make groff independent from locale's numeric settings. + + * configure.ac: Check for `setlocale'. + * configure, src/include/config.hin: Regenerated. + + * src/include/lib.h: Handle HAVE_SETLOCALE. + + * src/devices/grodvi/dvi.cc (main), src/devices/grolj4/lj4.cc + (main), src/devices/grops/ps.cc (main), src/preproc/grn/main.cc + (main), src/preproc/pic/main.cc (main): Call `setlocale'. + + * doc/groff.texinfo (Man font macros): Mention that there is no + space between arguments of .BI and friends. + 2003-04-02 Werner LEMBERG <wl@gnu.org> * src/devices/grohtml/html-table.cc (html_table::emit_col, diff --git a/Makefile.in b/Makefile.in index a906b98d..feefe7f7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # # This file is part of groff. @@ -236,6 +236,7 @@ make_install_html=@make_install_html@ # -DHAVE_MMAP if you have mmap() # -DHAVE_PUTENV if you have putenv() # -DHAVE_RENAME if you have rename() +# -DHAVE_SETLOCALE if you have setlocale() # -DHAVE_SNPRINTF if you have snprintf() # -DHAVE_STRCASECMP if you have strcasecmp() # -DHAVE_STRNCASECMP if you have strncasecmp() @@ -5358,7 +5358,8 @@ LIBS="$saved_libs" -for ac_func in gettimeofday isatty rename strsep + +for ac_func in gettimeofday isatty rename setlocale strsep do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/configure.ac b/configure.ac index 27409f68..74dfa49b 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ LIBS="$LIBS -lc $LIBM" AC_REPLACE_FUNCS(fmod getcwd putenv snprintf strcasecmp \ strerror strncasecmp strtol) LIBS="$saved_libs" -AC_CHECK_FUNCS(gettimeofday isatty rename strsep) +AC_CHECK_FUNCS(gettimeofday isatty rename setlocale strsep) GROFF_MKSTEMP AC_DECL_SYS_SIGLIST dnl checks for compiler characteristics diff --git a/doc/groff.texinfo b/doc/groff.texinfo index 99f7f59b..3b8a5846 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -2250,35 +2250,41 @@ font, one point size smaller than the default font. @endDefmac @Defmac {BI, text, man} -Set its arguments alternately in bold face and italic. Thus, +Set its arguments alternately in bold face and italic, without a space +between the arguments. Thus, @Example .BI this "word and" that @endExample @noindent -would set ``this'' and ``that'' in bold face, and ``word and'' in -italics. +produces ``thisword andthat'' with ``this'' and ``that'' in bold face, +and ``word and'' in italics. @endDefmac @Defmac {IB, text, man} -Set its arguments alternately in italic and bold face. +Set its arguments alternately in italic and bold face, without a space +between the arguments. @endDefmac @Defmac {RI, text, man} -Set its arguments alternately in roman and italic. +Set its arguments alternately in roman and italic, without a space between +the arguments. @endDefmac @Defmac {IR, text, man} -Set its arguments alternately in italic and roman. +Set its arguments alternately in italic and roman, without a space between +the arguments. @endDefmac @Defmac {BR, text, man} -Set its arguments alternately in bold face and roman. +Set its arguments alternately in bold face and roman, without a space +between the arguments. @endDefmac @Defmac {RB, text, man} -Set its arguments alternately in roman and bold face. +Set its arguments alternately in roman and bold face, without a space +between the arguments. @endDefmac @Defmac {B, [@Var{text}], man} diff --git a/man/roff.man b/man/roff.man index 5a9c5b54..621b362a 100644 --- a/man/roff.man +++ b/man/roff.man @@ -1,11 +1,11 @@ .ig roff.man -Last update: 22 Apr 2002 +Last update: 3 Apr 2003 This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. written by Bernd Warken <bwarken@mayn.de> maintained by Werner Lemberg <wl@gnu.org> @@ -269,7 +269,7 @@ operating system .RI ( "Compatible Time Sharing System" ) as early as 1961. . -When CTTS was further developed into the operating system +When CTSS was further developed into the operating system .URL http://\:www.multicians.org "Multics" , the famous predecessor of Unix from 1963, .I runoff @@ -1105,9 +1105,6 @@ troff.org .URL http://\:www.troff.org "The historical troff site" provides an overview and pointers to all historical aspects of roff. . -This web site is under construction; once, it will be the major source -for roff history. -. .TP Multics .URL http://\:www.multicians.org "The Multics site" diff --git a/src/devices/grodvi/dvi.cc b/src/devices/grodvi/dvi.cc index 408c3e0d..df169390 100644 --- a/src/devices/grodvi/dvi.cc +++ b/src/devices/grodvi/dvi.cc @@ -905,6 +905,7 @@ static void usage(FILE *stream); int main(int argc, char **argv) { + setlocale(LC_NUMERIC, "C"); program_name = argv[0]; static char stderr_buf[BUFSIZ]; setbuf(stderr, stderr_buf); diff --git a/src/devices/grolj4/lj4.cc b/src/devices/grolj4/lj4.cc index 3d36e227..1332e198 100644 --- a/src/devices/grolj4/lj4.cc +++ b/src/devices/grolj4/lj4.cc @@ -601,6 +601,7 @@ extern "C" int optopt, optind; int main(int argc, char **argv) { + setlocale(LC_NUMERIC, "C"); program_name = argv[0]; static char stderr_buf[BUFSIZ]; setbuf(stderr, stderr_buf); diff --git a/src/devices/grops/ps.cc b/src/devices/grops/ps.cc index 4491d7de..f1c094b4 100644 --- a/src/devices/grops/ps.cc +++ b/src/devices/grops/ps.cc @@ -1779,6 +1779,7 @@ static void usage(FILE *stream); int main(int argc, char **argv) { + setlocale(LC_NUMERIC, "C"); program_name = argv[0]; string env; static char stderr_buf[BUFSIZ]; diff --git a/src/include/config.hin b/src/include/config.hin index cfa94e84..ff487d26 100644 --- a/src/include/config.hin +++ b/src/include/config.hin @@ -51,6 +51,9 @@ /* Define to 1 if you have the `rename' function. */ #undef HAVE_RENAME +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF @@ -126,6 +129,12 @@ /* Define if your C++ doesn't declare putenv(). */ #undef NEED_DECLARATION_PUTENV +/* Define if your C++ doesn't declare rand(). */ +#undef NEED_DECLARATION_RAND + +/* Define if your C++ doesn't declare srand(). */ +#undef NEED_DECLARATION_SRAND + /* Define if your C++ doesn't declare strcasecmp(). */ #undef NEED_DECLARATION_STRCASECMP diff --git a/src/include/lib.h b/src/include/lib.h index 73910b63..de4c9cd9 100644 --- a/src/include/lib.h +++ b/src/include/lib.h @@ -44,6 +44,12 @@ extern "C" { #include <getopt.h> #endif +#ifdef HAVE_SETLOCALE +#include <locale.h> +#else +#define setlocale(category, locale) do {} while(0) +#endif + char *strsave(const char *s); int is_prime(unsigned); diff --git a/src/preproc/grn/main.cc b/src/preproc/grn/main.cc index 9b09ea63..63a5c9b3 100644 --- a/src/preproc/grn/main.cc +++ b/src/preproc/grn/main.cc @@ -243,6 +243,7 @@ int main(int argc, char **argv) { + setlocale(LC_NUMERIC, "C"); program_name = argv[0]; register FILE *fp; register int k; diff --git a/src/preproc/pic/main.cc b/src/preproc/pic/main.cc index 1f2e35e1..eb6db525 100644 --- a/src/preproc/pic/main.cc +++ b/src/preproc/pic/main.cc @@ -506,6 +506,7 @@ static char *fix_program_name(char *arg, char *dflt) int main(int argc, char **argv) { + setlocale(LC_NUMERIC, "C"); #if defined(__MSDOS__) || defined(__EMX__) argv[0] = fix_program_name(argv[0], "pic"); #endif /* __MSDOS__ || __EMX__ */ |