[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Mon Jun 19 19:22:01 EDT 2006)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Mon Jun 19 19:22:01 EDT 2006) |
|
Date: |
Mon, 19 Jun 2006 19:22:03 -0400 |
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.609
retrieving revision 1.612
diff -u -r1.609 -r1.612
--- ChangeLog 19 Jun 2006 09:35:01 -0000 1.609
+++ ChangeLog 19 Jun 2006 23:12:33 -0000 1.612
@@ -1,3 +1,16 @@
+2006-06-19 Karl Berry <address@hidden>
+
+ * system.h: move to top level.
+ * */Makefile.am (AM_CPPFLAGS): no longer need -I$(top_srcdir)/lib.
+
+ * makeinfo/makeinfo.c (getdocumenttext): replace with a modified
+ version of get_title from gettext, as suggested by Bruno Haible,
+ back on 2 Dec 2003.
+ * gnulib: import xsetenv module.
+
+ * doc/texinfo.tex (\indexdotfill): back to regular (non-italic)
+ periods, suggested by Werner Lemberg and others.
+
2006-06-19 Akim Demaille <address@hidden>
Support dvips and dvipdf for sake of pstricks, and to
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- NEWS 18 Jun 2006 23:39:43 -0000 1.127
+++ NEWS 19 Jun 2006 23:08:57 -0000 1.128
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.127 2006/06/18 23:39:43 karl Exp $
+$Id: NEWS,v 1.128 2006/06/19 23:08:57 karl Exp $
This NEWS file records noteworthy changes, very tersely.
See the manual for detailed information.
@@ -45,6 +45,7 @@
while preserving auxiliary files.
. new support for AUC-TeX: texi2dvi (weakly) supports arguments a la
TeX such as `\nonstopmode\input{file.tex}'.
+ . new options --ps and --dvipdf, useful especially for pstricks documents.
. new option --src-specials, passed to TeX.
. pdftexi2dvi is a new wrapper to `texi2dvi --pdf', equal to texi2pdf,
for sake of AUC-TeX which prepends `pdf' to the compilation command
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- doc/texi2dvi.1 18 Jun 2006 23:39:43 -0000 1.53
+++ doc/texi2dvi.1 19 Jun 2006 23:12:34 -0000 1.54
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH TEXI2DVI "1" "June 2006" "texi2dvi 1.83" "User Commands"
+.TH TEXI2DVI "1" "June 2006" "texi2dvi 1.84" "User Commands"
.SH NAME
texi2dvi \- convert Texinfo documents to DVI
.SH SYNOPSIS
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- doc/texinfo.tex 2 Jun 2006 00:11:26 -0000 1.215
+++ doc/texinfo.tex 19 Jun 2006 22:55:33 -0000 1.216
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2006-06-01.17}
+\def\texinfoversion{2006-06-19.13}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
@@ -4005,9 +4005,9 @@
\endgroup
}
-% Like \dotfill except takes at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 1 em.
\def\indexdotfill{\cleaders
- \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus
1fill}
+ \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
\def\primary #1{\line{#1\hfil}}
Index: gnulib/lib/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/Makefile.am 18 Jun 2006 23:39:43 -0000 1.1
+++ gnulib/lib/Makefile.am 19 Jun 2006 23:08:57 -0000 1.2
@@ -8,7 +8,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu
--source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux
--macro-prefix=gl getopt gettext memcpy memmove mkstemp strcase strdup strerror
xalloc
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu
--source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux
--macro-prefix=gl getopt gettext memcpy memmove mkstemp strcase strdup strerror
unsetenv xalloc xsetenv
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
@@ -27,6 +27,27 @@
AM_CPPFLAGS =
+## begin gnulib module alloca-opt
+
+BUILT_SOURCES += $(ALLOCA_H)
+EXTRA_DIST += alloca_.h
+
+# We need the following in order to create <alloca.h> when the system
+# doesn't have one that works with the given compiler.
+alloca.h: alloca_.h
+ cp $(srcdir)/alloca_.h address@hidden
+ mv address@hidden $@
+MOSTLYCLEANFILES += alloca.h alloca.h-t
+
+## end gnulib module alloca-opt
+
+## begin gnulib module allocsa
+
+libgnu_a_SOURCES += allocsa.h allocsa.c
+EXTRA_DIST += allocsa.valgrind
+
+## end gnulib module allocsa
+
## begin gnulib module exit
libgnu_a_SOURCES += exit.h
@@ -79,6 +100,12 @@
## end gnulib module mbuiter
+## begin gnulib module setenv
+
+libgnu_a_SOURCES += setenv.h
+
+## end gnulib module setenv
+
## begin gnulib module stdbool
BUILT_SOURCES += $(STDBOOL_H)
@@ -123,5 +150,11 @@
## end gnulib module xalloc-die
+## begin gnulib module xsetenv
+
+libgnu_a_SOURCES += xsetenv.h xsetenv.c
+
+## end gnulib module xsetenv
+
# Makefile.am ends here
Index: gnulib/m4/gnulib-cache.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-cache.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/gnulib-cache.m4 18 Jun 2006 23:39:43 -0000 1.1
+++ gnulib/m4/gnulib-cache.m4 19 Jun 2006 23:08:57 -0000 1.2
@@ -15,10 +15,10 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib
--m4-base=gnulib/m4 --aux-dir=build-aux --macro-prefix=gl getopt gettext memcpy
memmove mkstemp strcase strdup strerror xalloc
+# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib
--m4-base=gnulib/m4 --aux-dir=build-aux --macro-prefix=gl getopt gettext memcpy
memmove mkstemp strcase strdup strerror xalloc xsetenv
# Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_MODULES([getopt gettext memcpy memmove mkstemp strcase strdup strerror
xalloc])
+gl_MODULES([getopt gettext memcpy memmove mkstemp strcase strdup strerror
xalloc xsetenv])
gl_AVOID([])
gl_SOURCE_BASE([gnulib/lib])
gl_M4_BASE([gnulib/m4])
Index: gnulib/m4/gnulib-comp.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-comp.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/gnulib-comp.m4 18 Jun 2006 23:39:43 -0000 1.1
+++ gnulib/m4/gnulib-comp.m4 19 Jun 2006 23:08:57 -0000 1.2
@@ -28,6 +28,8 @@
AC_DEFUN([gl_INIT],
[
AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
+ gl_FUNC_ALLOCA
+ gl_ALLOCSA
gl_ERROR
gl_EXITFAIL
gl_GETOPT
@@ -39,6 +41,7 @@
gl_FUNC_MEMCPY
gl_FUNC_MEMMOVE
gl_FUNC_MKSTEMP
+ gt_FUNC_SETENV
gl_STAT_MACROS
AM_STDBOOL_H
gl_STRCASE
@@ -52,6 +55,10 @@
# gnulib-tool and may be removed by future gnulib-tool invocations.
AC_DEFUN([gl_FILE_LIST], [
build-aux/config.rpath
+ lib/alloca_.h
+ lib/allocsa.c
+ lib/allocsa.h
+ lib/allocsa.valgrind
lib/error.c
lib/error.h
lib/exit.h
@@ -69,6 +76,8 @@
lib/memcpy.c
lib/memmove.c
lib/mkstemp.c
+ lib/setenv.c
+ lib/setenv.h
lib/stat-macros.h
lib/stdbool_.h
lib/strcase.h
@@ -80,10 +89,16 @@
lib/strnlen1.c
lib/strnlen1.h
lib/tempname.c
+ lib/unsetenv.c
lib/xalloc-die.c
lib/xalloc.h
lib/xmalloc.c
+ lib/xsetenv.c
+ lib/xsetenv.h
+ m4/alloca.m4
+ m4/allocsa.m4
m4/codeset.m4
+ m4/eealloc.m4
m4/error.m4
m4/exitfail.m4
m4/getopt.m4
@@ -115,6 +130,7 @@
m4/po.m4
m4/printf-posix.m4
m4/progtest.m4
+ m4/setenv.m4
m4/signed.m4
m4/size_max.m4
m4/stat-macros.m4
Index: info/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- info/Makefile.am 18 Jun 2006 23:39:43 -0000 1.11
+++ info/Makefile.am 19 Jun 2006 23:12:34 -0000 1.12
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.11 2006/06/18 23:39:43 karl Exp $
+# $Id: Makefile.am,v 1.12 2006/06/19 23:12:34 karl Exp $
# Makefile.am for texinfo/info.
# Run automake in .. to produce Makefile.in from this.
#
@@ -19,8 +19,7 @@
localedir = $(datadir)/locale
infodir2 = $(datadir)/info
-AM_CPPFLAGS = -I$(top_srcdir)/lib \
- -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
+AM_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
DEFS = -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
-DINFODIR2=\"$(infodir2)\"
LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a \
cvs diff: Tag HEAD refers to a dead (removed) revision in file `lib/system.h'.
cvs diff: No comparison available. Pass `-N' to `cvs diff'?
Index: makeinfo/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makeinfo/Makefile.am 18 Jun 2006 23:39:43 -0000 1.7
+++ makeinfo/Makefile.am 19 Jun 2006 23:12:34 -0000 1.8
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.7 2006/06/18 23:39:43 karl Exp $
+# $Id: Makefile.am,v 1.8 2006/06/19 23:12:34 karl Exp $
# Makefile.am for texinfo/makeinfo.
# Run automake in .. to produce Makefile.in from this.
#
@@ -13,8 +13,7 @@
bin_PROGRAMS = makeinfo
localedir = $(datadir)/locale
-AM_CPPFLAGS = -I$(top_srcdir)/lib \
- -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
+AM_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
DEFS = -DLOCALEDIR=\"$(localedir)\"
LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- makeinfo/makeinfo.c 1 Jun 2006 23:48:33 -0000 1.86
+++ makeinfo/makeinfo.c 19 Jun 2006 23:08:57 -0000 1.87
@@ -1,5 +1,5 @@
/* makeinfo -- convert Texinfo source into other formats.
- $Id: makeinfo.c,v 1.86 2006/06/01 23:48:33 karl Exp $
+ $Id: makeinfo.c,v 1.87 2006/06/19 23:08:57 karl Exp $
Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -4210,18 +4210,59 @@
/* Translate MSGID according to the document language
(--document-language), rather than the environment language (LANG,
- etc.). */
+ etc.). This comes from the get_title function in gettext. (xsetenv
+ and unsetenv come from the gnulib xsetenv module.) */
char *
getdocumenttext (const char *msgid)
{
- char *s;
- char *old_locale = setlocale (LC_ALL, NULL);
- char *save_locale = xstrdup (old_locale);
-
- setlocale (LC_ALL, document_language);
- s = gettext (msgid);
- setlocale (LC_ALL, save_locale);
+ /* The original get_title also saves, sets, and restores
+ OUTPUT_CHARSET, so that the translation will be given in
+ the proper encoding (via canonical_locale_charset). But defining
+ that function ends up pulling a whole lot of subsidiary functions.
+ Not sure how to handle it; skip the whole thing for now. */
+ const char *tmp;
+ char *old_LC_ALL;
+ char *old_LANGUAGE;
+ const char *result;
+
+ /* Save LC_ALL, LANGUAGE environment variables. */
- return s;
+ tmp = getenv ("LC_ALL");
+ old_LC_ALL = (tmp != NULL ? xstrdup (tmp) : NULL);
+
+ tmp = getenv ("LANGUAGE");
+ old_LANGUAGE = (tmp != NULL ? xstrdup (tmp) : NULL);
+
+ xsetenv ("LC_ALL", document_language, 1);
+ unsetenv ("LANGUAGE");
+
+#ifdef HAVE_SETLOCALE
+ if (setlocale (LC_ALL, "") == NULL)
+ /* Nonexistent locale. Use the original. */
+ result = msgid;
+ else
+#endif
+ {
+ /* Fetch the translation. */
+ result = gettext (msgid);
+ }
+
+ /* Restore LC_ALL, LANGUAGE environment variables. */
+
+ if (old_LC_ALL != NULL)
+ xsetenv ("LC_ALL", old_LC_ALL, 1), free (old_LC_ALL);
+ else
+ unsetenv ("LC_ALL");
+
+ if (old_LANGUAGE != NULL)
+ xsetenv ("LANGUAGE", old_LANGUAGE, 1), free (old_LANGUAGE);
+ else
+ unsetenv ("LANGUAGE");
+
+#ifdef HAVE_SETLOCALE
+ setlocale (LC_ALL, "");
+#endif
+
+ return result;
}
Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- util/Makefile.am 19 Jun 2006 09:35:01 -0000 1.23
+++ util/Makefile.am 19 Jun 2006 23:12:34 -0000 1.24
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.23 2006/06/19 09:35:01 akim Exp $
+# $Id: Makefile.am,v 1.24 2006/06/19 23:12:34 karl Exp $
# Makefile.am for texinfo/util.
# Run automake in .. to produce Makefile.in from this.
#
@@ -27,8 +27,7 @@
transform = s/ginstall-info/install-info/; $(program_transform_name)
localedir = $(datadir)/locale
-AM_CPPFLAGS = -I$(top_srcdir)/lib \
- -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
+AM_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
DEFS = -DLOCALEDIR=\"$(localedir)\"
LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
P ChangeLog
P NEWS
U system.h
P doc/texi2dvi.1
P doc/texinfo.tex
P gnulib/lib/Makefile.am
U gnulib/lib/alloca.h
U gnulib/lib/alloca_.h
U gnulib/lib/allocsa.c
U gnulib/lib/allocsa.h
U gnulib/lib/allocsa.valgrind
U gnulib/lib/setenv.c
U gnulib/lib/setenv.h
U gnulib/lib/unsetenv.c
U gnulib/lib/xsetenv.c
U gnulib/lib/xsetenv.h
U gnulib/m4/alloca.m4
U gnulib/m4/allocsa.m4
U gnulib/m4/eealloc.m4
P gnulib/m4/gnulib-cache.m4
P gnulib/m4/gnulib-comp.m4
U gnulib/m4/setenv.m4
P info/Makefile.am
cvs update: `lib/system.h' is no longer in the repository
P makeinfo/Makefile.am
P makeinfo/makeinfo.c
P util/Makefile.am
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Mon Jun 19 19:22:01 EDT 2006),
Karl Berry <=