[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Thu Nov 11 13:52:01 EST 2004)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Thu Nov 11 13:52:01 EST 2004) |
|
Date: |
Thu, 11 Nov 2004 13:52:13 -0500 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.409
retrieving revision 1.410
diff -c -r1.409 -r1.410
*** ChangeLog 11 Nov 2004 17:48:42 -0000 1.409
--- ChangeLog 11 Nov 2004 18:34:28 -0000 1.410
***************
*** 1,9 ****
2004-11-11 Karl Berry <address@hidden>
! * makeinfo/makeinfo.c (expansion): save and restore xml_in_para,
! so we don't get a spurious </para> after </dircategory>
! (dircat test).
! From: Vincent Lefevre, 20 Oct 2004 15:40:39 +0200.
2004-11-08 Karl Berry <address@hidden>
--- 1,17 ----
2004-11-11 Karl Berry <address@hidden>
! * texinfo.dtd (metainformation): add documentdescription.
! (documentdescription): define.
! * xml.h (DOCUMENTDESCRIPTION): new value for xml_element.
! * xml.c (texinfoml_element_list): define documentdescription.
! (docbook_element_list): likewise, but don't know how to handle it.
! * cmds.c (cm_documentdescription): insert opening xml tag.
! * insertion.c (end_insertion): insert closing xml tag.
!
! * makeinfo/makeinfo.c (insert_string): declare const char * arg.
! * makeinfo/makeinfo.h: likewise.
! Report from: Vincent Lefevre, 20 Oct 2004 15:40:39 +0200,
! noting a spurious </para> after </dircategory>.
2004-11-08 Karl Berry <address@hidden>
Index: makeinfo/insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -c -r1.54 -r1.55
*** makeinfo/insertion.c 11 Apr 2004 17:56:47 -0000 1.54
--- makeinfo/insertion.c 11 Nov 2004 18:34:28 -0000 1.55
***************
*** 1,5 ****
/* insertion.c -- insertions for Texinfo.
! $Id: insertion.c,v 1.54 2004/04/11 17:56:47 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
Foundation, Inc.
--- 1,5 ----
/* insertion.c -- insertions for Texinfo.
! $Id: insertion.c,v 1.55 2004/11/11 18:34:28 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
Foundation, Inc.
***************
*** 1052,1058 ****
line_number--;
break;
- case documentdescription:
case ifclear:
case ifdocbook:
case ifinfo:
--- 1052,1057 ----
***************
*** 1104,1109 ****
--- 1103,1114 ----
close_insertion_paragraph ();
break;
+ case documentdescription:
+ if (xml)
+ insert_string (document_description);
+ xml_insert_element (DOCUMENTDESCRIPTION, END);
+ break;
+
case menu:
in_menu--; /* No longer hacking menus. */
if (html && !no_headers)
***************
*** 1548,1555 ****
void
cm_documentdescription (void)
{
! if (html || xml)
begin_insertion (documentdescription);
else
command_name_condition ();
}
--- 1553,1567 ----
void
cm_documentdescription (void)
{
! if (html)
begin_insertion (documentdescription);
+
+ else if (xml)
+ {
+ xml_insert_element (DOCUMENTDESCRIPTION, START);
+ begin_insertion (documentdescription);
+ }
+
else
command_name_condition ();
}
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -c -r1.69 -r1.70
*** makeinfo/makeinfo.c 11 Nov 2004 17:48:43 -0000 1.69
--- makeinfo/makeinfo.c 11 Nov 2004 18:34:28 -0000 1.70
***************
*** 1,5 ****
/* makeinfo -- convert Texinfo source into other formats.
! $Id: makeinfo.c,v 1.69 2004/11/11 17:48:43 karl Exp $
Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
/* makeinfo -- convert Texinfo source into other formats.
! $Id: makeinfo.c,v 1.70 2004/11/11 18:34:28 karl Exp $
Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 2822,2828 ****
/* Insert the null-terminated string STRING into `output_paragraph'. */
void
! insert_string (char *string)
{
while (*string)
insert (*string++);
--- 2822,2828 ----
/* Insert the null-terminated string STRING into `output_paragraph'. */
void
! insert_string (const char *string)
{
while (*string)
insert (*string++);
***************
*** 4015,4021 ****
maybe_escaped_expansion (char *str, int implicit_code, int do_html_escape)
{
char *result;
- extern int xml_in_para;
/* Inhibit indentation and filling, so that extra newlines
are not added to the expansion. (This is undesirable if
--- 4015,4020 ----
***************
*** 4024,4033 ****
int saved_indented_fill = indented_fill;
int saved_no_indent = no_indent;
int saved_escape_html = escape_html;
- int saved_xml_in_para;
-
- if (xml)
- saved_xml_in_para = xml_in_para;
filling_enabled = 0;
indented_fill = 0;
--- 4023,4028 ----
***************
*** 4041,4049 ****
no_indent = saved_no_indent;
escape_html = saved_escape_html;
- if (xml)
- xml_in_para = saved_xml_in_para;
-
return result;
}
--- 4036,4041 ----
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** makeinfo/makeinfo.h 30 Aug 2004 22:11:39 -0000 1.15
--- makeinfo/makeinfo.h 11 Nov 2004 18:34:28 -0000 1.16
***************
*** 1,5 ****
/* makeinfo.h -- declarations for Makeinfo.
! $Id: makeinfo.h,v 1.15 2004/08/30 22:11:39 karl Exp $
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
Software Foundation, Inc.
--- 1,5 ----
/* makeinfo.h -- declarations for Makeinfo.
! $Id: makeinfo.h,v 1.16 2004/11/11 18:34:28 karl Exp $
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
Software Foundation, Inc.
***************
*** 324,330 ****
add_char (int character),
add_meta_char (int character),
close_single_paragraph (void),
! insert_string (char *string),
insert (int character),
get_rest_of_line (int expand, char **string),
add_html_block_elt (char *string),
--- 324,330 ----
add_char (int character),
add_meta_char (int character),
close_single_paragraph (void),
! insert_string (const char *),
insert (int character),
get_rest_of_line (int expand, char **string),
add_html_block_elt (char *string),
Index: makeinfo/texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/texinfo.dtd,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** makeinfo/texinfo.dtd 2 Dec 2003 12:20:19 -0000 1.9
--- makeinfo/texinfo.dtd 11 Nov 2004 18:34:28 -0000 1.10
***************
*** 1,4 ****
! <!-- $Id: texinfo.dtd,v 1.9 2003/12/02 12:20:19 dirt Exp $
Document Type Definition for Texinfo.
Author: Philippe Martin (address@hidden)
--- 1,4 ----
! <!-- $Id: texinfo.dtd,v 1.10 2004/11/11 18:34:28 karl Exp $
Document Type Definition for Texinfo.
Author: Philippe Martin (address@hidden)
***************
*** 6,12 ****
Karl Eichwalder (address@hidden)
Alper Ersoy (address@hidden)
! Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
--- 6,12 ----
Karl Eichwalder (address@hidden)
Alper Ersoy (address@hidden)
! Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
***************
*** 17,23 ****
<!-- ENTITIES -->
<!-- Meta-information -->
! <!ENTITY % metainformation "setfilename | settitle | dircategory">
<!ENTITY % variables "setvalue | clearvalue">
<!-- Document language -->
--- 17,24 ----
<!-- ENTITIES -->
<!-- Meta-information -->
! <!ENTITY % metainformation "setfilename | settitle | dircategory
! | documentdescription">
<!ENTITY % variables "setvalue | clearvalue">
<!-- Document language -->
***************
*** 186,191 ****
--- 187,193 ----
<!-- ************** -->
<!ELEMENT quotation (%block; | %Inline.phrase;)*>
+ <!ELEMENT documentdescription (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT example (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT smallexample (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT lisp (#PCDATA | %block; | %Inline.phrase;)*>
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -c -r1.49 -r1.50
*** makeinfo/xml.c 31 Jul 2004 18:49:51 -0000 1.49
--- makeinfo/xml.c 11 Nov 2004 18:34:28 -0000 1.50
***************
*** 1,5 ****
/* xml.c -- xml output.
! $Id: xml.c,v 1.49 2004/07/31 18:49:51 karl Exp $
Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
/* xml.c -- xml output.
! $Id: xml.c,v 1.50 2004/11/11 18:34:28 karl Exp $
Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 46,51 ****
--- 46,52 ----
{ "setfilename", 0, 0, 0 },
{ "titlefont", 0, 0, 0 },
{ "settitle", 0, 0, 0 },
+ { "documentdescription", 1, 0, 0 },
{ "node", 1, 0, 0 },
{ "nodenext", 0, 0, 0 },
***************
*** 256,261 ****
--- 257,263 ----
{ "", 0, 0, 0 }, /* SETFILENAME */
{ "", 0, 0, 0 }, /* TITLEINFO */
{ "title", 0, 0, 0 }, /* SETTITLE */
+ { "", 1, 0, 0 }, /* DOCUMENTDESCRIPTION (?) */
{ "", 1, 0, 0 }, /* NODE */
{ "", 0, 0, 0 }, /* NODENEXT */
Index: makeinfo/xml.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** makeinfo/xml.h 31 Jul 2004 18:49:51 -0000 1.22
--- makeinfo/xml.h 11 Nov 2004 18:34:28 -0000 1.23
***************
*** 1,5 ****
/* xml.h -- xml output declarations.
! $Id: xml.h,v 1.22 2004/07/31 18:49:51 karl Exp $
Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
/* xml.h -- xml output declarations.
! $Id: xml.h,v 1.23 2004/11/11 18:34:28 karl Exp $
Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 49,70 ****
enum xml_element
{
! TEXINFO=0, SETFILENAME, TITLEFONT, SETTITLE,
/* Node */
! NODE /* 4 */, NODENEXT, NODEPREV, NODEUP,
/* Structuring */
! CHAPTER /* 8 */, SECTION, SUBSECTION, SUBSUBSECTION,
! TOP /* 12 */, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC,
UNNUMBEREDSUBSUBSEC,
! APPENDIX /* 17 */, APPENDIXSEC, APPENDIXSUBSEC, APPENDIXSUBSUBSEC,
! MAJORHEADING /* 21 */, CHAPHEADING, HEADING, SUBHEADING, SUBSUBHEADING,
/* Titlepage */
! TITLEPAGE /* 26 */, AUTHOR, BOOKTITLE, BOOKSUBTITLE,
/* Menu */
! MENU /* 30 */, DETAILMENU, MENUENTRY, MENUTITLE, MENUCOMMENT, MENUNODE,
NODENAME,
/* -- */
! ACRONYM/* 37 */, ACRONYMWORD, ACRONYMDESC,
ABBREV, ABBREVWORD, ABBREVDESC,
TT, CODE, COMMAND_TAG, ENV, FILE_TAG, OPTION, SAMP, KBD, URL, KEY,
VAR, SC, DFN, EMPH, STRONG, CITE, NOTFIXEDWIDTH, I, B, R,
--- 49,70 ----
enum xml_element
{
! TEXINFO=0, SETFILENAME, TITLEFONT, SETTITLE, DOCUMENTDESCRIPTION,
/* Node */
! NODE, NODENEXT, NODEPREV, NODEUP,
/* Structuring */
! CHAPTER, SECTION, SUBSECTION, SUBSUBSECTION,
! TOP, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC,
UNNUMBEREDSUBSUBSEC,
! APPENDIX, APPENDIXSEC, APPENDIXSUBSEC, APPENDIXSUBSUBSEC,
! MAJORHEADING, CHAPHEADING, HEADING, SUBHEADING, SUBSUBHEADING,
/* Titlepage */
! TITLEPAGE, AUTHOR, BOOKTITLE, BOOKSUBTITLE,
/* Menu */
! MENU, DETAILMENU, MENUENTRY, MENUTITLE, MENUCOMMENT, MENUNODE,
NODENAME,
/* -- */
! ACRONYM, ACRONYMWORD, ACRONYMDESC,
ABBREV, ABBREVWORD, ABBREVDESC,
TT, CODE, COMMAND_TAG, ENV, FILE_TAG, OPTION, SAMP, KBD, URL, KEY,
VAR, SC, DFN, EMPH, STRONG, CITE, NOTFIXEDWIDTH, I, B, R,
P ChangeLog
P makeinfo/insertion.c
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h
P makeinfo/texinfo.dtd
P makeinfo/xml.c
P makeinfo/xml.h
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Thu Nov 11 13:52:01 EST 2004),
Karl Berry <=