[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Mon Jul 5 18:44:01 EDT 2004)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Mon Jul 5 18:44:01 EDT 2004) |
|
Date: |
Mon, 05 Jul 2004 18:44:54 -0400 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.352
retrieving revision 1.353
diff -c -r1.352 -r1.353
*** ChangeLog 3 Jul 2004 12:48:22 -0000 1.352
--- ChangeLog 5 Jul 2004 22:23:21 -0000 1.353
***************
*** 1,3 ****
--- 1,11 ----
+ 2004-07-05 Karl Berry <address@hidden>
+
+ * makeinfo/xref.c (cm_email, cm_uref, et al.):
+ * makeinfo/xml.c (xml_insert_indexentry, xml_insert_indexterm):
+ * makeinfo/sectioning.c (sectioning_underscore):
+ * makeinfo/makeinfo.c (cm_listoffloats): use %s, don't pass string to
+ execute_string. Report from Christian Schenk.
+
2004-07-02 Karl Berry <address@hidden>
* makeinfo/makinfo.c (execute_string): don't worry about
Index: makeinfo/float.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** makeinfo/float.c 11 Apr 2004 17:56:47 -0000 1.7
--- makeinfo/float.c 5 Jul 2004 22:23:22 -0000 1.8
***************
*** 1,5 ****
/* float.c -- float environment functions.
! $Id: float.c,v 1.7 2004/04/11 17:56:47 karl Exp $
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
/* float.c -- float environment functions.
! $Id: float.c,v 1.8 2004/07/05 22:23:22 karl Exp $
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
***************
*** 232,238 ****
add_word ("\">");
if (strlen (float_type) > 0)
! execute_string (float_type);
if (strlen (temp->id) > 0)
{
--- 232,238 ----
add_word ("\">");
if (strlen (float_type) > 0)
! execute_string ("%s", float_type);
if (strlen (temp->id) > 0)
{
***************
*** 248,254 ****
|| strlen (temp->id) > 0)
insert_string (": ");
! execute_string (temp->title);
}
add_word ("</a>");
--- 248,254 ----
|| strlen (temp->id) > 0)
insert_string (": ");
! execute_string ("%s", temp->title);
}
add_word ("</a>");
Index: makeinfo/sectioning.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/sectioning.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** makeinfo/sectioning.c 11 Apr 2004 17:56:47 -0000 1.24
--- makeinfo/sectioning.c 5 Jul 2004 22:23:23 -0000 1.25
***************
*** 1,5 ****
/* sectioning.c -- for @chapter, @section, ..., @contents ...
! $Id: sectioning.c,v 1.24 2004/04/11 17:56:47 karl Exp $
Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
/* sectioning.c -- for @chapter, @section, ..., @contents ...
! $Id: sectioning.c,v 1.25 2004/07/05 22:23:23 karl Exp $
Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 393,399 ****
xml_insert_element (TITLE, START);
xml_open_section (level, secname);
! execute_string (temp);
xml_insert_element (TITLE, END);
free (temp);
--- 393,399 ----
xml_insert_element (TITLE, START);
xml_open_section (level, secname);
! execute_string ("%s", temp);
xml_insert_element (TITLE, END);
free (temp);
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** makeinfo/xml.c 11 Apr 2004 17:56:47 -0000 1.47
--- makeinfo/xml.c 5 Jul 2004 22:23:24 -0000 1.48
***************
*** 1,7 ****
/* xml.c -- xml output.
! $Id: xml.c,v 1.47 2004/04/11 17:56:47 karl Exp $
! Copyright (C) 2001, 2002, 2003 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
--- 1,7 ----
/* xml.c -- xml output.
! $Id: xml.c,v 1.48 2004/07/05 22:23:24 karl Exp $
! Copyright (C) 2001, 2002, 2003, 2004 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
***************
*** 1691,1704 ****
in_indexterm = 1;
xml_insert_element (PRIMARY, START);
if (primary)
! execute_string (primary);
else
! execute_string (indexterm);
xml_insert_element (PRIMARY, END);
if (primary)
{
xml_insert_element (SECONDARY, START);
! execute_string (secondary);
xml_insert_element (SECONDARY, END);
}
xml_insert_element (INDEXTERM, END);
--- 1691,1704 ----
in_indexterm = 1;
xml_insert_element (PRIMARY, START);
if (primary)
! execute_string ("%s", primary);
else
! execute_string ("%s", indexterm);
xml_insert_element (PRIMARY, END);
if (primary)
{
xml_insert_element (SECONDARY, START);
! execute_string ("%s", secondary);
xml_insert_element (SECONDARY, END);
}
xml_insert_element (INDEXTERM, END);
***************
*** 1862,1868 ****
{
xml_insert_element (SECONDARYIE, END);
xml_insert_element (SECONDARYIE, START);
! execute_string (secondary);
}
else
{
--- 1862,1868 ----
{
xml_insert_element (SECONDARYIE, END);
xml_insert_element (SECONDARYIE, START);
! execute_string ("%s", secondary);
}
else
{
***************
*** 1870,1879 ****
xml_insert_element (INDEXENTRY, START);
in_indexentry = 1;
xml_insert_element (PRIMARYIE, START);
! execute_string (primary);
xml_insert_element (PRIMARYIE, END);
xml_insert_element (SECONDARYIE, START);
! execute_string (secondary);
in_secondary = 1;
}
}
--- 1870,1879 ----
xml_insert_element (INDEXENTRY, START);
in_indexentry = 1;
xml_insert_element (PRIMARYIE, START);
! execute_string ("%s", primary);
xml_insert_element (PRIMARYIE, END);
xml_insert_element (SECONDARYIE, START);
! execute_string ("%s", secondary);
in_secondary = 1;
}
}
***************
*** 1883,1889 ****
xml_insert_element (INDEXENTRY, START);
in_indexentry = 1;
xml_insert_element (PRIMARYIE, START);
! execute_string (entry);
}
add_word (", ");
--- 1883,1889 ----
xml_insert_element (INDEXENTRY, START);
in_indexentry = 1;
xml_insert_element (PRIMARYIE, START);
! execute_string ("%s", entry);
}
add_word (", ");
Index: makeinfo/xref.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** makeinfo/xref.c 11 Apr 2004 17:56:47 -0000 1.1
--- makeinfo/xref.c 5 Jul 2004 22:23:25 -0000 1.2
***************
*** 1,5 ****
/* xref.c -- cross references for Texinfo.
! $Id: xref.c,v 1.1 2004/04/11 17:56:47 karl Exp $
Copyright (C) 2004 Free Software Foundation, Inc.
--- 1,5 ----
/* xref.c -- cross references for Texinfo.
! $Id: xref.c,v 1.2 2004/07/05 22:23:25 karl Exp $
Copyright (C) 2004 Free Software Foundation, Inc.
***************
*** 142,148 ****
xml_insert_element_with_attribute (XREFNODENAME, START,
"linkend=\"%s\"",
arg1_id);
free (arg1_id);
! execute_string (*arg3 ? arg3 : arg2);
xml_insert_element (XREFNODENAME, END);
}
else
--- 142,148 ----
xml_insert_element_with_attribute (XREFNODENAME, START,
"linkend=\"%s\"",
arg1_id);
free (arg1_id);
! execute_string ("%s", *arg3 ? arg3 : arg2);
xml_insert_element (XREFNODENAME, END);
}
else
***************
*** 172,201 ****
xml_insert_element (XREF, START);
xml_insert_element (XREFNODENAME, START);
! execute_string (arg1);
xml_insert_element (XREFNODENAME, END);
if (*arg2)
{
xml_insert_element (XREFINFONAME, START);
! execute_string (arg2);
xml_insert_element (XREFINFONAME, END);
}
if (*arg3)
{
xml_insert_element (XREFPRINTEDDESC, START);
! execute_string (arg3);
xml_insert_element (XREFPRINTEDDESC, END);
}
if (*arg4)
{
xml_insert_element (XREFINFOFILE, START);
! execute_string (arg4);
xml_insert_element (XREFINFOFILE, END);
}
if (*arg5)
{
xml_insert_element (XREFPRINTEDNAME, START);
! execute_string (arg5);
xml_insert_element (XREFPRINTEDNAME, END);
}
xml_insert_element (XREF, END);
--- 172,201 ----
xml_insert_element (XREF, START);
xml_insert_element (XREFNODENAME, START);
! execute_string ("%s", arg1);
xml_insert_element (XREFNODENAME, END);
if (*arg2)
{
xml_insert_element (XREFINFONAME, START);
! execute_string ("%s", arg2);
xml_insert_element (XREFINFONAME, END);
}
if (*arg3)
{
xml_insert_element (XREFPRINTEDDESC, START);
! execute_string ("%s", arg3);
xml_insert_element (XREFPRINTEDDESC, END);
}
if (*arg4)
{
xml_insert_element (XREFINFOFILE, START);
! execute_string ("%s", arg4);
xml_insert_element (XREFINFOFILE, END);
}
if (*arg5)
{
xml_insert_element (XREFPRINTEDNAME, START);
! execute_string ("%s", arg5);
xml_insert_element (XREFPRINTEDNAME, END);
}
xml_insert_element (XREF, END);
***************
*** 435,450 ****
{
xml_insert_element (INFOREF, START);
xml_insert_element (INFOREFNODENAME, START);
! execute_string (node);
xml_insert_element (INFOREFNODENAME, END);
if (*pname)
{
xml_insert_element (INFOREFREFNAME, START);
! execute_string (pname);
xml_insert_element (INFOREFREFNAME, END);
}
xml_insert_element (INFOREFINFONAME, START);
! execute_string (file);
xml_insert_element (INFOREFINFONAME, END);
xml_insert_element (INFOREF, END);
--- 435,450 ----
{
xml_insert_element (INFOREF, START);
xml_insert_element (INFOREFNODENAME, START);
! execute_string ("%s", node);
xml_insert_element (INFOREFNODENAME, END);
if (*pname)
{
xml_insert_element (INFOREFREFNAME, START);
! execute_string ("%s", pname);
xml_insert_element (INFOREFREFNAME, END);
}
xml_insert_element (INFOREFINFONAME, START);
! execute_string ("%s", file);
xml_insert_element (INFOREFINFONAME, END);
xml_insert_element (INFOREF, END);
***************
*** 497,525 ****
xml_insert_element_with_attribute (UREF, START, "url=\"%s\"",
text_expansion (url));
if (*replacement)
! execute_string (replacement);
else if (*desc)
! execute_string (desc);
else
! execute_string (url);
xml_insert_element (UREF, END);
}
else if (xml)
{
xml_insert_element (UREF, START);
xml_insert_element (UREFURL, START);
! execute_string (url);
xml_insert_element (UREFURL, END);
if (*desc)
{
xml_insert_element (UREFDESC, START);
! execute_string (desc);
xml_insert_element (UREFDESC, END);
}
if (*replacement)
{
xml_insert_element (UREFREPLACEMENT, START);
! execute_string (replacement);
xml_insert_element (UREFREPLACEMENT, END);
}
xml_insert_element (UREF, END);
--- 497,525 ----
xml_insert_element_with_attribute (UREF, START, "url=\"%s\"",
text_expansion (url));
if (*replacement)
! execute_string ("%s", replacement);
else if (*desc)
! execute_string ("%s", desc);
else
! execute_string ("%s", url);
xml_insert_element (UREF, END);
}
else if (xml)
{
xml_insert_element (UREF, START);
xml_insert_element (UREFURL, START);
! execute_string ("%s", url);
xml_insert_element (UREFURL, END);
if (*desc)
{
xml_insert_element (UREFDESC, START);
! execute_string ("%s", desc);
xml_insert_element (UREFDESC, END);
}
if (*replacement)
{
xml_insert_element (UREFREPLACEMENT, START);
! execute_string ("%s", replacement);
xml_insert_element (UREFREPLACEMENT, END);
}
xml_insert_element (UREF, END);
***************
*** 576,594 ****
{
xml_insert_element_with_attribute (EMAIL, START,
"url=\"mailto:%s\"";, addr);
if (*name)
! execute_string (name);
xml_insert_element (EMAIL, END);
}
else if (xml)
{
xml_insert_element (EMAIL, START);
xml_insert_element (EMAILADDRESS, START);
! execute_string (addr);
xml_insert_element (EMAILADDRESS, END);
if (*name)
{
xml_insert_element (EMAILNAME, START);
! execute_string (name);
xml_insert_element (EMAILNAME, END);
}
xml_insert_element (EMAIL, END);
--- 576,594 ----
{
xml_insert_element_with_attribute (EMAIL, START,
"url=\"mailto:%s\"";, addr);
if (*name)
! execute_string ("%s", name);
xml_insert_element (EMAIL, END);
}
else if (xml)
{
xml_insert_element (EMAIL, START);
xml_insert_element (EMAILADDRESS, START);
! execute_string ("%s", addr);
xml_insert_element (EMAILADDRESS, END);
if (*name)
{
xml_insert_element (EMAILNAME, START);
! execute_string ("%s", name);
xml_insert_element (EMAILNAME, END);
}
xml_insert_element (EMAIL, END);
P ChangeLog
P makeinfo/float.c
P makeinfo/sectioning.c
P makeinfo/xml.c
P makeinfo/xref.c
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Mon Jul 5 18:44:01 EDT 2004),
Karl Berry <=