[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/makeinfo defun.c,1.6,1.7 xml.c,1.19,1.20
|
From: |
dirt |
|
Subject: |
texinfo/makeinfo defun.c,1.6,1.7 xml.c,1.19,1.20 |
|
Date: |
Wed, 28 Jan 2004 22:34:19 +0100 |
Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv3792/makeinfo
Modified Files:
defun.c xml.c
Log Message:
2004-01-28 Alper Ersoy <address@hidden>
* makeinfo/defun.c (process_defun_args, defun_internal):
* makeinfo/insertion.c (begin_insertion, end_insertion): execute XML
only blocks for Docbook also.
* makeinfo/xml.c: added Docbook elements for definition commands.
(xml_begin_def_term): for Docbook, generate an Info-like @defun line.
(xml_insert_element_with_attribute): do not indent DEFINITION and
DEFINITIONTERM when the output is Docbook.
Index: defun.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/defun.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** defun.c 17 Jan 2004 11:34:37 -0000 1.6
--- defun.c 28 Jan 2004 21:34:16 -0000 1.7
***************
*** 240,244 ****
int pending_space = 0;
! if (xml && !docbook)
{
xml_process_defun_args (defun_args, auto_var_p);
--- 240,244 ----
int pending_space = 0;
! if (xml)
{
xml_process_defun_args (defun_args, auto_var_p);
***************
*** 600,635 ****
}
}
- else if (docbook)
- {
- switch (base_type)
- {
- case deffn:
- case defvr:
- case deftp:
- case defcv:
- case defop:
- xml_insert_element (FUNCTION, START);
- execute_string ("%s", defined_name);
- xml_insert_element (FUNCTION, END);
- break;
- case deftypefn:
- case deftypevr:
- execute_string ("%s ", type_name);
- xml_insert_element (FUNCTION, START);
- execute_string ("%s", defined_name);
- xml_insert_element (FUNCTION, END);
- break;
- case deftypecv:
- case deftypeop:
- case deftypemethod:
- case deftypeivar:
- execute_string ("%s ", type_name2);
- xml_insert_element (FUNCTION, START);
- execute_string ("%s", defined_name);
- xml_insert_element (FUNCTION, END);
- break;
- }
-
- }
else if (xml)
xml_begin_def_term (base_type, category, defined_name, type_name,
--- 600,603 ----
***************
*** 667,673 ****
close_single_paragraph ();
! /* Make an entry in the appropriate index. */
! /* (XML already got its index entry so skip it.) */
! if (!xml || docbook)
switch (base_type)
{
--- 635,641 ----
close_single_paragraph ();
! /* Make an entry in the appropriate index. (XML and
! Docbook already got their entries, so skip them.) */
! if (!xml)
switch (base_type)
{
***************
*** 697,701 ****
}
! if (xml && !docbook)
xml_end_def_term ();
else if (html)
--- 665,669 ----
}
! if (xml)
xml_end_def_term ();
else if (html)
Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** xml.c 25 Jan 2004 15:16:52 -0000 1.19
--- xml.c 28 Jan 2004 21:34:16 -0000 1.20
***************
*** 436,453 ****
{ "", 0, 0, 0 }, /* CLEARVALUE (xml) */
! { "", 0, 0, 0 }, /* DEFINITION (xml) */
! { "", 0, 0, 0 }, /* DEFINITIONTERM (xml) */
{ "", 0, 0, 0 }, /* DEFINITIONITEM (xml) */
{ "", 0, 0, 0 }, /* DEFCATEGORY (xml) */
! { "", 0, 0, 0 }, /* DEFFUNCTION (xml) */
! { "", 0, 0, 0 }, /* DEFVARIABLE (xml) */
! { "", 0, 0, 0 }, /* DEFPARAM (xml) */
{ "", 0, 0, 0 }, /* DEFDELIMITER (xml) */
! { "", 0, 0, 0 }, /* DEFTYPE (xml) */
! { "", 0, 0, 0 }, /* DEFPARAMTYPE (xml) */
! { "", 0, 0, 0 }, /* DEFDATATYPE (xml) */
! { "", 0, 0, 0 }, /* DEFCLASS (xml) */
! { "", 0, 0, 0 }, /* DEFCLASSVAR (xml) */
! { "", 0, 0, 0 }, /* DEFOPERATION (xml) */
{ "para", 0, 0, 0 } /* Must be last */
--- 436,453 ----
{ "", 0, 0, 0 }, /* CLEARVALUE (xml) */
! { "blockquote", 1, 0, 0 }, /* DEFINITION (xml) */
! { "screen", 0, 0, 1 }, /* DEFINITIONTERM (xml) */
{ "", 0, 0, 0 }, /* DEFINITIONITEM (xml) */
{ "", 0, 0, 0 }, /* DEFCATEGORY (xml) */
! { "function", 0, 0, 0 }, /* DEFFUNCTION (xml) */
! { "varname", 0, 0, 0 }, /* DEFVARIABLE (xml) */
! { "varname", 0, 0, 0 }, /* DEFPARAM (xml) */
{ "", 0, 0, 0 }, /* DEFDELIMITER (xml) */
! { "returnvalue", 0, 0, 0 }, /* DEFTYPE (xml) */
! { "type", 0, 0, 0 }, /* DEFPARAMTYPE (xml) */
! { "structname", 0, 0, 0 }, /* DEFDATATYPE (xml) */
! { "classname", 0, 0, 0 }, /* DEFCLASS (xml) */
! { "property", 0, 0, 0 }, /* DEFCLASSVAR (xml) */
! { "methodname", 0, 0, 0 }, /* DEFOPERATION (xml) */
{ "para", 0, 0, 0 } /* Must be last */
***************
*** 496,499 ****
--- 496,502 ----
{ INFORMALFIGURE, FLOAT, FLOATFIGURE },
{ CARTOUCHE, FLOAT, FLOATCARTOUCHE },
+ /* Unnecessary markup in @defun blocks. */
+ { VAR, DEFPARAM, -1 },
+ { CODE, DEFTYPE, -1 },
/* Add your elements to replace here */
{-1, 0, 0}
***************
*** 900,904 ****
if (arg == END && (elt == MENUENTRY || elt == ITEMIZE || elt == ENUMERATE
|| elt == TABLEITEM || elt == TABLE
! || elt == DEFINITION || elt == DEFINITIONTERM))
xml_indent ();
--- 903,907 ----
if (arg == END && (elt == MENUENTRY || elt == ITEMIZE || elt == ENUMERATE
|| elt == TABLEITEM || elt == TABLE
! || (!docbook && (elt == DEFINITION || elt == DEFINITIONTERM))))
xml_indent ();
***************
*** 2236,2240 ****
/* Start with category. */
xml_insert_element (DEFCATEGORY, START);
! execute_string ("%s", category);
xml_insert_element (DEFCATEGORY, END);
add_char(' ');
--- 2239,2243 ----
/* Start with category. */
xml_insert_element (DEFCATEGORY, START);
! execute_string (docbook ? "--- %s:" : "%s", category);
xml_insert_element (DEFCATEGORY, END);
add_char(' ');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/makeinfo defun.c,1.6,1.7 xml.c,1.19,1.20,
dirt <=