Merge branch 'cleanup-docs' into 'master'

Clean up the documentation

See merge request GNOME/at-spi2-core!4

3 files changed, 234 insertions, 160 deletions

diff --git a/atspi/atspi-constants.h b/atspi/atspi-constants.h
index 6fc7ce0a..d9ad1549 100644
--- a/atspi/atspi-constants.h
+++ b/atspi/atspi-constants.h
@@ -150,14 +150,16 @@ typedef enum {
 
 /**
  * AtspiCollectionSortOrder:
- * @ATSPI_Collection_SORT_ORDER_INVALID:
- * @ATSPI_Collection_SORT_ORDER_CANONICAL:
- * @ATSPI_Collection_SORT_ORDER_FLOW:
- * @ATSPI_Collection_SORT_ORDER_TAB:
- * @ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL:
- * @ATSPI_Collection_SORT_ORDER_REVERSE_FLOW:
- * @ATSPI_Collection_SORT_ORDER_REVERSE_TAB:
- * @ATSPI_Collection_SORT_ORDER_LAST_DEFINED:
+ * @ATSPI_Collection_SORT_ORDER_INVALID: Invalid sort order
+ * @ATSPI_Collection_SORT_ORDER_CANONICAL: Canonical sort order
+ * @ATSPI_Collection_SORT_ORDER_FLOW: Flow sort order
+ * @ATSPI_Collection_SORT_ORDER_TAB: Tab sort order
+ * @ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL: Reverse canonical sort order
+ * @ATSPI_Collection_SORT_ORDER_REVERSE_FLOW: Reverse flow sort order
+ * @ATSPI_Collection_SORT_ORDER_REVERSE_TAB: Reverse tab sort order
+ * @ATSPI_Collection_SORT_ORDER_LAST_DEFINED: Used only to determine the end of the
+ * enumeration.
+
  *
  * Enumeration used by interface #AtspiCollection to specify
  * the way #AtspiAccesible objects should be sorted.
@@ -183,14 +185,14 @@ typedef enum {
 
 /**
  * AtspiCollectionMatchType:
- * @ATSPI_Collection_MATCH_INVALID: Indicates an error condition or 
+ * @ATSPI_Collection_MATCH_INVALID: Indicates an error condition or
  * uninitialized value.
  * @ATSPI_Collection_MATCH_ALL: #TRUE if all of the criteria are met.
  * @ATSPI_Collection_MATCH_ANY: #TRUE if any of the criteria are met.
  * @ATSPI_Collection_MATCH_NONE: #TRUE if none of the criteria are met.
  * @ATSPI_Collection_MATCH_EMPTY: Same as @ATSPI_Collection_MATCH_ALL if
- * the criteria is non-empty; for empty criteria this rule requires returned 
- * value to also have empty set. 
+ * the criteria is non-empty; for empty criteria this rule requires returned
+ * value to also have empty set.
  * @ATSPI_Collection_MATCH_LAST_DEFINED: Used only to determine the end of the
  * enumeration.
  *
@@ -216,10 +218,11 @@ typedef enum {
 
 /**
  * AtspiCollectionTreeTraversalType:
- * @ATSPI_Collection_TREE_RESTRICT_CHILDREN:
- * @ATSPI_Collection_TREE_RESTRICT_SIBLING:
- * @ATSPI_Collection_TREE_INORDER:
- * @ATSPI_Collection_TREE_LAST_DEFINED:
+ * @ATSPI_Collection_TREE_RESTRICT_CHILDREN: Restrict children tree traveral
+ * @ATSPI_Collection_TREE_RESTRICT_SIBLING: Restrict sibling tree traversal
+ * @ATSPI_Collection_TREE_INORDER: In-order tree traversal.
+ * @ATSPI_Collection_TREE_LAST_DEFINED: Used only to determine the end of the
+ * enumeration.
  *
  * Enumeration used by interface #AtspiCollection to specify
  * restrictions on #AtspiAccesible objects to be traversed.
@@ -419,7 +422,7 @@ typedef enum {
  * @ATSPI_STATE_ACTIVE: Indicates a window is currently the active window, or
  * an object is the active subelement within a container or table.
  * @ATSPI_STATE_ACTIVE should not be used for objects which have
- * @ATSPI_STATE_FOCUSABLE or @ATSPI_STATE_SELECTABLE: Those objects should use
+ * #ATSPI_STATE_FOCUSABLE or #ATSPI_STATE_SELECTABLE: Those objects should use
  * @ATSPI_STATE_FOCUSED and @ATSPI_STATE_SELECTED respectively.
  * @ATSPI_STATE_ACTIVE is a means to indicate that an object which is not
  * focusable and not selectable is the currently-active item within its
@@ -443,8 +446,8 @@ typedef enum {
  * disclosure of its children.
  * @ATSPI_STATE_EXPANDED: Indicates this object is expanded.
  * @ATSPI_STATE_FOCUSABLE: Indicates this object can accept keyboard focus,
- * which means all       events resulting from typing on the keyboard will
- * normally be passed       to it when it has focus.
+ * which means all events resulting from typing on the keyboard will
+ * normally be passed to it when it has focus.
  * @ATSPI_STATE_FOCUSED: Indicates this object currently has the keyboard
  * focus.
  * @ATSPI_STATE_HAS_TOOLTIP: Indicates that the object has an associated
@@ -641,8 +644,8 @@ typedef enum {
 
 /**
  * AtspiKeyEventType:
- * @ATSPI_KEY_PRESSED:
- * @ATSPI_KEY_RELEASED:
+ * @ATSPI_KEY_PRESSED: Key press event
+ * @ATSPI_KEY_RELEASED: Key release event
  *
  * Deprecated. Should not be used.
  *
@@ -869,7 +872,7 @@ typedef enum {
  * the valuator. Common examples include association of scrollbars with the
  * viewport or panel which they control.
  *
- * 
+ *
  * Enumeration used to specify
  * the type of relation encapsulated in an #AtspiRelation object.
  *
@@ -1159,78 +1162,76 @@ typedef enum {
  * @ATSPI_ROLE_INFO_BAR: An object designed to present a message to the user
  * within an existing window.
  * @ATSPI_ROLE_LEVEL_BAR: A bar that serves as a level indicator to, for
- * instance, show the strength of a password or the state of a battery. 
- *   Since: 2.8
- *@ATSPI_ROLE_TITLE_BAR: A bar that serves as the title of a window or a
- * dialog. @Since: 2.12
- *@ATSPI_ROLE_BLOCK_QUOTE: An object which contains a text section
- * that is quoted from another source.  @Since: 2.12
- *@ATSPI_ROLE_AUDIO: An object which represents an audio
- * element. @Since: 2.12
- *@ATSPI_ROLE_VIDEO: An object which represents a video
- * element. @Since: 2.12
- *@ATSPI_ROLE_DEFINITION: A definition of a term or concept. @Since: 2.12
- *@ATSPI_ROLE_ARTICLE: A section of a page that consists of a
- * composition that forms an independent part of a document, page, or
- * site. Examples: A blog entry, a news story, a forum post. @Since:
- * 2.12
- *@ATSPI_ROLE_LANDMARK: A region of a web page intended as a
- * navigational landmark. This is designed to allow Assistive
- * Technologies to provide quick navigation among key regions within a
- * document. @Since: 2.12
- *@ATSPI_ROLE_LOG: A text widget or container holding log content, such
- * as chat history and error logs. In this role there is a
- * relationship between the arrival of new items in the log and the
- * reading order. The log contains a meaningful sequence and new
- * information is added only to the end of the log, not at arbitrary
- * points. @Since: 2.12
- *@ATSPI_ROLE_MARQUEE: A container where non-essential information
- * changes frequently. Common usages of marquee include stock tickers
- * and ad banners. The primary difference between a marquee and a log
- * is that logs usually have a meaningful order or sequence of
- * important content changes. @Since: 2.12
- *@ATSPI_ROLE_MATH: A text widget or container that holds a mathematical
- * expression. @Since: 2.12
- *@ATSPI_ROLE_RATING: A widget whose purpose is to display a rating,
- * such as the number of stars associated with a song in a media
- * player. Objects of this role should also implement
- * AtspiValue. @Since: 2.12
- *@ATSPI_ROLE_TIMER: An object containing a numerical counter which
- * indicates an amount of elapsed time from a start point, or the time
- * remaining until an end point. @Since: 2.12
- *@ATSPI_ROLE_STATIC: A generic non-container object whose purpose is to display
- * a brief amount of information to the user and whose role is known by the
- * implementor but lacks semantic value for the user. Examples in which
- * @ATSPI_ROLE_STATIC is appropriate include the message displayed in a message
- * box and an image used as an alternative means to display text.
- * @ATSPI_ROLE_STATIC should not be applied to widgets which are traditionally
- * interactive, objects which display a significant amount of content, or any
- * object which has an accessible relation pointing to another object. The
- * displayed information, as a general rule, should be exposed through the
- * accessible name of the object. For labels which describe another widget, see
- * @ATSPI_ROLE_LABEL. For text views, see @ATSPI_ROLE_TEXT. For generic
- * containers, see @ATSPI_ROLE_PANEL. For objects whose role is not known by the
- * implementor, see @ATSPI_ROLE_UNKNOWN. @Since: 2.16.
- *@ATSPI_ROLE_MATH_FRACTION: An object that represents a mathematical fraction.
- * @Since: 2.16.
- *@ATSPI_ROLE_MATH_ROOT: An object that represents a mathematical expression
- * displayed with a radical. @Since: 2.16.
- *@ATSPI_ROLE_SUBSCRIPT: An object that contains text that is displayed as a
- * subscript. @Since: 2.16.
- *@ATSPI_ROLE_SUPERSCRIPT: An object that contains text that is displayed as a
- * superscript. @Since: 2.16.
- *@ATSPI_ROLE_DESCRIPTION_LIST: An object that represents a list of term-value
- * groups. A term-value group represents an individual description and consist
- * of one or more names (@ATSPI_ROLE_DESCRIPTION_TERM) followed by one or more
- * values (@ATSPI_ROLE_DESCRIPTION_VALUE). For each list, there should not be
- * more than one group with the same term name. @Since: 2.26.
- *@ATSPI_ROLE_DESCRIPTION_TERM: An object that represents a term or phrase
- * with a corresponding definition. @Since: 2.26.
- *@ATSPI_ROLE_DESCRIPTION_VALUE: An object that represents the description,
- * definition, or value of a term. @Since: 2.26.
- *@ATSPI_ROLE_FOOTNOTE: An object that contains the text of a footnote. @Since: 2.26.
- * @ATSPI_ROLE_LAST_DEFINED: Not a valid role, used for finding end of
- * enumeration.
+ * instance, show the strength of a password or the state of a battery. @Since: 2.8
+ * @ATSPI_ROLE_TITLE_BAR: A bar that serves as the title of a window or a
+ *  dialog. @Since: 2.12
+ * @ATSPI_ROLE_BLOCK_QUOTE: An object which contains a text section
+ *  that is quoted from another source.  @Since: 2.12
+ * @ATSPI_ROLE_AUDIO: An object which represents an audio
+ *  element. @Since: 2.12
+ * @ATSPI_ROLE_VIDEO: An object which represents a video
+ *  element. @Since: 2.12
+ * @ATSPI_ROLE_DEFINITION: A definition of a term or concept. @Since: 2.12
+ * @ATSPI_ROLE_ARTICLE: A section of a page that consists of a
+ *  composition that forms an independent part of a document, page, or
+ *  site. Examples: A blog entry, a news story, a forum post. @Since:
+ *  2.12
+ * @ATSPI_ROLE_LANDMARK: A region of a web page intended as a
+ *  navigational landmark. This is designed to allow Assistive
+ *  Technologies to provide quick navigation among key regions within a
+ *  document. @Since: 2.12
+ * @ATSPI_ROLE_LOG: A text widget or container holding log content, such
+ *  as chat history and error logs. In this role there is a
+ *  relationship between the arrival of new items in the log and the
+ *  reading order. The log contains a meaningful sequence and new
+ *  information is added only to the end of the log, not at arbitrary
+ *  points. @Since: 2.12
+ * @ATSPI_ROLE_MARQUEE: A container where non-essential information
+ *  changes frequently. Common usages of marquee include stock tickers
+ *  and ad banners. The primary difference between a marquee and a log
+ *  is that logs usually have a meaningful order or sequence of
+ *  important content changes. @Since: 2.12
+ * @ATSPI_ROLE_MATH: A text widget or container that holds a mathematical
+ *  expression. @Since: 2.12
+ * @ATSPI_ROLE_RATING: A widget whose purpose is to display a rating,
+ *  such as the number of stars associated with a song in a media
+ *  player. Objects of this role should also implement
+ *  AtspiValue. @Since: 2.12
+ * @ATSPI_ROLE_TIMER: An object containing a numerical counter which
+ *  indicates an amount of elapsed time from a start point, or the time
+ *  remaining until an end point. @Since: 2.12
+ * @ATSPI_ROLE_STATIC: A generic non-container object whose purpose is to display
+ *  a brief amount of information to the user and whose role is known by the
+ *  implementor but lacks semantic value for the user. Examples in which
+ *  @ATSPI_ROLE_STATIC is appropriate include the message displayed in a message
+ *  box and an image used as an alternative means to display text.
+ *  @ATSPI_ROLE_STATIC should not be applied to widgets which are traditionally
+ *  interactive, objects which display a significant amount of content, or any
+ *  object which has an accessible relation pointing to another object. The
+ *  displayed information, as a general rule, should be exposed through the
+ *  accessible name of the object. For labels which describe another widget, see
+ *  @ATSPI_ROLE_LABEL. For text views, see @ATSPI_ROLE_TEXT. For generic
+ *  containers, see @ATSPI_ROLE_PANEL. For objects whose role is not known by the
+ *  implementor, see @ATSPI_ROLE_UNKNOWN. @Since: 2.16.
+ * @ATSPI_ROLE_MATH_FRACTION: An object that represents a mathematical fraction. @Since: 2.16.
+ * @ATSPI_ROLE_MATH_ROOT: An object that represents a mathematical expression
+ *  displayed with a radical. @Since: 2.16.
+ * @ATSPI_ROLE_SUBSCRIPT: An object that contains text that is displayed as a
+ *  subscript. @Since: 2.16.
+ * @ATSPI_ROLE_SUPERSCRIPT: An object that contains text that is displayed as a
+ *  superscript. @Since: 2.16.
+ * @ATSPI_ROLE_DESCRIPTION_LIST: An object that represents a list of term-value
+ *  groups. A term-value group represents an individual description and consist
+ *  of one or more names (@ATSPI_ROLE_DESCRIPTION_TERM) followed by one or more
+ *  values (@ATSPI_ROLE_DESCRIPTION_VALUE). For each list, there should not be
+ *  more than one group with the same term name. @Since: 2.26.
+ * @ATSPI_ROLE_DESCRIPTION_TERM: An object that represents a term or phrase
+ *  with a corresponding definition. @Since: 2.26.
+ * @ATSPI_ROLE_DESCRIPTION_VALUE: An object that represents the description,
+ *  definition, or value of a term. @Since: 2.26.
+ * @ATSPI_ROLE_FOOTNOTE: An object that contains the text of a footnote. @Since: 2.26.
+ *  @ATSPI_ROLE_LAST_DEFINED: Not a valid role, used for finding end of
+ *  enumeration.
  *
  * Enumeration used by interface #AtspiAccessible to specify the role
  * of an #AtspiAccessible object.
diff --git a/doc/libatspi/libatspi-docs.sgml b/doc/libatspi/libatspi-docs.sgml
index 8b9ff0dd..935767c6 100644
--- a/doc/libatspi/libatspi-docs.sgml
+++ b/doc/libatspi/libatspi-docs.sgml
@@ -42,8 +42,6 @@
     <xi:include href="xml/atspi-types.xml"/>
     <xi:include href="xml/atspi-constants.xml"/>
     <xi:include href="xml/atspi-misc.xml"/>
-    <xi:include href="xml/atspi-misc-private.xml"/>
-    <xi:include href="xml/atspi-listener-private.xml"/>
 
   </chapter>
   <chapter id="object-tree">
diff --git a/doc/libatspi/libatspi-sections.txt b/doc/libatspi/libatspi-sections.txt
index e5ef6bba..14304ff3 100644
--- a/doc/libatspi/libatspi-sections.txt
+++ b/doc/libatspi/libatspi-sections.txt
@@ -1,10 +1,8 @@
 <SECTION>
 <FILE>atspi-text</FILE>
 AtspiRange
-ATSPI_TYPE_RANGE
 atspi_range_copy
 AtspiTextRange
-ATSPI_TYPE_TEXT_RANGE
 atspi_text_get_type
 AtspiText
 atspi_text_range_get_type
@@ -29,12 +27,17 @@ atspi_text_get_selection
 atspi_text_add_selection
 atspi_text_remove_selection
 atspi_text_set_selection
+atspi_text_get_string_at_offset
+atspi_text_get_text_attribute_value
+atspi_text_get_text_attributes
 <SUBSECTION Standard>
 ATSPI_TEXT
 ATSPI_IS_TEXT
 ATSPI_TYPE_TEXT
 atspi_range_get_type
 ATSPI_TEXT_GET_IFACE
+ATSPI_TYPE_RANGE
+ATSPI_TYPE_TEXT_RANGE
 </SECTION>
 
 <SECTION>
@@ -97,6 +100,9 @@ AtspiAction
 atspi_action_get_n_actions
 atspi_action_get_description
 atspi_action_get_key_binding
+atspi_action_get_action_description
+atspi_action_get_action_name
+atspi_action_get_localized_name
 atspi_action_get_name
 atspi_action_do_action
 <SUBSECTION Standard>
@@ -161,6 +167,10 @@ AtspiDocument
 atspi_document_get_locale
 atspi_document_get_attribute_value
 atspi_document_get_attributes
+atspi_document_get_current_page_number
+atspi_document_get_document_attribute_value
+atspi_document_get_document_attributes
+atspi_document_get_page_count
 <SUBSECTION Standard>
 ATSPI_DOCUMENT
 ATSPI_IS_DOCUMENT
@@ -207,6 +217,8 @@ atspi_accessible_get_attributes_as_array
 atspi_accessible_get_locale
 atspi_accessible_get_toolkit_name
 atspi_accessible_get_toolkit_version
+atspi_accessible_get_atspi_version
+atspi_accessible_get_id
 atspi_accessible_get_application
 atspi_accessible_get_action
 atspi_accessible_get_collection
@@ -218,8 +230,24 @@ atspi_accessible_get_hypertext
 atspi_accessible_get_image
 atspi_accessible_get_selection
 atspi_accessible_get_table
+atspi_accessible_get_table_cell
 atspi_accessible_get_text
 atspi_accessible_get_value
+atspi_accessible_get_object_locale 
+atspi_accessible_set_cache_mask 
+atspi_accessible_clear_cache
+atspi_accessible_get_process_id
+atspi_accessible_get_action_iface
+atspi_accessible_get_collection_iface
+atspi_accessible_get_component_iface
+atspi_accessible_get_document_iface
+atspi_accessible_get_editable_text_iface
+atspi_accessible_get_hypertext_iface
+atspi_accessible_get_image_iface
+atspi_accessible_get_selection_iface
+atspi_accessible_get_table_iface
+atspi_accessible_get_text_iface
+atspi_accessible_get_value_iface
 atspi_accessible_get_interfaces
 <SUBSECTION Standard>
 ATSPI_ACCESSIBLE
@@ -229,6 +257,9 @@ atspi_accessible_get_type
 ATSPI_ACCESSIBLE_CLASS
 ATSPI_IS_ACCESSIBLE_CLASS
 ATSPI_ACCESSIBLE_GET_CLASS
+
+<SUBSECTION Private>
+AtspiAccessiblePrivate
 </SECTION>
 
 <SECTION>
@@ -253,6 +284,20 @@ ATSPI_DEVICE_LISTENER_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>atspi-hypertext</FILE>
+AtspiHypertext
+atspi_hypertext_get_n_links
+atspi_hypertext_get_link
+atspi_hypertext_get_link_index
+<SUBSECTION Standard>
+ATSPI_HYPERTEXT
+ATSPI_IS_HYPERTEXT
+ATSPI_TYPE_HYPERTEXT
+atspi_hypertext_get_type
+ATSPI_HYPERTEXT_GET_IFACE
+</SECTION>
+
+<SECTION>
 <FILE>atspi-hyperlink</FILE>
 <TITLE>AtspiHyperlink</TITLE>
 AtspiHyperlink
@@ -278,7 +323,6 @@ ATSPI_HYPERLINK_GET_CLASS
 <SECTION>
 <FILE>atspi-editabletext</FILE>
 AtspiEditableText
-atspi_editable_text_set_attributes
 atspi_editable_text_insert_text
 atspi_editable_text_copy_text
 atspi_editable_text_cut_text
@@ -290,6 +334,8 @@ ATSPI_IS_EDITABLE_TEXT
 ATSPI_TYPE_EDITABLE_TEXT
 atspi_editable_text_get_type
 ATSPI_EDITABLE_TEXT_GET_IFACE
+<SUBSECTION Private>
+atspi_editable_text_set_attributes
 </SECTION>
 
 <SECTION>
@@ -356,12 +402,13 @@ atspi_table_cell_get_position
 atspi_table_cell_get_row_column_span
 atspi_table_cell_get_table
 <SUBSECTION Standard>
-ATSPI_TABLE
-ATSPI_IS_TABLE
-ATSPI_TYPE_TABLE
-atspi_table_get_type
-ATSPI_TABLE_GET_IFACE
+ATSPI_TABLE_CELL
+ATSPI_IS_TABLE_CELL
+ATSPI_TYPE_TABLE_CELL
+atspi_table_cell_get_type
+ATSPI_TABLE_CELL_GET_IFACE
 </SECTION>
+
 <SECTION>
 <FILE>atspi-selection</FILE>
 AtspiSelection
@@ -393,7 +440,9 @@ atspi_event_listener_new
 atspi_event_listener_new_simple
 atspi_event_listener_register
 atspi_event_listener_register_from_callback
+atspi_event_listener_register_from_callback_full
 atspi_event_listener_register_no_data
+atspi_event_listener_register_full
 atspi_event_listener_deregister
 atspi_event_listener_deregister_from_callback
 atspi_event_listener_deregister_no_data
@@ -408,20 +457,6 @@ ATSPI_EVENT_LISTENER_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>atspi-hypertext</FILE>
-AtspiHypertext
-atspi_hypertext_get_n_links
-atspi_hypertext_get_link
-atspi_hypertext_get_link_index
-<SUBSECTION Standard>
-ATSPI_HYPERTEXT
-ATSPI_IS_HYPERTEXT
-ATSPI_TYPE_HYPERTEXT
-atspi_hypertext_get_type
-ATSPI_HYPERTEXT_GET_IFACE
-</SECTION>
-
-<SECTION>
 <FILE>atspi-component</FILE>
 AtspiRect
 ATSPI_TYPE_RECT
@@ -443,6 +478,9 @@ atspi_component_grab_focus
 atspi_component_get_alpha
 atspi_component_scroll_to
 atspi_component_scroll_to_point
+atspi_component_set_extents
+atspi_component_set_position
+atspi_component_set_size
 <SUBSECTION Standard>
 ATSPI_COMPONENT
 ATSPI_IS_COMPONENT
@@ -467,20 +505,6 @@ atspi_generate_mouse_event
 
 <SECTION>
 <FILE>atspi-types</FILE>
-AtspiAccessible
-AtspiAction
-AtspiCollection
-AtspiComponent
-AtspiDocument
-AtspiEditableText
-AtspiHyperlink
-AtspiHypertext
-AtspiImage
-AtspiSelection
-AtspiTable
-AtspiTableCell
-AtspiText
-AtspiValue
 AtspiControllerEventMask
 AtspiKeyMaskType
 AtspiKeyEventMask
@@ -489,9 +513,13 @@ AtspiDeviceEvent
 AtspiEventListenerMode
 AtspiKeyDefinition
 AtspiEvent
-ATSPI_TYPE_EVENT
 AtspiKeystrokeListener
 AtspiKeyListenerSyncType
+
+<SUBSECTION Standard>
+ATSPI_TYPE_EVENT
+atspi_device_event_get_type
+atspi_key_listener_sync_type_get_type
 </SECTION>
 
 <SECTION>
@@ -508,6 +536,7 @@ AtspiCollectionTreeTraversalType
 ATSPI_TREETRAVERSALTYPE
 AtspiComponentLayer
 ATSPI_COMPONENTLAYER_COUNT
+AtspiTextGranularity
 AtspiTextBoundaryType
 ATSPI_TEXT_BOUNDARY_TYPE_COUNT
 AtspiTextClipType
@@ -526,42 +555,83 @@ AtspiRelationType
 ATSPI_RELATIONTYPE_COUNT
 AtspiRole
 ATSPI_ROLE_COUNT
+AtspiCache
 AtspiScrollType
 ATSPI_SCROLLTYPE_COUNT
+
+<SUBSECTION Standard>
+atspi_cache_get_type
+atspi_collection_match_type_get_type
+atspi_collection_sort_order_get_type
+atspi_collection_tree_traversal_type_get_type
+atspi_component_layer_get_type
+atspi_coord_type_get_type
+atspi_event_type_get_type
+atspi_key_event_type_get_type
+atspi_key_synth_type_get_type
+atspi_locale_type_get_type
+atspi_modifier_type_get_type
+atspi_modifier_type_get_type
+atspi_relation_type_get_type
+atspi_role_get_type
+atspi_scroll_type_get_type
+atspi_state_type_get_type
+atspi_text_boundary_type_get_type
+atspi_text_clip_type_get_type
+atspi_text_granularity_get_type
+ATSPI_TYPE_CACHE
+ATSPI_TYPE_COLLECTION_MATCH_TYPE
+ATSPI_TYPE_COLLECTION_SORT_ORDER
+ATSPI_TYPE_COLLECTION_TREE_TRAVERSAL_TYPE
+ATSPI_TYPE_COMPONENT_LAYER
+ATSPI_TYPE_COORD_TYPE
+ATSPI_TYPE_DEVICE_EVENT
+ATSPI_TYPE_EVENT_TYPE
+ATSPI_TYPE_KEY_EVENT_TYPE
+ATSPI_TYPE_KEY_LISTENER_SYNC_TYPE
+ATSPI_TYPE_KEY_SYNTH_TYPE
+ATSPI_TYPE_LOCALE_TYPE
+ATSPI_TYPE_MODIFIER_TYPE
+ATSPI_TYPE_RELATION_TYPE
+ATSPI_TYPE_ROLE
+ATSPI_TYPE_SCROLL_TYPE
+ATSPI_TYPE_STATE_TYPE
+ATSPI_TYPE_TEXT_BOUNDARY_TYPE
+ATSPI_TYPE_TEXT_CLIP_TYPE
+ATSPI_TYPE_TEXT_GRANULARITY
 </SECTION>
 
 <SECTION>
 <FILE>atspi-misc</FILE>
 atspi_init
+atspi_is_initialized
+atspi_set_timeout
+atspi_set_main_context
 atspi_event_main
 atspi_event_quit
 atspi_exit
-</SECTION>
 
-<SECTION>
-<FILE>atspi-misc-private</FILE>
-ATSPI_CACHE_PARENT
+<SUBSECTION Private>
+atspi_main_loop
+atspi_get_a11y_bus
+atspi_dbus_connection_setup_with_g_main
+atspi_dbus_server_setup_with_g_main
+atspi_bus_registry
 ATSPI_CACHE_CHILDREN
-ATSPI_CACHE_NAME
 ATSPI_CACHE_DESCRIPTION
-ATSPI_CACHE_STATES
-ATSPI_CACHE_ROLE
 ATSPI_CACHE_INTERFACES
-AtspiReference
-ATSPI_DBUS_NAME_REGISTRY
-ATSPI_DBUS_PATH_REGISTRY
-ATSPI_DBUS_INTERFACE_REGISTRY
-ATSPI_DBUS_PATH_NULL
-ATSPI_DBUS_PATH_ROOT
-ATSPI_DBUS_PATH_DEC
-ATSPI_DBUS_INTERFACE_DEC
-ATSPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER
-ATSPI_DBUS_INTERFACE_CACHE
+ATSPI_CACHE_NAME
+ATSPI_CACHE_PARENT
+ATSPI_CACHE_ROLE
+ATSPI_CACHE_STATES
 ATSPI_DBUS_INTERFACE_ACCESSIBLE
 ATSPI_DBUS_INTERFACE_ACTION
 ATSPI_DBUS_INTERFACE_APPLICATION
+ATSPI_DBUS_INTERFACE_CACHE
 ATSPI_DBUS_INTERFACE_COLLECTION
 ATSPI_DBUS_INTERFACE_COMPONENT
+ATSPI_DBUS_INTERFACE_DEC
+ATSPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER
 ATSPI_DBUS_INTERFACE_DOCUMENT
 ATSPI_DBUS_INTERFACE_EDITABLE_TEXT
 ATSPI_DBUS_INTERFACE_EVENT_KEYBOARD
@@ -570,18 +640,22 @@ ATSPI_DBUS_INTERFACE_EVENT_OBJECT
 ATSPI_DBUS_INTERFACE_HYPERLINK
 ATSPI_DBUS_INTERFACE_HYPERTEXT
 ATSPI_DBUS_INTERFACE_IMAGE
+ATSPI_DBUS_INTERFACE_REGISTRY
 ATSPI_DBUS_INTERFACE_SELECTION
+ATSPI_DBUS_INTERFACE_SOCKET
 ATSPI_DBUS_INTERFACE_TABLE
+ATSPI_DBUS_INTERFACE_TABLE_CELL
 ATSPI_DBUS_INTERFACE_TEXT
 ATSPI_DBUS_INTERFACE_VALUE
-ATSPI_DBUS_INTERFACE_SOCKET
-atspi_path_dec
-atspi_path_registry
-atspi_path_root
-atspi_bus_registry
+ATSPI_DBUS_NAME_REGISTRY
+ATSPI_DBUS_PATH_DEC
+ATSPI_DBUS_PATH_NULL
+ATSPI_DBUS_PATH_REGISTRY
+ATSPI_DBUS_PATH_ROOT
 atspi_interface_accessible
 atspi_interface_action
 atspi_interface_application
+atspi_interface_cache
 atspi_interface_collection
 atspi_interface_component
 atspi_interface_dec
@@ -596,12 +670,13 @@ atspi_interface_selection
 atspi_interface_table
 atspi_interface_table_cell
 atspi_interface_text
-atspi_interface_cache
 atspi_interface_value
-</SECTION>
+atspi_no_cache
+atspi_path_dec
+atspi_path_registry
+atspi_path_root
+AtspiReference
+AtspiError
+ATSPI_ERROR
 
-<SECTION>
-<FILE>atspi-listener-private</FILE>
-atspi_dbus_handle_deviceEvent
 </SECTION>
-