[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Mon May 29 20:52:01 EDT 2006)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Mon May 29 20:52:01 EDT 2006) |
|
Date: |
Mon, 29 May 2006 20:52:04 -0400 |
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- ChangeLog 29 May 2006 13:50:00 -0000 1.596
+++ ChangeLog 30 May 2006 00:51:27 -0000 1.597
@@ -1,3 +1,19 @@
+2006-05-29 Karl Berry <address@hidden>
+
+ * makeinfo/makeinfo.h (getdocumenttext, __): new definitions for
+ strings translated according to the document language, instead of
+ the interface language.
+ * makeinfo/makeinfo.c (getdocumenttext): new fn.
+ (usage): new option --document-language to specify.
+ * makeinfo/lang.h (document_language): new declaration.
+ * makeinfo/lang.c (document_language): define.
+ * makeinfo/defun.c, makeinfo/html.c, makeinfo/node.c,
+ makeinfo/toc.c, makeinfo/xref.c: use __ instead of _ for document
+ strings.
+ * doc/texinfo.txi (makeinfo options): minimal documentation.
+ From Norbert Preining, 10 Mar 2006 02:22:19 +0100.
+ Debian bugs 113988 and 355367.
+
2006-05-28 Karl Berry <address@hidden>
* doc/texinfo.tex (\indexdummies): \let\endinput=\empty, to
Index: doc/makeinfo.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- doc/makeinfo.1 28 Feb 2006 16:53:18 -0000 1.48
+++ doc/makeinfo.1 30 May 2006 00:51:27 -0000 1.49
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH MAKEINFO "1" "February 2006" "makeinfo 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.TH MAKEINFO "1" "May 2006" "makeinfo 4.8" "User Commands"
.SH NAME
makeinfo \- translate Texinfo documents
.SH SYNOPSIS
@@ -13,6 +13,9 @@
\fB\-\-error\-limit\fR=\fINUM\fR
quit after NUM errors (default 100).
.TP
+\fB\-\-document\-language\fR=\fISTR\fR locale to use in translating Texinfo
keywords
+for the output document (default C).
+.TP
\fB\-\-force\fR
preserve output even if errors.
.TP
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- doc/texi2dvi.1 28 Feb 2006 16:53:18 -0000 1.49
+++ doc/texi2dvi.1 30 May 2006 00:51:27 -0000 1.50
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH TEXI2DVI "1" "February 2006" "texi2dvi 1.75" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.TH TEXI2DVI "1" "May 2006" "texi2dvi 1.79" "User Commands"
.SH NAME
texi2dvi \- convert Texinfo documents to DVI
.SH SYNOPSIS
@@ -18,7 +18,7 @@
`\einput{FILE}'
the actual file to compile
.TP
-`\enonstopmode\e
+`\enonstopmode'
same as \fB\-\-batch\fR
.PP
Makeinfo is used to perform Texinfo macro expansion before running TeX
@@ -52,7 +52,7 @@
.SS "TeX tuning:"
.TP
\-@
-use @input instead of \einput; for preloaded Texinfo
+use @input instead of \einput for preloaded Texinfo
.TP
\fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
force macro expansion using makeinfo
@@ -70,7 +70,7 @@
use pdftex or pdflatex for processing
.TP
\fB\-r\fR, \fB\-\-recode\fR
-call recode before TeX to translate input characters
+call recode before TeX to translate input
.TP
\fB\-\-recode\-from\fR=\fIENC\fR
recode from ENC to the @documentencoding
@@ -86,7 +86,7 @@
.SS "Build modes:"
.TP
\fB\-\-build\fR=\fIMODE\fR
-specify the treatment of auxiliary files [tidy]
+specify the treatment of auxiliary files [local]
.TP
\fB\-\-tidy\fR
same as \fB\-\-build\fR=\fItidy\fR
@@ -95,9 +95,9 @@
same as \fB\-\-build\fR=\fIclean\fR
.TP
\fB\-\-build\-dir\fR=\fIDIR\fR
-specify where the tidy compilation is performed.
-implies \fB\-\-tidy\fR
-defaults to TEXI2DVI_BUILD_DIRECTORY [/tmp/akim.t2d]
+specify where the tidy compilation is performed;
+implies \fB\-\-tidy\fR;
+defaults to TEXI2DVI_BUILD_DIRECTORY [.]
.TP
\fB\-\-mostly\-clean\fR
remove the auxiliary files and directories
@@ -133,7 +133,7 @@
.IP
\- clutter can be reduced to zero using \fB\-\-build\-dir=\fR/tmp/$USER.t2d or
.HP
-\fB\-\-build\-dir=\fR/home/akim/.t2d.
+\fB\-\-build\-dir=\fR/u/karl/.t2d.
.IP
\- the output file is updated after every succesful TeX run, for
.TP
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- doc/texinfo.txi 5 May 2006 16:31:37 -0000 1.162
+++ doc/texinfo.txi 30 May 2006 00:51:27 -0000 1.163
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.162 2006/05/05 16:31:37 karl Exp $
address@hidden $Id: texinfo.txi,v 1.163 2006/05/30 00:51:27 karl Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -15175,6 +15175,16 @@
@opindex --docbook
Generate Docbook output rather than Info.
address@hidden address@hidden
address@hidden --document-language
address@hidden LANG
+Use @var{lang} for translations of Texinfo keywords which end up in
+the output document. The default is (xxshould be) the locale
+specified by the @code{@@documentlanguage} command if there is one
+(@pxref{documentlanguage}), else the locale used for translations of
address@hidden's diagnostic messages, i.e., the @env{LANG}
+environment variable.
+
@item --enable-encoding
@opindex --enable-encoding
Output accented and special characters in Info or plain text output
@@ -18628,7 +18638,7 @@
(@url{http://www.gnu.org/software/rcs}) version control systems, which
expand it into a string such as:
@example
-$Id: texinfo.txi,v 1.162 2006/05/05 16:31:37 karl Exp $
+$Id: texinfo.txi,v 1.163 2006/05/30 00:51:27 karl Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -18694,7 +18704,7 @@
@verbatim
\input texinfo @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.162 2006/05/05 16:31:37 karl Exp $
address@hidden $Id: texinfo.txi,v 1.163 2006/05/30 00:51:27 karl Exp $
@comment %**start of header
@setfilename sample.info
@include version.texi
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- doc/version.texi 5 May 2006 16:31:37 -0000 1.37
+++ doc/version.texi 30 May 2006 00:51:28 -0000 1.38
@@ -1,4 +1,4 @@
address@hidden UPDATED 5 May 2006
address@hidden UPDATED 29 May 2006
@set UPDATED-MONTH May 2006
@set EDITION 4.8
@set VERSION 4.8
Index: makeinfo/defun.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/defun.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- makeinfo/defun.c 15 May 2005 00:00:07 -0000 1.14
+++ makeinfo/defun.c 30 May 2006 00:51:28 -0000 1.15
@@ -1,5 +1,5 @@
/* defun.c -- @defun and friends.
- $Id: defun.c,v 1.14 2005/05/15 00:00:07 karl Exp $
+ $Id: defun.c,v 1.15 2006/05/30 00:51:28 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
@@ -400,28 +400,28 @@
{
case defun:
case deftypefun:
- category = _("Function");
+ category = __("Function");
break;
case defmac:
- category = _("Macro");
+ category = __("Macro");
break;
case defspec:
- category = _("Special Form");
+ category = __("Special Form");
break;
case defvar:
case deftypevar:
- category = _("Variable");
+ category = __("Variable");
break;
case defopt:
- category = _("User Option");
+ category = __("User Option");
break;
case defivar:
case deftypeivar:
- category = _("Instance Variable");
+ category = __("Instance Variable");
break;
case defmethod:
case deftypemethod:
- category = _("Method");
+ category = __("Method");
break;
default:
category = next_nonwhite_defun_arg (&scan_args);
@@ -497,24 +497,24 @@
execute_string (" --- %s: %s %s", category, type_name, defined_name);
break;
case defcv:
- execute_string (" --- %s %s %s: %s", category, _("of"), type_name,
+ execute_string (" --- %s %s %s: %s", category, __("of"), type_name,
defined_name);
break;
case deftypecv:
case deftypeivar:
- execute_string (" --- %s %s %s: %s %s", category, _("of"), type_name,
+ execute_string (" --- %s %s %s: %s %s", category, __("of"), type_name,
type_name2, defined_name);
break;
case defop:
- execute_string (" --- %s %s %s: %s", category, _("on"), type_name,
+ execute_string (" --- %s %s %s: %s", category, __("on"), type_name,
defined_name);
break;
case deftypeop:
- execute_string (" --- %s %s %s: %s %s", category, _("on"), type_name,
+ execute_string (" --- %s %s %s: %s %s", category, __("on"), type_name,
type_name2, defined_name);
break;
case deftypemethod:
- execute_string (" --- %s %s %s: %s %s", category, _("on"), type_name,
+ execute_string (" --- %s %s %s: %s %s", category, __("on"), type_name,
type_name2, defined_name);
break;
}
@@ -542,13 +542,13 @@
case defcv:
case deftypecv:
case deftypeivar:
- execute_string ("--- %s %s %s: ", category, _("of"), type_name);
+ execute_string ("--- %s %s %s: ", category, __("of"), type_name);
break;
case defop:
case deftypemethod:
case deftypeop:
- execute_string ("--- %s %s %s: ", category, _("on"), type_name);
+ execute_string ("--- %s %s %s: ", category, __("on"), type_name);
break;
} /* switch (base_type)... */
@@ -641,13 +641,13 @@
execute_string ("@vindex %s\n", defined_name);
break;
case deftypeivar:
- execute_string ("@vindex %s %s %s\n", defined_name, _("of"),
+ execute_string ("@vindex %s %s %s\n", defined_name, __("of"),
type_name);
break;
case defop:
case deftypeop:
case deftypemethod:
- execute_string ("@findex %s %s %s\n", defined_name, _("on"),
+ execute_string ("@findex %s %s %s\n", defined_name, __("on"),
type_name);
break;
case deftp:
Index: makeinfo/html.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- makeinfo/html.c 25 Mar 2006 00:14:37 -0000 1.32
+++ makeinfo/html.c 30 May 2006 00:51:28 -0000 1.33
@@ -1,5 +1,5 @@
/* html.c -- html-related utilities.
- $Id: html.c,v 1.32 2006/03/25 00:14:37 karl Exp $
+ $Id: html.c,v 1.33 2006/05/30 00:51:28 karl Exp $
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
Foundation, Inc.
@@ -207,7 +207,7 @@
/* The <title> should not have markup, so use text_expansion. */
if (!html_title)
html_title = escape_string (title ?
- text_expansion (title) : (char *) _("Untitled"));
+ text_expansion (title) : (char *) __("Untitled"));
/* Make sure this is the very first string of the output document. */
output_paragraph_offset = 0;
Index: makeinfo/lang.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- makeinfo/lang.c 26 Jan 2006 01:06:05 -0000 1.17
+++ makeinfo/lang.c 30 May 2006 00:51:28 -0000 1.18
@@ -1,5 +1,5 @@
/* lang.c -- language-dependent support.
- $Id: lang.c,v 1.17 2006/01/26 01:06:05 karl Exp $
+ $Id: lang.c,v 1.18 2006/05/30 00:51:28 karl Exp $
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
Software Foundation, Inc.
@@ -35,6 +35,9 @@
/* Current language code; default is English. */
language_code_type language_code = en;
+/* Language to use for translations that end up in the output. */
+char *document_language = "C";
+
/* By default, unsupported encoding is an empty string. */
char *unknown_encoding = NULL;
Index: makeinfo/lang.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makeinfo/lang.h 15 May 2005 00:00:07 -0000 1.7
+++ makeinfo/lang.h 30 May 2006 00:51:28 -0000 1.8
@@ -1,7 +1,7 @@
/* lang.h -- declarations for language codes etc.
- $Id: lang.h,v 1.7 2005/05/15 00:00:07 karl Exp $
+ $Id: lang.h,v 1.8 2006/05/30 00:51:28 karl Exp $
- Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -145,4 +145,6 @@
extern char *current_document_encoding (void);
+extern char *document_language;
+
#endif /* not LANG_H */
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- makeinfo/makeinfo.c 12 Feb 2006 01:15:25 -0000 1.84
+++ makeinfo/makeinfo.c 30 May 2006 00:51:28 -0000 1.85
@@ -1,5 +1,5 @@
/* makeinfo -- convert Texinfo source into other formats.
- $Id: makeinfo.c,v 1.84 2006/02/12 01:15:25 karl Exp $
+ $Id: makeinfo.c,v 1.85 2006/05/30 00:51:28 karl Exp $
Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -351,6 +351,8 @@
printf (_("\
General options:\n\
--error-limit=NUM quit after NUM errors (default %d).\n\
+ --document-language=STR locale to use in translating Texinfo keywords\n\
+ for the output document (default C).\n\
--force preserve output even if errors.\n\
--help display this help and exit.\n\
--no-validate suppress node cross-reference validation.\n\
@@ -479,6 +481,7 @@
{ "css-include", 1, 0, 'C' },
{ "docbook", 0, 0, 'd' },
{ "enable-encoding", 0, &enable_encoding, 1 },
+ { "document-language", 1, 0, 'l' },
{ "error-limit", 1, 0, 'e' },
{ "fill-column", 1, 0, 'f' },
{ "footnote-style", 1, 0, 's' },
@@ -686,6 +689,11 @@
append_to_include_path (optarg);
break;
+ case 'l':
+ /* save the override language code */
+ document_language = xstrdup (optarg);
+ break;
+
case 'i':
if (sscanf (optarg, "%d", &xml_indentation_increment) != 1)
{
@@ -1674,7 +1682,7 @@
/* html fixxme: should output this as trailer on first page. */
if (!no_headers && !html && !xml)
- add_word_args (_("This is %s, produced by makeinfo version %s from %s.\n"),
+ add_word_args (__("This is %s, produced by makeinfo version %s from
%s.\n"),
output_filename, VERSION, input_filename);
close_paragraph ();
@@ -4186,3 +4194,22 @@
}
return 0;
}
+
+
+/* Translate MSGID according to the document language
+ (--document-language), rather than the environment language (LANG,
+ etc.). */
+
+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);
+
+ return s;
+}
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- makeinfo/makeinfo.h 15 May 2005 00:00:08 -0000 1.19
+++ makeinfo/makeinfo.h 30 May 2006 00:51:28 -0000 1.20
@@ -1,8 +1,8 @@
/* makeinfo.h -- declarations for Makeinfo.
- $Id: makeinfo.h,v 1.19 2005/05/15 00:00:08 karl Exp $
+ $Id: makeinfo.h,v 1.20 2006/05/30 00:51:28 karl Exp $
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -319,6 +319,11 @@
struct generic_list *next;
} GENERIC_LIST;
+/* Use __ instead of _ to translate strings that end up in the output
+ document. */
+extern char *getdocumenttext (const char *msgid);
+#define __(s) getdocumenttext(s)
+
/* Reverse the order of a list. */
extern GENERIC_LIST * reverse_list (GENERIC_LIST *list);
Index: makeinfo/node.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/node.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- makeinfo/node.c 15 May 2005 00:00:08 -0000 1.30
+++ makeinfo/node.c 30 May 2006 00:51:28 -0000 1.31
@@ -1,5 +1,5 @@
/* node.c -- nodes for Texinfo.
- $Id: node.c,v 1.30 2005/05/15 00:00:08 karl Exp $
+ $Id: node.c,v 1.31 2006/05/30 00:51:28 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
Foundation, Inc.
@@ -989,7 +989,7 @@
if (next)
{
tem = expansion (next, 0);
- add_word ((char *) _("Next:"));
+ add_word ((char *) __("Next:"));
add_word (" ");
add_word ("<a rel=\"next\" accesskey=\"n\" href=\"");
@@ -1005,7 +1005,7 @@
if (prev)
{
tem = expansion (prev, 0);
- add_word ((char *) _("Previous:"));
+ add_word ((char *) __("Previous:"));
add_word (" ");
add_word ("<a rel=\"previous\" accesskey=\"p\" href=\"");
add_anchor_name (tem, 1);
@@ -1019,7 +1019,7 @@
if (up)
{
tem = expansion (up, 0);
- add_word ((char *) _("Up:"));
+ add_word ((char *) __("Up:"));
add_word (" ");
add_word ("<a rel=\"up\" accesskey=\"u\" href=\"");
add_anchor_name (tem, 1);
@@ -1361,9 +1361,9 @@
switch (type)
{
case menu_reference:
- return _("Menu");
+ return __("Menu");
case followed_reference:
- return _("Cross");
+ return __("Cross");
default:
return "Internal-bad-reference-type";
}
@@ -1422,7 +1422,7 @@
/* If this node has a Next, then make sure that the Next exists. */
if (tags->next)
{
- validate (tags->next, tags->line_no, _("Next"));
+ validate (tags->next, tags->line_no, __("Next"));
/* If the Next node exists, and there is no Up, then make sure
that the Prev of the Next points back. But do nothing if
@@ -1460,7 +1460,7 @@
field at this stage. */
if (!(tags->flags & TAG_FLAG_PREV_ERROR) && tags->prev)
{
- int valid_p = validate (tags->prev, tags->line_no, _("Prev"));
+ int valid_p = validate (tags->prev, tags->line_no, __("Prev"));
if (!valid_p)
tags->flags |= TAG_FLAG_PREV_ERROR;
@@ -1522,7 +1522,7 @@
line_error (_("`%s' has no Up field (perhaps incorrect sectioning?)"),
tags->node);
else if (tags->up)
{
- int valid_p = validate (tags->up, tags->line_no, _("Up"));
+ int valid_p = validate (tags->up, tags->line_no, __("Up"));
/* If node X has Up: Y, then warn if Y fails to have a menu item
or note pointing at X, if Y isn't of the form "(Y)". */
Index: makeinfo/toc.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/toc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makeinfo/toc.c 15 May 2005 00:00:08 -0000 1.7
+++ makeinfo/toc.c 30 May 2006 00:51:28 -0000 1.8
@@ -1,5 +1,5 @@
/* toc.c -- table of contents handling.
- $Id: toc.c,v 1.7 2005/05/15 00:00:08 karl Exp $
+ $Id: toc.c,v 1.8 2006/05/30 00:51:28 karl Exp $
Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
@@ -194,7 +194,7 @@
/* no, so return to sender ;-) */
return;
- add_html_block_elt_args ("\n<div class=\"contents\">\n<h2>%s</h2>\n<ul>\n",
_("Table of Contents"));
+ add_html_block_elt_args ("\n<div class=\"contents\">\n<h2>%s</h2>\n<ul>\n",
__("Table of Contents"));
last_level = toc_entry_alist[0]->level;
@@ -268,9 +268,9 @@
if (!toc_counter)
return;
- insert_string ((char *) _("Table of Contents"));
+ insert_string ((char *) __("Table of Contents"));
insert ('\n');
- for (i = 0; i < strlen (_("Table of Contents")); i++)
+ for (i = 0; i < strlen (__("Table of Contents")); i++)
insert ('*');
insert_string ("\n\n");
@@ -301,7 +301,7 @@
if (!toc_counter)
return;
- add_html_block_elt_args ("\n<div
class=\"shortcontents\">\n<h2>%s</h2>\n<ul>\n", _("Short Contents"));
+ add_html_block_elt_args ("\n<div
class=\"shortcontents\">\n<h2>%s</h2>\n<ul>\n", __("Short Contents"));
if (contents_filename)
toc_file = filename_part (contents_filename);
@@ -334,9 +334,9 @@
if (!toc_counter)
return;
- insert_string ((char *) _("Short Contents"));
+ insert_string ((char *) __("Short Contents"));
insert ('\n');
- for (i = 0; i < strlen (_("Short Contents")); i++)
+ for (i = 0; i < strlen (__("Short Contents")); i++)
insert ('*');
insert_string ("\n\n");
Index: makeinfo/xref.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- makeinfo/xref.c 30 Aug 2005 13:55:55 -0000 1.9
+++ makeinfo/xref.c 30 May 2006 00:51:28 -0000 1.10
@@ -1,5 +1,5 @@
/* xref.c -- cross references for Texinfo.
- $Id: xref.c,v 1.9 2005/08/30 13:55:55 karl Exp $
+ $Id: xref.c,v 1.10 2006/05/30 00:51:28 karl Exp $
Copyright (C) 2004, 2005 Free Software Foundation, Inc.
@@ -131,7 +131,7 @@
{
if (!ref_flag)
add_word (px_ref_flag || printing_index
- ? (char *) _("see ") : (char *) _("See "));
+ ? (char *) __("see ") : (char *) __("See "));
if (!*arg4 && !*arg5)
{
@@ -155,7 +155,7 @@
}
else if (*arg5)
{
- add_word_args (_("See section ``%s'' in "), *arg3 ? arg3 : arg1);
+ add_word_args (__("See section ``%s'' in "), *arg3 ? arg3 :
arg1);
xml_insert_element (CITE, START);
add_word (arg5);
xml_insert_element (CITE, END);
@@ -168,7 +168,7 @@
else if (xml)
{
if (!ref_flag)
- add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
+ add_word_args ("%s", px_ref_flag ? __("see ") : __("See "));
xml_insert_element (XREF, START);
xml_insert_element (XREFNODENAME, START);
@@ -203,7 +203,7 @@
else if (html)
{
if (!ref_flag)
- add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
+ add_word_args ("%s", px_ref_flag ? __("see ") : __("See "));
}
else
add_word_args ("%s", px_ref_flag || ref_flag ? "*note " : "*Note ");
@@ -457,7 +457,7 @@
{
char *tem;
- add_word ((char *) _("see "));
+ add_word ((char *) __("see "));
/* html fixxme: revisit this */
add_html_elt ("<a href=");
if (splitting)
Index: util/dir-example
===================================================================
RCS file: /sources/texinfo/texinfo/util/dir-example,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- util/dir-example 25 Mar 2006 19:22:16 -0000 1.63
+++ util/dir-example 30 May 2006 00:51:28 -0000 1.64
@@ -10,7 +10,7 @@
If you have dir entries for Texinfo manuals you'd like to be added here,
please send them to address@hidden
-$Id: dir-example,v 1.63 2006/03/25 19:22:16 karl Exp $
+$Id: dir-example,v 1.64 2006/05/30 00:51:28 karl Exp $
File: dir, Node: Top, This is the top of the INFO tree.
@@ -85,80 +85,7 @@
* fixnt: (a2ps) fixnt. Fixing Microsoft NT PostScript Files
* pdiff: (a2ps) pdiff. Produce Pretty Comparison of Files
* psmandup: (a2ps) psmandup. Printing Duplex on Simplex Printers
-* psset: (a2ps) psset. Inserting calls to setpagedevice
-
-Software development
-* As: (as). Assembler.
-* Autoconf: (autoconf). Create source code configuration scripts.
-* Binutils: (binutils). ar/copy/objdump/nm/size/strip/ranlib.
-* automake: (automake). Making Makefile.in's.
-* Cpp: (cpp). The GNU C preprocessor.
-* Cpplib: (cppinternals). Cpplib internals.
-* CVS: (cvs). Concurrent Versions System
-* DejaGnu: (dejagnu). Testing framework.
-* Gdb: (gdb). The GNU debugger.
-* bison: (bison). GNU parser generator (Yacc replacement).
-* egcs: (egcs). Experimental GNU C compiler.
-* Flex: (flex). A fast scanner generator.
-* g77: (g77). GNU Fortran 77 compiler.
-* Gasp: (gasp). GNU Assembler preprocessor.
-* gcc: (gcc). The GNU Compiler Collection.
-* gccinstall: (gccinstall). Installing the GNU Compiler Collection.
-* gccint: (gccint). Internals of the GNU Compiler Collection.
-* Gnats: (gnats). Cygnus bug tracking system.
-* Gnulib: (gnulib). Source files to share among distributions.
-* Gperf: (gperf). Perfect hash function generator.
-* Gprof: (gprof). Profiler.
-* Guile Reference: (guile). The Guile reference manual.
-* Guile Tutorial: (guile-tut). The Guile Tutorial.
-* ID database: (id-utils). Identifier database utilities.
-* Indent: (indent). Prettyprinter for programs.
-* Ld: (ld). Linker.
-* Libtool: (libtool). Generic library support script.
-* Make: (make). Remake files automatically.
-* Remsync: (remsync). Remote synchronization of directory trees.
-* Send PR: (send-pr). Cygnus bug reporting for Gnats.
-* Source config: (cfg-paper). Some theory on configuring source packages.
-* help2man: (help2man). Automatic manual page generation from -help.
-
-Emacs
-* Ada mode: (ada-mode). The GNU Emacs mode for editing Ada.
-* Autotype: (autotype). Convenient features for text that you enter frequently
- in Emacs.
-* CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C,
- Java, Pike, and IDL code.
-* CL: (cl). Partial Common Lisp support for Emacs Lisp.
-* Dired-X: (dired-x). Dired Extra Features.
-* EUDC: (eudc). A client for directory servers (LDAP, PH)
-* Ebrowse: (ebrowse). A C++ class browser for Emacs.
-* Ediff: (ediff). A visual interface for comparing and merging programs.
-* Emacs: (emacs). The extensible self-documenting text editor.
-* Elisp: (elisp). The Emacs Lisp Reference Manual.
-* Emacs FAQ: (efaq). Frequently Asked Questions about Emacs.
-* Emacs MIME: (emacs-mime). The MIME de/composition library.
-* Eshell: (eshell). A command shell implemented in Emacs Lisp.
-* Forms: (forms). Emacs package for editing data bases
- by filling in forms.
-* Gnus: (gnus). The newsreader Gnus.
-* IDLWAVE: (idlwave). Major mode and shell for IDL and WAVE/CL files.
-* Intro Elisp: (emacs-lisp-intro). Introduction to Elisp programming.
-
-* AUC TeX: (auctex). Editing (La)TeX files.
-* MH-E: (mh-e). Emacs interface to the MH mail system.
-* Message: (message). Mail and news composition mode that goes with Gnus.
-* PCL-CVS: (pcl-cvs). Emacs front-end to CVS.
-* RefTeX: (reftex). Emacs support for LaTeX cross-references and citations.
-* SC: (sc). Supercite lets you cite parts of messages you're
- replying to, in flexible ways.
-* Speedbar: (speedbar). File/Tag summarizing utility.
-* TRAMP: (tramp). Transparent Remote Access, Multiple Protocol
- Emacs remote file access via rsh and rcp.
-* VIP: (vip). An older VI-emulation for Emacs.
-* VIPER: (viper). The newest Emacs VI-emulation mode.
- (also, A VI Plan for Emacs Rescue or the VI PERil.)
-* VM: (vm). View Mail for Emacs.
-* Widget: (widget). Documenting the "widget" package used by the
- Emacs Custom facility.
+* psset: (a2ps) psset. Inserting calls to
* WoMan: (woman). Browse UN*X Manual Pages `Wo (without) Man'.
Typesetting
@@ -301,64 +228,7 @@
* cvsclient: (cvsclient). The CVS client/server protocol.
* date: (coreutils)date invocation. Print/set system date and time.
* dd: (coreutils)dd invocation. Copy and convert a file.
-* df: (coreutils)df invocation. Report file system disk usage.
-* diff3: (diff)Invoking diff3. Compare 3 files line by line.
-* diff: (diff)Invoking diff. Compare 2 files line by line.
-* dir: (coreutils)dir invocation. List directories briefly.
-* dircolors: (coreutils)dircolors invocation. Color setup for ls.
-* dirname: (coreutils)dirname invocation. Strip non-directory suffix.
-* dmp: (web2c)Dmp invocation. Troff->MPX (MetaPost pictures).
-* du: (coreutils)du invocation. Report on disk usage.
-* dvicopy: (web2c)DVIcopy invocation. Virtual font expansion
-* dvipng: (dvipng)Invoking dvipng. A DVI-to-PNG translator.
-* dvitomp: (web2c)DVItoMP invocation. DVI to MPX (MetaPost pictures).
-* dvitype: (web2c)DVItype invocation. DVI to human-readable text.
-* echo: (coreutils)echo invocation. Print a line of text.
-* edit-pr: (gnats)Invoking edit-pr. Changing bugs.
-* egrep: (grep)Invoking. grep -E.
-* env: (coreutils)env invocation. Modify the environment.
-* expand: (coreutils)expand invocation. Convert tabs to spaces.
-* expr: (coreutils)expr invocation. Evaluate expressions.
-* factor: (coreutils)factor invocation. Print prime factors
-* false: (coreutils)false invocation. Do nothing, unsuccessfully.
-* fgrep: (fgrep)Invoking. grep -F.
-* fid: (id-utils)fid invocation. Listing a file's tokens.
-* file-pr: (gnats)file-pr. Processing incoming traffic.
-* find: (find)Invoking find. Finding and acting on files.
-* fmt: (coreutils)fmt invocation. Reformat paragraph text.
-* fnid: (id-utils)fnid invocation. Looking up file names.
-* fold: (coreutils)fold invocation. Wrap long input lines.
-* frm: (mailutils)frm. List headers from a mailbox.
-* gcal2txt: (gcal)Invoking gcal2txt. Calendar resource to text file.
-* gftodvi: (web2c)GFtoDVI invocation. Generic font proofsheets.
-* gftopk: (web2c)GFtoPK invocation. Generic to packed fonts.
-* gftype: (web2c)GFtype invocation. GF to human-readable text.
-* git: (git). GNU interactive tools.
-* groups: (coreutils)groups invocation. Print group names a user is in.
-* guimb: (mailutils)guimb. Mailbox processing language.
-* gunzip: (gzip)Overview. Decompression.
-* gzexe: (gzip)Overview. Compress executables.
-* head: (coreutils)head invocation. Output the first part of files.
-* hostid: (coreutils)hostid invocation. Print numeric host identifier.
-* hostname: (coreutils)hostname invocation. Print or set system name.
-* id: (coreutils)id invocation. Print user identity.
-* ifnames: (autoconf)ifnames Invocation. Listing conditionals in source.
-* imap4d: (mailutils)imap4d. IMAP4 daemon.
-* inimf: (web2c)inimf invocation. Initial Metafont.
-* inimp: (web2c)inimp invocation. Initial MetaPost.
-* initex: (web2c)initex invocation. Initial TeX.
-* install: (coreutils)install invocation. Copy and change attributes.
-* join: (coreutils)join invocation. Join lines on a common field.
-* kill: (coreutils)kill invocation. Send a signal to processes.
-* kpsewhich: (kpathsea)Invoking kpsewhich. TeX file searching.
-* libtoolize: (libtool)Invoking libtoolize. Adding libtool support.
-* lid: (id-utils)lid invocation. Matching words and patterns.
-* link: (coreutils)link invocation. Make hard links between files.
-* ln: (coreutils)ln invocation. Make links between files.
-* locate: (find)Invoking locate. Finding files in a database.
-* logname: (coreutils)logname invocation. Print current login name.
-* ls: (coreutils)ls invocation. List directory contents.
-* mail-files: (sharutils)mail-files invocation. Send files to remote site.
+* df: (coreutils)df invocation. Report file system disk usag
* mail.local: (mailutils)mail.local. Deliver mail to local mailbox.
* mail: (mailutils)mail. Send and receive mail.
* mailshar: (sharutils)mailshar invocation. Make and send a shell archive.
P ChangeLog
P doc/makeinfo.1
P doc/texi2dvi.1
P doc/texinfo.txi
P doc/version.texi
P makeinfo/defun.c
P makeinfo/html.c
P makeinfo/lang.c
P makeinfo/lang.h
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h
P makeinfo/node.c
P makeinfo/toc.c
P makeinfo/xref.c
P util/dir-example
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Mon May 29 20:52:01 EDT 2006),
Karl Berry <=