Change whitespace callback to return a string.

web
Michael R Sweet 20 years ago
parent 82fe862574
commit 465d3e7231
  1. 13
      CHANGES
  2. 9
      TODO
  3. 6
      documentation.html
  4. 45
      mxml-file.c
  5. 10
      mxml.h
  6. 789
      mxml.xml
  7. 73
      mxmldoc.c
  8. 20
      testmxml.c

@ -1,16 +1,23 @@
README - 04/30/2004 README - 05/01/2004
------------------- -------------------
CHANGES IN Mini-XML 2.0 CHANGES IN Mini-XML 2.0
- Changed the whitespace callback interface to return
strings instead of a single character, allowing for
greater control over the formatting of XML files
written using Mini-XML. THIS CHANGE WILL REQUIRE
CHANGES TO YOUR CODE IF YOU USE WHITESPACE CALLBACKS.
- The mxmldoc utility is now capable of documenting C++
classes, functions, and structures, and correctly
handles C++ comments.
- Added new modular tests for mxmldoc.
- Updated the mxmldoc output to be more compatible with - Updated the mxmldoc output to be more compatible with
embedding in manuals produced with HTMLDOC. embedding in manuals produced with HTMLDOC.
- The makefile incorrectly included a "/" separator - The makefile incorrectly included a "/" separator
between the destination path and install path. This between the destination path and install path. This
caused problems when building and installing with caused problems when building and installing with
MingW. MingW.
- The mxmldoc utility is now capable of documenting C++
structures and classes.
CHANGES IN Mini-XML 1.3 CHANGES IN Mini-XML 1.3

@ -1,9 +1,6 @@
TODO - 04/29/2004 TODO - 05/01/2004
----------------- -----------------
- Update write callback to return a string.
-- Return const char *
-- Loop through chars to figure out correct output column
- UTF-16 support. - UTF-16 support.
-- Auto-detect in strings via initial FFFE or FEFF BOM -- Auto-detect in strings via initial FFFE or FEFF BOM
-- Convert to UTF-8 -- Convert to UTF-8
@ -21,10 +18,6 @@ TODO - 04/29/2004
- Add access methods and make node structure opaque. - Add access methods and make node structure opaque.
-- To allow for C++ migration -- To allow for C++ migration
-- To make future binary compatibility easier -- To make future binary compatibility easier
- Build test file for mxmldoc.
-- C++ class documentation doesn't seem to work.
-- Do examples of all types of comments/code that mxmldoc is
supposed to handle.
- Add VC++/VC++.NET project files. - Add VC++/VC++.NET project files.
-- Include DLL .def file for making a DLL. -- Include DLL .def file for making a DLL.
- Add C++ class/struct. - Add C++ class/struct.

@ -523,7 +523,7 @@ allocated.</p>
char * char *
mxmlSaveAllocString( mxmlSaveAllocString(
<a href='#mxml_node_t'>mxml_node_t</a> * node, <a href='#mxml_node_t'>mxml_node_t</a> * node,
int (*cb)(mxml_node_t *node, int ws)); const char * (*cb)(mxml_node_t *node, int ws));
</pre> </pre>
<h4>Arguments</h4> <h4>Arguments</h4>
<p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'> <p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'>
@ -551,7 +551,7 @@ int
mxmlSaveFile( mxmlSaveFile(
<a href='#mxml_node_t'>mxml_node_t</a> * node, <a href='#mxml_node_t'>mxml_node_t</a> * node,
FILE * fp, FILE * fp,
int (*cb)(mxml_node_t *node, int ws)); const char * (*cb)(mxml_node_t *node, int ws));
</pre> </pre>
<h4>Arguments</h4> <h4>Arguments</h4>
<p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'> <p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'>
@ -579,7 +579,7 @@ mxmlSaveString(
<a href='#mxml_node_t'>mxml_node_t</a> * node, <a href='#mxml_node_t'>mxml_node_t</a> * node,
char * buffer, char * buffer,
int bufsize, int bufsize,
int (*cb)(mxml_node_t *node, int ws)); const char * (*cb)(mxml_node_t *node, int ws));
</pre> </pre>
<h4>Arguments</h4> <h4>Arguments</h4>
<p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'> <p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'>

@ -1,5 +1,5 @@
/* /*
* "$Id: mxml-file.c,v 1.28 2004/04/06 01:47:20 mike Exp $" * "$Id: mxml-file.c,v 1.29 2004/05/01 15:20:04 mike Exp $"
* *
* File loading code for mini-XML, a small XML-like file parsing library. * File loading code for mini-XML, a small XML-like file parsing library.
* *
@ -71,13 +71,13 @@ static int mxml_string_putc(int ch, void *p);
static int mxml_write_name(const char *s, void *p, static int mxml_write_name(const char *s, void *p,
int (*putc_cb)(int, void *)); int (*putc_cb)(int, void *));
static int mxml_write_node(mxml_node_t *node, void *p, static int mxml_write_node(mxml_node_t *node, void *p,
int (*cb)(mxml_node_t *, int), const char *(*cb)(mxml_node_t *, int),
int col, int col,
int (*putc_cb)(int, void *)); int (*putc_cb)(int, void *));
static int mxml_write_string(const char *s, void *p, static int mxml_write_string(const char *s, void *p,
int (*putc_cb)(int, void *)); int (*putc_cb)(int, void *));
static int mxml_write_ws(mxml_node_t *node, void *p, static int mxml_write_ws(mxml_node_t *node, void *p,
int (*cb)(mxml_node_t *, int), int ws, const char *(*cb)(mxml_node_t *, int), int ws,
int col, int (*putc_cb)(int, void *)); int col, int (*putc_cb)(int, void *));
@ -143,7 +143,7 @@ mxmlLoadString(mxml_node_t *top, /* I - Top node */
char * /* O - Allocated string or NULL */ char * /* O - Allocated string or NULL */
mxmlSaveAllocString(mxml_node_t *node, /* I - Node to write */ mxmlSaveAllocString(mxml_node_t *node, /* I - Node to write */
int (*cb)(mxml_node_t *node, int ws)) const char *(*cb)(mxml_node_t *node, int ws))
/* I - Whitespace callback or MXML_NO_CALLBACK */ /* I - Whitespace callback or MXML_NO_CALLBACK */
{ {
int bytes; /* Required bytes */ int bytes; /* Required bytes */
@ -201,7 +201,7 @@ mxmlSaveAllocString(mxml_node_t *node, /* I - Node to write */
int /* O - 0 on success, -1 on error. */ int /* O - 0 on success, -1 on error. */
mxmlSaveFile(mxml_node_t *node, /* I - Node to write */ mxmlSaveFile(mxml_node_t *node, /* I - Node to write */
FILE *fp, /* I - File to write to */ FILE *fp, /* I - File to write to */
int (*cb)(mxml_node_t *node, int ws)) const char *(*cb)(mxml_node_t *node, int ws))
/* I - Whitespace callback or MXML_NO_CALLBACK */ /* I - Whitespace callback or MXML_NO_CALLBACK */
{ {
int col; /* Final column */ int col; /* Final column */
@ -238,7 +238,7 @@ int /* O - Size of string */
mxmlSaveString(mxml_node_t *node, /* I - Node to write */ mxmlSaveString(mxml_node_t *node, /* I - Node to write */
char *buffer, /* I - String buffer */ char *buffer, /* I - String buffer */
int bufsize, /* I - Size of string buffer */ int bufsize, /* I - Size of string buffer */
int (*cb)(mxml_node_t *node, int ws)) const char *(*cb)(mxml_node_t *node, int ws))
/* I - Whitespace callback or MXML_NO_CALLBACK */ /* I - Whitespace callback or MXML_NO_CALLBACK */
{ {
int col; /* Final column */ int col; /* Final column */
@ -1426,7 +1426,7 @@ mxml_write_name(const char *s, /* I - Name to write */
static int /* O - Column or -1 on error */ static int /* O - Column or -1 on error */
mxml_write_node(mxml_node_t *node, /* I - Node to write */ mxml_write_node(mxml_node_t *node, /* I - Node to write */
void *p, /* I - File to write to */ void *p, /* I - File to write to */
int (*cb)(mxml_node_t *, int), const char *(*cb)(mxml_node_t *, int),
/* I - Whitespace callback */ /* I - Whitespace callback */
int col, /* I - Current column */ int col, /* I - Current column */
int (*putc_cb)(int, void *)) int (*putc_cb)(int, void *))
@ -1699,29 +1699,34 @@ mxml_write_string(const char *s, /* I - String to write */
static int /* O - New column */ static int /* O - New column */
mxml_write_ws(mxml_node_t *node, /* I - Current node */ mxml_write_ws(mxml_node_t *node, /* I - Current node */
void *p, /* I - Write pointer */ void *p, /* I - Write pointer */
int (*cb)(mxml_node_t *, int), const char *(*cb)(mxml_node_t *, int),
/* I - Callback function */ /* I - Callback function */
int ws, /* I - Where value */ int ws, /* I - Where value */
int col, /* I - Current column */ int col, /* I - Current column */
int (*putc_cb)(int, void *)) int (*putc_cb)(int, void *))
/* I - Write callback */ /* I - Write callback */
{ {
int ch; /* Whitespace character */ const char *s; /* Whitespace string */
if (cb && (ch = (*cb)(node, ws)) != 0) if (cb && (s = (*cb)(node, ws)) != NULL)
{ {
if ((*putc_cb)(ch, p) < 0) while (*s)
return (-1);
else if (ch == '\n')
col = 0;
else if (ch == '\t')
{ {
col += MXML_TAB; if ((*putc_cb)(*s, p) < 0)
col = col - (col % MXML_TAB); return (-1);
else if (*s == '\n')
col = 0;
else if (*s == '\t')
{
col += MXML_TAB;
col = col - (col % MXML_TAB);
}
else
col ++;
s ++;
} }
else
col ++;
} }
return (col); return (col);
@ -1729,5 +1734,5 @@ mxml_write_ws(mxml_node_t *node, /* I - Current node */
/* /*
* End of "$Id: mxml-file.c,v 1.28 2004/04/06 01:47:20 mike Exp $". * End of "$Id: mxml-file.c,v 1.29 2004/05/01 15:20:04 mike Exp $".
*/ */

@ -1,5 +1,5 @@
/* /*
* "$Id: mxml.h,v 1.17 2004/04/06 01:47:20 mike Exp $" * "$Id: mxml.h,v 1.18 2004/05/01 15:20:04 mike Exp $"
* *
* Header file for mini-XML, a small XML-like file parsing library. * Header file for mini-XML, a small XML-like file parsing library.
* *
@ -160,12 +160,12 @@ __attribute__ ((__format__ (__printf__, 3, 4)))
; ;
extern void mxmlRemove(mxml_node_t *node); extern void mxmlRemove(mxml_node_t *node);
extern char *mxmlSaveAllocString(mxml_node_t *node, extern char *mxmlSaveAllocString(mxml_node_t *node,
int (*cb)(mxml_node_t *, int)); const char *(*cb)(mxml_node_t *, int));
extern int mxmlSaveFile(mxml_node_t *node, FILE *fp, extern int mxmlSaveFile(mxml_node_t *node, FILE *fp,
int (*cb)(mxml_node_t *, int)); const char *(*cb)(mxml_node_t *, int));
extern int mxmlSaveString(mxml_node_t *node, char *buffer, extern int mxmlSaveString(mxml_node_t *node, char *buffer,
int bufsize, int bufsize,
int (*cb)(mxml_node_t *, int)); const char *(*cb)(mxml_node_t *, int));
extern int mxmlSetElement(mxml_node_t *node, const char *name); extern int mxmlSetElement(mxml_node_t *node, const char *name);
extern void mxmlSetErrorCallback(void (*cb)(const char *)); extern void mxmlSetErrorCallback(void (*cb)(const char *));
extern int mxmlSetInteger(mxml_node_t *node, int integer); extern int mxmlSetInteger(mxml_node_t *node, int integer);
@ -206,5 +206,5 @@ extern mxml_type_t mxml_real_cb(mxml_node_t *node);
/* /*
* End of "$Id: mxml.h,v 1.17 2004/04/06 01:47:20 mike Exp $". * End of "$Id: mxml.h,v 1.18 2004/05/01 15:20:04 mike Exp $".
*/ */

@ -1,59 +1,111 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<function name="mxmlAdd"><description>Add a node to a tree. <function name="mxmlAdd">
<description>Add a node to a tree.
Adds the specified node to the parent. If the child argument is not Adds the specified node to the parent. If the child argument is not
NULL, puts the new node before or after the specified child depending NULL, puts the new node before or after the specified child depending
on the value of the where argument. If the child argument is NULL, on the value of the where argument. If the child argument is NULL,
puts the new node at the beginning of the child list (MXML_ADD_BEFORE) puts the new node at the beginning of the child list (MXML_ADD_BEFORE)
or at the end of the child list (MXML_ADD_AFTER). The constant or at the end of the child list (MXML_ADD_AFTER). The constant
MXML_ADD_TO_PARENT can be used to specify a NULL child pointer.</description><argument MXML_ADD_TO_PARENT can be used to specify a NULL child pointer.</description>
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node</description></argument> <argument name="parent" direction="I">
<argument name="where" direction="I"><type>int</type><description>Where to add, MXML_ADD_BEFORE or MXML_ADD_AFTER</description></argument> <type>mxml_node_t *</type>
<argument name="child" direction="I"><type>mxml_node_t *</type><description>Child node for where or MXML_ADD_TO_PARENT</description></argument> <description>Parent node</description>
<argument name="node" direction="I"><type>mxml_node_t *</type><description>Node to add</description></argument> </argument>
<argument name="where" direction="I">
<type>int</type>
<description>Where to add, MXML_ADD_BEFORE or MXML_ADD_AFTER</description>
</argument>
<argument name="child" direction="I">
<type>mxml_node_t *</type>
<description>Child node for where or MXML_ADD_TO_PARENT</description>
</argument>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to add</description>
</argument>
</function> </function>
<function name="mxmlDelete"><description>Delete a node and all of its children. <function name="mxmlDelete">
<description>Delete a node and all of its children.
If the specified node has a parent, this function first removes the If the specified node has a parent, this function first removes the
node from its parent using the mxmlRemove() function.</description><argument node from its parent using the mxmlRemove() function.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to delete</description></argument> <argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to delete</description>
</argument>
</function> </function>
<function name="mxmlElementGetAttr"><returnvalue><description>Attribute value or NULL</description><type>const <function name="mxmlElementGetAttr">
char *</type></returnvalue> <returnvalue>
<description>Get an attribute. <description>Attribute value or NULL</description>
<type>const char *</type>
</returnvalue>
<description>Get an attribute.
This function returns NULL if the node is not an element or the This function returns NULL if the node is not an element or the
named attribute does not exist.</description><argument named attribute does not exist.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Element node</description></argument> <argument name="node" direction="I">
<argument name="name" direction="I"><type>const char *</type><description>Name of attribute</description></argument> <type>mxml_node_t *</type>
<description>Element node</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>Name of attribute</description>
</argument>
</function> </function>
<function name="mxmlElementSetAttr"><description>Set an attribute. <function name="mxmlElementSetAttr">
<description>Set an attribute.
If the named attribute already exists, the value of the attribute If the named attribute already exists, the value of the attribute
is replaced by the new string value. The string value is copied is replaced by the new string value. The string value is copied
into the element node. This function does nothing if the node is into the element node. This function does nothing if the node is
not an element.</description><argument not an element.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Element node</description></argument> <argument name="node" direction="I">
<argument name="name" direction="I"><type>const char *</type><description>Name of attribute</description></argument> <type>mxml_node_t *</type>
<argument name="value" direction="I"><type>const char *</type><description>Attribute value</description></argument> <description>Element node</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>Name of attribute</description>
</argument>
<argument name="value" direction="I">
<type>const char *</type>
<description>Attribute value</description>
</argument>
</function> </function>
<function name="mxmlEntityGetName"><returnvalue><description>Entity name or NULL</description><type>const <function name="mxmlEntityGetName">
char *</type></returnvalue> <returnvalue>
<description>Get the name that corresponds to the character value. <description>Entity name or NULL</description>
<type>const char *</type>
</returnvalue>
<description>Get the name that corresponds to the character value.
If val does not need to be represented by a named entity, NULL is returned.</description><argument If val does not need to be represented by a named entity, NULL is returned.</description>
name="val" direction="I"><type>int</type><description>Character value</description></argument> <argument name="val" direction="I">
<type>int</type>
<description>Character value</description>
</argument>
</function> </function>
<function name="mxmlEntityGetValue"><returnvalue><description>Character value or -1 on error</description><type>int</type></returnvalue> <function name="mxmlEntityGetValue">
<description>Get the character corresponding to a named entity. <returnvalue>
<description>Character value or -1 on error</description>
<type>int</type>
</returnvalue>
<description>Get the character corresponding to a named entity.
The entity name can also be a numeric constant. -1 is returned if the The entity name can also be a numeric constant. -1 is returned if the
name is not known.</description><argument name is not known.</description>
name="name" direction="I"><type>const char *</type><description>Entity name</description></argument> <argument name="name" direction="I">
<type>const char *</type>
<description>Entity name</description>
</argument>
</function> </function>
<function name="mxmlFindElement"><returnvalue><description>Element node or NULL</description><type>mxml_node_t <function name="mxmlFindElement">
*</type></returnvalue> <returnvalue>
<description>Find the named element. <description>Element node or NULL</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Find the named element.
The search is constrained by the name, attribute name, and value; any The search is constrained by the name, attribute name, and value; any
NULL names or values are treated as wildcards, so different kinds of NULL names or values are treated as wildcards, so different kinds of
@ -62,17 +114,38 @@ or all elements with a specific attribute. The descend argument determines
whether the search descends into child nodes; normally you will use whether the search descends into child nodes; normally you will use
MXML_DESCEND_FIRST for the initial search and MXML_NO_DESCEND to find MXML_DESCEND_FIRST for the initial search and MXML_NO_DESCEND to find
additional direct descendents of the node. The top node argument additional direct descendents of the node. The top node argument
constrains the search to a particular node's children.</description><argument constrains the search to a particular node's children.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Current node</description></argument> <argument name="node" direction="I">
<argument name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument> <type>mxml_node_t *</type>
<argument name="name" direction="I"><type>const char *</type><description>Element name or NULL for any</description></argument> <description>Current node</description>
<argument name="attr" direction="I"><type>const char *</type><description>Attribute name, or NULL for none</description></argument> </argument>
<argument name="value" direction="I"><type>const char *</type><description>Attribute value, or NULL for any</description></argument> <argument name="top" direction="I">
<argument name="descend" direction="I"><type>int</type><description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description></argument> <type>mxml_node_t *</type>
<description>Top node</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>Element name or NULL for any</description>
</argument>
<argument name="attr" direction="I">
<type>const char *</type>
<description>Attribute name, or NULL for none</description>
</argument>
<argument name="value" direction="I">
<type>const char *</type>
<description>Attribute value, or NULL for any</description>
</argument>
<argument name="descend" direction="I">
<type>int</type>
<description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description>
</argument>
</function> </function>
<function name="mxmlLoadFile"><returnvalue><description>First node or NULL if the file could not be read.</description><type>mxml_node_t <function name="mxmlLoadFile">
*</type></returnvalue> <returnvalue>
<description>Load a file into an XML node tree. <description>First node or NULL if the file could not be read.</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Load a file into an XML node tree.
The nodes in the specified file are added to the specified top node. The nodes in the specified file are added to the specified top node.
If no top node is provided, the XML file MUST be well-formed with a If no top node is provided, the XML file MUST be well-formed with a
@ -83,14 +156,26 @@ MXML_ELEMENT or MXML_TEXT nodes.
The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK, The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
child nodes of the specified type.</description><argument child nodes of the specified type.</description>
name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument> <argument name="top" direction="I">
<argument name="fp" direction="I"><type>FILE *</type><description>File to read from</description></argument> <type>mxml_node_t *</type>
<argument name="(*cb)(mxml_node_t *node)" direction="I"><type>mxml_type_t</type><description>Callback function or MXML_NO_CALLBACK</description></argument> <description>Top node</description>
</argument>
<argument name="fp" direction="I">
<type>FILE *</type>
<description>File to read from</description>
</argument>
<argument name="(*cb)(mxml_node_t *node)" direction="I">
<type>mxml_type_t</type>
<description>Callback function or MXML_NO_CALLBACK</description>
</argument>
</function> </function>
<function name="mxmlLoadString"><returnvalue><description>First node or NULL if the string has errors.</description><type>mxml_node_t <function name="mxmlLoadString">
*</type></returnvalue> <returnvalue>
<description>Load a string into an XML node tree. <description>First node or NULL if the string has errors.</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Load a string into an XML node tree.
The nodes in the specified string are added to the specified top node. The nodes in the specified string are added to the specified top node.
If no top node is provided, the XML string MUST be well-formed with a If no top node is provided, the XML string MUST be well-formed with a
@ -101,235 +186,529 @@ MXML_ELEMENT or MXML_TEXT nodes.
The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK, The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
child nodes of the specified type.</description><argument child nodes of the specified type.</description>
name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument> <argument name="top" direction="I">
<argument name="s" direction="I"><type>const char *</type><description>String to load</description></argument> <type>mxml_node_t *</type>
<argument name="(*cb)(mxml_node_t *node)" direction="I"><type>mxml_type_t</type><description>Callback function or MXML_NO_CALLBACK</description></argument> <description>Top node</description>
</argument>
<argument name="s" direction="I">
<type>const char *</type>
<description>String to load</description>
</argument>
<argument name="(*cb)(mxml_node_t *node)" direction="I">
<type>mxml_type_t</type>
<description>Callback function or MXML_NO_CALLBACK</description>
</argument>
</function> </function>
<function name="mxmlNewElement"><returnvalue><description>New node</description><type>mxml_node_t <function name="mxmlNewElement">
*</type></returnvalue> <returnvalue>
<description>Create a new element node. <description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new element node.
The new element node is added to the end of the specified parent's child The new element node is added to the end of the specified parent's child
list. The constant MXML_NO_PARENT can be used to specify that the new list. The constant MXML_NO_PARENT can be used to specify that the new
element node has no parent.</description><argument element node has no parent.</description>
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument> <argument name="parent" direction="I">
<argument name="name" direction="I"><type>const char *</type><description>Name of element</description></argument> <type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>Name of element</description>
</argument>
</function> </function>
<function name="mxmlNewInteger"><returnvalue><description>New node</description><type>mxml_node_t <function name="mxmlNewInteger">
*</type></returnvalue> <returnvalue>
<description>Create a new integer node. <description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new integer node.
The new integer node is added to the end of the specified parent's child The new integer node is added to the end of the specified parent's child
list. The constant MXML_NO_PARENT can be used to specify that the new list. The constant MXML_NO_PARENT can be used to specify that the new
integer node has no parent.</description><argument integer node has no parent.</description>
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument> <argument name="parent" direction="I">
<argument name="integer" direction="I"><type>int</type><description>Integer value</description></argument> <type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="integer" direction="I">
<type>int</type>
<description>Integer value</description>
</argument>
</function> </function>
<function name="mxmlNewOpaque"><returnvalue><description>New node</description><type>mxml_node_t <function name="mxmlNewOpaque">
*</type></returnvalue> <returnvalue>
<description>Create a new opaque string. <description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new opaque string.
The new opaque node is added to the end of the specified parent's child The new opaque node is added to the end of the specified parent's child
list. The constant MXML_NO_PARENT can be used to specify that the new list. The constant MXML_NO_PARENT can be used to specify that the new
opaque node has no parent. The opaque string must be nul-terminated and opaque node has no parent. The opaque string must be nul-terminated and
is copied into the new node.</description><argument is copied into the new node.</description>
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument> <argument name="parent" direction="I">
<argument name="opaque" direction="I"><type>const char *</type><description>Opaque string</description></argument> <type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="opaque" direction="I">
<type>const char *</type>
<description>Opaque string</description>
</argument>
</function> </function>
<function name="mxmlNewReal"><returnvalue><description>New node</description><type>mxml_node_t <function name="mxmlNewReal">
*</type></returnvalue> <returnvalue>
<description>Create a new real number node. <description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new real number node.
The new real number node is added to the end of the specified parent's The new real number node is added to the end of the specified parent's
child list. The constant MXML_NO_PARENT can be used to specify that child list. The constant MXML_NO_PARENT can be used to specify that
the new real number node has no parent.</description><argument the new real number node has no parent.</description>
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument> <argument name="parent" direction="I">
<argument name="real" direction="I"><type>double</type><description>Real number value</description></argument> <type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="real" direction="I">
<type>double</type>
<description>Real number value</description>
</argument>
</function> </function>
<function name="mxmlNewText"><returnvalue><description>New node</description><type>mxml_node_t <function name="mxmlNewText">
*</type></returnvalue> <returnvalue>
<description>Create a new text fragment node. <description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new text fragment node.
The new text node is added to the end of the specified parent's child The new text node is added to the end of the specified parent's child
list. The constant MXML_NO_PARENT can be used to specify that the new list. The constant MXML_NO_PARENT can be used to specify that the new
text node has no parent. The whitespace parameter is used to specify text node has no parent. The whitespace parameter is used to specify
whether leading whitespace is present before the node. The text whether leading whitespace is present before the node. The text
string must be nul-terminated and is copied into the new node.</description><argument string must be nul-terminated and is copied into the new node.</description>
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument> <argument name="parent" direction="I">
<argument name="whitespace" direction="I"><type>int</type><description>1 = leading whitespace, 0 = no whitespace</description></argument> <type>mxml_node_t *</type>
<argument name="string" direction="I"><type>const char *</type><description>String</description></argument> <description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="whitespace" direction="I">
<type>int</type>
<description>1 = leading whitespace, 0 = no whitespace</description>
</argument>
<argument name="string" direction="I">
<type>const char *</type>
<description>String</description>
</argument>
</function> </function>
<function name="mxmlNewTextf"><returnvalue><description>New node</description><type>mxml_node_t <function name="mxmlNewTextf">
*</type></returnvalue> <returnvalue>
<description>Create a new formatted text fragment node. <description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new formatted text fragment node.
The new text node is added to the end of the specified parent's child The new text node is added to the end of the specified parent's child
list. The constant MXML_NO_PARENT can be used to specify that the new list. The constant MXML_NO_PARENT can be used to specify that the new
text node has no parent. The whitespace parameter is used to specify text node has no parent. The whitespace parameter is used to specify
whether leading whitespace is present before the node. The format whether leading whitespace is present before the node. The format
string must be nul-terminated and is formatted into the new node.</description><argument string must be nul-terminated and is formatted into the new node.</description>
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument> <argument name="parent" direction="I">
<argument name="whitespace" direction="I"><type>int</type><description>1 = leading whitespace, 0 = no whitespace</description></argument> <type>mxml_node_t *</type>
<argument name="format" direction="I"><type>const char *</type><description>Printf-style frmat string</description></argument> <description>Parent node or MXML_NO_PARENT</description>
<argument name="..." direction="I"><type/><description>Additional args as needed</description></argument> </argument>
<argument name="whitespace" direction="I">
<type>int</type>
<description>1 = leading whitespace, 0 = no whitespace</description>
</argument>
<argument name="format" direction="I">
<type>const char *</type>
<description>Printf-style frmat string</description>
</argument>
<argument name="..." direction="I">
<type/> <description>Additional args as needed</description>
</argument>
</function> </function>
<function name="mxmlRemove"><description>Remove a node from its parent. <function name="mxmlRemove">
<description>Remove a node from its parent.
Does not free memory used by the node - use mxmlDelete() for that. Does not free memory used by the node - use mxmlDelete() for that.
This function does nothing if the node has no parent.</description><argument This function does nothing if the node has no parent.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to remove</description></argument> <argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to remove</description>
</argument>
</function> </function>
<function name="mxmlSaveAllocString"><returnvalue><description>Allocated string or NULL</description><type>char <function name="mxmlSaveAllocString">
*</type></returnvalue> <returnvalue>
<description>Save an XML node tree to an allocated string. <description>Allocated string or NULL</description>
<type>char *</type>
</returnvalue>
<description>Save an XML node tree to an allocated string.
This function returns a pointer to a string containing the textual This function returns a pointer to a string containing the textual
representation of the XML node tree. The string should be freed representation of the XML node tree. The string should be freed
using the free() function when you are done with it. NULL is returned using the free() function when you are done with it. NULL is returned
if the node would produce an empty string or if the string cannot be if the node would produce an empty string or if the string cannot be
allocated.</description><argument allocated.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to write</description></argument> <argument name="node" direction="I">
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I"><type>int</type><description>Whitespace callback or MXML_NO_CALLBACK</description></argument> <type>mxml_node_t *</type>
<description>Node to write</description>
</argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I">
<type>const char *</type>
<description>Whitespace callback or MXML_NO_CALLBACK</description>
</argument>
</function> </function>
<function name="mxmlSaveFile"><returnvalue><description>0 on success, -1 on error.</description><type>int</type></returnvalue> <function name="mxmlSaveFile">
<description>Save an XML tree to a file. <returnvalue>
<description>0 on success, -1 on error.</description>
<type>int</type>
</returnvalue>
<description>Save an XML tree to a file.
The callback argument specifies a function that returns a whitespace The callback argument specifies a function that returns a whitespace
character or nul (0) before and after each element. If MXML_NO_CALLBACK character or nul (0) before and after each element. If MXML_NO_CALLBACK
is specified, whitespace will only be added before MXML_TEXT nodes is specified, whitespace will only be added before MXML_TEXT nodes
with leading whitespace and before attribute names inside opening with leading whitespace and before attribute names inside opening
element tags.</description><argument element tags.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to write</description></argument> <argument name="node" direction="I">
<argument name="fp" direction="I"><type>FILE *</type><description>File to write to</description></argument> <type>mxml_node_t *</type>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I"><type>int</type><description>Whitespace callback or MXML_NO_CALLBACK</description></argument> <description>Node to write</description>
</argument>
<argument name="fp" direction="I">
<type>FILE *</type>
<description>File to write to</description>
</argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I">
<type>const char *</type>
<description>Whitespace callback or MXML_NO_CALLBACK</description>
</argument>
</function> </function>
<function name="mxmlSaveString"><returnvalue><description>Size of string</description><type>int</type></returnvalue> <function name="mxmlSaveString">
<description>Save an XML node tree to a string. <returnvalue>
<description>Size of string</description>
<type>int</type>
</returnvalue>
<description>Save an XML node tree to a string.
This function returns the total number of bytes that would be This function returns the total number of bytes that would be
required for the string but only copies (bufsize - 1) characters required for the string but only copies (bufsize - 1) characters
into the specified buffer.</description><argument into the specified buffer.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to write</description></argument> <argument name="node" direction="I">
<argument name="buffer" direction="I"><type>char *</type><description>String buffer</description></argument> <type>mxml_node_t *</type>
<argument name="bufsize" direction="I"><type>int</type><description>Size of string buffer</description></argument> <description>Node to write</description>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I"><type>int</type><description>Whitespace callback or MXML_NO_CALLBACK</description></argument> </argument>
<argument name="buffer" direction="I">
<type>char *</type>
<description>String buffer</description>
</argument>
<argument name="bufsize" direction="I">
<type>int</type>
<description>Size of string buffer</description>
</argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I">
<type>const char *</type>
<description>Whitespace callback or MXML_NO_CALLBACK</description>
</argument>
</function> </function>
<function name="mxmlSetElement"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue> <function name="mxmlSetElement">
<description>Set the name of an element node. <returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the name of an element node.
The node is not changed if it is not an element node.</description><argument The node is not changed if it is not an element node.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument> <argument name="node" direction="I">
<argument name="name" direction="I"><type>const char *</type><description>New name string</description></argument> <type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>New name string</description>
</argument>
</function> </function>
<function name="mxmlSetErrorCallback"><description>Set the error message callback.</description><argument <function name="mxmlSetErrorCallback">
name="(*cb)(const char *)" direction="I"><type>void</type><description>Error callback function</description></argument> <description>Set the error message callback.</description>
<argument name="(*cb)(const char *)" direction="I">
<type>void</type>
<description>Error callback function</description>
</argument>
</function> </function>
<function name="mxmlSetInteger"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue> <function name="mxmlSetInteger">
<description>Set the value of an integer node. <returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of an integer node.
The node is not changed if it is not an integer node.</description><argument The node is not changed if it is not an integer node.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument> <argument name="node" direction="I">
<argument name="integer" direction="I"><type>int</type><description>Integer value</description></argument> <type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="integer" direction="I">
<type>int</type>
<description>Integer value</description>
</argument>
</function> </function>
<function name="mxmlSetOpaque"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue> <function name="mxmlSetOpaque">
<description>Set the value of an opaque node. <returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of an opaque node.
The node is not changed if it is not an opaque node.</description><argument The node is not changed if it is not an opaque node.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument> <argument name="node" direction="I">
<argument name="opaque" direction="I"><type>const char *</type><description>Opaque string</description></argument> <type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="opaque" direction="I">
<type>const char *</type>
<description>Opaque string</description>
</argument>
</function> </function>
<function name="mxmlSetReal"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue> <function name="mxmlSetReal">
<description>Set the value of a real number node. <returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of a real number node.
The node is not changed if it is not a real number node.</description><argument The node is not changed if it is not a real number node.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument> <argument name="node" direction="I">
<argument name="real" direction="I"><type>double</type><description>Real number value</description></argument> <type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="real" direction="I">
<type>double</type>
<description>Real number value</description>
</argument>
</function> </function>
<function name="mxmlSetText"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue> <function name="mxmlSetText">
<description>Set the value of a text node. <returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of a text node.
The node is not changed if it is not a text node.</description><argument The node is not changed if it is not a text node.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument> <argument name="node" direction="I">
<argument name="whitespace" direction="I"><type>int</type><description>1 = leading whitespace, 0 = no whitespace</description></argument> <type>mxml_node_t *</type>
<argument name="string" direction="I"><type>const char *</type><description>String</description></argument> <description>Node to set</description>
</argument>
<argument name="whitespace" direction="I">
<type>int</type>
<description>1 = leading whitespace, 0 = no whitespace</description>
</argument>
<argument name="string" direction="I">
<type>const char *</type>
<description>String</description>
</argument>
</function> </function>
<function name="mxmlSetTextf"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue> <function name="mxmlSetTextf">
<description>Set the value of a text node to a formatted string. <returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of a text node to a formatted string.
The node is not changed if it is not a text node.</description><argument The node is not changed if it is not a text node.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument> <argument name="node" direction="I">
<argument name="whitespace" direction="I"><type>int</type><description>1 = leading whitespace, 0 = no whitespace</description></argument> <type>mxml_node_t *</type>
<argument name="format" direction="I"><type>const char *</type><description>Printf-style format string</description></argument> <description>Node to set</description>
<argument name="..." direction="I"><type/><description>Additional arguments as needed</description></argument> </argument>
<argument name="whitespace" direction="I">
<type>int</type>
<description>1 = leading whitespace, 0 = no whitespace</description>
</argument>
<argument name="format" direction="I">
<type>const char *</type>
<description>Printf-style format string</description>
</argument>
<argument name="..." direction="I">
<type/> <description>Additional arguments as needed</description>
</argument>
</function> </function>
<function name="mxmlWalkNext"><returnvalue><description>Next node or NULL</description><type>mxml_node_t <function name="mxmlWalkNext">
*</type></returnvalue> <returnvalue>
<description>Walk to the next logical node in the tree. <description>Next node or NULL</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Walk to the next logical node in the tree.
The descend argument controls whether the first child is considered The descend argument controls whether the first child is considered
to be the next node. The top node argument constrains the walk to to be the next node. The top node argument constrains the walk to
the node's children.</description><argument the node's children.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Current node</description></argument> <argument name="node" direction="I">
<argument name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument> <type>mxml_node_t *</type>
<argument name="descend" direction="I"><type>int</type><description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description></argument> <description>Current node</description>
</argument>
<argument name="top" direction="I">
<type>mxml_node_t *</type>
<description>Top node</description>
</argument>
<argument name="descend" direction="I">
<type>int</type>
<description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description>
</argument>
</function> </function>
<function name="mxmlWalkPrev"><returnvalue><description>Previous node or NULL</description><type>mxml_node_t <function name="mxmlWalkPrev">
*</type></returnvalue> <returnvalue>
<description>Walk to the previous logical node in the tree. <description>Previous node or NULL</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Walk to the previous logical node in the tree.
The descend argument controls whether the previous node's last child The descend argument controls whether the previous node's last child
is considered to be the previous node. The top node argument constrains is considered to be the previous node. The top node argument constrains
the walk to the node's children.</description><argument the walk to the node's children.</description>
name="node" direction="I"><type>mxml_node_t *</type><description>Current node</description></argument> <argument name="node" direction="I">
<argument name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument> <type>mxml_node_t *</type>
<argument name="descend" direction="I"><type>int</type><description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description></argument> <description>Current node</description>
</argument>
<argument name="top" direction="I">
<type>mxml_node_t *</type>
<description>Top node</description>
</argument>
<argument name="descend" direction="I">
<type>int</type>
<description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description>
</argument>
</function> </function>
<struct name="mxml_attr_s"><description>An XML element attribute value.</description><variable <struct name="mxml_attr_s">
name="name"><type>char *</type><description>Attribute name</description></variable> <description>An XML element attribute value.</description>
<variable name="value"><type>char *</type><description>Attribute value</description></variable> <variable name="name">
<type>char *</type>
<description>Attribute name</description>
</variable>
<variable name="value">
<type>char *</type>
<description>Attribute value</description>
</variable>
</struct> </struct>
<typedef name="mxml_attr_t"><description>An XML element attribute value.</description><type>struct <typedef name="mxml_attr_t">
mxml_attr_s</type></typedef> <description>An XML element attribute value.</description>
<typedef name="mxml_element_t"><description>An XML element value.</description><type>struct <type>struct mxml_attr_s</type>
mxml_value_s</type></typedef> </typedef>
<struct name="mxml_node_s"><description>An XML node.</description><variable <typedef name="mxml_element_t">
name="child"><type>struct mxml_node_s *</type><description>First child node</description></variable> <description>An XML element value.</description>
<variable name="last_child"><type>struct mxml_node_s *</type><description>Last child node</description></variable> <type>struct mxml_value_s</type>
<variable name="next"><type>struct mxml_node_s *</type><description>Next node under same parent</description></variable> </typedef>
<variable name="parent"><type>struct mxml_node_s *</type><description>Parent node</description></variable> <struct name="mxml_node_s">
<variable name="prev"><type>struct mxml_node_s *</type><description>Previous node under same parent</description></variable> <description>An XML node.</description>
<variable name="type"><type>mxml_type_t</type><description>Node type</description></variable> <variable name="child">
<variable name="value"><type>mxml_value_t</type><description>Node value</description></variable> <type>struct mxml_node_s *</type>
<description>First child node</description>
</variable>
<variable name="last_child">
<type>struct mxml_node_s *</type>
<description>Last child node</description>
</variable>
<variable name="next">
<type>struct mxml_node_s *</type>
<description>Next node under same parent</description>
</variable>
<variable name="parent">
<type>struct mxml_node_s *</type>
<description>Parent node</description>
</variable>
<variable name="prev">
<type>struct mxml_node_s *</type>
<description>Previous node under same parent</description>
</variable>
<variable name="type">
<type>mxml_type_t</type>
<description>Node type</description>
</variable>
<variable name="value">
<type>mxml_value_t</type>
<description>Node value</description>
</variable>
</struct> </struct>
<typedef name="mxml_node_t"><description>An XML node.</description><type>struct <typedef name="mxml_node_t">
mxml_node_s</type></typedef> <description>An XML node.</description>
<struct name="mxml_text_s"><description>An XML text value.</description><variable <type>struct mxml_node_s</type>
name="string"><type>char *</type><description>Fragment string</description></variable> </typedef>
<variable name="whitespace"><type>int</type><description>Leading whitespace?</description></variable> <struct name="mxml_text_s">
<description>An XML text value.</description>
<variable name="string">
<type>char *</type>
<description>Fragment string</description>
</variable>
<variable name="whitespace">
<type>int</type>
<description>Leading whitespace?</description>
</variable>
</struct> </struct>
<typedef name="mxml_text_t"><description>An XML text value.</description><type>struct <typedef name="mxml_text_t">
mxml_text_s</type></typedef> <description>An XML text value.</description>
<enumeration name="mxml_type_e"><description>The XML node type.</description><constant <type>struct mxml_text_s</type>
name="MXML_ELEMENT"><description>XML element with attributes</description></constant> </typedef>
<constant name="MXML_INTEGER"><description>Integer value</description></constant> <enumeration name="mxml_type_e">
<constant name="MXML_OPAQUE"><description>Opaque string</description></constant> <description>The XML node type.</description>
<constant name="MXML_REAL"><description>Real value</description></constant> <constant name="MXML_ELEMENT">
<constant name="MXML_TEXT"><description>Text fragment</description></constant> <description>XML element with attributes</description>
</constant>
<constant name="MXML_INTEGER">
<description>Integer value</description>
</constant>
<constant name="MXML_OPAQUE">
<description>Opaque string</description>
</constant>
<constant name="MXML_REAL">
<description>Real value</description>
</constant>
<constant name="MXML_TEXT">
<description>Text fragment</description>
</constant>
</enumeration> </enumeration>
<typedef name="mxml_type_t"><description>The XML node type.</description><type>enum <typedef name="mxml_type_t">
mxml_type_e</type></typedef> <description>The XML node type.</description>
<struct name="mxml_value_s"><description>An XML element value.</description><variable <type>enum mxml_type_e</type>
name="attrs"><type>mxml_attr_t *</type><description>Attributes</description></variable> </typedef>
<variable name="name"><type>char *</type><description>Name of element</description></variable> <struct name="mxml_value_s">
<variable name="num_attrs"><type>int</type><description>Number of attributes</description></variable> <description>An XML element value.</description>
<variable name="attrs">
<type>mxml_attr_t *</type>
<description>Attributes</description>
</variable>
<variable name="name">
<type>char *</type>
<description>Name of element</description>
</variable>
<variable name="num_attrs">
<type>int</type>
<description>Number of attributes</description>
</variable>
</struct> </struct>
<typedef name="mxml_value_t"><description>An XML node value.</description><type>union <typedef name="mxml_value_t">
mxml_value_u</type></typedef> <description>An XML node value.</description>
<union name="mxml_value_u"><description>An XML node value.</description><variable <type>union mxml_value_u</type>
name="element"><type>mxml_element_t</type><description>Element</description></variable> </typedef>
<variable name="integer"><type>int</type><description>Integer number</description></variable> <union name="mxml_value_u">
<variable name="opaque"><type>char *</type><description>Opaque string</description></variable> <description>An XML node value.</description>
<variable name="real"><type>double</type><description>Real number</description></variable> <variable name="element">
<variable name="text"><type>mxml_text_t</type><description>Text fragment</description></variable> <type>mxml_element_t</type>
<description>Element</description>
</variable>
<variable name="integer">
<type>int</type>
<description>Integer number</description>
</variable>
<variable name="opaque">
<type>char *</type>
<description>Opaque string</description>
</variable>
<variable name="real">
<type>double</type>
<description>Real number</description>
</variable>
<variable name="text">
<type>mxml_text_t</type>
<description>Text fragment</description>
</variable>
</union> </union>

@ -1,5 +1,5 @@
/* /*
* "$Id: mxmldoc.c,v 1.32 2004/05/01 07:08:14 mike Exp $" * "$Id: mxmldoc.c,v 1.33 2004/05/01 15:20:05 mike Exp $"
* *
* Documentation generator using mini-XML, a small XML-like file parsing * Documentation generator using mini-XML, a small XML-like file parsing
* library. * library.
@ -135,7 +135,7 @@ static void update_comment(mxml_node_t *parent,
static void write_documentation(mxml_node_t *doc); static void write_documentation(mxml_node_t *doc);
static void write_element(mxml_node_t *doc, mxml_node_t *element); static void write_element(mxml_node_t *doc, mxml_node_t *element);
static void write_string(const char *s); static void write_string(const char *s);
static int ws_cb(mxml_node_t *node, int where); static const char *ws_cb(mxml_node_t *node, int where);
/* /*
@ -2628,27 +2628,74 @@ write_string(const char *s) /* I - String to write */
* 'ws_cb()' - Whitespace callback for saving. * 'ws_cb()' - Whitespace callback for saving.
*/ */
static int /* O - Whitespace char or 0 for none */ static const char * /* O - Whitespace string or NULL for none */
ws_cb(mxml_node_t *node, /* I - Element node */ ws_cb(mxml_node_t *node, /* I - Element node */
int where) /* I - Where value */ int where) /* I - Where value */
{ {
const char *name; /* Name of element */ const char *name; /* Name of element */
int depth; /* Depth of node */
static const char *spaces = " ";
/* Whitespace (40 spaces) for indent */
name = node->value.element.name; name = node->value.element.name;
if ((!strcmp(name, "namespace") || !strcmp(name, "enumeration") || switch (where)
!strcmp(name, "typedef") || !strcmp(name, "function") || {
!strcmp(name, "variable") || !strcmp(name, "struct") || case MXML_WS_BEFORE_CLOSE :
!strcmp(name, "class") || !strcmp(name, "constant") || if (strcmp(name, "argument") &&
!strcmp(name, "argument") || !strcmp(name, "returnvalue")) && strcmp(name, "class") &&
where == MXML_WS_AFTER_CLOSE) strcmp(name, "constant") &&
return ('\n'); strcmp(name, "enumeration") &&
strcmp(name, "function") &&
strcmp(name, "namespace") &&
strcmp(name, "returnvalue") &&
strcmp(name, "struct") &&
strcmp(name, "typedef") &&
strcmp(name, "union") &&
strcmp(name, "variable"))
return (NULL);
for (depth = -4; node; node = node->parent, depth += 2);
if (depth > 40)
return (spaces);
else if (depth < 2)
return (NULL);
else
return (spaces + 40 - depth);
return (0); case MXML_WS_AFTER_CLOSE :
return ("\n");
case MXML_WS_BEFORE_OPEN :
for (depth = -4; node; node = node->parent, depth += 2);
if (depth > 40)
return (spaces);
else if (depth < 2)
return (NULL);
else
return (spaces + 40 - depth);
default :
case MXML_WS_AFTER_OPEN :
if (strcmp(name, "argument") &&
strcmp(name, "class") &&
strcmp(name, "constant") &&
strcmp(name, "enumeration") &&
strcmp(name, "function") &&
strcmp(name, "namespace") &&
strcmp(name, "returnvalue") &&
strcmp(name, "struct") &&
strcmp(name, "typedef") &&
strcmp(name, "union") &&
strcmp(name, "variable"))
return (NULL);
else
return ("\n");
}
} }
/* /*
* End of "$Id: mxmldoc.c,v 1.32 2004/05/01 07:08:14 mike Exp $". * End of "$Id: mxmldoc.c,v 1.33 2004/05/01 15:20:05 mike Exp $".
*/ */

@ -1,5 +1,5 @@
/* /*
* "$Id: testmxml.c,v 1.14 2004/04/06 01:47:20 mike Exp $" * "$Id: testmxml.c,v 1.15 2004/05/01 15:20:05 mike Exp $"
* *
* Test program for mini-XML, a small XML-like file parsing library. * Test program for mini-XML, a small XML-like file parsing library.
* *
@ -36,7 +36,7 @@
*/ */
mxml_type_t type_cb(mxml_node_t *node); mxml_type_t type_cb(mxml_node_t *node);
int whitespace_cb(mxml_node_t *node, int where); const char *whitespace_cb(mxml_node_t *node, int where);
/* /*
@ -377,7 +377,7 @@ type_cb(mxml_node_t *node) /* I - Element node */
* newlines and tabs... * newlines and tabs...
*/ */
int /* O - Whitespace char or 0 */ const char * /* O - Whitespace string or NULL */
whitespace_cb(mxml_node_t *node, /* I - Element node */ whitespace_cb(mxml_node_t *node, /* I - Element node */
int where) /* I - Open or close tag? */ int where) /* I - Open or close tag? */
{ {
@ -400,7 +400,7 @@ whitespace_cb(mxml_node_t *node, /* I - Element node */
*/ */
if (where == MXML_WS_BEFORE_OPEN || where == MXML_WS_AFTER_CLOSE) if (where == MXML_WS_BEFORE_OPEN || where == MXML_WS_AFTER_CLOSE)
return ('\n'); return ("\n");
} }
else if (!strcmp(name, "dl") || !strcmp(name, "ol") || !strcmp(name, "ul")) else if (!strcmp(name, "dl") || !strcmp(name, "ol") || !strcmp(name, "ul"))
{ {
@ -408,7 +408,7 @@ whitespace_cb(mxml_node_t *node, /* I - Element node */
* Put a newline before and after list elements... * Put a newline before and after list elements...
*/ */
return ('\n'); return ("\n");
} }
else if (!strcmp(name, "dd") || !strcmp(name, "dt") || !strcmp(name, "li")) else if (!strcmp(name, "dd") || !strcmp(name, "dt") || !strcmp(name, "li"))
{ {
@ -417,19 +417,19 @@ whitespace_cb(mxml_node_t *node, /* I - Element node */
*/ */
if (where == MXML_WS_BEFORE_OPEN) if (where == MXML_WS_BEFORE_OPEN)
return ('\t'); return ("\t");
else if (where == MXML_WS_AFTER_CLOSE) else if (where == MXML_WS_AFTER_CLOSE)
return ('\n'); return ("\n");
} }
/* /*
* Return 0 for no added whitespace... * Return NULL for no added whitespace...
*/ */
return (0); return (NULL);
} }
/* /*
* End of "$Id: testmxml.c,v 1.14 2004/04/06 01:47:20 mike Exp $". * End of "$Id: testmxml.c,v 1.15 2004/05/01 15:20:05 mike Exp $".
*/ */

Loading…
Cancel
Save