Index: doc/reference/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/reference/ChangeLog,v
retrieving revision 1.17
diff -u -r1.17 ChangeLog
--- a/doc/reference/ChangeLog	22 Dec 2003 21:16:14 -0000	1.17
+++ b/doc/reference/ChangeLog	23 Jun 2004 16:19:02 -0000
@@ -1,3 +1,13 @@
+2004-06-23 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+	* README: Update.
+
+	* conglomerate-sections.txt, conglomerate-types.txt:
+	* conglomerate-overrides.txt: Update for recent sources.
+
+	* conglomerate-docs.sgml: XInclude replaced with external
+	entities. This is common practice of gtk-doc usage.
+
 2003-12-22  Geert Stappers <stappers@stappers.nl>
 
 	* Makefile.am:
Index: doc/reference/README
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/reference/README,v
retrieving revision 1.5
diff -u -r1.5 README
--- a/doc/reference/README	29 Oct 2003 12:33:25 -0000	1.5
+++ b/doc/reference/README	23 Jun 2004 16:19:02 -0000
@@ -1,4 +1,3 @@
-
 In this directory you find GTK-doc files.
 This README tells more about the files.
 The important part is what files need maintaince and how.
@@ -22,15 +21,13 @@
  the reference to the corresponding xml file to/from conglomerate-docs.sgml.
 
 conglomerate-overrides.txt
- function unknown, FIXME when time permits.
- the file is updated by uss/mkgtkdocoverrides
+ Contains description of structures which description should be overrriden
+ because there not much information in sources.  Lists the data types that gtkdoc doesn't notice.
+
 
 conglomerate.types
  Lists the header files to be parsed for objects, and the object _get_type() functions.
 
-conglomerate-overrides.txt
- Lists the data types that gtkdoc doesn't notice.
-
 conglomerate-sections.txt
  The template files in the tmpl directory are generated from this.
 
@@ -46,8 +43,8 @@
 version.xml
  The conglomerate version number, used in the docs.
 
-other files:
- please help
-
-Documentation to gtkdoc usage
- URL: FIXME
+gtk-doc usage:  
+ Documentation to gtkdoc installed with gtk-doc, look for
+ it in your default documentation directory, for example,  
+ /usr/share/doc/gtk-doc-1.2/
+ 
Index: doc/reference/conglomerate-docs.sgml
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/reference/conglomerate-docs.sgml,v
retrieving revision 1.6
diff -u -r1.6 conglomerate-docs.sgml
--- a/doc/reference/conglomerate-docs.sgml	26 Oct 2003 07:56:38 -0000	1.6
+++ b/doc/reference/conglomerate-docs.sgml	23 Jun 2004 16:19:02 -0000
@@ -1,7 +1,107 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+    <!ENTITY cong-app   			SYSTEM "xml/cong-app.xml">
+    <!ENTITY cong-document			SYSTEM "xml/cong-document.xml">
+    <!ENTITY cong-dispspec			SYSTEM "xml/cong-dispspec.xml">
+    <!ENTITY cong-dispspec-registry		SYSTEM "xml/cong-dispspec-registry.xml">
+    <!ENTITY cong-dtd				SYSTEM "xml/cong-dtd.xml">
+    <!ENTITY cong-primary-window		SYSTEM "xml/cong-primary-window.xml">
+
+    <!ENTITY cong-node				SYSTEM "xml/cong-node.xml">
+    <!ENTITY cong-location			SYSTEM "xml/cong-location.xml">
+    <!ENTITY cong-range				SYSTEM "xml/cong-range.xml">
+    <!ENTITY cong-selection			SYSTEM "xml/cong-selection.xml">
+
+    <!ENTITY cong-command			SYSTEM "xml/cong-command.xml">
+    <!ENTITY cong-command-history		SYSTEM "xml/cong-command-history.xml">
+    <!ENTITY cong-modification			SYSTEM "xml/cong-modification.xml">
+    <!ENTITY cong-node-modification		SYSTEM "xml/cong-node-modification.xml">
+    <!ENTITY cong-node-modification-add-after	SYSTEM "xml/cong-node-modification-add-after.xml">
+    <!ENTITY cong-node-modification-add-before	SYSTEM "xml/cong-node-modification-add-before.xml">
+    <!ENTITY cong-node-modification-make-orphan	SYSTEM "xml/cong-node-modification-make-orphan.xml">
+    <!ENTITY cong-node-modification-remove-attribute	SYSTEM "xml/cong-node-modification-remove-attribute.xml">
+    <!ENTITY cong-node-modification-set-attribute	SYSTEM "xml/cong-node-modification-set-attribute.xml">
+    <!ENTITY cong-node-modification-set-parent	SYSTEM "xml/cong-node-modification-set-parent.xml">
+    <!ENTITY cong-node-modification-set-text	SYSTEM "xml/cong-node-modification-set-text.xml">
+    <!ENTITY cong-modification-cursor-change	SYSTEM "xml/cong-modification-cursor-change.xml">
+    <!ENTITY cong-modification-selection-change	SYSTEM "xml/cong-modification-selection-change.xml">
+    <!ENTITY cong-modification-set-dtd-ptr	SYSTEM "xml/cong-modification-set-dtd-ptr.xml">
+    <!ENTITY cong-editor-widget                           SYSTEM "xml/cong-editor-widget.xml">
+    <!ENTITY cong-editor-line-fragments                           SYSTEM "xml/cong-editor-line-fragments.xml">
+    <!ENTITY cong-editor-child-policy                           SYSTEM "xml/cong-editor-child-policy.xml">
+    <!ENTITY cong-editor-child-policy-flow-holder                           SYSTEM "xml/cong-editor-child-policy-flow-holder.xml">
+    <!ENTITY cong-editor-child-policy-inline                           SYSTEM "xml/cong-editor-child-policy-inline.xml">
+    <!ENTITY cong-editor-node                           SYSTEM "xml/cong-editor-node.xml">
+    <!ENTITY cong-editor-node-comment                           SYSTEM "xml/cong-editor-node-comment.xml">
+    <!ENTITY cong-editor-node-document                           SYSTEM "xml/cong-editor-node-document.xml">
+    <!ENTITY cong-editor-node-dtd                           SYSTEM "xml/cong-editor-node-dtd.xml">
+    <!ENTITY cong-editor-node-element-span                           SYSTEM "xml/cong-editor-node-element-span.xml">
+    <!ENTITY cong-editor-node-element-structural                           SYSTEM "xml/cong-editor-node-element-structural.xml">
+    <!ENTITY cong-editor-node-element-unknown                           SYSTEM "xml/cong-editor-node-element-unknown.xml">
+    <!ENTITY cong-editor-node-element                           SYSTEM "xml/cong-editor-node-element.xml">
+    <!ENTITY cong-editor-node-entity-decl                           SYSTEM "xml/cong-editor-node-entity-decl.xml">
+    <!ENTITY cong-editor-node-entity-ref                           SYSTEM "xml/cong-editor-node-entity-ref.xml">
+    <!ENTITY cong-editor-node-text                           SYSTEM "xml/cong-editor-node-text.xml">
+    <!ENTITY cong-editor-node-unimplemented                           SYSTEM "xml/cong-editor-node-unimplemented.xml">
+    <!ENTITY cong-editor-area                           SYSTEM "xml/cong-editor-area.xml">
+    <!ENTITY cong-editor-area-bin                           SYSTEM "xml/cong-editor-area-bin.xml">
+    <!ENTITY cong-editor-area-border                           SYSTEM "xml/cong-editor-area-border.xml">
+    <!ENTITY cong-editor-area-composer                           SYSTEM "xml/cong-editor-area-composer.xml">
+    <!ENTITY cong-editor-area-container                           SYSTEM "xml/cong-editor-area-container.xml">
+    <!ENTITY cong-editor-area-entity-decl                           SYSTEM "xml/cong-editor-area-entity-decl.xml">
+    <!ENTITY cong-editor-area-entity-ref                           SYSTEM "xml/cong-editor-area-entity-ref.xml">
+    <!ENTITY cong-editor-area-expander                           SYSTEM "xml/cong-editor-area-expander.xml">
+    <!ENTITY cong-editor-area-flow-holder-blocks                           SYSTEM "xml/cong-editor-area-flow-holder-blocks.xml">
+    <!ENTITY cong-editor-area-flow-holder-inlines                           SYSTEM "xml/cong-editor-area-flow-holder-inlines.xml">
+    <!ENTITY cong-editor-area-flow-holder-single                           SYSTEM "xml/cong-editor-area-flow-holder-single.xml">
+    <!ENTITY cong-editor-area-flow-holder                           SYSTEM "xml/cong-editor-area-flow-holder.xml">
+    <!ENTITY cong-editor-area-labelled                           SYSTEM "xml/cong-editor-area-labelled.xml">
+    <!ENTITY cong-editor-area-line                           SYSTEM "xml/cong-editor-area-line.xml">
+    <!ENTITY cong-editor-area-pixbuf                           SYSTEM "xml/cong-editor-area-pixbuf.xml">
+    <!ENTITY cong-editor-area-spacer                           SYSTEM "xml/cong-editor-area-spacer.xml">
+    <!ENTITY cong-editor-area-span-tag                           SYSTEM "xml/cong-editor-area-span-tag.xml">
+    <!ENTITY cong-editor-area-structural-tag                           SYSTEM "xml/cong-editor-area-structural-tag.xml">
+    <!ENTITY cong-editor-area-structural                           SYSTEM "xml/cong-editor-area-structural.xml">
+    <!ENTITY cong-editor-area-text-comment                           SYSTEM "xml/cong-editor-area-text-comment.xml">
+    <!ENTITY cong-editor-area-text-fragment                           SYSTEM "xml/cong-editor-area-text-fragment.xml">
+    <!ENTITY cong-editor-area-text                           SYSTEM "xml/cong-editor-area-text.xml">
+    <!ENTITY cong-editor-area-underline                           SYSTEM "xml/cong-editor-area-underline.xml">
+    <!ENTITY cong-editor-area-unknown-tag                           SYSTEM "xml/cong-editor-area-unknown-tag.xml">
+    <!ENTITY cong-view                           SYSTEM "xml/cong-view.xml">
+    <!ENTITY cong-tree-view                           SYSTEM "xml/cong-tree-view.xml">
+    <!ENTITY cong-overview-view                           SYSTEM "xml/cong-overview-view.xml">
+    <!ENTITY cong-plugin                           SYSTEM "xml/cong-plugin.xml">
+    <!ENTITY cong-fake-plugin-hooks                           SYSTEM "xml/cong-fake-plugin-hooks.xml">
+    <!ENTITY plugin-admonition-node-element                           SYSTEM "xml/plugin-admonition-node-element.xml">
+    <!ENTITY plugin-lists-area-listitem                           SYSTEM "xml/plugin-lists-area-listitem.xml">
+    <!ENTITY plugin-lists-node-element-listitem                           SYSTEM "xml/plugin-lists-node-element-listitem.xml">
+    <!ENTITY plugin-paragraph-area-paragraph                           SYSTEM "xml/plugin-paragraph-area-paragraph.xml">
+    <!ENTITY plugin-paragraph-node-element-paragraph                           SYSTEM "xml/plugin-paragraph-node-element-paragraph.xml">
+    <!ENTITY cong-attribute-editor                           SYSTEM "xml/cong-attribute-editor.xml">
+    <!ENTITY cong-attribute-editor-cdata                           SYSTEM "xml/cong-attribute-editor-cdata.xml">
+    <!ENTITY cong-attribute-editor-enumeration                           SYSTEM "xml/cong-attribute-editor-enumeration.xml">
+    <!ENTITY cong-attribute-wrapper                           SYSTEM "xml/cong-attribute-wrapper.xml">
+    <!ENTITY cong-attribute-wrapper-check-button                           SYSTEM "xml/cong-attribute-wrapper-check-button.xml">
+    <!ENTITY cong-attribute-wrapper-radio-button                           SYSTEM "xml/cong-attribute-wrapper-radio-button.xml">
+    <!ENTITY cong-dialog                           SYSTEM "xml/cong-dialog.xml">
+    <!ENTITY cong-eel                           SYSTEM "xml/cong-eel.xml">
+    <!ENTITY cong-eel-graphic-effects                           SYSTEM "xml/cong-eel-graphic-effects.xml">
+    <!ENTITY cong-enum-mapping                           SYSTEM "xml/cong-enum-mapping.xml">
+    <!ENTITY cong-error-dialog                           SYSTEM "xml/cong-error-dialog.xml">
+    <!ENTITY cong-util                           SYSTEM "xml/cong-util.xml">
+    <!ENTITY cong-text-cache                           SYSTEM "xml/cong-text-cache.xml">
+    <!ENTITY cong-progress-checklist                           SYSTEM "xml/cong-progress-checklist.xml">
+    <!ENTITY cong-font                           SYSTEM "xml/cong-font.xml">
+    <!ENTITY cong-graph                           SYSTEM "xml/cong-graph.xml">
+    <!ENTITY cong-marshal                           SYSTEM "xml/cong-marshal.xml">
+    <!ENTITY cong-parser-error                           SYSTEM "xml/cong-parser-error.xml">
+    <!ENTITY fo                           SYSTEM "xml/fo.xml">
+    <!ENTITY global                           SYSTEM "xml/global.xml">
+    <!ENTITY cong-vfs                           SYSTEM "xml/cong-vfs.xml">
+    <!ENTITY tree_index                           SYSTEM "xml/tree_index.sgml">
+    ]>
+<book id="index">
   <bookinfo>
     <title>Conglomerate Programmer's Reference Manual</title>
   </bookinfo>
@@ -14,22 +114,22 @@
     <para>There is also an earlier system, in which there are CongView structs which manually register themselves with CongDocument objects and receive all updates.  This is now deprecated.</para>
     <para>A dispspec is a "display specification"; it is a way of looking up tags in the xml document and deciding if they are "structural" and hence should appear as big blocks in the view, or "spans", in which case they can merely be rendered as an underline.  But it also supports looking up icons to use, and in theory, localisation of the tag names.</para>
     <para>The display specifications are generally loaded from ".xds" files, but can also be created at run-time. </para>
-    <xi:include href="xml/cong-app.xml"/>
-    <xi:include href="xml/cong-document.xml"/>
-    <xi:include href="xml/cong-dispspec.xml"/>
-    <xi:include href="xml/cong-dispspec-registry.xml"/>
-    <xi:include href="xml/cong-dtd.xml"/>
-    <xi:include href="xml/cong-primary-window.xml"/>
+    &cong-app;
+    &cong-document;
+    &cong-dispspec;
+    &cong-dispspec-registry;
+    &cong-dtd;
+    &cong-primary-window;
   </chapter>
 
   <chapter>
     <title>XML Handling</title>
     <para>A #CongNodePtr is a libxml2 xmlNodePtr; originally it was something else, though.  It's a node in the DOM tree of the document.  Everything is stored in UTF-8 internally.  There are some CongNode operations, and these are generally convenience wrappers around libxml2.</para>
     <para>A #CongLocation is a small struct which identifies a "location" in the document (e.g. for storing the cursor location).  It's got a pointer to a node in the document tree, together with an offset into the content of the node, which is only relevant for TEXT and COMMENT nodes.  It's the number of bytes, rather than the number of characters.</para>
-    <xi:include href="xml/cong-node.xml"/>
-    <xi:include href="xml/cong-location.xml"/>
-    <xi:include href="xml/cong-range.xml"/>
-    <xi:include href="xml/cong-selection.xml"/>
+    &cong-node;
+    &cong-location;
+    &cong-range;
+    &cong-selection;
   </chapter>
 
   <chapter>
@@ -47,20 +147,20 @@
     </para>
     <para>All commands are built up of modifications, all of which break down into a small number of atomic modifications.  Each type of modification corresponds to a subclass of #CongModification, and contains enough information to be able to redo and undo the command</para>
     <para>As the atomic modifications are done/undone, they call the appropriate CongDocument methods which have the word "private" in their names e.g. cong_document_private_node_add_after().  These emit signals which are listened to by the various views, widgets etc.  The CongDocument also handles the signal by calling a correspong cong_node_private function e.g. cong_node_private_add_after(), which actual makes the change to the libxml2 representation of the document.</para>
-    <xi:include href="xml/cong-command.xml"/>
-    <xi:include href="xml/cong-command-history.xml"/>
-    <xi:include href="xml/cong-modification.xml"/>
-    <xi:include href="xml/cong-node-modification.xml"/>
-    <xi:include href="xml/cong-node-modification-add-after.xml"/>
-    <xi:include href="xml/cong-node-modification-add-before.xml"/>
-    <xi:include href="xml/cong-node-modification-make-orphan.xml"/>
-    <xi:include href="xml/cong-node-modification-remove-attribute.xml"/>
-    <xi:include href="xml/cong-node-modification-set-attribute.xml"/>
-    <xi:include href="xml/cong-node-modification-set-parent.xml"/>
-    <xi:include href="xml/cong-node-modification-set-text.xml"/>
-    <xi:include href="xml/cong-modification-cursor-change.xml"/>
-    <xi:include href="xml/cong-modification-selection-change.xml"/>
-    <xi:include href="xml/cong-modification-set-dtd-ptr.xml"/>
+    &cong-command;
+    &cong-command-history;
+    &cong-modification;
+    &cong-node-modification;
+    &cong-node-modification-add-after;
+    &cong-node-modification-add-before;
+    &cong-node-modification-make-orphan;
+    &cong-node-modification-remove-attribute;
+    &cong-node-modification-set-attribute;
+    &cong-node-modification-set-parent;
+    &cong-node-modification-set-text;
+    &cong-modification-cursor-change;
+    &cong-modification-selection-change;
+    &cong-modification-set-dtd-ptr;
   </chapter>
 
   <chapter>
@@ -71,108 +171,107 @@
     <para>CongEditorNode objects work behind the scenes.  They are responsible for creating CongEditorArea objects to represent themselves.</para>
     <para>There are a few other classes involved: CongEditorAreaFlowHolder, and CongEditorChildPolicy.  These are responsible for generating paragraph-like areas, which the editor nodes "pour" their CongEditorAreas into.  This allows us to get the nice underlines, which is achieved by using a PangoLayout for every text node, splitting all the PangoLayoutLines into separate CongEditorArea objects, and then merging them, together with a few extra CongEditorAreas. </para>
     <para> If you want to see the CongEditorAreas, then go to src/cong-editor-area.c and play around with the #define settings; in particular DEBUG_RENDER_ALLOCATIONS can be used to render rectangles to indicate all of the bounding boxes of the CongEditorAreas.</para>
-    <xi:include href="xml/cong-editor-widget.xml"/>
-    <xi:include href="xml/cong-editor-widget3-impl.xml"/>
-    <xi:include href="xml/cong-editor-line-fragments.xml"/>
+    &cong-editor-widget;
+    &cong-editor-line-fragments;
 
     <sect1><title>Child Policies</title>
-    <xi:include href="xml/cong-editor-child-policy.xml"/>
-    <xi:include href="xml/cong-editor-child-policy-flow-holder.xml"/>
-    <xi:include href="xml/cong-editor-child-policy-inline.xml"/>
+    &cong-editor-child-policy;
+    &cong-editor-child-policy-flow-holder;
+    &cong-editor-child-policy-inline;
     </sect1>
 
     <sect1><title>Editor Nodes</title>
-    <xi:include href="xml/cong-editor-node.xml"/>
-    <xi:include href="xml/cong-editor-node-comment.xml"/>
-    <xi:include href="xml/cong-editor-node-document.xml"/>
-    <xi:include href="xml/cong-editor-node-dtd.xml"/>
-    <xi:include href="xml/cong-editor-node-element-span.xml"/>
-    <xi:include href="xml/cong-editor-node-element-structural.xml"/>
-    <xi:include href="xml/cong-editor-node-element-unknown.xml"/>
-    <xi:include href="xml/cong-editor-node-element.xml"/>
-    <xi:include href="xml/cong-editor-node-entity-decl.xml"/>
-    <xi:include href="xml/cong-editor-node-entity-ref.xml"/>
-    <xi:include href="xml/cong-editor-node-text.xml"/>
-    <xi:include href="xml/cong-editor-node-unimplemented.xml"/>
+    &cong-editor-node;
+    &cong-editor-node-comment;
+    &cong-editor-node-document;
+    &cong-editor-node-dtd;
+    &cong-editor-node-element-span;
+    &cong-editor-node-element-structural;
+    &cong-editor-node-element-unknown;
+    &cong-editor-node-element;
+    &cong-editor-node-entity-decl;
+    &cong-editor-node-entity-ref;
+    &cong-editor-node-text;
+    &cong-editor-node-unimplemented;
     </sect1>
 
     <sect1><title>Editor Areas</title>
-    <xi:include href="xml/cong-editor-area.xml"/>
-    <xi:include href="xml/cong-editor-area-bin.xml"/>
-    <xi:include href="xml/cong-editor-area-border.xml"/>
-    <xi:include href="xml/cong-editor-area-composer.xml"/>
-    <xi:include href="xml/cong-editor-area-container.xml"/>
-    <xi:include href="xml/cong-editor-area-entity-decl.xml"/>
-    <xi:include href="xml/cong-editor-area-entity-ref.xml"/>
-    <xi:include href="xml/cong-editor-area-expander.xml"/>
-    <xi:include href="xml/cong-editor-area-flow-holder-blocks.xml"/>
-    <xi:include href="xml/cong-editor-area-flow-holder-inlines.xml"/>
-    <xi:include href="xml/cong-editor-area-flow-holder-single.xml"/>
-    <xi:include href="xml/cong-editor-area-flow-holder.xml"/>
-    <xi:include href="xml/cong-editor-area-labelled.xml"/>
-    <xi:include href="xml/cong-editor-area-line.xml"/>
-    <xi:include href="xml/cong-editor-area-pixbuf.xml"/>
-    <xi:include href="xml/cong-editor-area-spacer.xml"/>
-    <xi:include href="xml/cong-editor-area-span-tag.xml"/>
-    <xi:include href="xml/cong-editor-area-structural-tag.xml"/>
-    <xi:include href="xml/cong-editor-area-structural.xml"/>
-    <xi:include href="xml/cong-editor-area-text-comment.xml"/>
-    <xi:include href="xml/cong-editor-area-text-fragment.xml"/>
-    <xi:include href="xml/cong-editor-area-text.xml"/>
-    <xi:include href="xml/cong-editor-area-underline.xml"/>
-    <xi:include href="xml/cong-editor-area-unknown-tag.xml"/>
+    &cong-editor-area;
+    &cong-editor-area-bin;
+    &cong-editor-area-border;
+    &cong-editor-area-composer;
+    &cong-editor-area-container;
+    &cong-editor-area-entity-decl;
+    &cong-editor-area-entity-ref;
+    &cong-editor-area-expander;
+    &cong-editor-area-flow-holder-blocks;
+    &cong-editor-area-flow-holder-inlines;
+    &cong-editor-area-flow-holder-single;
+    &cong-editor-area-flow-holder;
+    &cong-editor-area-labelled;
+    &cong-editor-area-line;
+    &cong-editor-area-pixbuf;
+    &cong-editor-area-spacer;
+    &cong-editor-area-span-tag;
+    &cong-editor-area-structural-tag;
+    &cong-editor-area-structural;
+    &cong-editor-area-text-comment;
+    &cong-editor-area-text-fragment;
+    &cong-editor-area-text;
+    &cong-editor-area-underline;
+    &cong-editor-area-unknown-tag;
     </sect1>
   </chapter>
 
   <chapter>
     <title>Other Views of the Document</title>
-    <xi:include href="xml/cong-view.xml"/>
-    <xi:include href="xml/cong-tree-view.xml"/>
-    <xi:include href="xml/cong-overview-view.xml"/>
+    &cong-view;
+    &cong-tree-view;
+    &cong-overview-view;
   </chapter>
 
   <chapter>
     <title>Plugins</title>
-    <xi:include href="xml/cong-plugin.xml"/>
-    <xi:include href="xml/cong-fake-plugin-hooks.xml"/>
-    <xi:include href="xml/plugin-admonition-node-element.xml"/>
-    <xi:include href="xml/plugin-lists-area-listitem.xml"/>
-    <xi:include href="xml/plugin-lists-node-element-listitem.xml"/>
-    <xi:include href="xml/plugin-paragraph-area-paragraph.xml"/>
-    <xi:include href="xml/plugin-paragraph-node-element-paragraph.xml"/>
+    &cong-plugin;
+    &cong-fake-plugin-hooks;
+    &plugin-admonition-node-element;
+    &plugin-lists-area-listitem;
+    &plugin-lists-node-element-listitem;
+    &plugin-paragraph-area-paragraph;
+    &plugin-paragraph-node-element-paragraph;
   </chapter>
 
   <chapter>
     <title>Helper Routines and Widgets</title>
-    <xi:include href="xml/cong-attribute-editor.xml"/>
-    <xi:include href="xml/cong-attribute-editor-cdata.xml"/>
-    <xi:include href="xml/cong-attribute-editor-enumeration.xml"/>
-    <xi:include href="xml/cong-attribute-wrapper.xml"/>
-    <xi:include href="xml/cong-attribute-wrapper-check-button.xml"/>
-    <xi:include href="xml/cong-attribute-wrapper-radio-button.xml"/>
-    <xi:include href="xml/cong-dialog.xml"/>
-    <xi:include href="xml/cong-eel.xml"/>
-    <xi:include href="xml/cong-eel-graphic-effects.xml"/>
-    <xi:include href="xml/cong-enum-mapping.xml"/>
-    <xi:include href="xml/cong-error-dialog.xml"/>
-    <xi:include href="xml/cong-util.xml"/>
-    <xi:include href="xml/cong-text-cache.xml"/>
-    <xi:include href="xml/cong-progress-checklist.xml"/>
+    &cong-attribute-editor;
+    &cong-attribute-editor-cdata;
+    &cong-attribute-editor-enumeration;
+    &cong-attribute-wrapper;
+    &cong-attribute-wrapper-check-button;
+    &cong-attribute-wrapper-radio-button;
+    &cong-dialog;
+    &cong-eel;
+    &cong-eel-graphic-effects;
+    &cong-enum-mapping;
+    &cong-error-dialog;
+    &cong-util;
+    &cong-text-cache;
+    &cong-progress-checklist;
   </chapter>
 
   <chapter>
     <title>Miscellaneous</title>
-    <xi:include href="xml/cong-font.xml"/>
-    <xi:include href="xml/cong-graph.xml"/>
-    <xi:include href="xml/cong-marshal.xml"/>
-    <xi:include href="xml/cong-parser-error.xml"/>
-    <xi:include href="xml/fo.xml"/>
-    <xi:include href="xml/global.xml"/>
-    <xi:include href="xml/cong-vfs.xml"/>
+    &cong-font;
+    &cong-graph;
+    &cong-marshal;
+    &cong-parser-error;
+    &fo;
+    &global;
+    &cong-vfs;
   </chapter>
   
   <chapter>
     <title>Object Tree</title>
-    <xi:include href="xml/tree_index.sgml"/>
+    &tree_index;
   </chapter>
 </book>
Index: doc/reference/conglomerate-overrides.txt
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/reference/conglomerate-overrides.txt,v
retrieving revision 1.1
diff -u -r1.1 conglomerate-overrides.txt
--- a/doc/reference/conglomerate-overrides.txt	28 Oct 2003 01:21:39 -0000	1.1
+++ b/doc/reference/conglomerate-overrides.txt	23 Jun 2004 16:19:02 -0000
@@ -1,201 +0,0 @@
-<STRUCT>
-<NAME>CongAttributeEditorCDATA</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongAttributeEditorENUMERATION</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongAttributeEditor</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongAttributeWrapperCheckButton</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongAttributeWrapperRadioButton</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongAttributeWrapper</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongCommandHistory</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongCommand</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongDocument</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaBin</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaBorder</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaComposer</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaContainer</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaEntityDecl</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaEntityRef</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaExpander</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaFlowHolderBlocks</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaFlowHolderInlines</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaFlowHolderSingle</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaFlowHolder</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaLabelled</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaLine</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaPixbuf</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaSpacer</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaSpanTag</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaStructuralTag</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaStructural</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaTextComment</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaTextFragment</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaText</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaUnderline</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaUnknownTag</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorArea</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorChildPolicyFlowHolder</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorChildPolicyInline</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorChildPolicy</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorLineFragments</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeComment</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeDocument</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeDtd</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeElementSpan</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeElementStructural</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeElementUnknown</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeElement</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeEntityDecl</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeEntityRef</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeText</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeUnimplemented</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNode</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorWidget3</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongModificationCursorChange</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongModificationSelectionChange</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongModificationSetDtdPtr</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongModification</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongNodeModificationAddAfter</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongNodeModificationAddBefore</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongNodeModificationMakeOrphan</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongNodeModificationRemoveAttribute</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongNodeModificationSetAttribute</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongNodeModificationSetParent</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongNodeModificationSetText</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongNodeModification</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeElementAdmonition</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaListitem</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeElementListitem</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorAreaParagraph</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CongEditorNodeElementParagraph</NAME>
-</STRUCT>
Index: doc/reference/conglomerate-sections.txt
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/reference/conglomerate-sections.txt,v
retrieving revision 1.1
diff -u -r1.1 conglomerate-sections.txt
--- a/doc/reference/conglomerate-sections.txt	28 Oct 2003 20:35:12 -0000	1.1
+++ b/doc/reference/conglomerate-sections.txt	23 Jun 2004 16:19:03 -0000
@@ -1,14 +1,25 @@
+
 <SECTION>
 <FILE>cong-app</FILE>
 cong_app_singleton
 cong_app_construct_singleton
 cong_app_destroy_singleton
-cong_app_get_clipboard
-cong_app_set_clipboard
+cong_app_post_init_hack
+cong_app_get_clipboard_xml_source
+cong_app_set_clipboard_from_xml_fragment
+cong_app_get_gnome_program
+cong_app_get_tooltips
+cong_app_get_font
+cong_app_get_plugin_manager
+cong_app_get_dispspec_registry
+cong_app_get_gconf_client
+cong_app_get_language_list
 </SECTION>
+
 <SECTION>
 <FILE>cong-attribute-editor-cdata</FILE>
-<TITLE></TITLE>
+<TITLE>CongAttributeEditorCDATA</TITLE>
+CongAttributeEditorCDATA
 CONG_ATTRIBUTE_EDITOR_CDATA
 CONG_ATTRIBUTE_EDITOR_CDATA_CLASS
 IS_CONG_ATTRIBUTE_EDITOR_CDATA
@@ -16,9 +27,11 @@
 cong_attribute_editor_cdata_construct
 cong_attribute_editor_cdata_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-attribute-editor-enumeration</FILE>
-<TITLE></TITLE>
+<TITLE>CongAttributeEditorENUMERATION</TITLE>
+CongAttributeEditorENUMERATION
 CONG_ATTRIBUTE_EDITOR_ENUMERATION
 CONG_ATTRIBUTE_EDITOR_ENUMERATION_CLASS
 IS_CONG_ATTRIBUTE_EDITOR_ENUMERATION
@@ -26,9 +39,11 @@
 cong_attribute_editor_enumeration_construct
 cong_attribute_editor_enumeration_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-attribute-editor</FILE>
-<TITLE></TITLE>
+<TITLE>CongAttributeEditor</TITLE>
+CongAttributeEditor
 CONG_ATTRIBUTE_EDITOR
 CONG_ATTRIBUTE_EDITOR_CLASS
 IS_CONG_ATTRIBUTE_EDITOR
@@ -37,8 +52,10 @@
 cong_attribute_editor_get_document
 cong_attribute_editor_get_node
 cong_attribute_editor_get_attribute
+cong_attribute_editor_get_ns
 cong_attribute_editor_get_attribute_name
 cong_attribute_editor_get_attribute_value
+cong_attribute_editor_try_set_value
 cong_attribute_editor_new
 cong_attribute_editor_id_new
 cong_attribute_editor_idref_new
@@ -47,17 +64,13 @@
 cong_attribute_editor_entities_new
 cong_attribute_editor_nmtoken_new
 cong_attribute_editor_nmtokens_new
-cong_attribute_editor_enumeration_new
 cong_attribute_editor_notation_new
-create_cdata_editor
-global_glade_doc_ptr
-global_glade_node_ptr
-cong_bind_radio_button
-cong_bind_check_button
 </SECTION>
+
 <SECTION>
 <FILE>cong-attribute-wrapper-check-button</FILE>
-<TITLE></TITLE>
+<TITLE>CongAttributeWrapperCheckButton</TITLE>
+CongAttributeWrapperCheckButton
 CONG_ATTRIBUTE_WRAPPER_CHECK_BUTTON
 CONG_ATTRIBUTE_WRAPPER_CHECK_BUTTON_CLASS
 IS_CONG_ATTRIBUTE_WRAPPER_CHECK_BUTTON
@@ -65,9 +78,11 @@
 cong_attribute_wrapper_check_button_construct
 cong_attribute_wrapper_check_button_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-attribute-wrapper-radio-button</FILE>
-<TITLE></TITLE>
+<TITLE>CongAttributeWrapperRadioButton</TITLE>
+CongAttributeWrapperRadioButton
 CONG_ATTRIBUTE_WRAPPER_RADIO_BUTTON
 CONG_ATTRIBUTE_WRAPPER_RADIO_BUTTON_CLASS
 IS_CONG_ATTRIBUTE_WRAPPER_RADIO_BUTTON
@@ -75,9 +90,11 @@
 cong_attribute_wrapper_radio_button_construct
 cong_attribute_wrapper_radio_button_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-attribute-wrapper</FILE>
-<TITLE></TITLE>
+<TITLE>CongAttributeWrapper</TITLE>
+CongAttributeWrapper
 CONG_ATTRIBUTE_WRAPPER
 CONG_ATTRIBUTE_WRAPPER_CLASS
 IS_CONG_ATTRIBUTE_WRAPPER
@@ -86,11 +103,83 @@
 cong_attribute_wrapper_get_document
 cong_attribute_wrapper_get_node
 cong_attribute_wrapper_get_attribute
+cong_attribute_wrapper_get_ns
 cong_attribute_wrapper_get_attribute_name
 cong_attribute_wrapper_get_attribute_value
 cong_attribute_wrapper_set_value
 cong_attribute_wrapper_remove_value
+cong_attribute_wrapper_bind_to_widget
+</SECTION>
+
+<SECTION>
+<FILE>cong-command-history</FILE>
+DEBUG_COMMAND_HISTORY_LIFETIMES
+<TITLE>CongCommandHistory</TITLE>
+CongCommandHistory
+CONG_COMMAND_HISTORY
+CONG_COMMAND_HISTORY_CLASS
+IS_CONG_COMMAND_HISTORY
+cong_command_history_get_type
+cong_command_history_construct
+cong_command_history_new
+cong_command_history_add_command
+cong_command_history_can_undo
+cong_command_history_can_redo
+cong_command_history_undo
+cong_command_history_redo
+cong_command_history_get_next_undo_command
+cong_command_history_get_next_redo_command
+</SECTION>
+
+<SECTION>
+<FILE>cong-command</FILE>
+DEBUG_COMMAND_LIFETIMES
+<TITLE>CongCommand</TITLE>
+CongCommand
+CONG_COMMAND
+CONG_COMMAND_CLASS
+IS_CONG_COMMAND
+cong_command_get_type
+cong_command_construct
+cong_command_private_new
+cong_command_get_document
+cong_command_get_description
+cong_command_get_consolidation_id
+cong_command_undo
+cong_command_redo
+cong_command_merge
+cong_command_has_ever_been_undone
+cong_command_add_modification
+cong_command_add_node_make_orphan
+cong_command_add_node_add_after
+cong_command_add_node_add_before
+cong_command_add_node_set_parent
+cong_command_add_node_set_text
+cong_command_add_node_set_attribute
+cong_command_add_node_remove_attribute
+cong_command_add_selection_change
+cong_command_add_cursor_change
+cong_command_add_set_dtd_ptr
+cong_command_add_set_clipboard
+cong_command_add_node_recursive_delete
+cong_command_for_each_location
+cong_command_add_delete_range
+cong_command_add_delete_selection
+cong_command_add_insert_text_at_cursor
+cong_command_add_nullify_cursor
+cong_command_add_nullify_selection
+cong_command_add_xml_frag_data_nice_split2
+cong_command_add_merge_adjacent_text_nodes
+cong_command_add_merge_adjacent_text_children_of_node
+cong_command_can_add_reparent_selection
+cong_command_add_reparent_selection
+cong_command_add_node_split3
+cong_command_add_remove_tag
+cong_command_add_set_cursor_to_first_text_descendant
+cong_command_add_set_external_dtd
+cong_command_add_required_sub_elements
 </SECTION>
+
 <SECTION>
 <FILE>cong-dialog</FILE>
 cong_dialog_content_new
@@ -103,17 +192,49 @@
 cong_dialog_revert_confirmation_alert_new
 cong_dialog_information_alert_new
 </SECTION>
+
+<SECTION>
+<FILE>cong-dispspec-element</FILE>
+cong_dispspec_element_new
+cong_dispspec_element_destroy
+cong_dispspec_element_get_ns_uri
+cong_dispspec_element_get_local_name
+cong_dispspec_element_username
+cong_dispspec_element_get_description
+cong_dispspec_element_get_icon
+cong_dispspec_element_get_value_for_key
+cong_dispspec_element_name_name_get
+cong_dispspec_element_set_whitespace
+cong_dispspec_element_collapseto
+cong_dispspec_element_is_structural
+cong_dispspec_element_is_span
+cong_dispspec_element_gc
+cong_dispspec_element_col
+cong_dispspec_element_header_info
+cong_dispspec_element_header_info_get_xpath_expression
+cong_dispspec_element_get_title
+cong_dispspec_element_get_section_header_text
+cong_dispspec_element_get_font
+cong_dispspec_element_get_editor_service_id
+cong_dispspec_element_get_property_dialog_service_id
+cong_dispspec_element_to_xml
+cong_dispspec_element_from_xml
+</SECTION>
+
 <SECTION>
 <FILE>cong-dispspec-registry</FILE>
 cong_dispspec_registry_new
+cong_dispspec_registry_add_dir
 cong_dispspec_registry_free
 cong_dispspec_registry_get
 cong_dispspec_registry_add
 cong_dispspec_registry_dump
 cong_dispspec_registry_get_appropriate_dispspec
 </SECTION>
+
 <SECTION>
 <FILE>cong-dispspec</FILE>
+generate_gc_for_col
 cong_dispspec_new
 cong_dispspec_new_from_ds_file
 cong_dispspec_new_from_xds_file
@@ -133,8 +254,10 @@
 cong_dispspec_lookup_element
 cong_dispspec_lookup_node
 cong_dispspec_get_first_element
-cong_dispspec_get_paragraph
+cong_dispspec_for_each_element
 cong_dispspec_add_element
+cong_dispspec_get_num_elements
+cong_dispspec_get_element
 cong_dispspec_gc_get
 cong_dispspec_name_gc_get
 cong_dispspec_name_get
@@ -142,34 +265,35 @@
 cong_dispspec_element_collapse
 cong_dispspec_element_span
 cong_dispspec_element_insert
-cong_dispspec_element_new
-cong_dispspec_element_destroy
-cong_dispspec_element_get_xmlns
-cong_dispspec_element_tagname
-cong_dispspec_element_username
-cong_dispspec_element_get_description
-cong_dispspec_element_get_icon
-cong_dispspec_element_name_name_get
-cong_dispspec_element_next
-cong_dispspec_element_set_whitespace
-cong_dispspec_element_collapseto
-cong_dispspec_element_is_structural
-cong_dispspec_element_is_span
-cong_dispspec_element_gc
-cong_dispspec_element_col
-cong_dispspec_element_header_info
-cong_dispspec_element_get_title
-cong_dispspec_element_get_section_header_text
-cong_dispspec_element_get_font
-cong_dispspec_element_get_editor_plugin_id
-cong_dispspec_element_get_property_dialog_plugin_id
 cong_serialisation_format_get_extension
 cong_external_document_model_get_public_id
 cong_external_document_model_get_system_id
+cong_dispspec_get_template
+cong_dispspec_calculate_coverage
+</SECTION>
+
+<SECTION>
+<FILE>cong-document-traversal</FILE>
+<TITLE>CongDocumentTraversal</TITLE>
+CongDocumentTraversal
+CONG_DOCUMENT_TRAVERSAL
+CONG_DOCUMENT_TRAVERSAL_CLASS
+IS_CONG_DOCUMENT_TRAVERSAL
+cong_document_traversal_get_type
+cong_document_traversal_construct
+cong_document_traversal_new
+cong_document_traversal_get_document
+cong_document_traversal_get_root_traversal_node
+cong_document_traversal_for_each_traversal_node
+cong_document_traversal_has_traversal_node_for_node
+cong_document_traversal_get_traversal_node
+cong_document_traversal_get_a_traversal_node
 </SECTION>
+
 <SECTION>
 <FILE>cong-document</FILE>
-<TITLE></TITLE>
+<TITLE>CongDocument</TITLE>
+CongDocument
 CONG_DOCUMENT
 CONG_DOCUMENT_CLASS
 IS_CONG_DOCUMENT
@@ -178,25 +302,32 @@
 cong_document_new_from_xmldoc
 cong_document_get_xml
 cong_document_get_root
+cong_document_get_traversal
+cong_document_get_root_traversal_node
+cong_document_get_find_dialog_data
 cong_document_get_dispspec
 cong_document_get_dispspec_element_for_node
 cong_document_get_filename
 cong_document_get_full_uri
 cong_document_get_parent_uri
 cong_document_get_dtd_public_identifier
+cong_document_get_xml_ns
 cong_document_get_nsptr
 cong_document_save
 cong_document_is_modified
 cong_document_set_modified
 cong_document_set_primary_window
+cong_document_get_primary_window
 cong_document_set_url
 cong_document_get_seconds_since_last_save_or_load
+cong_document_get_node_name
 cong_document_get_num_nodes
 cong_document_node_ref
 cong_document_node_unref
 cong_document_set_with_ref
 cong_document_begin_command
 cong_document_end_command
+cong_document_abort_command
 cong_document_begin_edit
 cong_document_end_edit
 cong_document_is_within_edit
@@ -211,18 +342,20 @@
 cong_document_private_on_selection_change
 cong_document_private_on_cursor_change
 cong_document_private_set_dtd_ptr
-cong_document_private_set_external_dtd
 cong_document_register_view
 cong_document_unregister_view
 cong_document_get_cursor
 cong_document_get_selection
+cong_document_get_selected_node
 cong_document_get_language_for_node
 cong_document_get_command_history
 cong_document_undo
 cong_document_redo
+cong_document_select_node
 cong_document_cut_selection
 cong_document_copy_selection
-cong_document_delete_selection
+cong_document_can_paste
+cong_document_can_print
 cong_document_paste_clipboard_or_selection
 cong_document_paste_source_at
 cong_document_paste_source_under
@@ -232,21 +365,14 @@
 CongDocumentRecursionCallback
 cong_document_for_each_node
 cong_document_for_each_child_of_node
-cong_document_merge_adjacent_text_nodes
-cong_document_merge_adjacent_text_children_of_node
-cong_document_node_recursive_delete
-cong_document_delete_range
-cong_document_insert_text
 cong_document_make_nodes_from_source_fragment
-gboolean
-cong_document_for_each_location
-cong_document_node_split3
-cong_document_node_split2
 cong_document_get_dtd_element
 cong_document_get_valid_new_child_elements
 cong_document_get_valid_new_previous_sibling_elements
 cong_document_get_valid_new_next_sibling_elements
+cong_document_node_can_be_deleted
 </SECTION>
+
 <SECTION>
 <FILE>cong-dtd</FILE>
 CongDtdElementCallback
@@ -254,10 +380,26 @@
 CongDtdAttributeCallback
 cong_dtd_for_each_attribute
 cong_dtd_element_content_can_contain_pcdata
+cong_dtd_element_get_element_for_node
+cong_dtd_content_model_node_is_element
+cong_dtd_get_element_for_content
+cong_dtd_for_each_reference_to_element
+cong_dtd_count_references_to_element
+cong_dtd_guess_start_elements
+</SECTION>
+
+<SECTION>
+<FILE>cong-edit-find-and-replace</FILE>
+cong_document_find
+cong_document_find_next
+cong_document_find_prev
+cong_document_replace
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-bin</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaBin</TITLE>
+CongEditorAreaBin
 CONG_EDITOR_AREA_BIN
 CONG_EDITOR_AREA_BIN_CLASS
 IS_CONG_EDITOR_AREA_BIN
@@ -266,9 +408,11 @@
 cong_editor_area_bin_new
 cong_editor_area_bin_get_child
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-border</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaBorder</TITLE>
+CongEditorAreaBorder
 CONG_EDITOR_AREA_BORDER
 CONG_EDITOR_AREA_BORDER_CLASS
 IS_CONG_EDITOR_AREA_BORDER
@@ -276,22 +420,27 @@
 cong_editor_area_border_construct
 cong_editor_area_border_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-composer</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaComposer</TITLE>
+CongEditorAreaComposer
 CONG_EDITOR_AREA_COMPOSER
 CONG_EDITOR_AREA_COMPOSER_CLASS
 IS_CONG_EDITOR_AREA_COMPOSER
 cong_editor_area_composer_get_type
 cong_editor_area_composer_construct
 cong_editor_area_composer_new
-cong_editor_area_composer_pack
+cong_editor_area_composer_pack_start
+cong_editor_area_composer_pack_end
 cong_editor_area_composer_pack_after
 cong_editor_area_composer_set_child_packing
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-container</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaContainer</TITLE>
+CongEditorAreaContainer
 CONG_EDITOR_AREA_CONTAINER
 CONG_EDITOR_AREA_CONTAINER_CLASS
 IS_CONG_EDITOR_AREA_CONTAINER
@@ -305,9 +454,11 @@
 cong_editor_area_container_for_each
 cong_editor_area_container_protected_postprocess_add_non_internal_child
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-entity-decl</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaEntityDecl</TITLE>
+CongEditorAreaEntityDecl
 CONG_EDITOR_AREA_ENTITY_DECL
 CONG_EDITOR_AREA_ENTITY_DECL_CLASS
 IS_CONG_EDITOR_AREA_ENTITY_DECL
@@ -315,9 +466,11 @@
 cong_editor_area_entity_decl_construct
 cong_editor_area_entity_decl_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-entity-ref</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaEntityRef</TITLE>
+CongEditorAreaEntityRef
 CONG_EDITOR_AREA_ENTITY_REF
 CONG_EDITOR_AREA_ENTITY_REF_CLASS
 IS_CONG_EDITOR_AREA_ENTITY_REF
@@ -325,9 +478,24 @@
 cong_editor_area_entity_ref_construct
 cong_editor_area_entity_ref_new
 </SECTION>
+
+<SECTION>
+<FILE>cong-editor-area-expander</FILE>
+<TITLE>CongEditorAreaExpander</TITLE>
+CongEditorAreaExpander
+CONG_EDITOR_AREA_EXPANDER
+CONG_EDITOR_AREA_EXPANDER_CLASS
+IS_CONG_EDITOR_AREA_EXPANDER
+cong_editor_area_expander_get_type
+cong_editor_area_expander_construct
+cong_editor_area_expander_new
+cong_editor_area_expander_get_state
+</SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-flow-holder-blocks</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaFlowHolderBlocks</TITLE>
+CongEditorAreaFlowHolderBlocks
 CONG_EDITOR_AREA_FLOW_HOLDER_BLOCKS
 CONG_EDITOR_AREA_FLOW_HOLDER_BLOCKS_CLASS
 IS_CONG_EDITOR_AREA_FLOW_HOLDER_BLOCKS
@@ -337,9 +505,11 @@
 cong_editor_area_flow_holder_get_child_flow_holder_for_node
 cong_editor_area_flow_holder_get_previous_child_flow_holder
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-flow-holder-inlines</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaFlowHolderInlines</TITLE>
+CongEditorAreaFlowHolderInlines
 CONG_EDITOR_AREA_FLOW_HOLDER_INLINES
 CONG_EDITOR_AREA_FLOW_HOLDER_INLINES_CLASS
 IS_CONG_EDITOR_AREA_FLOW_HOLDER_INLINES
@@ -356,9 +526,11 @@
 cong_editor_area_flow_holder_inlines_get_final_node
 cong_editor_area_flow_holder_inlines_contains_editor_node_directly
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-flow-holder-single</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaFlowHolderSingle</TITLE>
+CongEditorAreaFlowHolderSingle
 CONG_EDITOR_AREA_FLOW_HOLDER_SINGLE
 CONG_EDITOR_AREA_FLOW_HOLDER_SINGLE_CLASS
 IS_CONG_EDITOR_AREA_FLOW_HOLDER_SINGLE
@@ -366,9 +538,11 @@
 cong_editor_area_flow_holder_single_construct
 cong_editor_area_flow_holder_single_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-flow-holder</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaFlowHolder</TITLE>
+CongEditorAreaFlowHolder
 CONG_EDITOR_AREA_FLOW_HOLDER
 CONG_EDITOR_AREA_FLOW_HOLDER_CLASS
 IS_CONG_EDITOR_AREA_FLOW_HOLDER
@@ -378,9 +552,25 @@
 cong_editor_area_flow_holder_remove_areas_for_node
 cong_editor_area_flow_holder_manufacture
 </SECTION>
+
+<SECTION>
+<FILE>cong-editor-area-labelled</FILE>
+<TITLE>CongEditorAreaLabelled</TITLE>
+CongEditorAreaLabelled
+CONG_EDITOR_AREA_LABELLED
+CONG_EDITOR_AREA_LABELLED_CLASS
+IS_CONG_EDITOR_AREA_LABELLED
+cong_editor_area_labelled_get_type
+cong_editor_area_labelled_construct
+cong_editor_area_labelled_new
+cong_editor_area_labelled_set_label
+cong_editor_area_labelled_get_label
+</SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-line</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaLine</TITLE>
+CongEditorAreaLine
 CONG_EDITOR_AREA_LINE
 CONG_EDITOR_AREA_LINE_CLASS
 IS_CONG_EDITOR_AREA_LINE
@@ -391,9 +581,11 @@
 cong_editor_area_line_get_width_used
 cong_editor_area_line_get_width_free
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-pixbuf</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaPixbuf</TITLE>
+CongEditorAreaPixbuf
 CONG_EDITOR_AREA_PIXBUF
 CONG_EDITOR_AREA_PIXBUF_CLASS
 IS_CONG_EDITOR_AREA_PIXBUF
@@ -401,9 +593,11 @@
 cong_editor_area_pixbuf_construct
 cong_editor_area_pixbuf_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-spacer</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaSpacer</TITLE>
+CongEditorAreaSpacer
 CONG_EDITOR_AREA_SPACER
 CONG_EDITOR_AREA_SPACER_CLASS
 IS_CONG_EDITOR_AREA_SPACER
@@ -411,9 +605,11 @@
 cong_editor_area_spacer_construct
 cong_editor_area_spacer_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-span-tag</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaSpanTag</TITLE>
+CongEditorAreaSpanTag
 CONG_EDITOR_AREA_SPAN_TAG
 CONG_EDITOR_AREA_SPAN_TAG_CLASS
 IS_CONG_EDITOR_AREA_SPAN_TAG
@@ -421,9 +617,11 @@
 cong_editor_area_span_tag_construct
 cong_editor_area_span_tag_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-structural-tag</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaStructuralTag</TITLE>
+CongEditorAreaStructuralTag
 CONG_EDITOR_AREA_STRUCTURAL_TAG
 CONG_EDITOR_AREA_STRUCTURAL_TAG_CLASS
 IS_CONG_EDITOR_AREA_STRUCTURAL_TAG
@@ -431,9 +629,23 @@
 cong_editor_area_structural_tag_construct
 cong_editor_area_structural_tag_new
 </SECTION>
+
+<SECTION>
+<FILE>cong-editor-area-structural</FILE>
+<TITLE>CongEditorAreaStructural</TITLE>
+CongEditorAreaStructural
+CONG_EDITOR_AREA_STRUCTURAL
+CONG_EDITOR_AREA_STRUCTURAL_CLASS
+IS_CONG_EDITOR_AREA_STRUCTURAL
+cong_editor_area_structural_get_type
+cong_editor_area_structural_construct
+cong_editor_area_structural_new
+</SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-text-comment</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaTextComment</TITLE>
+CongEditorAreaTextComment
 CONG_EDITOR_AREA_TEXT_COMMENT
 CONG_EDITOR_AREA_TEXT_COMMENT_CLASS
 IS_CONG_EDITOR_AREA_TEXT_COMMENT
@@ -445,9 +657,11 @@
 cong_editor_area_text_comment_get_single_line_requisition
 cong_editor_area_text_comment_xy_to_index
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-text-fragment</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaTextFragment</TITLE>
+CongEditorAreaTextFragment
 CONG_EDITOR_AREA_TEXT_FRAGMENT
 CONG_EDITOR_AREA_TEXT_FRAGMENT_CLASS
 IS_CONG_EDITOR_AREA_TEXT_FRAGMENT
@@ -457,9 +671,11 @@
 cong_editor_area_text_get_pango_layout_line
 cong_editor_area_text_fragment_x_to_index
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-text</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaText</TITLE>
+CongEditorAreaText
 CONG_EDITOR_AREA_TEXT
 CONG_EDITOR_AREA_TEXT_CLASS
 IS_CONG_EDITOR_AREA_TEXT
@@ -471,9 +687,11 @@
 cong_editor_area_text_get_single_line_requisition
 cong_editor_area_text_xy_to_index
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-underline</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaUnderline</TITLE>
+CongEditorAreaUnderline
 CONG_EDITOR_AREA_UNDERLINE
 CONG_EDITOR_AREA_UNDERLINE_CLASS
 IS_CONG_EDITOR_AREA_UNDERLINE
@@ -481,9 +699,11 @@
 cong_editor_area_underline_construct
 cong_editor_area_underline_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area-unknown-tag</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaUnknownTag</TITLE>
+CongEditorAreaUnknownTag
 CONG_EDITOR_AREA_UNKNOWN_TAG
 CONG_EDITOR_AREA_UNKNOWN_TAG_CLASS
 IS_CONG_EDITOR_AREA_UNKNOWN_TAG
@@ -491,10 +711,12 @@
 cong_editor_area_unknown_tag_construct
 cong_editor_area_unknown_tag_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-area</FILE>
 DEBUG_EDITOR_AREA_LIFETIMES
-<TITLE></TITLE>
+<TITLE>CongEditorArea</TITLE>
+CongEditorArea
 CONG_EDITOR_AREA
 CONG_EDITOR_AREA_CLASS
 IS_CONG_EDITOR_AREA
@@ -506,12 +728,17 @@
 cong_editor_area_is_hidden
 cong_editor_area_show
 cong_editor_area_hide
+cong_editor_area_get_state
+cong_editor_area_set_state
+cong_editor_area_get_cursor
+cong_editor_area_set_cursor
 cong_editor_area_get_window_coords
 cong_editor_area_get_requisition
 cong_editor_area_get_requisition_width
 cong_editor_area_get_requisition_height
 cong_editor_area_get_cached_requisition
 cong_editor_area_debug_render_area
+cong_editor_area_debug_render_state
 cong_editor_area_get_parent
 cong_editor_area_recursive_render
 cong_editor_area_on_button_press
@@ -533,9 +760,11 @@
 cong_editor_area_protected_postprocess_add_internal_child
 cong_editor_area_protected_set_parent
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-child-policy-flow-holder</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorChildPolicyFlowHolder</TITLE>
+CongEditorChildPolicyFlowHolder
 CONG_EDITOR_CHILD_POLICY_FLOW_HOLDER
 CONG_EDITOR_CHILD_POLICY_FLOW_HOLDER_CLASS
 IS_CONG_EDITOR_CHILD_POLICY_FLOW_HOLDER
@@ -543,9 +772,11 @@
 cong_editor_child_policy_flow_holder_construct
 cong_editor_child_policy_flow_holder_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-child-policy-inline</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorChildPolicyInline</TITLE>
+CongEditorChildPolicyInline
 CONG_EDITOR_CHILD_POLICY_INLINE
 CONG_EDITOR_CHILD_POLICY_INLINE_CLASS
 IS_CONG_EDITOR_CHILD_POLICY_INLINE
@@ -553,10 +784,12 @@
 cong_editor_child_policy_inline_construct
 cong_editor_child_policy_inline_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-child-policy</FILE>
 DEBUG_EDITOR_CHILD_POLICY_LIFETIMES
-<TITLE></TITLE>
+<TITLE>CongEditorChildPolicy</TITLE>
+CongEditorChildPolicy
 CONG_EDITOR_CHILD_POLICY
 CONG_EDITOR_CHILD_POLICY_CLASS
 IS_CONG_EDITOR_CHILD_POLICY
@@ -567,10 +800,12 @@
 cong_editor_child_policy_insert_areas_for_node
 cong_editor_child_policy_remove_areas_for_node
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-line-fragments</FILE>
 DEBUG_EDITOR_LINE_FRAGMENTS_LIFETIMES
-<TITLE></TITLE>
+<TITLE>CongEditorLineFragments</TITLE>
+CongEditorLineFragments
 CONG_EDITOR_LINE_FRAGMENTS
 CONG_EDITOR_LINE_FRAGMENTS_CLASS
 IS_CONG_EDITOR_LINE_FRAGMENTS
@@ -580,9 +815,11 @@
 cong_editor_line_fragments_get_area_list
 cong_editor_line_fragments_add_area
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-comment</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeComment</TITLE>
+CongEditorNodeComment
 CONG_EDITOR_NODE_COMMENT
 CONG_EDITOR_NODE_COMMENT_CLASS
 IS_CONG_EDITOR_NODE_COMMENT
@@ -590,9 +827,11 @@
 cong_editor_node_comment_construct
 cong_editor_node_comment_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-document</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeDocument</TITLE>
+CongEditorNodeDocument
 CONG_EDITOR_NODE_DOCUMENT
 CONG_EDITOR_NODE_DOCUMENT_CLASS
 IS_CONG_EDITOR_NODE_DOCUMENT
@@ -600,9 +839,11 @@
 cong_editor_node_document_construct
 cong_editor_node_document_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-dtd</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeDtd</TITLE>
+CongEditorNodeDtd
 CONG_EDITOR_NODE_DTD
 CONG_EDITOR_NODE_DTD_CLASS
 IS_CONG_EDITOR_NODE_DTD
@@ -610,9 +851,11 @@
 cong_editor_node_dtd_construct
 cong_editor_node_dtd_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-element-span</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeElementSpan</TITLE>
+CongEditorNodeElementSpan
 CONG_EDITOR_NODE_ELEMENT_SPAN
 CONG_EDITOR_NODE_ELEMENT_SPAN_CLASS
 IS_CONG_EDITOR_NODE_ELEMENT_SPAN
@@ -620,9 +863,11 @@
 cong_editor_node_element_span_construct
 cong_editor_node_element_span_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-element-structural</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeElementStructural</TITLE>
+CongEditorNodeElementStructural
 CONG_EDITOR_NODE_ELEMENT_STRUCTURAL
 CONG_EDITOR_NODE_ELEMENT_STRUCTURAL_CLASS
 IS_CONG_EDITOR_NODE_ELEMENT_STRUCTURAL
@@ -630,9 +875,11 @@
 cong_editor_node_element_structural_construct
 cong_editor_node_element_structural_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-element-unknown</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeElementUnknown</TITLE>
+CongEditorNodeElementUnknown
 CONG_EDITOR_NODE_ELEMENT_UNKNOWN
 CONG_EDITOR_NODE_ELEMENT_UNKNOWN_CLASS
 IS_CONG_EDITOR_NODE_ELEMENT_UNKNOWN
@@ -640,9 +887,11 @@
 cong_editor_node_element_unknown_construct
 cong_editor_node_element_unknown_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-element</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeElement</TITLE>
+CongEditorNodeElement
 CONG_EDITOR_NODE_ELEMENT
 CONG_EDITOR_NODE_ELEMENT_CLASS
 IS_CONG_EDITOR_NODE_ELEMENT
@@ -650,9 +899,11 @@
 cong_editor_node_element_construct
 cong_editor_node_element_get_dispspec_element
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-entity-decl</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeEntityDecl</TITLE>
+CongEditorNodeEntityDecl
 CONG_EDITOR_NODE_ENTITY_DECL
 CONG_EDITOR_NODE_ENTITY_DECL_CLASS
 IS_CONG_EDITOR_NODE_ENTITY_DECL
@@ -660,9 +911,11 @@
 cong_editor_node_entity_decl_construct
 cong_editor_node_entity_decl_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-entity-ref</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeEntityRef</TITLE>
+CongEditorNodeEntityRef
 CONG_EDITOR_NODE_ENTITY_REF
 CONG_EDITOR_NODE_ENTITY_REF_CLASS
 IS_CONG_EDITOR_NODE_ENTITY_REF
@@ -670,9 +923,11 @@
 cong_editor_node_entity_ref_construct
 cong_editor_node_entity_ref_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-text</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeText</TITLE>
+CongEditorNodeText
 CONG_EDITOR_NODE_TEXT
 CONG_EDITOR_NODE_TEXT_CLASS
 IS_CONG_EDITOR_NODE_TEXT
@@ -683,9 +938,11 @@
 cong_editor_node_text_calc_up
 cong_editor_node_text_calc_down
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node-unimplemented</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeUnimplemented</TITLE>
+CongEditorNodeUnimplemented
 CONG_EDITOR_NODE_UNIMPLEMENTED
 CONG_EDITOR_NODE_UNIMPLEMENTED_CLASS
 IS_CONG_EDITOR_NODE_UNIMPLEMENTED
@@ -693,10 +950,12 @@
 cong_editor_node_unimplemented_construct
 cong_editor_node_unimplemented_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-node</FILE>
 DEBUG_EDITOR_NODE_LIFETIMES
-<TITLE></TITLE>
+<TITLE>CongEditorNode</TITLE>
+CongEditorNode
 CONG_EDITOR_NODE
 CONG_EDITOR_NODE_CLASS
 IS_CONG_EDITOR_NODE
@@ -707,7 +966,10 @@
 cong_editor_node_get_widget
 cong_editor_node_get_document
 cong_editor_node_get_node
+cong_editor_node_get_traversal_node
 cong_editor_node_get_traversal_parent
+cong_editor_node_is_selected
+cong_editor_node_private_set_selected
 cong_editor_node_get_primary_area
 cong_editor_node_get_inner_area
 cong_editor_node_generate_block_area
@@ -721,40 +983,45 @@
 cong_editor_node_get_parents_child_policy
 cong_editor_node_set_parents_child_policy
 </SECTION>
+
 <SECTION>
 <FILE>cong-editor-widget</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorWidget3</TITLE>
+CongEditorWidget3
 CONG_EDITOR_WIDGET3
 CONG_EDITOR_WIDGET3_CLASS
 IS_CONG_EDITOR_WIDGET3
-cong_editor_widget_get_type
-cong_editor_widget_construct
+cong_editor_widget3_get_type
+cong_editor_widget3_construct
 cong_editor_widget3_new
 cong_editor_widget3_get_document
 cong_editor_widget3_get_dispspec
 cong_editor_widget3_force_layout_update
 CongEditorNodeCallback
 cong_editor_widget3_for_each_editor_node
+cong_editor_widget3_get_editor_node_for_traversal_node
 cong_editor_widget3_get_editor_node
 cong_editor_widget3_get_an_editor_node
+cong_editor_widget3_get_prehighlight_editor_area
+cong_editor_widget3_set_prehighlight_editor_area
 cong_editor_widget3_get_test_gc
 cong_editor_widget3_get_area_at
 cong_flow_type_get_debug_string
+editor_popup_build
+cong_editor_widget3_add_popup_items
+cong_editor_widget3_get_preedit_data
 </SECTION>
+
 <SECTION>
-<FILE>cong-editor-widget3-impl</FILE>
-cong_editor_element_generate_areas
-cong_element_editor_recursive_render
-void
-cong_editor_node_for_each_area
-cong_editor_node_dummy_new
-cong_editor_node_new
-cong_editor_node_unknown_tag_new
-cong_editor_node_structural_tag_new
-cong_editor_node_span_tag_new
-cong_editor_node_text_new
-cong_editor_node_comment_new
+<FILE>cong-eel-graphic-effects</FILE>
+eel_create_spotlight_pixbuf
+eel_create_darkened_pixbuf
+eel_create_colorized_pixbuf
+eel_stretch_frame_image
+eel_embed_image_in_frame
+eel_make_semi_transparent
 </SECTION>
+
 <SECTION>
 <FILE>cong-eel</FILE>
 CONG_EEL_LOG_REF_COUNT
@@ -783,11 +1050,13 @@
 cong_eel_set_string
 cong_eel_draw_pixbuf
 </SECTION>
+
 <SECTION>
 <FILE>cong-enum-mapping</FILE>
 cong_enum_mapping_lookup
 cong_enum_mapping_lookup_string
 </SECTION>
+
 <SECTION>
 <FILE>cong-error-dialog</FILE>
 cong_error_dialog_new
@@ -811,12 +1080,21 @@
 cong_error_dialog_new_from_file_operation_failure
 cong_error_tests
 </SECTION>
+
 <SECTION>
 <FILE>cong-fake-plugin-hooks</FILE>
+plugin_abiword_plugin_register
+plugin_abiword_plugin_configure
+plugin_admonition_plugin_register
+plugin_admonition_plugin_configure
+plugin_arbitrary_plugin_register
+plugin_arbitrary_plugin_configure
 plugin_cleanup_source_plugin_register
 plugin_cleanup_source_plugin_configure
 plugin_convert_case_plugin_register
 plugin_convert_case_plugin_configure
+plugin_css_plugin_register
+plugin_css_plugin_configure
 plugin_docbook_plugin_register
 plugin_docbook_plugin_configure
 plugin_dtd_plugin_register
@@ -825,12 +1103,20 @@
 plugin_empty_plugin_configure
 plugin_fo_plugin_register
 plugin_fo_plugin_configure
+plugin_html_plugin_register
+plugin_html_plugin_configure
 plugin_lists_plugin_register
 plugin_lists_plugin_configure
 plugin_paragraph_plugin_register
 plugin_paragraph_plugin_configure
+plugin_random_plugin_register
+plugin_random_plugin_configure
+plugin_relaxng_plugin_register
+plugin_relaxng_plugin_configure
 plugin_sgml_plugin_register
 plugin_sgml_plugin_configure
+plugin_tei_plugin_register
+plugin_tei_plugin_configure
 plugin_tests_plugin_register
 plugin_tests_plugin_configure
 plugin_validate_plugin_register
@@ -841,9 +1127,18 @@
 plugin_xsl_plugin_configure
 plugin_save_dispspec_plugin_register
 plugin_save_dispspec_plugin_configure
-plugin_doc_from_xds_plugin_register
-plugin_doc_from_xds_plugin_configure
+plugin_templates_plugin_register
+plugin_templates_plugin_configure
+</SECTION>
+
+<SECTION>
+<FILE>cong-file-selection</FILE>
+CongFileChooserAction
+cong_get_file_name
+cong_get_file_name_with_filter
+cong_file_selection_make_xml_filter_list
 </SECTION>
+
 <SECTION>
 <FILE>cong-font</FILE>
 cong_font_load
@@ -853,6 +1148,7 @@
 cong_font_draw_string_slow
 cong_font_string_width_slow
 </SECTION>
+
 <SECTION>
 <FILE>cong-graph</FILE>
 CONG_DEPENDENCY_NODE
@@ -865,18 +1161,21 @@
 cong_dependency_graph_process
 cong_dependency_node_from_file_is_up_to_date
 </SECTION>
+
 <SECTION>
 <FILE>cong-location</FILE>
+CONG_LOCATION_BYTE_OFFSET_NULL_NODE
+CONG_LOCATION_BYTE_OFFSET_MEANINGLESS
 cong_location_is_valid
 cong_location_nullify
 cong_location_set_to_start_of_node
+cong_location_set_to_end_of_node
 cong_location_set_node_and_byte_offset
 cong_location_set_node_and_char_offset
 cong_location_exists
 cong_location_equals
 cong_location_get_unichar
 cong_location_get_utf8_pointer
-cong_location_xml_frag_data_nice_split2
 cong_location_del_next_char
 cong_location_xml_frag_prev
 cong_location_xml_frag_next
@@ -899,31 +1198,189 @@
 cong_location_copy_with_ref
 cong_location_nullify_with_ref
 </SECTION>
+
 <SECTION>
 <FILE>cong-marshal</FILE>
 cong_cclosure_marshal_BOOLEAN__POINTER
-cong_cclosure_marshal_VOID__CONGNODEPTR
-cong_cclosure_marshal_VOID__CONGNODEPTR_CONGNODEPTR
-cong_cclosure_marshal_VOID__CONGNODEPTR_STRING
-cong_cclosure_marshal_VOID__CONGNODEPTR_STRING_STRING
+cong_cclosure_marshal_VOID__POINTER
+cong_cclosure_marshal_VOID__POINTER_POINTER
+cong_cclosure_marshal_VOID__POINTER_POINTER_BOOLEAN
+cong_cclosure_marshal_VOID__POINTER_STRING
+cong_cclosure_marshal_VOID__POINTER_POINTER_STRING
+cong_cclosure_marshal_VOID__POINTER_POINTER_STRING_STRING
 cong_cclosure_marshal_VOID__STRING_STRING_STRING
 </SECTION>
+
+<SECTION>
+<FILE>cong-modification-cursor-change</FILE>
+<TITLE>CongModificationCursorChange</TITLE>
+CongModificationCursorChange
+CONG_MODIFICATION_CURSOR_CHANGE
+CONG_MODIFICATION_CURSOR_CHANGE_CLASS
+IS_CONG_MODIFICATION_CURSOR_CHANGE
+cong_modification_cursor_change_get_type
+cong_modification_cursor_change_construct
+cong_modification_cursor_change_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-modification-selection-change</FILE>
+<TITLE>CongModificationSelectionChange</TITLE>
+CongModificationSelectionChange
+CONG_MODIFICATION_SELECTION_CHANGE
+CONG_MODIFICATION_SELECTION_CHANGE_CLASS
+IS_CONG_MODIFICATION_SELECTION_CHANGE
+cong_modification_selection_change_get_type
+cong_modification_selection_change_construct
+cong_modification_selection_change_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-modification-set-dtd-ptr</FILE>
+<TITLE>CongModificationSetDtdPtr</TITLE>
+CongModificationSetDtdPtr
+CONG_MODIFICATION_SET_DTD_PTR
+CONG_MODIFICATION_SET_DTD_PTR_CLASS
+IS_CONG_MODIFICATION_SET_DTD_PTR
+cong_modification_set_dtd_ptr_get_type
+cong_modification_set_dtd_ptr_construct
+cong_modification_set_dtd_ptr_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-modification</FILE>
+DEBUG_MODIFICATION_LIFETIMES
+<TITLE>CongModification</TITLE>
+CongModification
+CONG_MODIFICATION
+CONG_MODIFICATION_CLASS
+IS_CONG_MODIFICATION
+cong_modification_get_type
+cong_modification_construct
+cong_modification_get_document
+cong_modification_undo
+cong_modification_redo
+</SECTION>
+
+<SECTION>
+<FILE>cong-node-modification-add-after</FILE>
+<TITLE>CongNodeModificationAddAfter</TITLE>
+CongNodeModificationAddAfter
+CONG_NODE_MODIFICATION_ADD_AFTER
+CONG_NODE_MODIFICATION_ADD_AFTER_CLASS
+IS_CONG_NODE_MODIFICATION_ADD_AFTER
+cong_node_modification_add_after_get_type
+cong_node_modification_add_after_construct
+cong_node_modification_add_after_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-node-modification-add-before</FILE>
+<TITLE>CongNodeModificationAddBefore</TITLE>
+CongNodeModificationAddBefore
+CONG_NODE_MODIFICATION_ADD_BEFORE
+CONG_NODE_MODIFICATION_ADD_BEFORE_CLASS
+IS_CONG_NODE_MODIFICATION_ADD_BEFORE
+cong_node_modification_add_before_get_type
+cong_node_modification_add_before_construct
+cong_node_modification_add_before_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-node-modification-make-orphan</FILE>
+<TITLE>CongNodeModificationMakeOrphan</TITLE>
+CongNodeModificationMakeOrphan
+CONG_NODE_MODIFICATION_MAKE_ORPHAN
+CONG_NODE_MODIFICATION_MAKE_ORPHAN_CLASS
+IS_CONG_NODE_MODIFICATION_MAKE_ORPHAN
+cong_node_modification_make_orphan_get_type
+cong_node_modification_make_orphan_construct
+cong_node_modification_make_orphan_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-node-modification-remove-attribute</FILE>
+<TITLE>CongNodeModificationRemoveAttribute</TITLE>
+CongNodeModificationRemoveAttribute
+CONG_NODE_MODIFICATION_REMOVE_ATTRIBUTE
+CONG_NODE_MODIFICATION_REMOVE_ATTRIBUTE_CLASS
+IS_CONG_NODE_MODIFICATION_REMOVE_ATTRIBUTE
+cong_node_modification_remove_attribute_get_type
+cong_node_modification_remove_attribute_construct
+cong_node_modification_remove_attribute_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-node-modification-set-attribute</FILE>
+<TITLE>CongNodeModificationSetAttribute</TITLE>
+CongNodeModificationSetAttribute
+CONG_NODE_MODIFICATION_SET_ATTRIBUTE
+CONG_NODE_MODIFICATION_SET_ATTRIBUTE_CLASS
+IS_CONG_NODE_MODIFICATION_SET_ATTRIBUTE
+cong_node_modification_set_attribute_get_type
+cong_node_modification_set_attribute_construct
+cong_node_modification_set_attribute_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-node-modification-set-parent</FILE>
+<TITLE>CongNodeModificationSetParent</TITLE>
+CongNodeModificationSetParent
+CONG_NODE_MODIFICATION_SET_PARENT
+CONG_NODE_MODIFICATION_SET_PARENT_CLASS
+IS_CONG_NODE_MODIFICATION_SET_PARENT
+cong_node_modification_set_parent_get_type
+cong_node_modification_set_parent_construct
+cong_node_modification_set_parent_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-node-modification-set-text</FILE>
+<TITLE>CongNodeModificationSetText</TITLE>
+CongNodeModificationSetText
+CONG_NODE_MODIFICATION_SET_TEXT
+CONG_NODE_MODIFICATION_SET_TEXT_CLASS
+IS_CONG_NODE_MODIFICATION_SET_TEXT
+cong_node_modification_set_text_get_type
+cong_node_modification_set_text_construct
+cong_node_modification_set_text_new
+</SECTION>
+
+<SECTION>
+<FILE>cong-node-modification</FILE>
+<TITLE>CongNodeModification</TITLE>
+CongNodeModification
+CONG_NODE_MODIFICATION
+CONG_NODE_MODIFICATION_CLASS
+IS_CONG_NODE_MODIFICATION
+cong_node_modification_get_type
+cong_node_modification_construct
+cong_node_modification_get_node
+</SECTION>
+
 <SECTION>
 <FILE>cong-node</FILE>
 CongNodePtr
 CongXMLChar
-cong_node_name
-cong_node_xmlns
 cong_node_prev
 cong_node_next
 cong_node_first_child
 cong_node_parent
-cong_node_is_tag
-cong_node_get_xmlns
+cong_node_is_element
+cong_node_is_element_from_set
+cong_node_get_ns
+cong_node_get_ns_uri
+cong_node_get_ns_prefix
+cong_node_get_local_name
+cong_node_get_qualified_name
+cong_node_get_ns_for_uri
+cong_node_get_ns_for_prefix
+cong_node_get_attr_ns
 cong_node_get_path
 cong_node_debug_description
 cong_node_type_description
 cong_node_get_attribute
+cong_node_has_attribute
 cong_node_self_test
 cong_node_self_test_recursive
 cong_node_recursive_set_doc
@@ -936,8 +1393,10 @@
 cong_node_new_element_from_dispspec
 cong_node_new_text
 cong_node_new_text_len
+cong_node_new_comment
 cong_node_free
 cong_node_generate_source
+cong_node_generate_child_source
 cong_node_generate_source_from_byte_offset
 cong_node_generate_source_up_to_byte_offset
 cong_node_generate_source_between_byte_offsets
@@ -950,113 +1409,99 @@
 cong_node_private_remove_attribute
 cong_node_get_child_by_name
 cong_node_get_first_text_node_descendant
+cong_node_should_be_visible_in_editor
 cong_node_is_valid_cursor_location
+cong_node_supports_byte_offsets
+cong_node_can_be_cut
+cong_node_can_be_copied
+cong_node_get_ordering
+cong_node_calc_first_node_in_subtree_satisfying
+cong_node_calc_final_node_in_subtree_satisfying
+cong_node_calc_prev_node_satisfying
+cong_node_calc_next_node_satisfying
+</SECTION>
+
+<SECTION>
+<FILE>cong-object</FILE>
+PRIVATE
+CONG_DECLARE_CLASS_BEGIN
+CONG_DECLARE_CLASS
+CONG_DEFINE_CLASS_BEGIN
+CONG_DEFINE_EMPTY_DISPOSE
+CONG_DEFINE_CLASS
 </SECTION>
+
 <SECTION>
 <FILE>cong-overview-view</FILE>
 cong_overview_view_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-parser-error</FILE>
+cong_ui_parse_buffer
 cong_parser_result_add_issue
 cong_parser_result_dialog_new
+cong_error_dialog_new_file_open_failed_from_parser_error
+cong_parse_from_filename
+cong_parse_from_memory
 </SECTION>
+
 <SECTION>
-<FILE>cong-plugin</FILE>
-CONG_FUNCTIONALITY
-CONG_TOOL
-CongPluginCallbackInit
-CongPluginCallbackUninit
-CongPluginCallbackRegister
-CongPluginCallbackConfigure
-CongDocumentFactoryPageCreationCallback
-CongDocumentFactoryActionCallback
-CongImporterMimeFilter
-CongImporterActionCallback
-CongExporterDocumentFilter
-CongExporterActionCallback
-gboolean
-void
-CongCustomPropertyFactoryMethod
-CongPrintMethodDocumentFilter
-CongPrintMethodActionCallback
-CongEditorNodeFactoryMethod
+<FILE>cong-plugin-manager</FILE>
 cong_plugin_manager_new
 cong_plugin_manager_register
 cong_plugin_manager_unregister
 cong_plugin_manager_for_each_plugin
+cong_plugin_manager_for_each_service
+cong_plugin_manager_for_each_service_of_type
+cong_plugin_manager_locate_service_by_id
 cong_plugin_manager_for_each_document_factory
 cong_plugin_manager_for_each_importer
 cong_plugin_manager_for_each_exporter
-cong_plugin_manager_for_each_printmethod
-cong_plugin_manager_for_each_thumbnailer
+cong_plugin_manager_for_each_print_method
 cong_plugin_manager_for_each_doc_tool
 cong_plugin_manager_for_each_node_tool
 cong_plugin_manager_for_each_custom_property_dialog
 cong_plugin_manager_locate_custom_property_dialog_by_id
 cong_plugin_manager_locate_editor_node_factory_by_id
-cong_plugin_register_document_factory
-cong_plugin_register_importer
-cong_plugin_register_exporter
-cong_plugin_register_print_method
-cong_plugin_register_editor_node_factory
-cong_plugin_register_doc_tool
-cong_plugin_register_node_tool
-cong_plugin_register_custom_property_dialog
-cong_plugin_for_each_document_factory
-cong_plugin_for_each_importer
-cong_plugin_for_each_exporter
-cong_plugin_for_each_print_method
-cong_plugin_for_each_thumbnailer
-cong_plugin_for_each_doc_tool
-cong_plugin_for_each_node_tool
-cong_plugin_for_each_custom_property_dialog
+</SECTION>
+
+<SECTION>
+<FILE>cong-plugin</FILE>
+<TITLE></TITLE>
+
+CONG_PLUGIN
+CONG_PLUGIN_CLASS
+IS_CONG_PLUGIN
+cong_plugin_construct
+cong_plugin_add_service
+cong_plugin_for_each_service
+cong_plugin_for_each_service_of_type
+cong_plugin_locate_service_by_id
+cong_plugin_locate_custom_property_dialog_by_id
+cong_plugin_locate_editor_node_factory_by_id
+cong_plugin_get_id
 cong_plugin_get_gconf_namespace
 cong_plugin_get_gconf_key
-cong_functionality_get_name
-cong_functionality_get_description
-cong_functionality_get_gconf_namespace
-cong_functionality_get_gconf_key
-cong_document_factory_invoke_page_creation_callback
-cong_document_factory_invoke_action_callback
-cong_document_factory_get_icon
-cong_importer_supports_mime_type
-cong_importer_invoke
-cong_exporter_supports_document
-cong_exporter_invoke
-cong_exporter_get_preferred_uri
-cong_exporter_set_preferred_uri
-cong_print_method_supports_document
-cong_print_method_invoke
-cong_tool_get_menu_text
-cong_tool_get_tip_text
-cong_tool_get_tip_further_text
-cong_doc_tool_supports_document
-cong_doc_tool_invoke
-cong_node_tool_supports_node
-cong_node_tool_invoke
 cong_ui_new_document_from_manufactured_xml
 cong_ui_new_document_from_imported_xml
-cong_ui_parse_buffer
 cong_ui_transform_doc
 cong_ui_transform_doc_to_uri
 cong_ui_load_imported_file_content
 cong_ui_append_advanced_node_properties_page
-cong_new_file_assistant_new_page
-cong_new_file_assistant_set_page
-cong_new_file_assistant_get_toplevel
-cong_plugin_editor_node_factory_invoke
-cong_custom_property_dialog_make
 </SECTION>
+
 <SECTION>
 <FILE>cong-primary-window</FILE>
 cong_primary_window_new
+cong_primary_window_add_doc
 cong_primary_window_free
 cong_primary_window_get_document
 cong_primary_window_update_title
 cong_primary_window_get_toplevel
 cong_primary_window_can_close
 </SECTION>
+
 <SECTION>
 <FILE>cong-progress-checklist</FILE>
 CongProgressChecklist
@@ -1070,17 +1515,23 @@
 cong_progress_checklist_dialog_get_progress_checklist
 cong_progress_checklist_dialog_set_progress_bar
 </SECTION>
+
 <SECTION>
 <FILE>cong-range</FILE>
 cong_range_init
 cong_range_nullify
+cong_range_is_valid
 cong_range_generate_source
 cong_range_exists
 cong_range_is_empty
 cong_range_is_ordered
+cong_range_can_be_cut
+cong_range_can_be_copied
 cong_range_make_ordered
+cong_range_is_node
 cong_range_copy
 </SECTION>
+
 <SECTION>
 <FILE>cong-selection</FILE>
 cong_selection_new
@@ -1096,21 +1547,194 @@
 cong_selection_get_ordered_end
 cong_selection_set_logical_start
 cong_selection_set_logical_end
+cong_selection_set_logical_range
+cong_selection_get_selected_text
+cong_selection_is_node
 cong_selection_nullify
 cong_selection_is_valid
 cong_selection_legacy_get_gc_valid
 cong_selection_legacy_get_gc_invalid
 </SECTION>
+
+<SECTION>
+<FILE>cong-service-doc-tool</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_DOC_TOOL
+CONG_SERVICE_DOC_TOOL_CLASS
+IS_CONG_SERVICE_DOC_TOOL
+cong_plugin_register_doc_tool
+cong_service_doc_tool_construct
+cong_doc_tool_supports_document
+cong_doc_tool_invoke
+cong_plugin_for_each_doc_tool
+</SECTION>
+
+<SECTION>
+<FILE>cong-service-document-factory</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_DOCUMENT_FACTORY
+CONG_SERVICE_DOCUMENT_FACTORY_CLASS
+IS_CONG_SERVICE_DOCUMENT_FACTORY
+cong_service_document_factory_construct
+cong_plugin_register_document_factory
+cong_document_factory_invoke_page_creation_callback
+cong_document_factory_invoke_action_callback
+cong_document_factory_get_icon
+cong_plugin_for_each_document_factory
+cong_new_file_assistant_new_page
+cong_new_file_assistant_set_page
+cong_new_file_assistant_get_toplevel
+cong_new_file_assistant_set_data_for_factory
+cong_new_file_assistant_get_data_for_factory
+</SECTION>
+
+<SECTION>
+<FILE>cong-service-editor-node-factory</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_EDITOR_NODE_FACTORY
+CONG_SERVICE_EDITOR_NODE_FACTORY_CLASS
+IS_CONG_SERVICE_EDITOR_NODE_FACTORY
+cong_service_editor_node_factory_construct
+cong_plugin_register_editor_node_factory
+cong_plugin_editor_node_factory_invoke
+</SECTION>
+
+<SECTION>
+<FILE>cong-service-exporter</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_EXPORTER
+CONG_SERVICE_EXPORTER_CLASS
+IS_CONG_SERVICE_EXPORTER
+cong_service_exporter_construct
+cong_plugin_register_exporter
+cong_exporter_supports_document
+cong_exporter_invoke
+cong_exporter_get_preferred_uri
+cong_exporter_set_preferred_uri
+cong_plugin_for_each_exporter
+</SECTION>
+
+<SECTION>
+<FILE>cong-service-importer</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_IMPORTER
+CONG_SERVICE_IMPORTER_CLASS
+IS_CONG_SERVICE_IMPORTER
+cong_service_importer_construct
+cong_plugin_register_importer
+cong_importer_make_file_filter
+cong_importer_invoke
+cong_plugin_for_each_importer
+cong_service_importer_make_basic_filter
+</SECTION>
+
+<SECTION>
+<FILE>cong-service-node-property-dialog</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_NODE_PROPERTY_DIALOG
+CONG_SERVICE_NODE_PROPERTY_DIALOG_CLASS
+IS_CONG_SERVICE_NODE_PROPERTY_DIALOG
+cong_service_node_property_dialog_construct
+cong_plugin_register_custom_property_dialog
+cong_plugin_register_custom_property_dialog_for_element
+cong_plugin_for_each_custom_property_dialog
+cong_custom_property_dialog_make
+</SECTION>
+
+<SECTION>
+<FILE>cong-service-node-tool</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_NODE_TOOL
+CONG_SERVICE_NODE_TOOL_CLASS
+IS_CONG_SERVICE_NODE_TOOL
+</SECTION>
+
+<SECTION>
+<FILE>cong-service-print-method</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_PRINT_METHOD
+CONG_SERVICE_PRINT_METHOD_CLASS
+IS_CONG_SERVICE_PRINT_METHOD
+cong_service_print_method_construct
+cong_plugin_register_print_method
+cong_print_method_supports_document
+cong_print_method_invoke
+cong_plugin_for_each_print_method
+</SECTION>
+
+<SECTION>
+<FILE>cong-service-tool</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE_TOOL
+CONG_SERVICE_TOOL_CLASS
+IS_CONG_SERVICE_TOOL
+cong_service_tool_construct
+cong_service_tool_get_menu_text
+cong_service_tool_get_tip_text
+cong_service_tool_get_tip_further_text
+cong_service_tool_get_user_data
+</SECTION>
+
+<SECTION>
+<FILE>cong-service</FILE>
+<TITLE></TITLE>
+
+CONG_SERVICE
+CONG_SERVICE_CLASS
+IS_CONG_SERVICE
+cong_service_construct
+cong_service_get_name
+cong_service_get_description
+cong_service_get_id
+cong_service_get_gconf_namespace
+cong_service_get_gconf_key
+</SECTION>
+
 <SECTION>
 <FILE>cong-text-cache</FILE>
 cong_text_cache_span_new
 cong_text_cache_new
 cong_text_cache_free
-cong_text_cache_get_text
-cong_text_cache_set_text
+cong_text_cache_get_output_text
+cong_text_cache_get_output_attributes
+cong_text_cache_set_input_text
+cong_text_cache_set_input_attributes
 cong_text_cache_convert_stripped_byte_offset_to_original
 cong_text_cache_convert_original_byte_offset_to_stripped
 </SECTION>
+
+<SECTION>
+<FILE>cong-traversal-node</FILE>
+DEBUG_TRAVERSAL_NODE_LIFETIMES
+<TITLE>CongTraversalNode</TITLE>
+CongTraversalNode
+CONG_TRAVERSAL_NODE
+CONG_TRAVERSAL_NODE_CLASS
+IS_CONG_TRAVERSAL_NODE
+cong_traversal_node_get_type
+cong_traversal_node_construct
+cong_traversal_node_new
+cong_traversal_node_get_document_traversal
+cong_traversal_node_get_document
+cong_traversal_node_get_node
+cong_traversal_node_get_parent
+CongTraversalNodeCallback
+cong_traversal_node_for_each_child
+cong_traversal_node_get_first_child
+cong_traversal_node_get_prev
+cong_traversal_node_get_next
+cong_traversal_node_is_referenced_entity_decl
+</SECTION>
+
 <SECTION>
 <FILE>cong-tree-view</FILE>
 CONG_TREE_VIEW
@@ -1121,16 +1745,71 @@
 cong_tree_view_free
 cong_tree_view_get_widget
 cong_tree_view_should_show_node
-cong_tree_view_get_tree_store
+cong_tree_view_get_selected_node
+cong_tree_view_protected_get_tree_store
+cong_tree_view_protected_force_node_update
+</SECTION>
+
+<SECTION>
+<FILE>cong-ui-hooks</FILE>
+cong_menu_item_attach_callback_Document
+cong_menu_item_attach_callback_Document_Node_ParentWindow
+cong_menu_item_attach_callback_Document_DispspecElement_Node
+cong_menu_add_item
+cong_ui_hook_file_import
+cong_ui_hook_file_export
+cong_ui_hook_file_print_preview
+cong_ui_hook_file_print
+cong_ui_hook_edit_preferences
+cong_ui_hook_tree_new_sibling
+cong_ui_hook_tree_new_sub_element
+cong_ui_hook_tree_properties
+cong_ui_hook_tree_cut
+cong_ui_hook_tree_copy
+cong_ui_hook_tree_paste_under
+cong_ui_hook_tree_paste_before
+cong_ui_hook_tree_paste_after
+cong_ui_hook_tree_convert_to_comment
+cong_ui_hook_tree_convert_from_comment
+toolbar_callback_open
+toolbar_callback_new
+toolbar_callback_save
+toolbar_callback_cut
+toolbar_callback_copy
+toolbar_callback_paste
+menu_callback_debug_error
+menu_callback_debug_document_types
+menu_callback_debug_transform_docbook_to_html
+menu_callback_debug_transform_docbook_to_xhtml
+menu_callback_debug_transform_docbook_to_html_help
+menu_callback_debug_transform_docbook_to_javahelp
+menu_callback_debug_transform_docbook_to_fo
+menu_callback_debug_preview_fo
+cong_gnome_print_render_xslfo
+menu_callback_debug_dtd
+menu_callback_debug_dialog
+cong_menus_create_items
+editor_popup_show
+editor_popup_init
+cong_ui_popup_init
+tag_new_pick
+open_document
+save_document
+save_document_as
+pick_structural_tag
+open_document_do
+new_document
+gui_window_new_document_make
+cong_gui_get_a_window
+cong_file_properties_dialog_new
 </SECTION>
+
 <SECTION>
 <FILE>cong-util</FILE>
-cong_vfs_new_buffer_from_file
-cong_vfs_new_buffer_from_uri
 cong_util_is_docbook
 cong_util_is_pure_whitespace
 cong_util_cleanup_text
-cong_util_get_local_path_from_uri
+cong_util_text_header
 cong_utils_get_norman_walsh_stylesheet_path
 cong_utils_get_norman_walsh_stylesheet
 cong_util_load_icon
@@ -1138,19 +1817,70 @@
 cong_util_prepend
 cong_util_print_xslfo
 CONG_GET_VAR_STR
-cong_util_set_cursor_to_first_text_descendant
 cong_util_make_dtd
 cong_util_add_external_dtd
-cong_util_split_uri
-cong_util_remove_tag
+cong_util_run_add_dtd_dialog
 cong_util_draw_blended_line
+cong_util_ns_equality
+cong_util_ns_uri_equality
+cong_util_ns_uri_sort_order
+cong_util_make_source_view
+cong_source_view_new_full
+cong_util_attribute_value_equality
+cong_element_description_new
+cong_element_description_clone
+cong_element_description_free
+cong_element_description_make_node
+cong_element_description_get_dispspec_element_for_doc
+cong_element_description_get_dispspec_element_for_dispspec
+cong_element_description_get_qualified_name
+cong_element_description_list_free
+cong_util_modal_element_selection_dialog
+cong_util_make_menu_item
+cong_util_make_stock_menu_item
+cong_util_make_menu_item_for_dispspec_element
+cong_util_make_menu_item_for_element_desc
+cong_util_add_menu_separator
+cong_util_get_qualified_attribute_name
+cong_util_show_in_window
+cong_util_make_file_filter
+</SECTION>
+
+<SECTION>
+<FILE>cong-vfs</FILE>
+cong_vfs_new_buffer_from_file
+cong_vfs_new_buffer_from_uri
+cong_vfs_load_xml_from_uri
+cong_vfs_save_xml_to_uri
+cong_vfs_get_local_path_from_uri
+cong_vfs_split_vfs_uri
+cong_vfs_split_string_uri
+cong_vfs_extract_short_name
 </SECTION>
+
 <SECTION>
 <FILE>cong-view</FILE>
 CONG_VIEW
 cong_view_get_document
 cong_view_get_dispspec
 </SECTION>
+
+<SECTION>
+<FILE>cong-xpath-expression</FILE>
+DEBUG_XPATH_EXPRESSION_LIFETIMES
+<TITLE>CongXPathExpression</TITLE>
+CongXPathExpression
+CONG_XPATH_EXPRESSION
+CONG_XPATH_EXPRESSION_CLASS
+IS_CONG_XPATH_EXPRESSION
+cong_xpath_expression_get_type
+cong_xpath_expression_construct
+cong_xpath_expression_new
+cong_xpath_expression_get_document
+cong_xpath_expression_get_context_node
+cong_xpath_expression_get_string_result
+</SECTION>
+
 <SECTION>
 <FILE>fo</FILE>
 FoUnit
@@ -1193,13 +1923,13 @@
 fo_print_context_pop_state
 fo_print_context_translate
 </SECTION>
+
 <SECTION>
 <FILE>global</FILE>
 CONG_GCONF_PATH
 RELEASE
 isblank
 NEW_LOOK
-SUPPORT_UNDO
 CONG_VALIDATE_UTF8
 cong_editor_view_new
 cong_editor_view_free
@@ -1209,40 +1939,18 @@
 cong_debug_message_log_view_new
 cong_debug_signal_log_view_new
 cong_node_properties_dialog_new
-cong_gui_get_a_window
 cong_cursor_blink
-new_document
-tree_new_sibling
-tree_new_sub_element
-tree_properties
-tree_cut
-tree_copy
-tree_paste_under
-tree_paste_before
-tree_paste_after
 xml_frag_data_nice
 xml_frag_name_nice
-cong_selection_reparent_all
-cong_selection_delete
 xml_all_present_span_elements
 xml_all_valid_span_elements
 xml_fetch_clean_data
-xml_add_required_children
-tag_new_pick
-open_document
-save_document
-save_document_as
-cong_get_file_name
-pick_structural_tag
-open_document_do
 UNUSED_VAR
-gui_window_new_document_make
 col_to_gcol
 cong_cursor_init
 cong_cursor_uninit
 cong_cursor_on
 cong_cursor_off
-cong_cursor_data_insert
 cong_cursor_paragraph_insert
 cong_cursor_calc_prev_char
 cong_cursor_calc_next_char
@@ -1251,41 +1959,76 @@
 cong_cursor_del_next_char
 cong_cursor_home
 cong_cursor_end
-editor_popup_show
-editor_popup_build
-editor_popup_init
-cong_ui_popup_init
-string_selection_dialog
+cong_cursor_get_location
 xv_style_r
 query_for_forced_dispspec
-cong_vfs_new_buffer_from_file
-cong_vfs_new_buffer_from_uri
-toolbar_callback_open
-toolbar_callback_save_as
-toolbar_callback_cut
-toolbar_callback_copy
-toolbar_callback_paste
-menu_callback_debug_error
-menu_callback_debug_document_types
-menu_callback_debug_transform_docbook_to_html
-menu_callback_debug_transform_docbook_to_xhtml
-menu_callback_debug_transform_docbook_to_html_help
-menu_callback_debug_transform_docbook_to_javahelp
-menu_callback_debug_transform_docbook_to_fo
-menu_callback_debug_preview_fo
-cong_gnome_print_render_xslfo
-menu_callback_debug_dtd
-menu_callback_debug_dialog
-cong_menus_create_items
-cong_ui_file_import
-cong_ui_file_export
-cong_file_properties_dialog_new
-cong_xml_save_to_vfs
+make_uneditable_text
+get_col_string
 xmlNewProp_NUMBER
 </SECTION>
+
+<SECTION>
+<FILE>gxx-declare-object-from-xml-tree</FILE>
+GXX_STRUCT_BEGIN_ELEMENT
+GXX_STRUCT_BEGIN_ELEMENT_WITH_CONSTRUCTOR
+GXX_STRUCT_END_ELEMENT
+GXX_STRUCT_ATTRIBUTE_STRING
+GXX_STRUCT_ATTRIBUTE_ENUM
+GXX_STRUCT_UNIQUE_CHILD_PTR_TO_STRUCT
+GXX_STRUCT_HASH_TABLE_OF_CHILDREN_WITH_PCDATA
+</SECTION>
+
+<SECTION>
+<FILE>gxx-declare-object-to-xml-tree</FILE>
+GXX_STRUCT_BEGIN_ELEMENT
+GXX_STRUCT_BEGIN_ELEMENT_WITH_CONSTRUCTOR
+GXX_STRUCT_END_ELEMENT
+GXX_STRUCT_ATTRIBUTE_INT
+GXX_STRUCT_ATTRIBUTE_STRING
+GXX_STRUCT_ATTRIBUTE_ENUM
+GXX_STRUCT_UNIQUE_CHILD_PTR_TO_STRUCT
+GXX_STRUCT_HASH_TABLE_OF_CHILDREN_WITH_PCDATA
+</SECTION>
+
+<SECTION>
+<FILE>gxx-object-from-xml-tree</FILE>
+GXX_STRUCT_BEGIN_ELEMENT
+GXX_STRUCT_BEGIN_ELEMENT_WITH_CONSTRUCTOR
+GXX_STRUCT_ATTRIBUTE_STRING
+GXX_STRUCT_ATTRIBUTE_ENUM
+GXX_STRUCT_UNIQUE_CHILD_PTR_TO_STRUCT
+GXX_STRUCT_HASH_TABLE_OF_CHILDREN_WITH_PCDATA
+</SECTION>
+
+<SECTION>
+<FILE>gxx-object-to-xml-tree</FILE>
+gxx_hash_table_of_children_with_pcdata_to_xml_tree
+GXX_STRUCT_BEGIN_ELEMENT
+GXX_STRUCT_BEGIN_ELEMENT_WITH_CONSTRUCTOR
+GXX_STRUCT_END_ELEMENT
+GXX_STRUCT_ATTRIBUTE_INT
+GXX_STRUCT_ATTRIBUTE_STRING
+GXX_STRUCT_ATTRIBUTE_ENUM
+GXX_STRUCT_UNIQUE_CHILD_PTR_TO_STRUCT
+GXX_STRUCT_HASH_TABLE_OF_CHILDREN_WITH_PCDATA
+</SECTION>
+
+<SECTION>
+<FILE>plugin-admonition-node-element</FILE>
+<TITLE>CongEditorNodeElementAdmonition</TITLE>
+CongEditorNodeElementAdmonition
+CONG_EDITOR_NODE_ELEMENT_ADMONITION
+CONG_EDITOR_NODE_ELEMENT_ADMONITION_CLASS
+IS_CONG_EDITOR_NODE_ELEMENT_ADMONITION
+cong_editor_node_element_admonition_get_type
+cong_editor_node_element_admonition_construct
+cong_editor_node_element_admonition_new
+</SECTION>
+
 <SECTION>
 <FILE>plugin-lists-area-listitem</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaListitem</TITLE>
+CongEditorAreaListitem
 CONG_EDITOR_AREA_LISTITEM
 CONG_EDITOR_AREA_LISTITEM_CLASS
 IS_CONG_EDITOR_AREA_LISTITEM
@@ -1294,20 +2037,24 @@
 cong_editor_area_listitem_new
 cong_editor_area_listitem_set_label
 </SECTION>
+
 <SECTION>
 <FILE>plugin-lists-node-element-listitem</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeElementListitem</TITLE>
+CongEditorNodeElementListitem
 CONG_EDITOR_NODE_ELEMENT_LISTITEM
 CONG_EDITOR_NODE_ELEMENT_LISTITEM_CLASS
 IS_CONG_EDITOR_NODE_ELEMENT_LISTITEM
 cong_editor_node_element_listitem_get_type
 cong_editor_node_element_listitem_construct
 cong_editor_node_element_listitem_new
-cong_editor_node_element_listitem_calculate_label
+cong_editor_node_element_listitem_get_label
 </SECTION>
+
 <SECTION>
 <FILE>plugin-paragraph-area-paragraph</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorAreaParagraph</TITLE>
+CongEditorAreaParagraph
 CONG_EDITOR_AREA_PARAGRAPH
 CONG_EDITOR_AREA_PARAGRAPH_CLASS
 IS_CONG_EDITOR_AREA_PARAGRAPH
@@ -1315,9 +2062,11 @@
 cong_editor_area_paragraph_construct
 cong_editor_area_paragraph_new
 </SECTION>
+
 <SECTION>
 <FILE>plugin-paragraph-node-element-paragraph</FILE>
-<TITLE></TITLE>
+<TITLE>CongEditorNodeElementParagraph</TITLE>
+CongEditorNodeElementParagraph
 CONG_EDITOR_NODE_ELEMENT_PARAGRAPH
 CONG_EDITOR_NODE_ELEMENT_PARAGRAPH_CLASS
 IS_CONG_EDITOR_NODE_ELEMENT_PARAGRAPH
@@ -1325,53 +2074,29 @@
 cong_editor_node_element_paragraph_construct
 cong_editor_node_element_paragraph_new
 </SECTION>
+
 <SECTION>
-<FILE>cong-command-history</FILE>
-DEBUG_COMMAND_HISTORY_LIFETIMES
+<FILE>cong-attribute-editor-lang</FILE>
+CongAttributeEditorLangDetails
 <TITLE></TITLE>
-CONG_COMMAND_HISTORY
-CONG_COMMAND_HISTORY_CLASS
-IS_CONG_COMMAND_HISTORY
-cong_command_history_get_type
-cong_command_history_construct
-cong_command_history_new
-cong_command_history_add_command
-cong_command_history_can_undo
-cong_command_history_can_redo
-cong_command_history_undo
-cong_command_history_redo
-cong_command_history_get_next_undo_command
-cong_command_history_get_next_redo_command
+
+CONG_ATTRIBUTE_EDITOR_LANG
+CONG_ATTRIBUTE_EDITOR_LANG_CLASS
+IS_CONG_ATTRIBUTE_EDITOR_LANG
+<TITLE>CongAttributeEditorLang</TITLE>
+cong_attribute_editor_lang_get_type
+cong_attribute_editor_lang_construct
+cong_attribute_editor_lang_new
 </SECTION>
+
 <SECTION>
-<FILE>cong-command</FILE>
-DEBUG_COMMAND_LIFETIMES
-<TITLE></TITLE>
-CONG_COMMAND
-CONG_COMMAND_CLASS
-IS_CONG_COMMAND
-cong_command_get_type
-cong_command_construct
-cong_command_private_new
-cong_command_get_document
-cong_command_get_description
-cong_command_get_consolidation_id
-cong_command_undo
-cong_command_redo
-cong_command_merge
-cong_command_has_ever_been_undone
-cong_command_add_modification
-cong_command_add_node_make_orphan
-cong_command_add_node_add_after
-cong_command_add_node_add_before
-cong_command_add_node_set_parent
-cong_command_add_node_set_text
-cong_command_add_node_set_attribute
-cong_command_add_node_remove_attribute
-cong_command_add_selection_change
-cong_command_add_cursor_change
-cong_command_add_set_dtd_ptr
-cong_command_add_set_clipboard
-cong_command_add_node_recursive_delete
-cong_command_for_each_location
-cong_command_add_delete_range
+<FILE>cong-glade</FILE>
+global_glade_doc_ptr
+global_glade_node_ptr
+cong_util_load_glade_file
+create_cdata_editor
+create_enumeration_editor
+create_lang_editor
+cong_bind_radio_button
+cong_bind_check_button
+</SECTION>
Index: doc/reference/conglomerate.types
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/reference/conglomerate.types,v
retrieving revision 1.3
diff -u -r1.3 conglomerate.types
--- a/doc/reference/conglomerate.types	28 Oct 2003 20:35:12 -0000	1.3
+++ b/doc/reference/conglomerate.types	23 Jun 2004 16:19:03 -0000
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "cong-app.h"
 #include "cong-attribute-editor-cdata.h"
+#include "cong-attribute-editor-lang.h"
 #include "cong-attribute-editor-enumeration.h"
 #include "cong-attribute-editor.h"
 #include "cong-attribute-wrapper-check-button.h"
@@ -92,6 +93,7 @@
 
 cong_attribute_editor_cdata_get_type
 cong_attribute_editor_enumeration_get_type
+cong_attribute_editor_lang_get_type
 cong_attribute_editor_get_type
 cong_attribute_wrapper_check_button_get_type
 cong_attribute_wrapper_radio_button_get_type
Index: src/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/src/ChangeLog,v
retrieving revision 1.635
diff -u -r1.635 ChangeLog
--- a/src/ChangeLog	22 Jun 2004 03:05:35 -0000	1.635
+++ b/src/ChangeLog	23 Jun 2004 16:19:05 -0000
@@ -1,3 +1,8 @@
+2004-06-23 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+	Changes in LOTS of files to cleanup gtk-doc usage and 
+	suppress gtk-doc warnings.	    
+
 2004-06-21  David Malcolm  <dmalcolm@redhat.com>
 
 	* cong-file-properties.c, cong-util.c, cong-util.h, plugin-validate.c
Index: src/cong-app.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-app.c,v
retrieving revision 1.33
diff -u -r1.33 cong-app.c
--- a/src/cong-app.c	21 Jun 2004 04:43:08 -0000	1.33
+++ b/src/cong-app.c	23 Jun 2004 16:19:06 -0000
@@ -123,6 +123,7 @@
  * cong_app_singleton:
  *
  * TODO: Write me
+ * Returns:
  */
 CongApp*
 cong_app_singleton (void)
@@ -169,6 +170,7 @@
  * @app:
  *
  * TODO: Write me
+ * Returns:
  */
 int
 cong_app_post_init_hack (CongApp *app)
@@ -303,6 +305,7 @@
  * @length:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 convert_ucs2_to_utf8 (guchar *data,
@@ -321,6 +324,7 @@
  * @length:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 convert_utf8_string (guchar *data, 
@@ -357,6 +361,7 @@
  * @length:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 convert_text_html (guchar *data, 
@@ -470,6 +475,7 @@
  * @n_targets:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_eel_gtk_clipboard_wait_for_targets (GtkClipboard  *clipboard, 
@@ -525,11 +531,17 @@
 
 /**
  * cong_app_get_clipboard_xml_source:
- * @app:
- * @selection:
- * @target_doc:
- *
- * TODO: Write me
+ * @app: the #CongApp
+ * @selection: should be either GDK_SELECTION_CLIPBOARD or GDK_SELECTION_PRIMARY
+ * @target_doc: the #CongDocument into which the source is to be pasted
+ * 
+ * This function interrogates the appropriate clipboard and attempts to get the content
+ * in the best possible format for the target document.  It may attempt to do conversions,
+ * for example, converting &lt;li&gt; elements into &lt;listitem&gt; when pasting HTML into a DocBook document.
+ *
+ * Returns: a newly-allocated UTF-8 fragment of XML source, wrapped in a &lt;placeholder&gt; element,
+ * suitable for parsing and adding to the document (which must then be freed using g_free) or NULL
+ * Returns: 
  */
 gchar*
 cong_app_get_clipboard_xml_source (CongApp *app,
@@ -781,12 +793,19 @@
 
 /**
  * cong_app_set_clipboard_from_xml_fragment:
- * @app:
- * @selection:
- * @xml_fragment:
- * @source_doc:
- *
- * TODO: Write me
+ * @app: the #CongApp
+ * @selection: should be either GDK_SELECTION_CLIPBOARD or GDK_SELECTION_PRIMARY
+ * @xml_fragment: a fragment of XML source
+ * @source_doc: the #CongDocument from which the source has been cut
+ * 
+ * This function takes the XML source and attempts to place it into the appropriate clipboard.  It will attempt to make it 
+ * available in a number of formats, and in the best possible way for each format.  It may attempt to do conversions when it does 
+ * this, e.g. generating pretty versions of bulleted lists for text, or converting to an HTML representation
+ * where appropriate.
+ *
+ * The XML form of the source is not converted, but is wrapped in an &lt;xml-fragment&gt; top-level element and given a DOCTYPE declaration if available in the source document.
+ * So it should be well-formed, but not valid.
+ * Haven't yet specified what happens to entities.
  */
 void
 cong_app_set_clipboard_from_xml_fragment (CongApp *app,
@@ -833,6 +852,7 @@
  * @app:
  *
  * TODO: Write me
+ * Returns:
  */
 GnomeProgram*
 cong_app_get_gnome_program (CongApp *app)
@@ -847,6 +867,7 @@
  * @app:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkTooltips*
 cong_app_get_tooltips (CongApp *app)
@@ -862,10 +883,11 @@
  * @role:
  *
  * TODO: Write me
+ * Returns:
  */
 CongFont*
 cong_app_get_font (CongApp *app,
-		   enum CongFontRole role)
+		   CongFontRole role)
 {
 	g_return_val_if_fail (app, NULL);
 	g_return_val_if_fail (role<CONG_FONT_ROLE_NUM, NULL);
@@ -878,6 +900,7 @@
  * @app:
  *
  * TODO: Write me
+ * Returns:
  */
 CongPluginManager*
 cong_app_get_plugin_manager (CongApp *app)
@@ -892,6 +915,7 @@
  * @app:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecRegistry*
 cong_app_get_dispspec_registry (CongApp *app)
@@ -906,6 +930,7 @@
  * @app:
  *
  * TODO: Write me
+ * Returns:
  */
 GConfClient*
 cong_app_get_gconf_client (CongApp *app)
@@ -920,6 +945,7 @@
  * @app:
  *
  * TODO: Write me
+ * Returns:
  */
 const GList*
 cong_app_get_language_list (CongApp *app)
Index: src/cong-app.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-app.h,v
retrieving revision 1.11
diff -u -r1.11 cong-app.h
--- a/src/cong-app.h	11 Jan 2004 04:35:20 -0000	1.11
+++ b/src/cong-app.h	23 Jun 2004 16:19:06 -0000
@@ -53,41 +53,12 @@
 cong_app_post_init_hack (CongApp *app);
 
 
-/**
- * cong_app_get_clipboard_xml_source:
- * @app: the #CongApp
- * @selection: should be either GDK_SELECTION_CLIPBOARD or GDK_SELECTION_PRIMARY
- * @target_doc: the #CongDocument into which the source is to be pasted
- * 
- * This function interrogates the appropriate clipboard and attempts to get the content
- * in the best possible format for the target document.  It may attempt to do conversions,
- * for example, converting <li> elements into <listitem> when pasting HTML into a DocBook document.
- *
- * Returns: a newly-allocated UTF-8 fragment of XML source, wrapped in a <placeholder> element,
- * suitable for parsing and adding to the document (which must then be freed using g_free) or NULL
- */
 gchar*
 cong_app_get_clipboard_xml_source (CongApp *app,
 				   GdkAtom selection,
 				   CongDocument *target_doc);
 
 
-/**
- * cong_app_set_clipboard_from_xml_fragment:
- * @app: the #CongApp
- * @selection: should be either GDK_SELECTION_CLIPBOARD or GDK_SELECTION_PRIMARY
- * @xml_fragment: a fragment of XML source
- * @source_doc: the #CongDocument from which the source has been cut
- * 
- * This function takes the XML source and attempts to place it into the appropriate clipboard.  It will attempt to make it 
- * available in a number of formats, and in the best possible way for each format.  It may attempt to do conversions when it does 
- * this, e.g. generating pretty versions of bulleted lists for text, or converting to an HTML representation
- * where appropriate.
- *
- * The XML form of the source is not converted, but is wrapped in an <xml-fragment> top-level element and given a DOCTYPE declaration if available in the source document.
- * So it should be well-formed, but not valid.
- * Haven't yet specified what happens to entities.
- */
 void
 cong_app_set_clipboard_from_xml_fragment (CongApp *app,
 					  GdkAtom selection,
@@ -102,7 +73,7 @@
 
 CongFont*
 cong_app_get_font (CongApp *app,
-		   enum CongFontRole role);
+		   CongFontRole role);
 
 CongPluginManager*
 cong_app_get_plugin_manager (CongApp *app);
Index: src/cong-attribute-editor-cdata.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-editor-cdata.c,v
retrieving revision 1.9
diff -u -r1.9 cong-attribute-editor-cdata.c
--- a/src/cong-attribute-editor-cdata.c	21 Jun 2004 03:34:42 -0000	1.9
+++ b/src/cong-attribute-editor-cdata.c	23 Jun 2004 16:19:06 -0000
@@ -28,7 +28,7 @@
 
 #define PRIVATE(x) ((x)->private)
 
-struct CongAttributeEditorCDATADetails
+struct _CongAttributeEditorCDATADetails
 {
 	GtkBox *hbox;
 	GtkEntry *entry;
@@ -86,6 +86,7 @@
  * @attr:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeEditor*
 cong_attribute_editor_cdata_construct (CongAttributeEditorCDATA *attribute_editor_cdata,
@@ -163,6 +164,7 @@
  * @attr:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget*
 cong_attribute_editor_cdata_new (CongDocument *doc,
Index: src/cong-attribute-editor-cdata.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-editor-cdata.h,v
retrieving revision 1.3
diff -u -r1.3 cong-attribute-editor-cdata.h
--- a/src/cong-attribute-editor-cdata.h	3 Mar 2004 21:26:23 -0000	1.3
+++ b/src/cong-attribute-editor-cdata.h	23 Jun 2004 16:19:06 -0000
@@ -29,22 +29,22 @@
 
 G_BEGIN_DECLS
 
-typedef struct CongAttributeEditorCDATA CongAttributeEditorCDATA;
-typedef struct CongAttributeEditorCDATAClass CongAttributeEditorCDATAClass;
-typedef struct CongAttributeEditorCDATADetails CongAttributeEditorCDATADetails;
+typedef struct _CongAttributeEditorCDATA CongAttributeEditorCDATA;
+typedef struct _CongAttributeEditorCDATAClass CongAttributeEditorCDATAClass;
+typedef struct _CongAttributeEditorCDATADetails CongAttributeEditorCDATADetails;
 
 #define CONG_ATTRIBUTE_EDITOR_CDATA_TYPE	      (cong_attribute_editor_cdata_get_type ())
 #define CONG_ATTRIBUTE_EDITOR_CDATA(obj)         G_TYPE_CHECK_INSTANCE_CAST (obj, CONG_ATTRIBUTE_EDITOR_CDATA_TYPE, CongAttributeEditorCDATA)
 #define CONG_ATTRIBUTE_EDITOR_CDATA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, CONG_ATTRIBUTE_EDITOR_CDATA_TYPE, CongAttributeEditorCDATAClass)
 #define IS_CONG_ATTRIBUTE_EDITOR_CDATA(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, CONG_ATTRIBUTE_EDITOR_CDATA_TYPE)
 
-struct CongAttributeEditorCDATA
+struct _CongAttributeEditorCDATA
 {
 	CongAttributeEditor attribute_editor;
 	CongAttributeEditorCDATADetails *private;
 };
 
-struct CongAttributeEditorCDATAClass
+struct _CongAttributeEditorCDATAClass
 {
 	CongAttributeEditorClass attribute_editor_klass;
 };
Index: src/cong-attribute-editor-enumeration.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-editor-enumeration.c,v
retrieving revision 1.11
diff -u -r1.11 cong-attribute-editor-enumeration.c
--- a/src/cong-attribute-editor-enumeration.c	21 Jun 2004 03:34:42 -0000	1.11
+++ b/src/cong-attribute-editor-enumeration.c	23 Jun 2004 16:19:06 -0000
@@ -78,6 +78,7 @@
  * @attr:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeEditor*
 cong_attribute_editor_enumeration_construct (CongAttributeEditorENUMERATION *attribute_editor_enumeration,
@@ -141,6 +142,7 @@
  * @attr:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget*
 cong_attribute_editor_enumeration_new (CongDocument *doc,
Index: src/cong-attribute-editor-lang.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-editor-lang.c,v
retrieving revision 1.3
diff -u -r1.3 cong-attribute-editor-lang.c
--- a/src/cong-attribute-editor-lang.c	21 Jun 2004 03:34:42 -0000	1.3
+++ b/src/cong-attribute-editor-lang.c	23 Jun 2004 16:19:06 -0000
@@ -116,10 +116,10 @@
  * @doc:
  * @node:
  * @ns_ptr:
- * @attribute_name:
  * @attr:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeEditor*
 cong_attribute_editor_lang_construct (CongAttributeEditorLang *attribute_editor_lang,
@@ -200,6 +200,7 @@
  * @attr: Pointer to attribute
  *
  * TODO: Creates editor of language-based attribute
+ * Returns:
  */
 GtkWidget*
 cong_attribute_editor_lang_new (CongDocument *doc,
Index: src/cong-attribute-editor-lang.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-editor-lang.h,v
retrieving revision 1.1
diff -u -r1.1 cong-attribute-editor-lang.h
--- a/src/cong-attribute-editor-lang.h	17 Jun 2004 16:14:58 -0000	1.1
+++ b/src/cong-attribute-editor-lang.h	23 Jun 2004 16:19:06 -0000
@@ -54,7 +54,7 @@
 cong_attribute_editor_lang_get_type (void);
 
 CongAttributeEditor*
-cong_attribute_editor_lang_construct (CongAttributeEditorLang *attribute_editor_cdata,
+cong_attribute_editor_lang_construct (CongAttributeEditorLang *attribute_editor_lang,
 				       CongDocument *doc,
 				       CongNodePtr node,
 				       xmlNs *ns_ptr,
Index: src/cong-attribute-editor.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-editor.c,v
retrieving revision 1.12
diff -u -r1.12 cong-attribute-editor.c
--- a/src/cong-attribute-editor.c	21 Jun 2004 03:34:42 -0000	1.12
+++ b/src/cong-attribute-editor.c	23 Jun 2004 16:19:07 -0000
@@ -105,6 +105,7 @@
  * @attr:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeEditor*
 cong_attribute_editor_construct (CongAttributeEditor *attribute_editor,
@@ -143,6 +144,7 @@
  * @attribute_editor:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_attribute_editor_get_document (CongAttributeEditor *attribute_editor)
@@ -157,6 +159,7 @@
  * @attribute_editor:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_attribute_editor_get_node (CongAttributeEditor *attribute_editor)
@@ -171,6 +174,7 @@
  * @attribute_editor:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlAttributePtr
 cong_attribute_editor_get_attribute (CongAttributeEditor *attribute_editor)
@@ -185,6 +189,7 @@
  * @attribute_editor:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlNs *
 cong_attribute_editor_get_ns (CongAttributeEditor *attribute_editor)
@@ -199,6 +204,7 @@
  * @attribute_editor:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_attribute_editor_get_attribute_name (CongAttributeEditor *attribute_editor)
@@ -213,6 +219,7 @@
  * @attribute_editor:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_attribute_editor_get_attribute_value (CongAttributeEditor *attribute_editor)
@@ -235,7 +242,6 @@
  * function is proposed to use on updates of UI in various 
  * implementaion of CongAttributeEditor.
  */
-
 void
 cong_attribute_editor_try_set_value (CongAttributeEditor *attribute_editor, const gchar *new_attr_value) {
 
@@ -293,6 +299,7 @@
  * @attr:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget*
 cong_attribute_editor_new (CongDocument *doc,
Index: src/cong-attribute-wrapper-check-button.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-wrapper-check-button.c,v
retrieving revision 1.5
diff -u -r1.5 cong-attribute-wrapper-check-button.c
--- a/src/cong-attribute-wrapper-check-button.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-attribute-wrapper-check-button.c	23 Jun 2004 16:19:07 -0000
@@ -97,6 +97,7 @@
  * @attribute_value_checked:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeWrapperCheckButton*
 cong_attribute_wrapper_check_button_construct (CongAttributeWrapperCheckButton *attribute_wrapper,
@@ -145,6 +146,7 @@
  * @attribute_value_checked:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeWrapperCheckButton*
 cong_attribute_wrapper_check_button_new ( CongDocument *doc,
Index: src/cong-attribute-wrapper-check-button.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-wrapper-check-button.h,v
retrieving revision 1.3
diff -u -r1.3 cong-attribute-wrapper-check-button.h
--- a/src/cong-attribute-wrapper-check-button.h	3 Mar 2004 21:26:23 -0000	1.3
+++ b/src/cong-attribute-wrapper-check-button.h	23 Jun 2004 16:19:07 -0000
@@ -55,7 +55,7 @@
 
 /* it's legitimate for attr to be NULL */
 CongAttributeWrapperCheckButton*
-cong_attribute_wrapper_check_button_construct (CongAttributeWrapperCheckButton *attribute_wrapper_check_button,
+cong_attribute_wrapper_check_button_construct (CongAttributeWrapperCheckButton *attribute_wrapper,
 					       CongDocument *doc,
 					       CongNodePtr node,
 					       xmlNs *ns_ptr,
Index: src/cong-attribute-wrapper-radio-button.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-wrapper-radio-button.c,v
retrieving revision 1.5
diff -u -r1.5 cong-attribute-wrapper-radio-button.c
--- a/src/cong-attribute-wrapper-radio-button.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-attribute-wrapper-radio-button.c	23 Jun 2004 16:19:07 -0000
@@ -95,6 +95,7 @@
  * @attribute_value:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeWrapperRadioButton*
 cong_attribute_wrapper_radio_button_construct (CongAttributeWrapperRadioButton *attribute_wrapper,
@@ -139,6 +140,7 @@
  * @attribute_value:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeWrapperRadioButton*
 cong_attribute_wrapper_radio_button_new ( CongDocument *doc,
Index: src/cong-attribute-wrapper-radio-button.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-wrapper-radio-button.h,v
retrieving revision 1.3
diff -u -r1.3 cong-attribute-wrapper-radio-button.h
--- a/src/cong-attribute-wrapper-radio-button.h	3 Mar 2004 21:26:23 -0000	1.3
+++ b/src/cong-attribute-wrapper-radio-button.h	23 Jun 2004 16:19:07 -0000
@@ -55,7 +55,7 @@
 
 /* it's legitimate for attr to be NULL */
 CongAttributeWrapperRadioButton*
-cong_attribute_wrapper_radio_button_construct (CongAttributeWrapperRadioButton *attribute_wrapper_radio_button,
+cong_attribute_wrapper_radio_button_construct (CongAttributeWrapperRadioButton *attribute_wrapper,
 					       CongDocument *doc,
 					       CongNodePtr node,
 					       xmlNs *ns_ptr,
Index: src/cong-attribute-wrapper.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-attribute-wrapper.c,v
retrieving revision 1.9
diff -u -r1.9 cong-attribute-wrapper.c
--- a/src/cong-attribute-wrapper.c	21 Jun 2004 03:34:42 -0000	1.9
+++ b/src/cong-attribute-wrapper.c	23 Jun 2004 16:19:07 -0000
@@ -103,6 +103,7 @@
  * @attr:
  *
  * TODO: Write me
+ * Returns:
  */
 CongAttributeWrapper*
 cong_attribute_wrapper_construct (CongAttributeWrapper *attribute_wrapper,
@@ -141,6 +142,7 @@
  * @attribute_wrapper:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_attribute_wrapper_get_document (CongAttributeWrapper *attribute_wrapper)
@@ -155,6 +157,7 @@
  * @attribute_wrapper:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_attribute_wrapper_get_node (CongAttributeWrapper *attribute_wrapper)
@@ -169,6 +172,7 @@
  * @attribute_wrapper:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlAttributePtr
 cong_attribute_wrapper_get_attribute (CongAttributeWrapper *attribute_wrapper)
@@ -183,6 +187,7 @@
  * @attribute_wrapper:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlNs *
 cong_attribute_wrapper_get_ns (CongAttributeWrapper *attribute_wrapper)
@@ -197,6 +202,7 @@
  * @attribute_wrapper:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_attribute_wrapper_get_attribute_name (CongAttributeWrapper *attribute_wrapper)
@@ -211,6 +217,7 @@
  * @attribute_wrapper:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_attribute_wrapper_get_attribute_value (CongAttributeWrapper *attribute_wrapper)
@@ -361,7 +368,7 @@
 
 /**
  * cong_attribute_wrapper_bind_to_widget:
- * @attribute_wrapper:
+ * @wrapper:
  * @widget:
  *
  * TODO: Write me
Index: src/cong-command-history.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-command-history.c,v
retrieving revision 1.6
diff -u -r1.6 cong-command-history.c
--- a/src/cong-command-history.c	18 Apr 2004 05:32:29 -0000	1.6
+++ b/src/cong-command-history.c	23 Jun 2004 16:19:07 -0000
@@ -80,6 +80,7 @@
  * @command_history:
  *
  * TODO: Write me
+ * Returns:
  */
 CongCommandHistory*
 cong_command_history_construct (CongCommandHistory *command_history)
@@ -91,6 +92,7 @@
  * cong_command_history_new:
  *
  * TODO: Write me
+ * Returns:
  */
 CongCommandHistory*
 cong_command_history_new (void)
@@ -137,6 +139,7 @@
  * @command_history:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_command_history_can_undo (CongCommandHistory *command_history)
@@ -151,6 +154,7 @@
  * @command_history:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_command_history_can_redo (CongCommandHistory *command_history)
@@ -230,6 +234,7 @@
  * @command_history:
  *
  * TODO: Write me
+ * Returns:
  */
 CongCommand*
 cong_command_history_get_next_undo_command (CongCommandHistory *command_history)
@@ -248,6 +253,7 @@
  * @command_history:
  *
  * TODO: Write me
+ * Returns:
  */
 CongCommand*
 cong_command_history_get_next_redo_command (CongCommandHistory *command_history)
Index: src/cong-command-history.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-command-history.h,v
retrieving revision 1.1
diff -u -r1.1 cong-command-history.h
--- a/src/cong-command-history.h	29 Sep 2003 19:15:59 -0000	1.1
+++ b/src/cong-command-history.h	23 Jun 2004 16:19:07 -0000
@@ -38,9 +38,6 @@
 
 typedef struct CongCommandHistoryDetails CongCommandHistoryDetails;
 
-
-/**
- */
 struct CongCommandHistory
 {
 	GObject object;
Index: src/cong-command.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-command.c,v
retrieving revision 1.24
diff -u -r1.24 cong-command.c
--- a/src/cong-command.c	18 Apr 2004 05:32:29 -0000	1.24
+++ b/src/cong-command.c	23 Jun 2004 16:19:08 -0000
@@ -92,6 +92,7 @@
  * @consolidation_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongCommand*
 cong_command_construct (CongCommand *command,
@@ -117,6 +118,7 @@
  * @consolidation_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongCommand*
 cong_command_private_new (CongDocument *doc,
@@ -134,6 +136,7 @@
  * @command:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_command_get_document (CongCommand *command)
@@ -148,6 +151,7 @@
  * @command:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_command_get_description (CongCommand *command)
@@ -162,6 +166,7 @@
  * @command:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_command_get_consolidation_id (CongCommand *command)
@@ -661,6 +666,7 @@
  * @cursor:
  *
  * TODO: Write me
+ * Returns:
  */
 const CongLocation*
 cong_cursor_get_location (const CongCursor *cursor)
@@ -1100,6 +1106,7 @@
  * @loc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_command_add_xml_frag_data_nice_split2  (CongCommand *cmd, 
@@ -1279,6 +1286,7 @@
  * @new_parent:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_command_can_add_reparent_selection (CongCommand *cmd,
@@ -1303,13 +1311,14 @@
 /**
  * cong_command_add_reparent_selection:
  * @cmd:
- * @new_parent:
+ * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_command_add_reparent_selection (CongCommand *cmd, 
-				     CongNodePtr new_parent)
+				     CongNodePtr node)
 {
 	CongDocument *doc;
 	CongSelection *selection;
@@ -1321,7 +1330,7 @@
 	CongLocation new_selection_end;
 
 	g_return_val_if_fail (IS_CONG_COMMAND(cmd), NULL);
-	g_return_val_if_fail (new_parent, NULL);
+	g_return_val_if_fail (node, NULL);
 
 	doc = cong_command_get_document (cmd);
 	selection = cong_document_get_selection (doc);
@@ -1340,7 +1349,7 @@
 	cong_location_copy (&new_selection_start, ordered_start);
 	cong_location_copy (&new_selection_end, ordered_end);
 
-	CONG_NODE_SELF_TEST(new_parent);
+	CONG_NODE_SELF_TEST(node);
 
 	/* --- Processing for multiple nodes --- */
 	if (loc0.node != loc1.node)
@@ -1368,10 +1377,10 @@
 
 		/* Position new_parent within the tree: */
 		if (prev_node) {
-			cong_command_add_node_add_after(cmd, new_parent, prev_node);
+			cong_command_add_node_add_after(cmd, node, prev_node);
 			CONG_NODE_SELF_TEST(prev_node);
 		} else {
-			cong_command_add_node_set_parent(cmd, new_parent, loc0.node->parent);
+			cong_command_add_node_set_parent(cmd, node, loc0.node->parent);
 		}
 
 		/* Reparent, first & middle */
@@ -1379,12 +1388,12 @@
 			iter_next = iter->next;
 
 			CONG_NODE_SELF_TEST(iter);
-			CONG_NODE_SELF_TEST(new_parent);
+			CONG_NODE_SELF_TEST(node);
 
-			cong_command_add_node_set_parent(cmd, iter, new_parent);			
+			cong_command_add_node_set_parent(cmd, iter, node);			
 
 			CONG_NODE_SELF_TEST(iter);
-			CONG_NODE_SELF_TEST(new_parent);
+			CONG_NODE_SELF_TEST(node);
 		}
 
 		/* Split, last */
@@ -1398,7 +1407,7 @@
 		new_selection_end.byte_offset = 0;
 
 		/* Reparent, last */
-		cong_command_add_node_set_parent(cmd, loc1.node, new_parent);
+		cong_command_add_node_set_parent(cmd, loc1.node, node);
 
 		cong_command_add_selection_change (cmd,
 						   &new_selection_start,
@@ -1431,12 +1440,12 @@
 		
 		/* Position new_parent where the selection was: */
 		if (loc0.node->prev) {
-			cong_command_add_node_add_after(cmd, new_parent, loc0.node->prev);
+			cong_command_add_node_add_after(cmd, node, loc0.node->prev);
 		} else {
-			cong_command_add_node_set_parent(cmd, new_parent, loc0.node->parent);
+			cong_command_add_node_set_parent(cmd, node, loc0.node->parent);
 		}
 		/* Move the selection below new_parent: */
-		cong_command_add_node_set_parent(cmd, cong_selection_get_ordered_start (selection)->node, new_parent);
+		cong_command_add_node_set_parent(cmd, cong_selection_get_ordered_start (selection)->node, node);
 
 		cong_command_add_selection_change (cmd,
 						   &new_selection_start,
@@ -1445,7 +1454,7 @@
 		cong_document_end_edit(doc);
 
 		/* Return node before new_parent's new position (I think): */
-		return new_parent->prev;
+		return node->prev;
 	}
 }
 
@@ -1495,6 +1504,7 @@
  * @c1:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_command_add_node_split3 (CongCommand *cmd, 
Index: src/cong-dialog.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dialog.c,v
retrieving revision 1.10
diff -u -r1.10 cong-dialog.c
--- a/src/cong-dialog.c	22 Jun 2004 00:13:54 -0000	1.10
+++ b/src/cong-dialog.c	23 Jun 2004 16:19:09 -0000
@@ -34,6 +34,7 @@
  * @within_notebook:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDialogContent *
 cong_dialog_content_new(gboolean within_notebook)
@@ -59,6 +60,7 @@
  * @dialog_content:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget *
 cong_dialog_content_get_widget(CongDialogContent *dialog_content)
@@ -74,6 +76,7 @@
  * @title:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDialogCategory *
 cong_dialog_content_add_category(CongDialogContent *dialog_content, const gchar *title)
@@ -199,6 +202,7 @@
  * @tertiary_text:
  *
  * TODO: Write me
+ * Returns:
  */
 static gchar*
 make_dialog_message(const gchar* primary_text, 
@@ -230,6 +234,7 @@
  * @tertiary_text:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_alert_content_new(const gchar* stock_icon,
@@ -276,6 +281,7 @@
  * @seconds_since_last_save_or_load:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog *
 cong_dialog_save_confirmation_alert_new(GtkWindow *parent, 
@@ -341,6 +347,7 @@
  * @seconds_since_last_save_or_load:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog *
 cong_dialog_revert_confirmation_alert_new(GtkWindow *parent, 
@@ -402,6 +409,7 @@
  * @message:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog *
 cong_dialog_information_alert_new(GtkWindow *parent, 
Index: src/cong-dispspec-element.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dispspec-element.c,v
retrieving revision 1.20
diff -u -r1.20 cong-dispspec-element.c
--- a/src/cong-dispspec-element.c	18 Apr 2004 05:32:29 -0000	1.20
+++ b/src/cong-dispspec-element.c	23 Jun 2004 16:19:09 -0000
@@ -45,9 +45,9 @@
 
 	gchar *icon_name;
 	GdkPixbuf *icon16;
-	enum CongWhitespaceHandling whitespace;
+	CongWhitespaceHandling whitespace;
 
-	enum CongElementType type;
+	CongElementType type;
 	gboolean collapseto;
 
 #if NEW_LOOK
@@ -197,7 +197,7 @@
 	{ 0x632829, 0x632829, 0x632829, 0x632829 }
 };
 
-static void get_col(GdkColor *dst, const GdkColor *src, enum CongDispspecGCUsage usage)
+static void get_col(GdkColor *dst, const GdkColor *src, CongDispspecGCUsage usage)
 {
 	/* pick one of the test colour tables based on a dodgy hashing of the source colour: */
 	col_to_gcol(dst, hacked_cols[(src->red>>8)%2][usage]);
@@ -209,6 +209,7 @@
  * @col:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkGC*
 generate_gc_for_col (const GdkColor *col)
@@ -284,20 +285,22 @@
 
 /* Exported functions: */
 
-/* Construction  */
-/**
+/** 
  * cong_dispspec_element_new:
- * @ns_uri:
- * @local_name:
+ * @ns_uri: the URI of the namespace, or NULL
+ * @local_name: the local name for the new element; must be non-NULL
  * @type:
- * @autogenerate_username:
+ * @autogenerate_username:  if TRUE, then generate a sane user-visible name for the element,
+ * using "header capitalisation"
  *
- * TODO: Write me
- */
+ * Constructs a new #CongDispspecElement, initialising fields to sane defaults.
+ *
+ * Returns: a freshly allocated #CongDispspecElement 
+ **/
 CongDispspecElement*
 cong_dispspec_element_new (const gchar* ns_uri, 
 			   const gchar* local_name, 
-			   enum CongElementType type,
+			   CongElementType type,
 			   gboolean autogenerate_username)
 {
 	CongDispspecElement* element;
@@ -390,11 +393,11 @@
 	/* FIXME:  do we need to remove from the list? */
 }
 
-/**
+/** 
  * cong_dispspec_element_get_ns_uri:
- * @element:
- *
- * TODO: Write me
+ * @element: the element in question
+ * 
+ * Returns: the namespace URI for this kind of element, or NULL if none
  */
 const gchar*
 cong_dispspec_element_get_ns_uri (CongDispspecElement *element)
@@ -406,9 +409,9 @@
 
 /**
  * cong_dispspec_element_get_local_name:
- * @element:
- *
- * TODO: Write me
+ * @element: the element in question
+ * 
+ * Returns: the local name (relative to its namespace, if any) for this kind of element
  */
 const gchar*
 cong_dispspec_element_get_local_name(CongDispspecElement* element)
@@ -423,6 +426,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_dispspec_element_username(CongDispspecElement* element)
@@ -444,6 +448,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_dispspec_element_get_description(CongDispspecElement *element)
@@ -458,6 +463,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf*
 cong_dispspec_element_get_icon(CongDispspecElement *element)
@@ -472,10 +478,13 @@
 
 /**
  * cong_dispspec_element_get_value_for_key:
- * @key:
- * @element:
- *
- * TODO: Write me
+ * @key: the key
+ * @element:  the dispspec element
+ * 
+ * Dispspec elements support a list of key/value string pairs; this is intended as a mechanism
+ * to allow plugins to have arbitrary data whilst having a DTD for xds files.
+ * 
+ * Returns:  the value, if found, or NULL if not present.
  */
 const gchar*
 cong_dispspec_element_get_value_for_key (const gchar *key, 
@@ -493,8 +502,9 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
-enum CongElementType
+CongElementType
 cong_dispspec_element_type(CongDispspecElement *element)
 {
 	g_return_val_if_fail(element, CONG_ELEMENT_TYPE_UNKNOWN);
@@ -504,11 +514,12 @@
 
 /**
  * cong_dispspec_element_get_whitespace:
- * @element:
+ * @element:  The element of the display spec
  *
- * TODO: Write me
+ * Get the #CongWhitespaceHandling behaviour for this element
+ * Returns:  
  */
-enum CongWhitespaceHandling
+CongWhitespaceHandling
 cong_dispspec_element_get_whitespace (CongDispspecElement *element)
 {
 	g_return_val_if_fail (element, CONG_WHITESPACE_NORMALIZE);
@@ -518,14 +529,14 @@
 
 /**
  * cong_dispspec_element_set_whitespace:
- * @element:
- * @whitespace:
+ * @element:  The element of the display spec
+ * @whitespace: The new value for whitespace handling
  *
- * TODO: Write me
+ * Set the #CongWhitespaceHandling behaviour for this element
  */
 void
 cong_dispspec_element_set_whitespace (CongDispspecElement *element,
-				      enum CongWhitespaceHandling whitespace)
+				      CongWhitespaceHandling whitespace)
 {	
 	g_return_if_fail (element);
 
@@ -537,6 +548,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_dispspec_element_collapseto(CongDispspecElement *element)
@@ -549,6 +561,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_dispspec_element_is_structural(CongDispspecElement *element)
@@ -567,6 +580,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_dispspec_element_is_span(CongDispspecElement *element)
@@ -587,9 +601,10 @@
  * @usage:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkGC*
-cong_dispspec_element_gc(CongDispspecElement *element, enum CongDispspecGCUsage usage)
+cong_dispspec_element_gc(CongDispspecElement *element, CongDispspecGCUsage usage)
 {
 	g_return_val_if_fail(element, NULL);
 	g_return_val_if_fail(usage<CONG_DISPSPEC_GC_USAGE_NUM, NULL);
@@ -603,9 +618,10 @@
  * @usage:
  *
  * TODO: Write me
+ * Returns:
  */
 const GdkColor*
-cong_dispspec_element_col(CongDispspecElement *element, enum CongDispspecGCUsage usage)
+cong_dispspec_element_col(CongDispspecElement *element, CongDispspecGCUsage usage)
 {
 	g_return_val_if_fail(element, NULL);
 	g_return_val_if_fail(usage<CONG_DISPSPEC_GC_USAGE_NUM, NULL);
@@ -614,12 +630,7 @@
 }
 
 #else
-/**
- * cong_dispspec_element_gc:
- * @element:
- *
- * TODO: Write me
- */
+
 GdkGC*
 cong_dispspec_element_gc(CongDispspecElement *element)
 {
@@ -628,12 +639,6 @@
 	return element->gc;
 }
 
-/**
- * cong_dispspec_element_col:
- * @element:
- *
- * TODO: Write me
- */
 const GdkColor*
 cong_dispspec_element_col(CongDispspecElement *element)
 {
@@ -648,6 +653,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElementHeaderInfo*
 cong_dispspec_element_header_info(CongDispspecElement *element)
@@ -662,6 +668,7 @@
  * @header_info:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_dispspec_element_header_info_get_xpath_expression (CongDispspecElementHeaderInfo *header_info)
@@ -683,6 +690,7 @@
  * @x:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_dispspec_element_get_title(CongDispspecElement *element, CongNodePtr x)
@@ -784,6 +792,7 @@
  * @x:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_dispspec_element_get_section_header_text(CongDispspecElement *element, CongNodePtr x)
@@ -817,9 +826,10 @@
  * @role:
  *
  * TODO: Write me
+ * Returns:
  */
 CongFont*
-cong_dispspec_element_get_font(CongDispspecElement *element, enum CongFontRole role)
+cong_dispspec_element_get_font(CongDispspecElement *element, CongFontRole role)
 {
 	g_return_val_if_fail(element, NULL);
 	g_return_val_if_fail(role<CONG_FONT_ROLE_NUM, NULL);
@@ -834,6 +844,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_dispspec_element_get_editor_service_id(CongDispspecElement *element)
@@ -848,6 +859,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_dispspec_element_get_property_dialog_service_id(CongDispspecElement *element)
@@ -859,9 +871,11 @@
 
 /**
  * cong_dispspec_element_from_xml:
- * @xml_element:
+ * @xml_element:  the element within the XML document
  *
- * TODO: Write me
+ * Create an #CongDispspecElement from an xds XML representation
+ *
+ * Returns: a newly-created #CongDispspecElement
  */
 CongDispspecElement*
 cong_dispspec_element_from_xml (xmlNodePtr xml_element)
@@ -953,10 +967,12 @@
 
 /**
  * cong_dispspec_element_to_xml:
- * @element:
- * @xml_doc:
+ * @element:  the dispspec element we are adding
+ * @xml_doc:  the XML document we are creating
  *
- * TODO: Write me
+ * Create an element tag suitable for adding to an element-list tag within an xds XML document.
+ *
+ * Returns: a newly-created #xmlNodePtr
  */
 xmlNodePtr
 cong_dispspec_element_to_xml (const CongDispspecElement *element,
Index: src/cong-dispspec-element.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dispspec-element.h,v
retrieving revision 1.8
diff -u -r1.8 cong-dispspec-element.h
--- a/src/cong-dispspec-element.h	5 Mar 2004 01:36:15 -0000	1.8
+++ b/src/cong-dispspec-element.h	23 Jun 2004 16:19:09 -0000
@@ -27,23 +27,27 @@
 
 G_BEGIN_DECLS
 
-/** 
- * cong_dispspec_element_new:
- * @ns_uri: the URI of the namespace, or NULL
- * @local_name: the local name for the new element; must be non-NULL
- * @type:
- * @autogenerate_username:  if TRUE, then generate a sane user-visible name for the element,
- * using "header capitalisation"
- *
- * Constructs a new #CongDispspecElement, initialising fields to sane defaults.
- *
- * Returns: a freshly allocated #CongDispspecElement 
- *
- **/
+typedef enum 
+{
+	CONG_ELEMENT_TYPE_STRUCTURAL,
+	CONG_ELEMENT_TYPE_SPAN,
+	CONG_ELEMENT_TYPE_INSERT,
+
+	CONG_ELEMENT_TYPE_EMBED_EXTERNAL_FILE,
+
+	/* Other types?  Table? Plugin widget/Bonobo control? */
+
+	CONG_ELEMENT_TYPE_PLUGIN,
+
+	CONG_ELEMENT_TYPE_UNKNOWN,
+
+	CONG_ELEMENT_TYPE_ALL
+} CongElementType;
+
 CongDispspecElement*
 cong_dispspec_element_new (const gchar* ns_uri, 
 			   const gchar* local_name,
-			   enum CongElementType type,
+			   CongElementType type,
 			   gboolean autogenerate_username);
 
 /* Destruction  */
@@ -51,23 +55,9 @@
 cong_dispspec_element_destroy (CongDispspecElement *element); 
 
 
-/** 
- * cong_dispspec_element_get_ns_uri:
- * @element: the element in question
- * 
- * Returns: the namespace URI for this kind of element, or NULL if none
- *
- */
 const gchar*
 cong_dispspec_element_get_ns_uri (CongDispspecElement *element); 
 
-/**
- * cong_dispspec_element_get_local_name:
- * @element: the element in question
- * 
- * Returns: the local name (relative to its namespace, if any) for this kind of element
- *
- */
 const char*
 cong_dispspec_element_get_local_name (CongDispspecElement *element);
 
@@ -85,17 +75,6 @@
 GdkPixbuf*
 cong_dispspec_element_get_icon(CongDispspecElement *element);
 
-/**
- * cong_dispspec_element_get_value_for_key:
- *
- * @key: the key
- * @element:  the dispspec element
- * 
- * Dispspec elements support a list of key/value string pairs; this is intended as a mechanism
- * to allow plugins to have arbitrary data whilst having a DTD for xds files.
- * 
- * Returns:  the value, if found, or NULL if not present.
- */
 const gchar*
 cong_dispspec_element_get_value_for_key (const gchar *key, 
 					 const CongDispspecElement *element);
@@ -103,30 +82,16 @@
 const char*
 cong_dispspec_element_name_name_get(CongDispspecElement* element);
 
-enum CongElementType
+CongElementType
 cong_dispspec_element_type(CongDispspecElement *element);
 
 
-/**
- * cong_dispspec_element_get_whitespace:
- * @element:  The element of the display spec
- *
- * Get the #CongWhitespaceHandling behaviour for this element
- * Returns:  
- */
-enum CongWhitespaceHandling
+CongWhitespaceHandling
 cong_dispspec_element_get_whitespace (CongDispspecElement *element);
 
-/**
- * cong_dispspec_element_set_whitespace:
- * @element:  The element of the display spec
- * @whitespace: The new value for whitespace handling
- *
- * Set the #CongWhitespaceHandling behaviour for this element
- */
 void
 cong_dispspec_element_set_whitespace (CongDispspecElement *element,
-				      enum CongWhitespaceHandling whitespace);
+				      CongWhitespaceHandling whitespace);
 
 gboolean
 cong_dispspec_element_collapseto(CongDispspecElement *element);
@@ -142,10 +107,10 @@
 
 #if NEW_LOOK
 GdkGC*
-cong_dispspec_element_gc(CongDispspecElement *element, enum CongDispspecGCUsage usage);
+cong_dispspec_element_gc(CongDispspecElement *element, CongDispspecGCUsage usage);
 
 const GdkColor*
-cong_dispspec_element_col(CongDispspecElement *element, enum CongDispspecGCUsage usage);
+cong_dispspec_element_col(CongDispspecElement *element, CongDispspecGCUsage usage);
 #else
 GdkGC*
 cong_dispspec_element_gc(CongDispspecElement *element);
@@ -170,7 +135,7 @@
 cong_dispspec_element_get_section_header_text(CongDispspecElement *element, CongNodePtr x);
 
 CongFont*
-cong_dispspec_element_get_font(CongDispspecElement *element, enum CongFontRole role);
+cong_dispspec_element_get_font(CongDispspecElement *element, CongFontRole role);
 
 const gchar*
 cong_dispspec_element_get_editor_service_id(CongDispspecElement *element);
@@ -178,30 +143,10 @@
 const gchar*
 cong_dispspec_element_get_property_dialog_service_id(CongDispspecElement *element);
 
-/**
- * cong_dispspec_element_to_xml:
- *
- * @element:  the dispspec element we are adding
- * @xml_doc:  the XML document we are creating
- *
- * Create an element tag suitable for adding to an element-list tag within an xds XML document.
- *
- * Returns: a newly-created #xmlNodePtr
- */
 xmlNodePtr
 cong_dispspec_element_to_xml (const CongDispspecElement *element,
 			      xmlDocPtr xml_doc);
 
-/**
- * cong_dispspec_element_from_xml:
- *
- * @xml_element:  the element within the XML document
- *
- * Create an #CongDispspecElement from an xds XML representation
- *
- * Returns: a newly-created #CongDispspecElement
- *
- */
 CongDispspecElement*
 cong_dispspec_element_from_xml (xmlNodePtr xml_element);
 
Index: src/cong-dispspec-registry.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dispspec-registry.c,v
retrieving revision 1.24
diff -u -r1.24 cong-dispspec-registry.c
--- a/src/cong-dispspec-registry.c	18 Apr 2004 05:32:29 -0000	1.24
+++ b/src/cong-dispspec-registry.c	23 Jun 2004 16:19:09 -0000
@@ -83,12 +83,12 @@
  * @registry:
  * @xds_directory:
  * @toplevel_window:
- * @raise_errors:
+ * @raise_errs:
  *
  * TODO: Write me
  */
 void
-cong_dispspec_registry_add_dir(CongDispspecRegistry *registry, const gchar *xds_directory, GtkWindow *toplevel_window, gboolean raise_errors)
+cong_dispspec_registry_add_dir(CongDispspecRegistry *registry, const gchar *xds_directory, GtkWindow *toplevel_window, gboolean raise_errs)
 {
 	GnomeVFSResult vfs_result;
 	struct LoadingDetails details;
@@ -103,7 +103,7 @@
 					       visit_func,
 					       (gpointer)&details);
 
-	if (raise_errors && vfs_result!=GNOME_VFS_OK) {
+	if (raise_errs && vfs_result!=GNOME_VFS_OK) {
 		GtkDialog* dialog = cong_error_dialog_new_from_file_operation_failure(toplevel_window,
 										      _("Conglomerate could not read its registry of document types."),
 										      xds_directory,
@@ -126,6 +126,7 @@
  * @toplevel_window:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecRegistry*
 cong_dispspec_registry_new(const gchar* xds_directory, GtkWindow *toplevel_window)
@@ -158,6 +159,7 @@
  * @registry:
  *
  * TODO: Write me
+ * Returns:
  */
 unsigned int
 cong_dispspec_registry_get_num(CongDispspecRegistry* registry)
@@ -173,6 +175,7 @@
  * @i:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec*
 cong_dispspec_registry_get(CongDispspecRegistry* registry, unsigned int i)
@@ -370,7 +373,7 @@
 /**
  * cong_dispspec_registry_get_appropriate_dispspec:
  * @registry:
- * @xml_doc:
+ * @doc:
  * @filename_extension:
  * 
  * Routine to figure out an appropriate dispspec for use with this file.
@@ -382,7 +385,7 @@
  */
 CongDispspec*
 cong_dispspec_registry_get_appropriate_dispspec (CongDispspecRegistry* registry, 
-						 xmlDocPtr xml_doc,
+						 xmlDocPtr doc,
 						 const gchar *filename_extension)
 {
 #if 0
@@ -391,13 +394,13 @@
 #endif
 
 	g_return_val_if_fail (registry,NULL);
-	g_return_val_if_fail (xml_doc,NULL);
+	g_return_val_if_fail (doc,NULL);
 
 	/* Check for a DTD match: */
-	if (xml_doc->extSubset) {
+	if (doc->extSubset) {
 
 		/* Check for matching PUBLIC ID: */
-		if (xml_doc->extSubset->ExternalID) {
+		if (doc->extSubset->ExternalID) {
 			int i;
 
 			for (i=0;i<cong_dispspec_registry_get_num (registry);i++) {
@@ -407,8 +410,8 @@
 
 				if (dtd) {
 					if (cong_external_document_model_get_public_id (dtd)) {
-						if (0==strcmp (xml_doc->extSubset->ExternalID, cong_external_document_model_get_public_id (dtd))) {
-							g_message("Found display spec based on matching public ID of DTD:\n    %s\n", xml_doc->extSubset->ExternalID);
+						if (0==strcmp (doc->extSubset->ExternalID, cong_external_document_model_get_public_id (dtd))) {
+							g_message("Found display spec based on matching public ID of DTD:\n    %s\n", doc->extSubset->ExternalID);
 							return ds;
 						}
 					}
@@ -417,8 +420,8 @@
 		}
 
 		/* Check for matching SYSTEM ID: */
-		if (xml_doc->extSubset->SystemID) {
-			const unsigned char *sysID = xml_doc->extSubset->SystemID;
+		if (doc->extSubset->SystemID) {
+			const unsigned char *sysID = doc->extSubset->SystemID;
 			int i;
 			
 			for (i=0;i<cong_dispspec_registry_get_num(registry);i++) {
@@ -456,7 +459,7 @@
 		for (i=0;i<cong_dispspec_registry_get_num (registry);i++) {
 			coverage_array[i].ds = cong_dispspec_registry_get (registry, i);
 			coverage_array[i].coverage = cong_dispspec_calculate_coverage (coverage_array[i].ds,
-										       xml_doc);
+										       doc);
 			g_message ("coverage of %s = %f", 
 				   cong_dispspec_get_name (coverage_array[i].ds), 
 				   coverage_array[i].coverage);
@@ -495,7 +498,7 @@
 	}
 #else
 	/* Otherwise, check for a matching top-level element:*/
-	if (get_toplevel_tag(xml_doc, &toplevel_xmlns, &toplevel_tag)) {
+	if (get_toplevel_tag(doc, &toplevel_xmlns, &toplevel_tag)) {
 		int i;
 		
 		g_message("Searching for a match against top-level tag <%s>\n", toplevel_tag);
Index: src/cong-dispspec.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dispspec.c,v
retrieving revision 1.46
diff -u -r1.46 cong-dispspec.c
--- a/src/cong-dispspec.c	18 Apr 2004 05:32:29 -0000	1.46
+++ b/src/cong-dispspec.c	23 Jun 2004 16:19:10 -0000
@@ -51,7 +51,7 @@
 
 struct CongExternalDocumentModel
 {
-	enum CongDocumentModelType model_type;
+	CongDocumentModelType model_type;
 	gchar *public_id;
 	gchar *system_id;
 };
@@ -177,7 +177,7 @@
 }
 
 static CongExternalDocumentModel*
-cong_external_document_model_new (enum CongDocumentModelType model_type,
+cong_external_document_model_new (CongDocumentModelType model_type,
 				  const gchar *public_id,
 				  const gchar *system_id)
 {
@@ -572,7 +572,7 @@
  */
 const CongExternalDocumentModel*
 cong_dispspec_get_external_document_model (const CongDispspec *ds,
-					   enum CongDocumentModelType model_type)
+					   CongDocumentModelType model_type)
 {
 	g_return_val_if_fail(ds, NULL);
 	g_return_val_if_fail(model_type<NUM_CONG_DOCUMENT_MODEL_TYPES, NULL);
@@ -654,7 +654,7 @@
  *
  * TODO: Write me
  */
-enum CongElementType
+CongElementType
 cong_dispspec_type (CongDispspec *ds, 
 		    const gchar* ns_uri, 
 		    const gchar* local_name)
@@ -803,7 +803,7 @@
 /* Various functions that may get deprecated at some point: */
 #if NEW_LOOK
 #if 0
-GdkGC *cong_dispspec_gc_get(CongDispspec *ds, CongNodePtr x, enum CongDispspecGCUsage usage)
+GdkGC *cong_dispspec_gc_get(CongDispspec *ds, CongNodePtr x, CongDispspecGCUsage usage)
 {
 	CongDispspecElement* element = cong_dispspec_lookup_element(ds, );
 
@@ -942,16 +942,17 @@
  * cong_dispspec_element_span:
  * @ds:
  * @ns_uri:
- * @name:
+ * @local_name:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_dispspec_element_span (CongDispspec *ds, 
 			    const gchar *ns_uri, 
-			    const char *name)
+			    const char *local_name)
 {
-	CongDispspecElement* element = cong_dispspec_lookup_element (ds, ns_uri, name);
+	CongDispspecElement* element = cong_dispspec_lookup_element (ds, ns_uri, local_name);
 
 	if (NULL==element) {
 		return FALSE;
@@ -1199,7 +1200,7 @@
 	type = cong_node_get_attribute (node, NULL, "type");
 
 	if (type) {
-		enum CongDocumentModelType model_type = cong_enum_mapping_lookup (document_model_enum_mapping,
+		CongDocumentModelType model_type = cong_enum_mapping_lookup (document_model_enum_mapping,
 										  sizeof(document_model_enum_mapping)/sizeof(CongEnumMapping),
 										  "type",
 										  CONG_DOCUMENT_MODE_TYPE_DTD);
@@ -1353,7 +1354,7 @@
 		     node_document_models);
 	
 	for (i=0; i<NUM_CONG_DOCUMENT_MODEL_TYPES; i++) {
-		enum CongDocumentModelType model_type = (enum CongDocumentModelType)i;
+		CongDocumentModelType model_type = (CongDocumentModelType)i;
 
 		const CongExternalDocumentModel* model = cong_dispspec_get_external_document_model (dispspec,
 												    model_type);
Index: src/cong-dispspec.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dispspec.h,v
retrieving revision 1.20
diff -u -r1.20 cong-dispspec.h
--- a/src/cong-dispspec.h	5 Mar 2004 01:27:49 -0000	1.20
+++ b/src/cong-dispspec.h	23 Jun 2004 16:19:10 -0000
@@ -22,19 +22,21 @@
  * Authors: David Malcolm <david@davemalcolm.demon.co.uk>
  */
 
+#include "cong-dispspec-element.h"
+
 #ifndef __CONG_DISPSPEC_H__
 #define __CONG_DISPSPEC_H__
 
 G_BEGIN_DECLS
 
-enum CongDocumentModelType
+typedef enum 
 {
 	CONG_DOCUMENT_MODE_TYPE_DTD,
 	CONG_DOCUMENT_MODE_TYPE_W3C_XML_SCHEMA,
 	CONG_DOCUMENT_MODE_TYPE_RELAX_NG_SCHEMA,
 
 	NUM_CONG_DOCUMENT_MODEL_TYPES
-};
+} CongDocumentModelType;
 
 typedef struct CongSerialisationFormat CongSerialisationFormat;
 typedef struct CongExternalDocumentModel CongExternalDocumentModel;
@@ -95,7 +97,7 @@
 
 const CongExternalDocumentModel*
 cong_dispspec_get_external_document_model (const CongDispspec *ds,
-					   enum CongDocumentModelType model_type);
+					   CongDocumentModelType model_type);
 
 /**
  *  Get a pixbuf (if any) for this dispspec; caller is repsonsible for unrefing the pixbuf
@@ -113,7 +115,7 @@
 cong_dispspec_lookup_node (const CongDispspec *ds, 
 			   CongNodePtr node);
 
-enum CongElementType
+CongElementType
 cong_dispspec_type (CongDispspec *ds, 
 		    const gchar* ns_uri, 
 		    const gchar* local_name);
@@ -144,7 +146,7 @@
 
 /* Various functions that may get deprecated at some point: */
 #if NEW_LOOK
-GdkGC *cong_dispspec_gc_get(CongDispspec *ds, CongNodePtr x, enum CongDispspecGCUsage usage);
+GdkGC *cong_dispspec_gc_get(CongDispspec *ds, CongNodePtr x, CongDispspecGCUsage usage);
 #else
 #if 0
 GdkGC *cong_dispspec_name_gc_get(CongDispspec *ds, TTREE *t, int tog);
Index: src/cong-document.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-document.h,v
retrieving revision 1.44
diff -u -r1.44 cong-document.h
--- a/src/cong-document.h	17 Jun 2004 13:36:02 -0000	1.44
+++ b/src/cong-document.h	23 Jun 2004 16:19:11 -0000
@@ -22,6 +22,8 @@
  * Authors: David Malcolm <david@davemalcolm.demon.co.uk>
  */
 
+#include "cong-dispspec-element.h"
+
 #ifndef __CONG_DOCUMENT_H__
 #define __CONG_DOCUMENT_H__
 
@@ -510,15 +512,15 @@
 GList* 
 cong_document_get_valid_new_child_elements (CongDocument *doc,
 					    CongNodePtr node, 
-					    enum CongElementType tag_type);
+					    CongElementType tag_type);
 GList* 
 cong_document_get_valid_new_previous_sibling_elements (CongDocument *doc,
 						       CongNodePtr node, 
-						       enum CongElementType tag_type);
+						       CongElementType tag_type);
 GList* 
 cong_document_get_valid_new_next_sibling_elements (CongDocument* doc, 
 						   CongNodePtr node, 
-						   enum CongElementType tag_type);
+						   CongElementType tag_type);
 
 /**
  * cong_document_node_can_be_deleted:
Index: src/cong-dom-view.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dom-view.c,v
retrieving revision 1.12
diff -u -r1.12 cong-dom-view.c
--- a/src/cong-dom-view.c	18 Apr 2004 05:32:29 -0000	1.12
+++ b/src/cong-dom-view.c	23 Jun 2004 16:19:11 -0000
@@ -44,7 +44,7 @@
 clean_text(const gchar* txt);
 
 const gchar*
-cong_ui_get_colour_string(enum CongNodeType type);
+cong_ui_get_colour_string(CongNodeType type);
 
 static gchar*
 get_text_for_node(CongNodePtr node);
@@ -149,7 +149,7 @@
  * TODO: Write me
  */
 const gchar*
-cong_ui_get_colour_string(enum CongNodeType type)
+cong_ui_get_colour_string(CongNodeType type)
 {
 	/* FIXME: this should be linked to the theme and/or the GtkSourceView settings */
 
@@ -203,7 +203,7 @@
 static gchar*
 get_text_for_node(CongNodePtr node)
 {
-	enum CongNodeType node_type;
+	CongNodeType node_type;
 	const gchar *colour_string;
 	const gchar *string_colour_string;
 	gchar *text = NULL;
Index: src/cong-dtd.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dtd.c,v
retrieving revision 1.8
diff -u -r1.8 cong-dtd.c
--- a/src/cong-dtd.c	18 Apr 2004 05:32:29 -0000	1.8
+++ b/src/cong-dtd.c	23 Jun 2004 16:19:11 -0000
@@ -97,7 +97,7 @@
  *
  * TODO: Write me
  */
-enum CongElementType
+CongElementType
 cong_dtd_element_guess_dispspec_type (xmlElementPtr element)
 {
 	g_return_val_if_fail (element, CONG_ELEMENT_TYPE_UNKNOWN);
Index: src/cong-dtd.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dtd.h,v
retrieving revision 1.6
diff -u -r1.6 cong-dtd.h
--- a/src/cong-dtd.h	26 Feb 2004 02:57:04 -0000	1.6
+++ b/src/cong-dtd.h	23 Jun 2004 16:19:11 -0000
@@ -25,6 +25,8 @@
 #ifndef __CONG_DTD_H__
 #define __CONG_DTD_H__
 
+#include "cong-dispspec-element.h"
+
 G_BEGIN_DECLS
 
 /* Callback for traversing DTD elements: */
@@ -56,7 +58,7 @@
  * 
  * Returns: 
  */
-enum CongElementType
+CongElementType
 cong_dtd_element_guess_dispspec_type (xmlElementPtr element);
 
 /**
Index: src/cong-editor-area-flow-holder-blocks.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-flow-holder-blocks.c,v
retrieving revision 1.15
diff -u -r1.15 cong-editor-area-flow-holder-blocks.c
--- a/src/cong-editor-area-flow-holder-blocks.c	18 Apr 2004 05:32:29 -0000	1.15
+++ b/src/cong-editor-area-flow-holder-blocks.c	23 Jun 2004 16:19:13 -0000
@@ -219,7 +219,7 @@
 	CongEditorNode *iter;
 	GList *list_of_removed_nodes = NULL;
 
-	enum CongFlowType flow_type;
+	CongFlowType flow_type;
 
 	flow_type = cong_editor_node_get_flow_type (editor_node);
 
Index: src/cong-editor-area-flow-holder-single.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-flow-holder-single.c,v
retrieving revision 1.6
diff -u -r1.6 cong-editor-area-flow-holder-single.c
--- a/src/cong-editor-area-flow-holder-single.c	18 Apr 2004 05:32:29 -0000	1.6
+++ b/src/cong-editor-area-flow-holder-single.c	23 Jun 2004 16:19:15 -0000
@@ -237,7 +237,7 @@
 {
 	if (IS_CONG_EDITOR_AREA_CONTAINER(editor_area) ) {
 		CongEditorAreaFlowHolder *flow_holder;
-		enum CongFlowType flow_type = cong_editor_node_get_flow_type (editor_node);
+		CongFlowType flow_type = cong_editor_node_get_flow_type (editor_node);
 		
 		flow_holder = cong_editor_area_flow_holder_manufacture (cong_editor_node_get_widget(editor_node),
 									flow_type);
Index: src/cong-editor-area-flow-holder.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-flow-holder.c,v
retrieving revision 1.5
diff -u -r1.5 cong-editor-area-flow-holder.c
--- a/src/cong-editor-area-flow-holder.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-editor-area-flow-holder.c	23 Jun 2004 16:19:15 -0000
@@ -133,7 +133,7 @@
  */
 CongEditorAreaFlowHolder*
 cong_editor_area_flow_holder_manufacture (CongEditorWidget3 *editor_widget,
-					  enum CongFlowType flow_type)
+					  CongFlowType flow_type)
 {
 	switch (flow_type) {
 	default: g_assert_not_reached();
Index: src/cong-editor-area-flow-holder.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-flow-holder.h,v
retrieving revision 1.4
diff -u -r1.4 cong-editor-area-flow-holder.h
--- a/src/cong-editor-area-flow-holder.h	1 Aug 2003 18:16:05 -0000	1.4
+++ b/src/cong-editor-area-flow-holder.h	23 Jun 2004 16:19:15 -0000
@@ -73,7 +73,7 @@
 
 CongEditorAreaFlowHolder*
 cong_editor_area_flow_holder_manufacture (CongEditorWidget3 *editor_widget,
-					  enum CongFlowType flow_type);
+					  CongFlowType flow_type);
 
 
 G_END_DECLS
Index: src/cong-editor-area-span-tag.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-span-tag.c,v
retrieving revision 1.17
diff -u -r1.17 cong-editor-area-span-tag.c
--- a/src/cong-editor-area-span-tag.c	18 Apr 2004 05:32:29 -0000	1.17
+++ b/src/cong-editor-area-span-tag.c	23 Jun 2004 16:19:16 -0000
@@ -308,12 +308,11 @@
 }
 
 /**
- * allocate_child_space
- * @area CongEditorArea for parent span element
+ * allocate_child_space:
+ * @area: CongEditorArea for parent span element
  *
  * Given area allocated for span element, allocate two subareas (its inner_bin and its title).
  * 
- * Returns: void
  */
 static void
 allocate_child_space (CongEditorArea *area)
Index: src/cong-editor-area-underline.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-underline.c,v
retrieving revision 1.6
diff -u -r1.6 cong-editor-area-underline.c
--- a/src/cong-editor-area-underline.c	18 Apr 2004 05:32:29 -0000	1.6
+++ b/src/cong-editor-area-underline.c	23 Jun 2004 16:19:17 -0000
@@ -32,7 +32,7 @@
 
 struct CongEditorAreaUnderlineDetails
 {
-	enum CongEditorAreaUnderlineStyle style;
+	CongEditorAreaUnderlineStyle style;
 	
 	GdkGC *gc;
 };
@@ -80,7 +80,7 @@
 CongEditorArea*
 cong_editor_area_underline_construct (CongEditorAreaUnderline *area_underline,
 				      CongEditorWidget3 *editor_widget,
-				      enum CongEditorAreaUnderlineStyle style)
+				      CongEditorAreaUnderlineStyle style)
 {
 	g_return_val_if_fail (area_underline, NULL);
 
@@ -102,7 +102,7 @@
  */
 CongEditorArea*
 cong_editor_area_underline_new (CongEditorWidget3 *editor_widget,
-				enum CongEditorAreaUnderlineStyle style)
+				CongEditorAreaUnderlineStyle style)
 {
 	return cong_editor_area_underline_construct
 		(g_object_new (CONG_EDITOR_AREA_UNDERLINE_TYPE, NULL),
Index: src/cong-editor-area-underline.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-underline.h,v
retrieving revision 1.1
diff -u -r1.1 cong-editor-area-underline.h
--- a/src/cong-editor-area-underline.h	15 Jul 2003 16:22:17 -0000	1.1
+++ b/src/cong-editor-area-underline.h	23 Jun 2004 16:19:17 -0000
@@ -38,12 +38,12 @@
 #define CONG_EDITOR_AREA_UNDERLINE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, CONG_EDITOR_AREA_UNDERLINE_TYPE, CongEditorAreaUnderlineClass)
 #define IS_CONG_EDITOR_AREA_UNDERLINE(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, CONG_EDITOR_AREA_UNDERLINE_TYPE)
 
-enum CongEditorAreaUnderlineStyle {
+typedef enum  {
 	CONG_EDITOR_AREA_UNDERLINE_STYLE_SPAN_TAG_START,
 	CONG_EDITOR_AREA_UNDERLINE_STYLE_SPAN_TAG_END,
 	CONG_EDITOR_AREA_UNDERLINE_STYLE_SPELLING_ERROR,
 	CONG_EDITOR_AREA_UNDERLINE_STYLE_GRAMMAR_ERROR
-};
+} CongEditorAreaUnderlineStyle;
 
 struct CongEditorAreaUnderline
 {
@@ -63,11 +63,11 @@
 CongEditorArea*
 cong_editor_area_underline_construct (CongEditorAreaUnderline *area_underline,
 				      CongEditorWidget3 *editor_widget,
-				      enum CongEditorAreaUnderlineStyle style);
+				      CongEditorAreaUnderlineStyle style);
 
 CongEditorArea*
 cong_editor_area_underline_new (CongEditorWidget3 *editor_widget,
-				enum CongEditorAreaUnderlineStyle style);
+				CongEditorAreaUnderlineStyle style);
 
 G_END_DECLS
 
Index: src/cong-editor-area-unknown-tag.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-unknown-tag.c,v
retrieving revision 1.11
diff -u -r1.11 cong-editor-area-unknown-tag.c
--- a/src/cong-editor-area-unknown-tag.c	18 Apr 2004 05:32:29 -0000	1.11
+++ b/src/cong-editor-area-unknown-tag.c	23 Jun 2004 16:19:18 -0000
@@ -90,7 +90,7 @@
 }
 
 const gchar*
-cong_ui_get_colour_string(enum CongNodeType type);
+cong_ui_get_colour_string(CongNodeType type);
 
 /* Exported function definitions: */
 /**
Index: src/cong-editor-node-element-span.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-element-span.c,v
retrieving revision 1.14
diff -u -r1.14 cong-editor-node-element-span.c
--- a/src/cong-editor-node-element-span.c	18 Apr 2004 05:32:29 -0000	1.14
+++ b/src/cong-editor-node-element-span.c	23 Jun 2004 16:19:20 -0000
@@ -48,7 +48,7 @@
 			       gint line_width,
 			       gint initial_indent);
 
-static enum CongFlowType
+static CongFlowType
 get_flow_type(CongEditorNode *editor_node);
 
 /* Extra stuff: */
@@ -278,7 +278,7 @@
 	return result;
 }
 
-static enum CongFlowType
+static CongFlowType
 get_flow_type(CongEditorNode *editor_node)
 {
 	return CONG_FLOW_TYPE_INLINE;
Index: src/cong-editor-node-text.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-text.c,v
retrieving revision 1.43
diff -u -r1.43 cong-editor-node-text.c
--- a/src/cong-editor-node-text.c	18 Apr 2004 05:32:29 -0000	1.43
+++ b/src/cong-editor-node-text.c	23 Jun 2004 16:19:21 -0000
@@ -108,7 +108,7 @@
 			       gint line_width,
 			       gint initial_indent);
 
-static enum CongFlowType
+static CongFlowType
 get_flow_type (CongEditorNode *editor_node);
 
 /* FIXME:  We probably shouldn't have every text node in the doc listening to every text node change... probably should allow for a dispatch mechanism within the widget */
@@ -215,7 +215,7 @@
 #if 0
 	gchar *markup;	
 #endif
-	enum CongWhitespaceHandling whitespace = cong_node_get_whitespace_handling (cong_editor_widget3_get_document (editor_widget),
+	CongWhitespaceHandling whitespace = cong_node_get_whitespace_handling (cong_editor_widget3_get_document (editor_widget),
 										    cong_traversal_node_get_node (traversal_node));
 
 	cong_editor_node_construct (CONG_EDITOR_NODE (editor_node_text),
@@ -1083,7 +1083,7 @@
 	return FALSE;
 }
 
-static enum CongFlowType
+static CongFlowType
 get_flow_type(CongEditorNode *editor_node)
 {
 	return CONG_FLOW_TYPE_INLINE;
Index: src/cong-editor-node.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node.c,v
retrieving revision 1.25
diff -u -r1.25 cong-editor-node.c
--- a/src/cong-editor-node.c	18 Apr 2004 05:32:29 -0000	1.25
+++ b/src/cong-editor-node.c	23 Jun 2004 16:19:22 -0000
@@ -68,7 +68,7 @@
 	gboolean is_selected;
 };
 
-static enum CongFlowType
+static CongFlowType
 get_flow_type(CongEditorNode *editor_node);
 
 #if 0
@@ -154,7 +154,7 @@
 {
 	CongDocument *doc;
 	CongNodePtr xml_node;
-	enum CongNodeType type;
+	CongNodeType type;
 
 	g_return_val_if_fail (IS_CONG_EDITOR_WIDGET3 (widget), NULL);
 	g_return_val_if_fail (IS_CONG_TRAVERSAL_NODE (traversal_node), NULL);
@@ -479,10 +479,10 @@
  *
  * TODO: Write me
  */
-enum CongFlowType
+CongFlowType
 cong_editor_node_get_flow_type (CongEditorNode *editor_node)
 {
-	enum CongFlowType flow_type;
+	CongFlowType flow_type;
 		
 	g_return_val_if_fail (editor_node, CONG_FLOW_TYPE_BLOCK);
 
@@ -742,7 +742,7 @@
 	PRIVATE(editor_node)->parents_child_policy = child_policy;
 }
 
-static enum CongFlowType
+static CongFlowType
 get_flow_type(CongEditorNode *editor_node)
 {
 	return CONG_FLOW_TYPE_BLOCK;
Index: src/cong-editor-node.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node.h,v
retrieving revision 1.17
diff -u -r1.17 cong-editor-node.h
--- a/src/cong-editor-node.h	11 Jan 2004 04:35:20 -0000	1.17
+++ b/src/cong-editor-node.h	23 Jun 2004 16:19:22 -0000
@@ -80,7 +80,7 @@
 
 	void (*line_regeneration_required) (CongEditorNode *editor_node);
 	
-	enum CongFlowType (*get_flow_type) (CongEditorNode *editor_node);
+	 CongFlowType (*get_flow_type) (CongEditorNode *editor_node);
 };
 
 GType
@@ -146,7 +146,7 @@
 void
 cong_editor_node_line_regeneration_required (CongEditorNode *editor_node);
 
-enum CongFlowType
+CongFlowType
 cong_editor_node_get_flow_type (CongEditorNode *editor_node);
 
 /**
Index: src/cong-editor-widget.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-widget.h,v
retrieving revision 1.16
diff -u -r1.16 cong-editor-widget.h
--- a/src/cong-editor-widget.h	16 Dec 2003 17:27:17 -0000	1.16
+++ b/src/cong-editor-widget.h	23 Jun 2004 16:19:22 -0000
@@ -31,12 +31,6 @@
 
 /* Third attempt at an editor widget: */
 
-enum CongFlowType
-{
-	CONG_FLOW_TYPE_BLOCK,
-	CONG_FLOW_TYPE_INLINE
-};
-
 #define CONG_EDITOR_WIDGET3_TYPE	 (cong_editor_widget3_get_type ())
 #define CONG_EDITOR_WIDGET3(obj)         G_TYPE_CHECK_INSTANCE_CAST (obj, CONG_EDITOR_WIDGET3_TYPE, CongEditorWidget3)
 #define CONG_EDITOR_WIDGET3_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, CONG_EDITOR_WIDGET3_TYPE, CongEditorWidget3Class)
@@ -150,7 +144,7 @@
 				 gint y);
 
 const gchar*
-cong_flow_type_get_debug_string(enum CongFlowType flow_type);
+cong_flow_type_get_debug_string(CongFlowType flow_type);
 
 void 
 editor_popup_build (CongEditorWidget3 *editor_widget, 
Index: src/cong-editor-widget3.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-widget3.c,v
retrieving revision 1.58
diff -u -r1.58 cong-editor-widget3.c
--- a/src/cong-editor-widget3.c	18 Apr 2004 05:32:29 -0000	1.58
+++ b/src/cong-editor-widget3.c	23 Jun 2004 16:19:23 -0000
@@ -702,7 +702,7 @@
  * TODO: Write me
  */
 const gchar*
-cong_flow_type_get_debug_string(enum CongFlowType flow_type)
+cong_flow_type_get_debug_string(CongFlowType flow_type)
 {
 	switch (flow_type) {
 	default: g_assert_not_reached();
@@ -1670,7 +1670,7 @@
 {
 	CongEditorChildPolicy *parents_child_policy = NULL;
 	CongEditorChildPolicy *this_child_policy = NULL;
-	enum CongFlowType flow_type;
+	CongFlowType flow_type;
 	CongNodePtr node = cong_editor_node_get_node (editor_node);
 
 #if LOG_EDITOR_AREAS
Index: src/cong-font.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-font.c,v
retrieving revision 1.10
diff -u -r1.10 cong-font.c
--- a/src/cong-font.c	18 Apr 2004 05:32:29 -0000	1.10
+++ b/src/cong-font.c	23 Jun 2004 16:19:26 -0000
@@ -142,7 +142,7 @@
 			   const gchar *text,
 			   gint x,
 			   gint y,
-			   enum CongFontYPos y_pos)
+			   CongFontYPos y_pos)
 {
 	gint adjusted_y;
 	gint text_height;
Index: src/cong-font.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-font.h,v
retrieving revision 1.1
diff -u -r1.1 cong-font.h
--- a/src/cong-font.h	16 Apr 2003 17:37:05 -0000	1.1
+++ b/src/cong-font.h	23 Jun 2004 16:19:26 -0000
@@ -28,7 +28,7 @@
 /**
    An enum for describing the meaning of a y coordinate when rendering text.
  */
-enum CongFontYPos {
+typedef enum {
 	
 	/* Render so that the Y coord is the ascent of the text: */
 	CONG_FONT_Y_POS_TOP,
@@ -38,7 +38,7 @@
 
 	/* Render so that the Y coord is the baseline of the text: */
 	CONG_FONT_Y_POS_BASELINE,
-};
+} CongFontYPos;
 
 CongFont*
 cong_font_load(const gchar *font_name);
@@ -65,7 +65,7 @@
 			   const gchar *text,
 			   gint x,
 			   gint y,
-			   enum CongFontYPos y_pos);
+			   CongFontYPos y_pos);
 
 /**
    Get the width of a string rendered in the font in pixels
Index: src/cong-glade.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-glade.c,v
retrieving revision 1.1
diff -u -r1.1 cong-glade.c
--- a/src/cong-glade.c	21 Jun 2004 03:34:42 -0000	1.1
+++ b/src/cong-glade.c	23 Jun 2004 16:19:27 -0000
@@ -42,7 +42,6 @@
 
 /**
  * cong_util_load_glade_file:
- *
  * @filename:  Datadir-relative path of the file, e.g. "conglomerate/glade/my-file.glade"
  * @root:  The root widget to be created, or NULL for all of them
  * @doc:  The #CongDocument to be available to custom widgets, or NULL
@@ -55,10 +54,7 @@
  * wire themselves up properly.
  *
  * Returns: a freshly-loaded #GladeXML interface; client must unref it.
- *
  */
-
-
 GladeXML*
 cong_util_load_glade_file (const gchar *filename,
 			   const gchar *root,
@@ -170,6 +166,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget*
 create_cdata_editor (GladeXML *xml,
@@ -221,6 +218,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget*
 create_lang_editor (GladeXML *xml,
Index: src/cong-location.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-location.c,v
retrieving revision 1.41
diff -u -r1.41 cong-location.c
--- a/src/cong-location.c	23 May 2004 03:34:59 -0000	1.41
+++ b/src/cong-location.c	23 Jun 2004 16:19:27 -0000
@@ -20,7 +20,7 @@
 gboolean
 cong_location_is_valid(const CongLocation *loc)
 {
-	enum CongNodeType type;
+	CongNodeType type;
 	
 	g_return_val_if_fail(loc != NULL, FALSE);
 
@@ -227,7 +227,7 @@
  *
  * TODO: Write me
  */
-enum CongNodeType
+CongNodeType
 cong_location_node_type(const CongLocation *loc)
 {
 	g_return_val_if_fail(loc, CONG_NODE_TYPE_UNKNOWN);
Index: src/cong-location.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-location.h,v
retrieving revision 1.9
diff -u -r1.9 cong-location.h
--- a/src/cong-location.h	25 Oct 2003 22:00:38 -0000	1.9
+++ b/src/cong-location.h	23 Jun 2004 16:19:27 -0000
@@ -70,7 +70,7 @@
 gboolean
 cong_location_equals(const CongLocation *loc0, const CongLocation *loc1);
 
-enum CongNodeType
+CongNodeType
 cong_location_node_type(const CongLocation *loc);
 
 gunichar
Index: src/cong-node.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node.c,v
retrieving revision 1.25
diff -u -r1.25 cong-node.c
--- a/src/cong-node.c	10 Jun 2004 01:30:45 -0000	1.25
+++ b/src/cong-node.c	23 Jun 2004 16:19:31 -0000
@@ -107,7 +107,7 @@
  *
  * TODO: Write me
  */
-enum CongNodeType 
+CongNodeType 
 cong_node_type(CongNodePtr node)
 {
 	g_return_val_if_fail(node, CONG_NODE_TYPE_UNKNOWN);
@@ -534,7 +534,7 @@
  * TODO: Write me
  */
 const gchar *
-cong_node_type_description(enum CongNodeType node_type)
+cong_node_type_description(CongNodeType node_type)
 {
 	g_return_val_if_fail(node_type<CONG_NODE_TYPE_NUM,"(invalid type)");
 
@@ -1633,7 +1633,7 @@
  *
  * TODO: Write me
  */
-enum CongWhitespaceHandling
+CongWhitespaceHandling
 cong_node_get_whitespace_handling (CongDocument *doc,
 				   CongNodePtr text_node)
 {
@@ -1719,9 +1719,13 @@
 
 /**
  * cong_node_supports_byte_offsets:
- * @node:
+ * @node:  a node to be tested
  *
- * TODO: Write me
+ * The function determines if #CongLocation objects that reference this node can have meaningful byte offsets
+ *
+ * Only TEXT and COMMENT nodes can currently have meaningful byte offsets.
+ * 
+ * Returns: a #gboolean which is TRUE iff #CongLocations that reference this node can have a meaningful byte offset 
  */
 gboolean
 cong_node_supports_byte_offsets (CongNodePtr node)
@@ -1806,10 +1810,14 @@
 
 /**
  * cong_node_get_ordering:
- * @n0:
- * @n1:
+ * @n0:  first node to be compared
+ * @n1:  second node to be compared
  *
- * TODO: Write me
+ * This functions compares the location of two nodes in the xml tree and returns a numeric comparsion representing
+ * their locations in a depth-first traversal.
+ *
+ * Returns: negative if n0 is reached before n1, zero if they are the same node, positive if n0 is reached after n1
+ * 
  */
 int 
 cong_node_get_ordering (CongNodePtr n0,
@@ -1876,11 +1884,18 @@
 
 /**
  * cong_node_calc_first_node_in_subtree_satisfying:
- * @node:
- * @predicate:
- * @user_data:
  *
- * TODO: Write me
+ * @node: the top of the subtree
+ * @predicate: the #CongNodePredicate to test nodes for
+ * @user_data: user-supplied data passed to the predicate
+ *
+ * Finds the first node in a depth-first traversal of the subtree below this node
+ * that satisfies the predicate.
+ *
+ * Note that @node is the initial node of the tree (and hence is tested first)
+ *
+ * Returns: the appropriate node satisfying @predicate, or NULL if there are none
+ *
  */
 CongNodePtr
 cong_node_calc_first_node_in_subtree_satisfying (CongNodePtr node,
@@ -1914,11 +1929,18 @@
 
 /**
  * cong_node_calc_final_node_in_subtree_satisfying:
- * @node:
- * @predicate:
- * @user_data:
  *
- * TODO: Write me
+ * @node: the top of the subtree
+ * @predicate: the #CongNodePredicate to test nodes for
+ * @user_data: user-supplied data passed to the predicate
+ *
+ * Finds the final node in a depth-first traversal of the subtree below this node
+ * that satisfies the predicate.
+ *
+ * Note that @node is the initial node of the tree (and hence is tested last)
+ *
+ * Returns: the appropriate node satisfying @predicate, or NULL if there are none
+ *
  */
 CongNodePtr
 cong_node_calc_final_node_in_subtree_satisfying (CongNodePtr node, 
@@ -1952,11 +1974,16 @@
 
 /**
  * cong_node_calc_prev_node_satisfying:
- * @node:
- * @predicate:
- * @user_data:
  *
- * TODO: Write me
+ * @node: the start of the search
+ * @predicate: the #CongNodePredicate to test nodes for
+ * @user_data: user-supplied data passed to the predicate
+ *
+ * Finds the first preceding node relative to the input that satisfies the predicate,
+ * in an imagined depth-first traversal of the document.  Includes ancestors.
+ *
+ * Returns: the appropriate node satisfying @predicate, or NULL if there are none
+ *
  */
 CongNodePtr
 cong_node_calc_prev_node_satisfying (CongNodePtr node, 
@@ -1997,11 +2024,16 @@
 
 /**
  * cong_node_calc_next_node_satisfying:
- * @node:
- * @predicate:
- * @user_data:
  *
- * TODO: Write me
+ * @node: the start of the search
+ * @predicate: the #CongNodePredicate to test nodes for
+ * @user_data: user-supplied data passed to the predicate
+ *
+ * Finds the first following node relative to the input that satisfies the predicate,
+ * in an imagined depth-first traversal of the document.   Includes ancestors.
+ *
+ * Returns: the appropriate node satisfying @predicate, or NULL if there are none
+ *
  */
 CongNodePtr
 cong_node_calc_next_node_satisfying (CongNodePtr node,
Index: src/cong-node.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node.h,v
retrieving revision 1.28
diff -u -r1.28 cong-node.h
--- a/src/cong-node.h	10 Jun 2004 01:30:45 -0000	1.28
+++ b/src/cong-node.h	23 Jun 2004 16:19:31 -0000
@@ -27,7 +27,7 @@
 
 G_BEGIN_DECLS
 
-enum CongNodeType
+typedef enum
 {
 	CONG_NODE_TYPE_UNKNOWN,
 
@@ -53,25 +53,18 @@
 	CONG_NODE_TYPE_XINCLUDE_END,
 
 	CONG_NODE_TYPE_NUM
-};
+}  CongNodeType;
 
-
-enum CongElementType
+typedef enum 
 {
-	CONG_ELEMENT_TYPE_STRUCTURAL,
-	CONG_ELEMENT_TYPE_SPAN,
-	CONG_ELEMENT_TYPE_INSERT,
-
-	CONG_ELEMENT_TYPE_EMBED_EXTERNAL_FILE,
-
-	/* Other types?  Table? Plugin widget/Bonobo control? */
-
-	CONG_ELEMENT_TYPE_PLUGIN,
-
-	CONG_ELEMENT_TYPE_UNKNOWN,
-
-	CONG_ELEMENT_TYPE_ALL
-};
+	CONG_FLOW_TYPE_BLOCK,
+	CONG_FLOW_TYPE_INLINE
+} CongFlowType;
+
+typedef enum  {
+	CONG_WHITESPACE_NORMALIZE,
+	CONG_WHITESPACE_PRESERVE
+} CongWhitespaceHandling;
 
 typedef struct CongDocument CongDocument;
 typedef struct CongView CongView;
@@ -97,7 +90,7 @@
 CongNodePtr cong_node_first_child(CongNodePtr node);
 CongNodePtr cong_node_parent(CongNodePtr node);
 
-enum CongNodeType cong_node_type(CongNodePtr node);
+CongNodeType cong_node_type(CongNodePtr node);
 
 /** 
  * cong_node_is_element:
@@ -223,7 +216,7 @@
 /* Handy debug methods for writing log info: */
 gchar *cong_node_debug_description(CongNodePtr node);
 
-const gchar *cong_node_type_description(enum CongNodeType node_type);
+const gchar *cong_node_type_description(CongNodeType node_type);
 
 /* Methods for accessing attribute values: */
 
@@ -401,7 +394,7 @@
 CongNodePtr 
 cong_node_get_first_text_node_descendant (CongNodePtr node);
 
-enum CongWhitespaceHandling
+CongWhitespaceHandling
 cong_node_get_whitespace_handling (CongDocument *doc,
 				   CongNodePtr text_node);
 
@@ -434,16 +427,6 @@
 gboolean
 cong_node_is_valid_cursor_location (CongNodePtr node);
 
-/**
- * cong_node_supports_byte_offsets:
- * @node:  a node to be tested
- *
- * The function determines if #CongLocation objects that reference this node can have meaningful byte offsets
- *
- * Only TEXT and COMMENT nodes can currently have meaningful byte offsets.
- * 
- * Returns: a #gboolean which is TRUE iff #CongLocations that reference this node can have a meaningful byte offset 
- */
 gboolean
 cong_node_supports_byte_offsets (CongNodePtr node);
 
@@ -453,17 +436,6 @@
 gboolean
 cong_node_can_be_copied (CongNodePtr node);
 
-/**
- * cong_node_get_ordering:
- * @n0:  first node to be compared
- * @n1:  second node to be compared
- *
- * This functions compares the location of two nodes in the xml tree and returns a numeric comparsion representing
- * their locations in a depth-first traversal.
- *
- * Returns: negative if n0 is reached before n1, zero if they are the same node, positive if n0 is reached after n1
- * 
- */
 int 
 cong_node_get_ordering (CongNodePtr n0,
 			CongNodePtr n1);
@@ -479,77 +451,21 @@
 		      gpointer user_data);
 		      
 
-/**
- * cong_node_calc_first_node_in_subtree_satisfying:
- *
- * @node: the top of the subtree
- * @predicate: the #CongNodePredicate to test nodes for
- * @user_data: user-supplied data passed to the predicate
- *
- * Finds the first node in a depth-first traversal of the subtree below this node
- * that satisfies the predicate.
- *
- * Note that @node is the initial node of the tree (and hence is tested first)
- *
- * Returns: the appropriate node satisfying @predicate, or NULL if there are none
- *
- */
 CongNodePtr
 cong_node_calc_first_node_in_subtree_satisfying (CongNodePtr node,
 						 CongNodePredicate predicate,
 						 gpointer user_data);
 
-/**
- * cong_node_calc_final_node_in_subtree_satisfying:
- *
- * @node: the top of the subtree
- * @predicate: the #CongNodePredicate to test nodes for
- * @user_data: user-supplied data passed to the predicate
- *
- * Finds the final node in a depth-first traversal of the subtree below this node
- * that satisfies the predicate.
- *
- * Note that @node is the initial node of the tree (and hence is tested last)
- *
- * Returns: the appropriate node satisfying @predicate, or NULL if there are none
- *
- */
 CongNodePtr
 cong_node_calc_final_node_in_subtree_satisfying (CongNodePtr node, 
 						 CongNodePredicate predicate,
 						 gpointer user_data);
 
-/**
- * cong_node_calc_prev_node_satisfying:
- *
- * @node: the start of the search
- * @predicate: the #CongNodePredicate to test nodes for
- * @user_data: user-supplied data passed to the predicate
- *
- * Finds the first preceding node relative to the input that satisfies the predicate,
- * in an imagined depth-first traversal of the document.  Includes ancestors.
- *
- * Returns: the appropriate node satisfying @predicate, or NULL if there are none
- *
- */
 CongNodePtr
 cong_node_calc_prev_node_satisfying (CongNodePtr node, 
 				     CongNodePredicate predicate,
 				     gpointer user_data);
 
-/**
- * cong_node_calc_next_node_satisfying:
- *
- * @node: the start of the search
- * @predicate: the #CongNodePredicate to test nodes for
- * @user_data: user-supplied data passed to the predicate
- *
- * Finds the first following node relative to the input that satisfies the predicate,
- * in an imagined depth-first traversal of the document.   Includes ancestors.
- *
- * Returns: the appropriate node satisfying @predicate, or NULL if there are none
- *
- */
 CongNodePtr
 cong_node_calc_next_node_satisfying (CongNodePtr node,
 				     CongNodePredicate predicate,
Index: src/cong-overview-view.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-overview-view.c,v
retrieving revision 1.9
diff -u -r1.9 cong-overview-view.c
--- a/src/cong-overview-view.c	18 Apr 2004 05:32:30 -0000	1.9
+++ b/src/cong-overview-view.c	23 Jun 2004 16:19:31 -0000
@@ -106,7 +106,7 @@
 	     CongNodePtr node,
 	     gpointer user_data)
 {
-	enum CongNodeType node_type;
+	CongNodeType node_type;
 
 	g_return_val_if_fail(cong_tree_view, FALSE);
 	g_return_val_if_fail(node, FALSE);
@@ -180,7 +180,7 @@
 			gpointer user_data)
 {
 	GtkTreeStore *gtk_tree_store;
-	enum CongNodeType node_type;
+	CongNodeType node_type;
 	CongDocument *doc;
 	CongDispspec *ds;
 
@@ -289,7 +289,7 @@
 			    CongNodePtr node,
 			    gpointer user_data)
 {
-	enum CongNodeType node_type;
+	CongNodeType node_type;
 
 	g_return_val_if_fail (cong_tree_view, NULL);
 	g_return_val_if_fail (node, NULL);
Index: src/cong-parser-error.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-parser-error.c,v
retrieving revision 1.9
diff -u -r1.9 cong-parser-error.c
--- a/src/cong-parser-error.c	18 Apr 2004 05:32:30 -0000	1.9
+++ b/src/cong-parser-error.c	23 Jun 2004 16:19:31 -0000
@@ -28,7 +28,7 @@
  * TODO: Write me
  */
 void 
-cong_parser_result_add_issue(CongParserResult *result, enum CongIssueType type, int linenum, gchar *description)
+cong_parser_result_add_issue(CongParserResult *result, CongIssueType type, int linenum, gchar *description)
 {
 	CongParserIssue *issue;
 
@@ -61,7 +61,7 @@
  * TODO: Write me
  */
 void 
-on_issue(CongParserResult *result, enum CongIssueType type, xmlParserCtxtPtr ctxt, gchar* description)
+on_issue(CongParserResult *result, CongIssueType type, xmlParserCtxtPtr ctxt, gchar* description)
 {
 	g_return_if_fail(description);
 
Index: src/cong-parser-error.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-parser-error.h,v
retrieving revision 1.3
diff -u -r1.3 cong-parser-error.h
--- a/src/cong-parser-error.h	14 Oct 2003 13:39:57 -0000	1.3
+++ b/src/cong-parser-error.h	23 Jun 2004 16:19:31 -0000
@@ -6,15 +6,15 @@
 G_BEGIN_DECLS
 
 /* Towards improved error handling: */
-enum CongIssueType
+typedef enum
 {
 	CONG_ISSUE_ERROR,
 	CONG_ISSUE_WARNING
-};
+} CongIssueType;
 
 typedef struct CongParserIssue
 {
-	enum CongIssueType type;
+	CongIssueType type;
 	gchar *filename;
 	int linenum;
 	gchar *description;
@@ -36,7 +36,7 @@
 		      const gchar *string_uri,
 		      GtkWindow *parent_window);
 
-void cong_parser_result_add_issue(CongParserResult *result, enum CongIssueType type, int linenum, gchar *description);
+void cong_parser_result_add_issue(CongParserResult *result, CongIssueType type, int linenum, gchar *description);
 
 GtkDialog *cong_parser_result_dialog_new(CongParserResult *parser_result);
 
Index: src/global.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/global.h,v
retrieving revision 1.121
diff -u -r1.121 global.h
--- a/src/global.h	17 Jun 2004 13:36:02 -0000	1.121
+++ b/src/global.h	23 Jun 2004 16:19:39 -0000
@@ -61,32 +61,9 @@
 #include "cong-node.h"
 #include "cong-location.h"
 
-enum CongWhitespaceHandling {
-	CONG_WHITESPACE_NORMALIZE,
-	CONG_WHITESPACE_PRESERVE
-};
-
-
 typedef struct CongRange CongRange;
 
-struct CongCursor
-{
-	/* Visual representation */
-	GdkGC *gc;
-
-	gboolean on;
-
-	/* Conceptual location at which stuff will be inserted i.e. the byte_offset is the offset of the character immediately following the caret. So it's zero for the beginning of the text */
-	CongLocation location;
-
-	guint timeout_id;
-
-	CongDocument *doc;
-};
-
-
-enum CongFontRole
-{
+typedef enum {
 	CONG_FONT_ROLE_BODY_TEXT,
 	CONG_FONT_ROLE_SPAN_TAG,
 	CONG_FONT_ROLE_TITLE_TEXT,
@@ -94,17 +71,16 @@
 	/* replaces: f, fm, ft in order */
 
 	CONG_FONT_ROLE_NUM
-};
+} CongFontRole;
 
-enum CongDispspecGCUsage
-{
+typedef enum {
 	CONG_DISPSPEC_GC_USAGE_BOLD_LINE,
 	CONG_DISPSPEC_GC_USAGE_DIM_LINE,
 	CONG_DISPSPEC_GC_USAGE_BACKGROUND,
 	CONG_DISPSPEC_GC_USAGE_TEXT,
 
 	CONG_DISPSPEC_GC_USAGE_NUM
-};
+} CongDispspecGCUsage;
 
 
 typedef struct CongPlugin CongPlugin;
@@ -125,6 +101,21 @@
 
 typedef struct CongServiceNodePropertyDialog CongServiceNodePropertyDialog;
 
+struct CongCursor
+{
+	/* Visual representation */
+	GdkGC *gc;
+
+	gboolean on;
+
+	/* Conceptual location at which stuff will be inserted i.e. the byte_offset is the offset of the character immediately following the caret. So it's zero for the beginning of the text */
+	CongLocation location;
+
+	guint timeout_id;
+
+	CongDocument *doc;
+};
+
 CongEditorView *cong_editor_view_new(CongDocument *doc);
 void cong_editor_view_free(CongEditorView *editor_view);
 GtkWidget* cong_editor_view_get_widget(CongEditorView *editor_view);
Index: src/plugin-cleanup-source.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-cleanup-source.c,v
retrieving revision 1.17
diff -u -r1.17 plugin-cleanup-source.c
--- a/src/plugin-cleanup-source.c	18 Apr 2004 05:32:30 -0000	1.17
+++ b/src/plugin-cleanup-source.c	23 Jun 2004 16:19:41 -0000
@@ -310,7 +310,7 @@
 			g_assert(node->parent);
 			
 			{
-				enum CongNodeType parent_type = cong_node_type (node->parent);
+				CongNodeType parent_type = cong_node_type (node->parent);
 				if (parent_type!=CONG_NODE_TYPE_DOCUMENT) {
 					add_indentation_and_cr_nodes (doc, 
 								      node,
Index: src/plugin-lists-node-element-listitem.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-lists-node-element-listitem.c,v
retrieving revision 1.13
diff -u -r1.13 plugin-lists-node-element-listitem.c
--- a/src/plugin-lists-node-element-listitem.c	18 Apr 2004 05:32:30 -0000	1.13
+++ b/src/plugin-lists-node-element-listitem.c	23 Jun 2004 16:19:42 -0000
@@ -112,6 +112,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeElementListitem*
 cong_editor_node_element_listitem_construct (CongEditorNodeElementListitem *editor_node_element_listitem,
@@ -138,6 +139,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_element_listitem_new (CongEditorWidget3* widget,
Index: src/plugin-paragraph-area-paragraph.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-paragraph-area-paragraph.c,v
retrieving revision 1.8
diff -u -r1.8 plugin-paragraph-area-paragraph.c
--- a/src/plugin-paragraph-area-paragraph.c	18 Apr 2004 05:32:30 -0000	1.8
+++ b/src/plugin-paragraph-area-paragraph.c	23 Jun 2004 16:19:42 -0000
@@ -90,6 +90,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_paragraph_construct (CongEditorAreaParagraph *area_paragraph,
@@ -110,6 +111,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_paragraph_new (CongEditorWidget3 *editor_widget)
Index: src/plugin-paragraph-node-element-paragraph.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-paragraph-node-element-paragraph.c,v
retrieving revision 1.6
diff -u -r1.6 plugin-paragraph-node-element-paragraph.c
--- a/src/plugin-paragraph-node-element-paragraph.c	18 Apr 2004 05:32:30 -0000	1.6
+++ b/src/plugin-paragraph-node-element-paragraph.c	23 Jun 2004 16:19:42 -0000
@@ -63,18 +63,19 @@
 /**
  * cong_editor_node_element_paragraph_construct:
  * @editor_node_element_paragraph:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeElementParagraph*
 cong_editor_node_element_paragraph_construct (CongEditorNodeElementParagraph *editor_node_element_paragraph,
-					      CongEditorWidget3 *editor_widget,
+					      CongEditorWidget3 *widget,
 					      CongTraversalNode *traversal_node)
 {
 	cong_editor_node_element_construct (CONG_EDITOR_NODE_ELEMENT (editor_node_element_paragraph),
-					    editor_widget,
+					    widget,
 					    traversal_node);
 
 	return editor_node_element_paragraph;
@@ -86,6 +87,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_element_paragraph_new (CongEditorWidget3* widget,
Index: src/plugin-validate.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-validate.c,v
retrieving revision 1.12
diff -u -r1.12 plugin-validate.c
--- a/src/plugin-validate.c	22 Jun 2004 03:05:35 -0000	1.12
+++ b/src/plugin-validate.c	23 Jun 2004 16:19:43 -0000
@@ -169,7 +169,7 @@
 								 why_failed,
 								 _("You can fix this by adding a Document Type Declaration (DTD) to the document"),
 								 _("_Add a DTD"),
-								 _("_Cancel"),
+								 GTK_STOCK_CANCEL,
 								 TRUE,
 								 on_add_dtd,
 								 primary_window);
Index: src/xmldata.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/xmldata.c,v
retrieving revision 1.68
diff -u -r1.68 xmldata.c
--- a/src/xmldata.c	18 Jun 2004 13:20:22 -0000	1.68
+++ b/src/xmldata.c	23 Jun 2004 16:19:46 -0000
@@ -29,8 +29,8 @@
 static gint xml_valid_get_potential_element_children(xmlElementContent *ctree, const xmlChar **list, int *len, int max);
 static gint wrap_xml_valid_get_valid_elements(CongDocument *doc, xmlNode *parent, xmlNode *next_sibling, const xmlChar ** elements, gint max);
 static GList *xml_filter_valid_children_with_dispspec(CongDispspec* ds, const xmlChar **elements, 
-						      gint elements_length, enum CongElementType tag_type);
-static GList* xml_get_elements_from_dispspec(CongDispspec* ds, enum CongElementType tag_type);
+						      gint elements_length, CongElementType tag_type);
+static GList* xml_get_elements_from_dispspec(CongDispspec* ds, CongElementType tag_type);
 
 
 /* Other stuff: */
@@ -337,12 +337,13 @@
 	}
 }
 
-/**
+/*
  * Adds required children from an
  * input content model.
  *
  * Returns whether all required content was added
  */
+ 
 static gboolean cong_command_add_xml_add_required_content (CongCommand *cmd, 
 							   xmlElementContentPtr content, 
 							   xmlNodePtr node) 
@@ -407,13 +408,14 @@
 	}
 }
 
-/**
+/*
  * Allows the user to select between a set
  * of choices for a required content element.
  * Adds that choice to the node.
  *
  * Returns whether the choice was correctly selected and added
  */
+ 
 static gboolean
 cong_command_add_xml_add_required_content_choice (CongCommand *cmd, 
 						  xmlElementContentPtr content, 
@@ -491,13 +493,14 @@
 }
 	
  
-/**
+/*
  * Adds an optional text node when it
  * conforms to the content model, such that
  * the user may type.
  *
- * @return whether a text node has been added
+ * Return whether a text node has been added
  */
+ 
 static gboolean cong_command_add_xml_add_optional_text_nodes(CongCommand *cmd, xmlElementContentPtr content, xmlNodePtr node) {
 	xmlNodePtr new_node;
 	CongDocument *cong_doc;
@@ -685,7 +688,7 @@
 GList*
 cong_document_get_valid_new_child_elements (CongDocument *doc,
 					    CongNodePtr node, 
-					    enum CongElementType tag_type)
+					    CongElementType tag_type)
 {
 	const xmlChar *elements[MAX_ELEMENTS];
 	gint result;
@@ -728,7 +731,7 @@
 GList* 
 cong_document_get_valid_new_previous_sibling_elements (CongDocument *doc,
 						       CongNodePtr node, 
-						       enum CongElementType tag_type)
+						       CongElementType tag_type)
 {
 	const xmlChar  *elements[MAX_ELEMENTS];
 	gint result;
@@ -766,7 +769,7 @@
 GList* 
 cong_document_get_valid_new_next_sibling_elements (CongDocument* doc, 
 						   CongNodePtr node, 
-						   enum CongElementType tag_type)
+						   CongElementType tag_type)
 {
 	const xmlChar  *elements[MAX_ELEMENTS];
 	gint result;
@@ -799,7 +802,7 @@
  */
 gboolean
 should_include_element (CongDispspecElement *element,
-			enum CongElementType tag_type )
+			CongElementType tag_type )
 {
 	g_return_val_if_fail (element, FALSE);
 
@@ -834,7 +837,7 @@
  * 
  * Returns:
  */
-static GList *xml_filter_valid_children_with_dispspec(CongDispspec* ds, const xmlChar **elements, gint elements_length, enum CongElementType tag_type) {
+static GList *xml_filter_valid_children_with_dispspec(CongDispspec* ds, const xmlChar **elements, gint elements_length, CongElementType tag_type) {
 	CongDispspecElement *element;
 	GList *list = NULL;
 	gint i;
@@ -865,7 +868,7 @@
 struct add_element_data
 {
 	GList *list;
-	enum CongElementType tag_type;
+	CongElementType tag_type;
 };
 
 static void
@@ -895,7 +898,7 @@
  */
 static GList* 
 xml_get_elements_from_dispspec (CongDispspec* ds,
-				enum CongElementType tag_type)
+				CongElementType tag_type)
 {
 
 	struct add_element_data add_element_data;
Index: src/xmlview.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/xmlview.c,v
retrieving revision 1.36
diff -u -r1.36 xmlview.c
--- a/src/xmlview.c	18 Apr 2004 05:32:30 -0000	1.36
+++ b/src/xmlview.c	23 Jun 2004 16:19:47 -0000
@@ -838,7 +838,7 @@
 {
 	for ( ; x; x = cong_node_next(x))
 	{
-		enum CongNodeType node_type = cong_node_type(x);
+		CongNodeType node_type = cong_node_type(x);
 		const char *name = xml_frag_name_nice(x);
 
 #error
@@ -1056,7 +1056,7 @@
 
 	for ( ; x; )
 	{
-		enum CongNodeType node_type = cong_node_type(x);
+		CongNodeType node_type = cong_node_type(x);
 		const char *name = xml_frag_name_nice(x);
 
 		/* g_message("Examining frag %s\n",name); */
@@ -1187,7 +1187,7 @@
 
 	for ( ; x; x = cong_node_next(x))
 	{
-		enum CongNodeType type = cong_node_type(x);
+		CongNodeType type = cong_node_type(x);
 
 		const char *name = xml_frag_name_nice(x);
 
Index: uss/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/uss/ChangeLog,v
retrieving revision 1.21
diff -u -r1.21 ChangeLog
--- a/uss/ChangeLog	5 May 2004 21:58:07 -0000	1.21
+++ b/uss/ChangeLog	23 Jun 2004 16:19:47 -0000
@@ -1,3 +1,9 @@
+2004-06-21 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+	* cgtkdocincludes
+	
+	Update check for moving to external entities
+	
 2004-05-05  Geert Stappers <stappers@stappers.nl>
 
 	* mkcvstarball
Index: uss/ckgtkdocincludes
===================================================================
RCS file: /cvs/gnome/conglomerate/uss/ckgtkdocincludes,v
retrieving revision 1.5
diff -u -r1.5 ckgtkdocincludes
--- a/uss/ckgtkdocincludes	26 Oct 2003 07:48:06 -0000	1.5
+++ b/uss/ckgtkdocincludes	23 Jun 2004 16:19:47 -0000
@@ -12,5 +12,5 @@
     NAMETOCHECK1=`basename $HEADERFILE`
     NAMETOCHECK=${NAMETOCHECK1%%.h}
 #    echo $NAMETOCHECK
-    test `grep -c $NAMETOCHECK $CDOCS` -eq "0" && echo $NAMETOCHECK not found
+    test `grep -c \&$NAMETOCHECK\; $CDOCS` -eq "0" && echo $NAMETOCHECK not found
 done 
