[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Sat Sep 15 19:53:01 EDT 2007)
From: |
Karl Berry |
Subject: |
texinfo update (Sat Sep 15 19:53:01 EDT 2007) |
Date: |
Sat, 15 Sep 2007 19:53:03 -0400 |
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.753
retrieving revision 1.754
diff -u -r1.753 -r1.754
--- ChangeLog 10 Sep 2007 00:36:29 -0000 1.753
+++ ChangeLog 15 Sep 2007 23:48:45 -0000 1.754
@@ -1,3 +1,14 @@
+2007-09-15 Karl Berry <address@hidden>
+
+ * makeinfo/makeinfo.h,
+ * makeinfo/makeinfo.c,
+ * makeinfo/defun.c,
+ * makeinfo/html.c,
+ * makeinfo/node.c,
+ * makeinfo/toc.c,
+ * makeinfo/xref.c (__): rename to gdt, since HP-UX uses it in
+ <stdsyms.h>. (Report from Bert Deknuydt, 12 Sep 2007 12:17:34).
+
2007-09-09 Karl Berry <address@hidden>
* Version 4.11.
Index: makeinfo/defun.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/defun.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- makeinfo/defun.c 1 Jul 2007 21:20:32 -0000 1.17
+++ makeinfo/defun.c 15 Sep 2007 23:48:45 -0000 1.18
@@ -1,5 +1,5 @@
/* defun.c -- @defun and friends.
- $Id: defun.c,v 1.17 2007/07/01 21:20:32 karl Exp $
+ $Id: defun.c,v 1.18 2007/09/15 23:48:45 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
Free Software Foundation, Inc.
@@ -399,28 +399,28 @@
{
case defun:
case deftypefun:
- category = __("Function");
+ category = gdt("Function");
break;
case defmac:
- category = __("Macro");
+ category = gdt("Macro");
break;
case defspec:
- category = __("Special Form");
+ category = gdt("Special Form");
break;
case defvar:
case deftypevar:
- category = __("Variable");
+ category = gdt("Variable");
break;
case defopt:
- category = __("User Option");
+ category = gdt("User Option");
break;
case defivar:
case deftypeivar:
- category = __("Instance Variable");
+ category = gdt("Instance Variable");
break;
case defmethod:
case deftypemethod:
- category = __("Method");
+ category = gdt("Method");
break;
default:
category = next_nonwhite_defun_arg (&scan_args);
@@ -496,24 +496,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, gdt("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, gdt("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, gdt("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, gdt("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, gdt("on"), type_name,
type_name2, defined_name);
break;
}
@@ -541,13 +541,13 @@
case defcv:
case deftypecv:
case deftypeivar:
- execute_string ("--- %s %s %s: ", category, __("of"), type_name);
+ execute_string ("--- %s %s %s: ", category, gdt("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, gdt("on"), type_name);
break;
} /* switch (base_type)... */
@@ -640,13 +640,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, gdt("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, gdt("on"),
type_name);
break;
case deftp:
Index: makeinfo/html.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- makeinfo/html.c 1 Jul 2007 21:20:32 -0000 1.39
+++ makeinfo/html.c 15 Sep 2007 23:48:45 -0000 1.40
@@ -1,5 +1,5 @@
/* html.c -- html-related utilities.
- $Id: html.c,v 1.39 2007/07/01 21:20:32 karl Exp $
+ $Id: html.c,v 1.40 2007/09/15 23:48:45 karl Exp $
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
@@ -200,7 +200,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 *) gdt("Untitled"));
/* Make sure this is the very first string of the output document. */
output_paragraph_offset = 0;
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- makeinfo/makeinfo.c 3 Sep 2007 12:06:29 -0000 1.105
+++ makeinfo/makeinfo.c 15 Sep 2007 23:48:45 -0000 1.106
@@ -1,5 +1,5 @@
/* makeinfo -- convert Texinfo source into other formats.
- $Id: makeinfo.c,v 1.105 2007/09/03 12:06:29 karl Exp $
+ $Id: makeinfo.c,v 1.106 2007/09/15 23:48:45 karl Exp $
Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -2608,7 +2608,7 @@
static void
info_output_head (void)
{
- add_word_args (__("This is %s, produced by makeinfo version %s from %s.\n"),
+ add_word_args (gdt("This is %s, produced by makeinfo version %s from %s.\n"),
output_filename, VERSION, input_filename);
/* Start afresh with whatever real text we have. */
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- makeinfo/makeinfo.h 11 Jul 2007 00:16:24 -0000 1.29
+++ makeinfo/makeinfo.h 15 Sep 2007 23:48:45 -0000 1.30
@@ -1,5 +1,5 @@
/* makeinfo.h -- declarations for Makeinfo.
- $Id: makeinfo.h,v 1.29 2007/07/11 00:16:24 karl Exp $
+ $Id: makeinfo.h,v 1.30 2007/09/15 23:48:45 karl Exp $
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007 Free Software Foundation, Inc.
@@ -318,10 +318,10 @@
struct generic_list *next;
} GENERIC_LIST;
-/* Use __ instead of _ to translate strings that end up in the output
- document. */
+/* Use `gdt' instead of `_' to translate strings that end up in the
+ output document. */
extern char *getdocumenttext (const char *msgid);
-#define __(s) getdocumenttext(s)
+#define gdt(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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- makeinfo/node.c 8 Jul 2007 13:11:48 -0000 1.37
+++ makeinfo/node.c 15 Sep 2007 23:48:46 -0000 1.38
@@ -1,5 +1,5 @@
/* node.c -- nodes for Texinfo.
- $Id: node.c,v 1.37 2007/07/08 13:11:48 karl Exp $
+ $Id: node.c,v 1.38 2007/09/15 23:48:46 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
Free Software Foundation, Inc.
@@ -988,7 +988,7 @@
if (next)
{
tem = expansion (next, 0);
- add_word ((char *) __("Next:"));
+ add_word ((char *) gdt("Next:"));
add_word (" ");
add_word ("<a rel=\"next\" accesskey=\"n\" href=\"");
@@ -1004,7 +1004,7 @@
if (prev)
{
tem = expansion (prev, 0);
- add_word ((char *) __("Previous:"));
+ add_word ((char *) gdt("Previous:"));
add_word (" ");
add_word ("<a rel=\"previous\" accesskey=\"p\" href=\"");
add_anchor_name (tem, 1);
@@ -1018,7 +1018,7 @@
if (up)
{
tem = expansion (up, 0);
- add_word ((char *) __("Up:"));
+ add_word ((char *) gdt("Up:"));
add_word (" ");
add_word ("<a rel=\"up\" accesskey=\"u\" href=\"");
add_anchor_name (tem, 1);
@@ -1373,9 +1373,9 @@
switch (type)
{
case menu_reference:
- return __("Menu");
+ return gdt("Menu");
case followed_reference:
- return __("Cross");
+ return gdt("Cross");
default:
return "Internal-bad-reference-type";
}
@@ -1434,7 +1434,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, gdt("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
@@ -1472,7 +1472,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, gdt("Prev"));
if (!valid_p)
tags->flags |= TAG_FLAG_PREV_ERROR;
@@ -1534,7 +1534,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, gdt("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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- makeinfo/toc.c 1 Jul 2007 21:20:33 -0000 1.10
+++ makeinfo/toc.c 15 Sep 2007 23:48:46 -0000 1.11
@@ -1,5 +1,5 @@
/* toc.c -- table of contents handling.
- $Id: toc.c,v 1.10 2007/07/01 21:20:33 karl Exp $
+ $Id: toc.c,v 1.11 2007/09/15 23:48:46 karl Exp $
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2007
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",
gdt("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 *) gdt("Table of Contents"));
insert ('\n');
- for (i = 0; i < strlen (__("Table of Contents")); i++)
+ for (i = 0; i < strlen (gdt("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", gdt("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 *) gdt("Short Contents"));
insert ('\n');
- for (i = 0; i < strlen (__("Short Contents")); i++)
+ for (i = 0; i < strlen (gdt("Short Contents")); i++)
insert ('*');
insert_string ("\n\n");
Index: makeinfo/xref.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- makeinfo/xref.c 1 Jul 2007 21:20:33 -0000 1.12
+++ makeinfo/xref.c 15 Sep 2007 23:48:46 -0000 1.13
@@ -1,5 +1,5 @@
/* xref.c -- cross references for Texinfo.
- $Id: xref.c,v 1.12 2007/07/01 21:20:33 karl Exp $
+ $Id: xref.c,v 1.13 2007/09/15 23:48:46 karl Exp $
Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
@@ -130,7 +130,7 @@
{
if (!ref_flag)
add_word (px_ref_flag || printing_index
- ? (char *) __("see ") : (char *) __("See "));
+ ? (char *) gdt("see ") : (char *) gdt("See "));
if (!*arg4 && !*arg5)
{
@@ -154,7 +154,7 @@
}
else if (*arg5)
{
- add_word_args (__("See section ``%s'' in "), *arg3 ? arg3 :
arg1);
+ add_word_args (gdt("See section ``%s'' in "), *arg3 ? arg3 :
arg1);
xml_insert_element (CITE, START);
add_word (arg5);
xml_insert_element (CITE, END);
@@ -167,7 +167,7 @@
else if (xml)
{
if (!ref_flag)
- add_word_args ("%s", px_ref_flag ? __("see ") : __("See "));
+ add_word_args ("%s", px_ref_flag ? gdt("see ") : gdt("See "));
xml_insert_element (XREF, START);
xml_insert_element (XREFNODENAME, START);
@@ -202,7 +202,7 @@
else if (html)
{
if (!ref_flag)
- add_word_args ("%s", px_ref_flag ? __("see ") : __("See "));
+ add_word_args ("%s", px_ref_flag ? gdt("see ") : gdt("See "));
}
else
add_word_args ("%s", px_ref_flag || ref_flag ? "*note " : "*Note ");
@@ -456,7 +456,7 @@
{
char *tem;
- add_word ((char *) __("see "));
+ add_word ((char *) gdt("see "));
/* html fixxme: revisit this */
add_html_elt ("<a href=");
if (splitting)
P ChangeLog
P makeinfo/defun.c
P makeinfo/html.c
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h
P makeinfo/node.c
P makeinfo/toc.c
P makeinfo/xref.c
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Sat Sep 15 19:53:01 EDT 2007),
Karl Berry <=